add unrar fix

(Portage version: 2.0.51.19)

7 files changed, 58 insertions, 72 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index 583a2b5f6397..fe39fc06d661 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.102 2005/04/25 12:36:08 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.103 2005/04/28 22:03:01 foser Exp $
+
+  29 Apr 2005; foser <foser@gentoo.org> file-roller-2.10.{0-r1,2}.ebuild :
+  Add unrar fix (#89531)
 
   25 Apr 2005; Mike Gardiner <obz@gentoo.org> file-roller-2.8.4.ebuild:
   Keyworded ppc x86
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index e55f1ae291a6..b3b135ea45dd 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,25 +1,24 @@
-MD5 35290718295f39b15e98188a36e4cf1f ChangeLog 12601
 MD5 b723cfc86639346e7d9964c64a0f254b file-roller-2.8.3.ebuild 1199
+MD5 1a1a406af1ceaa03a4f6637160424087 file-roller-2.8.0.ebuild 1200
 MD5 45f34e07323606deac952fb8275d00cd file-roller-2.6.1.ebuild 1209
 MD5 18da0c3e62a81b7e1d0e8c73c96728ac file-roller-2.8.4.ebuild 1202
-MD5 1a1a406af1ceaa03a4f6637160424087 file-roller-2.8.0.ebuild 1200
+MD5 253db15a97eef4fbbf47ed17fd890a9a file-roller-2.10.2.ebuild 1318
+MD5 27b95bef5a708c7a1a81bf8621412a6a file-roller-2.10.0-r1.ebuild 1414
+MD5 35290718295f39b15e98188a36e4cf1f ChangeLog 12601
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 87dbf573cbdef11dc0bb741f5f272a2e file-roller-2.10.0-r1.ebuild 1331
-MD5 ab67de9078ccc16e46cd67e0c33c901b file-roller-2.10.0.ebuild 1250
-MD5 b1e25f83141fca033329fcfa86d6dd83 file-roller-2.10.2.ebuild 1247
-MD5 08b8885901c763ef33125b33b52e890f files/digest-file-roller-2.8.3 71
-MD5 d779986864325c09e5caba951a634f9a files/digest-file-roller-2.10.0 72
-MD5 a2afcaf32ad39410e36d24188021895e files/digest-file-roller-2.6.1 71
-MD5 7e51d88b0a0bfe30944615eff903d0af files/digest-file-roller-2.8.4 71
-MD5 519fed8816b9e6198b4cd9f6cdf9e525 files/digest-file-roller-2.8.0 71
-MD5 7c3bf595636ee254e23445ccf07c4075 files/file-roller-2.4.4-64bit.patch 2808
-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 d23f66e1c734a44ce6ee89b0e724b371 files/rpm2cpio-file-roller 2556
-MD5 d779986864325c09e5caba951a634f9a files/digest-file-roller-2.10.0-r1 72
 MD5 d12176c3351e047a90fc4740f4b09237 files/file-roller-2.10.0-fix_whitespace.patch 1713
+MD5 d779986864325c09e5caba951a634f9a files/digest-file-roller-2.10.0-r1 72
 MD5 5b3ab144e33da2c64e45a02b79cb7d6f files/digest-file-roller-2.10.2 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 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 95cec21e3d5831f9a65c3fc4bf3e40d5 files/file-roller-2.10.2-use_bin_tar.patch 402
+MD5 d23f66e1c734a44ce6ee89b0e724b371 files/rpm2cpio-file-roller 2556
+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
+MD5 b3c29c8524d0b4485f2b5abc64d003fe files/file-roller-2.10.2-fix_unrar.patch 858
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 5390c674aeb5..b4154e2f73ee 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.4 2005/03/29 10:20:26 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.10.0-r1.ebuild,v 1.5 2005/04/28 22:03:01 foser Exp $
 
 inherit gnome2 eutils
 
@@ -42,6 +42,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.10-use_fr_rpm2cpio.patch
 	#allow filenames with whitespaces
 	epatch ${FILESDIR}/${P}-fix_whitespace.patch
+	# fix unrar not working #89531
+	epatch ${FILESDIR}/${PN}-2.10.2-fix_unrar.patch
+
 }
 
 src_install() {
@@ -50,4 +53,5 @@ src_install() {
 	dobin ${FILESDIR}/rpm2cpio-file-roller
 
 }
+
 USE_DESTDIR="1"
diff --git a/app-arch/file-roller/file-roller-2.10.0.ebuild b/app-arch/file-roller/file-roller-2.10.0.ebuild
deleted file mode 100644
index 12a1ff5cd1b1..000000000000
--- a/app-arch/file-roller/file-roller-2.10.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.ebuild,v 1.3 2005/03/20 02:18:48 kingtaco Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6
-	>=gnome-base/libgnome-2.6
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-vfs-2.9
-	>=gnome-base/libglade-2.4
-	>=gnome-base/libbonobo-2.6
-	>=gnome-base/libbonoboui-2.6
-	>=gnome-base/nautilus-2.9
-	>=gnome-base/gconf-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	>=app-text/scrollkeeper-0.3.11"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# Use absolute path to GNU tar since star doesn't have the same
-	# 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
-
-}
-
-src_install() {
-
-	gnome2_src_install
-	dobin ${FILESDIR}/rpm2cpio-file-roller
-
-}
-USE_DESTDIR="1"
diff --git a/app-arch/file-roller/file-roller-2.10.2.ebuild b/app-arch/file-roller/file-roller-2.10.2.ebuild
index e03d38845658..ebeb46c6214c 100644
--- a/app-arch/file-roller/file-roller-2.10.2.ebuild
+++ b/app-arch/file-roller/file-roller-2.10.2.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.2.ebuild,v 1.1 2005/04/17 13:53:43 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.10.2.ebuild,v 1.2 2005/04/28 22:03:01 foser Exp $
 
 inherit gnome2 eutils
 
@@ -40,6 +40,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.10.2-use_bin_tar.patch
 	# use a local rpm2cpio script to avoid the dep
 	epatch ${FILESDIR}/${PN}-2.10-use_fr_rpm2cpio.patch
+	# fix unrar #89531
+	epatch ${FILESDIR}/${PN}-2.10.2-fix_unrar.patch
+
 }
 
 src_install() {
@@ -48,4 +51,5 @@ src_install() {
 	dobin ${FILESDIR}/rpm2cpio-file-roller
 
 }
+
 USE_DESTDIR="1"
diff --git a/app-arch/file-roller/files/digest-file-roller-2.10.0 b/app-arch/file-roller/files/digest-file-roller-2.10.0
deleted file mode 100644
index 6f0df710fa92..000000000000
--- a/app-arch/file-roller/files/digest-file-roller-2.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0cb5b09aad7c9d352922994a6e8cf088 file-roller-2.10.0.tar.bz2 1311026
diff --git a/app-arch/file-roller/files/file-roller-2.10.2-fix_unrar.patch b/app-arch/file-roller/files/file-roller-2.10.2-fix_unrar.patch
new file mode 100644
index 000000000000..55b1624cce40
--- /dev/null
+++ b/app-arch/file-roller/files/file-roller-2.10.2-fix_unrar.patch
@@ -0,0 +1,29 @@
+Index: src/fr-command-rar.c
+===================================================================
+RCS file: /cvs/gnome/file-roller/src/fr-command-rar.c,v
+retrieving revision 1.15
+retrieving revision 1.16
+diff -u -r1.15 -r1.16
+--- src/fr-command-rar.c	28 Feb 2005 19:54:26 -0000	1.15
++++ src/fr-command-rar.c	11 Apr 2005 21:29:16 -0000	1.16
+@@ -144,8 +144,6 @@
+ 		
+ 		fields = split_line (line, 6);
+ 
+-		g_print ("%s\n", fields[5]);
+-
+ 		if ((fdata->name == NULL)
+ 		    || (*fdata->name == '\0') 
+ 		    || (fields[5][1] == 'D') 
+@@ -441,10 +439,8 @@
+ {
+ 	FRCommand *comm;
+ 
+-	if ((!is_program_in_path("rar")) ||
+-	    (!is_program_in_path("unrar"))) {
++	if ((!is_program_in_path("rar")) && (!is_program_in_path("unrar"))) 
+ 		return NULL;
+-	}
+ 
+ 	comm = FR_COMMAND (g_object_new (FR_TYPE_COMMAND_RAR, NULL));
+ 	fr_command_construct (comm, process, filename);