Cleanup.

Package-Manager: portage-2.2.18/cvs/Linux x86_64

diff --git a/app-arch/xarchiver/ChangeLog b/app-arch/xarchiver/ChangeLog
index 504b9249a742977292409b999b9ff3e3131fa11f..d29f171b6c96e0cd026aff013e9b7459162c2ae5 100644 (file)
--- a/app-arch/xarchiver/ChangeLog
+++ b/app-arch/xarchiver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/xarchiver
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/ChangeLog,v 1.43 2015/04/21 04:04:46 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/ChangeLog,v 1.44 2015/04/21 14:01:01 calchan Exp $
+
+  21 Apr 2015; Denis Dupeyron <calchan@gentoo.org> -xarchiver-0.5.3.ebuild,
+  -xarchiver-0.5.3-r1.ebuild, -files/xarchiver-0.5.3-fix-double-escaping.patch,
+  -files/xarchiver-0.5.3-rar5-whitespace.patch:
+  Cleanup.
 
 *xarchiver-0.5.4 (21 Apr 2015)
 

diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index d7e267295cf1bb3cab5b6f365c4f7a0dcb1383c9..2f8bf83a70f10b8c416b23f02deb72cb853f35ee 100644 (file)
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,12 +1,7 @@
 AUX xarchiver-0.5.3-add-mime-types.patch 1436 SHA256 9fee60d67b43aeca0934db0c5be97c87254079dbf6bc01c0616d416bfab08d97 SHA512 a11bedb1ddd28571cca950d6b61a1f292d01c44f4077401c5a2f75cc99cb7a311b3593c1b1da6355a988aceeb35fb13714ad28ad3b707dd1b26f4a0e9d14b136 WHIRLPOOL b836355c80014d2ee1a16d5a2cc14ac6023a4c693c656d0edc3ace6349acd05d8223c0fcf10bb75df560801a2526bd50790674178e14dae6c98b081b3e4557f0
-AUX xarchiver-0.5.3-fix-double-escaping.patch 1132 SHA256 76e08db4f0b085a9ee221f74b8c3b42cc7cb6ea8881f12475184d093777aa938 SHA512 e987ffb9d8ee559a478914a0e78b53919cc884870650dd70bbffed75e21e50f2bbf0e81894448b0a118640db9f1741c8f0e95b1c4e8a0650ba55d68fd735ce7d WHIRLPOOL d182c01ddb7c36ddbc32b4e2d623e9f1fb8aee4c3b47cac6a43946885ee2b98425188581c797ff5e9300537d2bfa5c7eea4bdb0745af44b497703dec3f6525ba
 AUX xarchiver-0.5.3-fix-password-protected.patch 1213 SHA256 f8bfd2e8087d55520e1fb330a10670b79fb568a52be678d93cf4144a5b3b5d71 SHA512 bd38943d8afdc0e023195c31c8bee78a7fdd5ec6a276c3f66c395dc41779b18bf829356dea4d794329abc0bd8ac81a58bbd961283b95f74a9008006826be9a75 WHIRLPOOL b0f53f407ceeca21a69a4892dc3859d6f73b1f8c60fcd4ece5d0583d400a58f611631877a921a92661bfabf6bcb7350ffef28ada6b281f6d28b94a8902b8fb57
 AUX xarchiver-0.5.3-fix-rpm-support.patch 3291 SHA256 f570238c818b88092bc459ebc37b9d58669baf92b969197b29c8662bf8783315 SHA512 4ea64799b765ceadb34d4ea48df8f1e1748749a128a3b734265c7e9aa414bbc4a443007d3ae2b767cb3d6c3cae6b6bfb3866f76584cbbf66b8cc4afa34a76ebd WHIRLPOOL e56dd6e7c33a245f34cc37befffa0311a7bf762106c2d810f127bb198d12b4f91e74d8a885cbf47ec2b950102e90be60a90094d3f15c20a6eff27fc8cbe01ab8
-AUX xarchiver-0.5.3-rar5-whitespace.patch 978 SHA256 f611ea9e88f68afc24d4ad57da3e83b6f11c2ae072910e9e8216a62c98671369 SHA512 15b7c4f560bdffc63396236ada635ffd594cdf02faec66a8aecf407af25da2714fdbaec7cefe51576ef0bbcebf85210b5f9bb8bf4a32f74243d9386ceda0cb1f WHIRLPOOL c86e97484222f0dc6ba2abeffc957bcf09057025bd5b2789d09f896f9fac8396f6d3168ced6ac2899f8240bd90d425ba6fa5929dbddb896628cdcd114a74f56b
-DIST xarchiver-0.5.3.tar.bz2 778871 SHA256 c5899cb495e83a63f89b5eea002d2dd1c691db8d7b6343b3c182ce6e00c16d81 SHA512 b8719a1b7f71c999952390fca999a66baf709e1058f307b40a6b0500d5d268f3923bded742b2fbc0d8c760c43f33b7d5d4971f36a6dc4659310ad41ca7a045d6 WHIRLPOOL 97aac076be74e84c5379294a9a049b6aa727b8cdc5f9788d126795fd221e59415223eb62af931a4920f5f25779d842f0942ae001aa5f49cc05e22fb140f1bc7f
 DIST xarchiver-0.5.4.tar.bz2 1003045 SHA256 e63fa73979fcc56efe8cca9095fd915d31a1714ce9676246b8626f164e452ef4 SHA512 3b767c2601d94104e2fc72aa8d168afa5a154b5747a9b0518d1c348417e56e4c19d872a0029fb78decc897e0f3bc9573e17d0317b85f584e7275b0e519f5f30d WHIRLPOOL 3f5a277b05147daf29db0be26718ed51fa0bb6d2416ee41cdd8ce6c54bc66064fc5f313af39a32b428997f906c9fd4d1a0b8d60fe5d2d867b1137960b0cbe4d1
-EBUILD xarchiver-0.5.3-r1.ebuild 1540 SHA256 cbbb6ea4f3b637e6bb43e6fef6e150f4ee1efbd3985ba884fa906fca9abd27ed SHA512 af788d4c92d2698882ba6a13e14c77ab94c52bd43103e31b8dccebf27b1d7ad72254ea64e1781f1cd5cab1f4f5e2138cea949da59f6124f06292db19238173f4 WHIRLPOOL 5f29c22c02edab18d7d00a9a76ddc8c626926b45c593db85c1b96ae19fa0d08ffb77316a315bd69a3fc5dd6400c7558c3a9e91be3f2b69cb030d1138fdb7a9d0
-EBUILD xarchiver-0.5.3.ebuild 1296 SHA256 c0332dac4174cb92cdc17c710aa39699d18029ebb5c1a43b2eeb57d0fb06422e SHA512 aa2517ea48bad7ef9f3cb137ef6275e1075211ff84f3586146531e448e075c8f680ab20ac269378587978d6ad96fd8ca27184d4566f74725f6586ed11061f1e0 WHIRLPOOL 62f53543a308fe14857ac390391e271e6ad95e993a3085b006bd0bdbec20090cd99e5573d025be5ea80fc021e9b71c7787a086f6b97280f71cf29a312bb3a1d5
 EBUILD xarchiver-0.5.4.ebuild 1466 SHA256 4c78b5bbc3218b32afa9ae32993416769bb67873880ec31d9035fcfb2d84d653 SHA512 fc35284201fe2ee7031ee23f62b209313e2b9ce8d7cce8d9c54c1fae6e1df10a1230a6707737920d81b54f9a2214d1236c4c359734d7e4729109af76a82c2c3c WHIRLPOOL 4974471eca0bd3eb42abe0b38630282e472ad15e128211fe3fb4ca4dd4264f141e7eb0421563e5f930c5f5125aaa186055b8daec6f2cb570b9422a010b0bf04f
-MISC ChangeLog 541 SHA256 e3db36d43d735248f35ef9d0b7edc0b9c1259036552876e0d562a3f2b8f3a0ca SHA512 9be5709ea3b0e2262297e59fb59742ce34cff14c1d38d8d49c84802d1993366155413d01293798944e3b9a75f55a79f6c44722db2a8165e291fa2a4cdd97f979 WHIRLPOOL 436da2e945c445cd332cfd0e715d6e1b174ed1320072e6d0433346f79ff6fdb2ac6002442ff720e023920de3e5b6b615ae5953a5f2a97e84b3e989489c34ebc1
+MISC ChangeLog 757 SHA256 f41862e59c1a964cc22899d97a4e03bf7b66ae9595a42d4b83c63fcf9c7d3586 SHA512 cb45322788c37b64fd9269380307e35b7415634ca7ec0f756091d7597791a8fde2baa6353ef430a3375fc6eeb245186582926d10e6cda3617bbfa3eeea867c19 WHIRLPOOL 4edb69a7287a168053179c52f3e2844eb188a7ef3c9350d2544eaab9503332b3da668daef54e6ad21219aedeedb0505097d70460b26f9292fad41c0b81a9d4e7
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3

diff --git a/app-arch/xarchiver/files/xarchiver-0.5.3-fix-double-escaping.patch b/app-arch/xarchiver/files/xarchiver-0.5.3-fix-double-escaping.patch
deleted file mode 100644 (file)
index 8b44d91..0000000
--- a/app-arch/xarchiver/files/xarchiver-0.5.3-fix-double-escaping.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: =?UTF-8?q?Guido=20Berh=C3=B6rster?= <gber@opensuse.org>
-Date: Sat, 19 Jan 2013 09:27:36 +0100
-Subject: fix-double-escaping
-
-Do not escape file names twice. Fixes an error when trying to create archives
-with spaces.
-
-Bug: http://bugs.debian.org/697493.
----
- src/main.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index a13d737..a6a7f93 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -208,13 +208,13 @@ int main (int argc, char **argv)
-                               g_free(_current_dir);
-                               GSList *files = NULL;
-                               _current_dir = g_path_get_basename(add_files);
--                              files = g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#"));
-+                              files = g_slist_append(files,g_strdup(_current_dir));
-                               g_free(_current_dir);
-                               g_free(add_files);
-                               for (x = 1; x< argc; x++)
-                               {
-                                       _current_dir = g_path_get_basename(argv[x]);
--                                      files = g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#"));
-+                                      files = g_slist_append(files,g_strdup(_current_dir));
-                                       g_free (_current_dir);
-                               }
-                               xa_execute_add_commands(archive,files,NULL);

diff --git a/app-arch/xarchiver/files/xarchiver-0.5.3-rar5-whitespace.patch b/app-arch/xarchiver/files/xarchiver-0.5.3-rar5-whitespace.patch
deleted file mode 100644 (file)
index 0d317e4..0000000
--- a/app-arch/xarchiver/files/xarchiver-0.5.3-rar5-whitespace.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- xarchiver-0.5.3.orig/src/rar.c
-+++ xarchiver-0.5.3/src/rar.c
-@@ -345,7 +345,7 @@
-       unsigned short int i = 0;
-       unsigned int linesize,n,a;
-       gboolean dir = FALSE;
--      static gchar *filename;
-+      static gchar *filename, *end;
- 
-       if (last_line)
-               return;
-@@ -388,7 +388,6 @@
-               last_line = TRUE;
-               return;
-       }
--
-       archive->nr_of_files++;
- 
-       /* Permissions */
-@@ -453,15 +452,15 @@
-       for(; n < linesize && line[n] != ' '; n++);
-       line[n] = '\0';
-       item[i] = line + a;
--      i++;
--      n++;
--      
--      /* fileName */
--      for(n=64; n < linesize && line[n] == ' '; n++);
--      a = n;
--      for(; n < linesize && line[n] != ' ' && line[n] != '\n'; n++);
--      line[n]='\0';
--      filename = g_strdup(line + a);
-+
-+      /* FileName */
-+      line[linesize - 1] = '\0';
-+      filename = g_strdup(line+64);
-+  
-+      /* Strip trailing whitespace */
-+      end = filename + strlen(filename) - 1;
-+      while(end >= filename && *end == ' ') end--;
-+      *(end + 1) = '\0';
-       
-       /* Work around for rar which doesn't
-        * output / with directories */

diff --git a/app-arch/xarchiver/xarchiver-0.5.3-r1.ebuild b/app-arch/xarchiver/xarchiver-0.5.3-r1.ebuild
deleted file mode 100644 (file)
index 43a84d4..0000000
--- a/app-arch/xarchiver/xarchiver-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/xarchiver-0.5.3-r1.ebuild,v 1.1 2014/05/12 03:51:01 ssuominen Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="a GTK+ based and advanced archive manager that can be used with Thunar"
-HOMEPAGE="http://xarchiver.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2
-       >=x11-libs/gtk+-2.24:2"
-DEPEND="${RDEPEND}
-       dev-util/intltool
-       sys-devel/gettext
-       virtual/pkgconfig"
-
-pkg_setup() {
-       PATCHES=(
-               "${FILESDIR}"/${P}-add-mime-types.patch
-               "${FILESDIR}"/${P}-fix-password-protected.patch
-               "${FILESDIR}"/${P}-rar5-whitespace.patch
-               "${FILESDIR}"/${P}-fix-double-escaping.patch
-               "${FILESDIR}"/${P}-fix-rpm-support.patch
-               )
-
-       XFCONF=(
-               $(xfconf_use_debug)
-               )
-
-       DOCS=( AUTHORS ChangeLog README TODO )
-}
-
-src_prepare() {
-       sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.in || die
-       xfconf_src_prepare
-}
-
-src_install() {
-       xfconf_src_install DOCDIR="${ED}/usr/share/doc/${PF}"
-}
-
-pkg_postinst() {
-       xfconf_pkg_postinst
-       elog "You need external programs for some formats, including:"
-       elog "7zip - app-arch/p7zip"
-       elog "arj - app-arch/unarj app-arch/arj"
-       elog "lha - app-arch/lha"
-       elog "lzop - app-arch/lzop"
-       elog "rar - app-arch/unrar app-arch/rar"
-       elog "zip - app-arch/unzip app-arch/zip"
-}

diff --git a/app-arch/xarchiver/xarchiver-0.5.3.ebuild b/app-arch/xarchiver/xarchiver-0.5.3.ebuild
deleted file mode 100644 (file)
index a3b59f3..0000000
--- a/app-arch/xarchiver/xarchiver-0.5.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/xarchiver-0.5.3.ebuild,v 1.1 2014/05/11 17:57:05 ssuominen Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="a GTK+ based and advanced archive manager that can be used with Thunar"
-HOMEPAGE="http://xarchiver.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2
-       >=x11-libs/gtk+-2.24:2"
-DEPEND="${RDEPEND}
-       dev-util/intltool
-       sys-devel/gettext
-       virtual/pkgconfig"
-
-pkg_setup() {
-       XFCONF=(
-               $(xfconf_use_debug)
-               )
-
-       DOCS=( AUTHORS ChangeLog README TODO )
-}
-
-src_prepare() {
-       sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.in || die
-       xfconf_src_prepare
-}
-
-src_install() {
-       xfconf_src_install DOCDIR="${ED}/usr/share/doc/${PF}"
-}
-
-pkg_postinst() {
-       xfconf_pkg_postinst
-       elog "You need external programs for some formats, including:"
-       elog "7zip - app-arch/p7zip"
-       elog "arj - app-arch/unarj app-arch/arj"
-       elog "lha - app-arch/lha"
-       elog "lzop - app-arch/lzop"
-       elog "rar - app-arch/unrar app-arch/rar"
-       elog "zip - app-arch/unzip app-arch/zip"
-}