fix the rpm mix

Package-Manager: portage-2.0.51.19

4 files changed, 50 insertions, 26 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index ae279ac00381..c18ec0d779bf 100644
--- a/app-arch/file-roller/ChangeLog
+++ b/app-arch/file-roller/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/file-roller
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.98 2005/03/20 02:18:48 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.99 2005/03/29 10:20:26 foser Exp $
+
+  29 Mar 2005; foser <foser@gentoo.org> file-roller-2.10.0-r1.ebuild :
+  Update rpm patch so it actually works again
 
   19 Mar 2005; Mike Doty <kingtaco@gentoo.org> file-roller-2.10.0-r1.ebuild,
   file-roller-2.10.0.ebuild:
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 027e2995f23b..5e03d4895623 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,31 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b27db5856c64bdd09a389c03a73ba7ea ChangeLog 12101
 MD5 3395c0d78a82cca00565749f09618c02 file-roller-2.8.3.ebuild 1200
+MD5 1a1a406af1ceaa03a4f6637160424087 file-roller-2.8.0.ebuild 1200
 MD5 45f34e07323606deac952fb8275d00cd file-roller-2.6.1.ebuild 1209
+MD5 ab67de9078ccc16e46cd67e0c33c901b file-roller-2.10.0.ebuild 1250
 MD5 f601b9f8bff005cc3f9ec4e1ddf1a34d file-roller-2.8.4.ebuild 1204
-MD5 1a1a406af1ceaa03a4f6637160424087 file-roller-2.8.0.ebuild 1200
+MD5 87dbf573cbdef11dc0bb741f5f272a2e file-roller-2.10.0-r1.ebuild 1331
+MD5 0149d194348973d5c92e28edee1f5954 ChangeLog 12216
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 ab67de9078ccc16e46cd67e0c33c901b file-roller-2.10.0.ebuild 1250
-MD5 1d485a913248a28e858ee1cb2a8e305a file-roller-2.10.0-r1.ebuild 1333
-MD5 08b8885901c763ef33125b33b52e890f files/digest-file-roller-2.8.3 71
-MD5 7e51d88b0a0bfe30944615eff903d0af files/digest-file-roller-2.8.4 71
-MD5 a2afcaf32ad39410e36d24188021895e files/digest-file-roller-2.6.1 71
-MD5 519fed8816b9e6198b4cd9f6cdf9e525 files/digest-file-roller-2.8.0 71
-MD5 7c3bf595636ee254e23445ccf07c4075 files/file-roller-2.4.4-64bit.patch 2808
+MD5 762daf169c908a33e04b670097c4a4fc files/file-roller-2.6-use_fr_rpm2cpio.patch 949
+MD5 d12176c3351e047a90fc4740f4b09237 files/file-roller-2.10.0-fix_whitespace.patch 1713
+MD5 d779986864325c09e5caba951a634f9a files/digest-file-roller-2.10.0-r1 72
+MD5 d779986864325c09e5caba951a634f9a files/digest-file-roller-2.10.0 72
 MD5 0a8f1b361ffded42281e52d734654f48 files/file-roller-2.4.4-gentoo.patch 566
 MD5 cc549bc88cee498549b0ed92538c4e3e files/file-roller-2.6-use_bin_tar.patch 493
-MD5 762daf169c908a33e04b670097c4a4fc files/file-roller-2.6-use_fr_rpm2cpio.patch 949
 MD5 67f58f96b7c00be703c9bf9cf38cd191 files/file-roller-2.8.0-use_bin_tar.patch 405
+MD5 cb207c4a86910d9e23948e4fb15d5d8d files/file-roller-2.10-use_fr_rpm2cpio.patch 1113
 MD5 d23f66e1c734a44ce6ee89b0e724b371 files/rpm2cpio-file-roller 2556
-MD5 d779986864325c09e5caba951a634f9a files/digest-file-roller-2.10.0 72
-MD5 d779986864325c09e5caba951a634f9a files/digest-file-roller-2.10.0-r1 72
-MD5 d12176c3351e047a90fc4740f4b09237 files/file-roller-2.10.0-fix_whitespace.patch 1713
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCPN2R0K3RJaeXx6cRAhUQAKCApg07Uc1+H4UuC8CX+Ihk+2HiUACg2sTv
-jY3LqsaCng6cAakygtYL6Vk=
-=yVBp
------END PGP SIGNATURE-----
+MD5 7c3bf595636ee254e23445ccf07c4075 files/file-roller-2.4.4-64bit.patch 2808
+MD5 a2afcaf32ad39410e36d24188021895e files/digest-file-roller-2.6.1 71
+MD5 519fed8816b9e6198b4cd9f6cdf9e525 files/digest-file-roller-2.8.0 71
+MD5 08b8885901c763ef33125b33b52e890f files/digest-file-roller-2.8.3 71
+MD5 7e51d88b0a0bfe30944615eff903d0af files/digest-file-roller-2.8.4 71
diff --git a/app-arch/file-roller/file-roller-2.10.0-r1.ebuild b/app-arch/file-roller/file-roller-2.10.0-r1.ebuild
index c030f722b549..5390c674aeb5 100644
--- a/app-arch/file-roller/file-roller-2.10.0-r1.ebuild
+++ b/app-arch/file-roller/file-roller-2.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.10.0-r1.ebuild,v 1.3 2005/03/20 02:18:48 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.10.0-r1.ebuild,v 1.4 2005/03/29 10:20:26 foser Exp $
 
 inherit gnome2 eutils
 
@@ -39,7 +39,7 @@ src_unpack() {
 	# options.  On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
 	epatch ${FILESDIR}/${PN}-2.8.0-use_bin_tar.patch
 	# use a local rpm2cpio script to avoid the dep
-	epatch ${FILESDIR}/${PN}-2.6-use_fr_rpm2cpio.patch
+	epatch ${FILESDIR}/${PN}-2.10-use_fr_rpm2cpio.patch
 	#allow filenames with whitespaces
 	epatch ${FILESDIR}/${P}-fix_whitespace.patch
 }
diff --git a/app-arch/file-roller/files/file-roller-2.10-use_fr_rpm2cpio.patch b/app-arch/file-roller/files/file-roller-2.10-use_fr_rpm2cpio.patch
new file mode 100644
index 000000000000..6b9ce2d521a6
--- /dev/null
+++ b/app-arch/file-roller/files/file-roller-2.10-use_fr_rpm2cpio.patch
@@ -0,0 +1,30 @@
+diff -uNr file-roller-2.10.0/src/fr-command-rpm.c file-roller-2.10.0.patched/src/fr-command-rpm.c
+--- file-roller-2.10.0/src/fr-command-rpm.c	2005-03-07 13:29:37.000000000 +0100
++++ file-roller-2.10.0.patched/src/fr-command-rpm.c	2005-03-29 12:40:38.000000000 +0200
+@@ -131,7 +131,7 @@
+ 				      list__process_line,
+ 				      comm);
+ 
+-	fr_process_begin_command (comm->process, "rpm2cpio");
++	fr_process_begin_command (comm->process, "rpm2cpio-file-roller");
+ 	fr_process_add_arg (comm->process, comm->e_filename);
+ 	fr_process_add_arg (comm->process, "| cpio --list --force-local --verbose");
+ 	fr_process_end_command (comm->process);
+@@ -150,7 +150,7 @@
+ {
+ 	GList *scan;
+ 
+-	fr_process_begin_command (comm->process, "rpm2cpio");
++	fr_process_begin_command (comm->process, "rpm2cpio-file-roller");
+ 	if (dest_dir != NULL)
+                 fr_process_set_working_dir (comm->process, dest_dir);
+ 	fr_process_add_arg (comm->process, comm->e_filename);
+@@ -240,7 +240,7 @@
+ {
+ 	FRCommand *comm;
+ 
+-	if (!is_program_in_path("rpm2cpio")) {
++	if (!is_program_in_path("rpm2cpio-file-roller")) {
+ 		return NULL;
+ 	}
+