new release, cleanup & fixes

Package-Manager: portage-2.0.51.19

11 files changed, 37 insertions, 71 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index d2dd60ce8441..3dba1077236a 100644
--- a/app-arch/file-roller/ChangeLog
+++ b/app-arch/file-roller/ChangeLog
@@ -1,6 +1,12 @@
 # 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.110 2005/05/18 01:50:41 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.111 2005/06/06 12:42:38 foser Exp $
+
+*file-roller-2.10.3 (06 Jun 2005)
+
+  06 Jun 2005; Marinus Schraal <foser@gentoo.org> file-roller-2.*.ebuild :
+  New release (2.10.3)
+  Add fix for scrollkeeper sandboxing (#92920)
 
   18 May 2005; Jason Wever <weeve@gentoo.org> file-roller-2.8.4.ebuild:
   Stable on SPARC.
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 8b65fbc6bc75..fcc02b73a0fe 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,15 +1,15 @@
-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 21b350bcb24290ff8bb89c82cc9f57e1 file-roller-2.8.4.ebuild 1199
-MD5 40624d73d10abc25826a3c9b13e60992 file-roller-2.10.2.ebuild 1335
+MD5 a2e83a190daa54639e35166db5f1acf0 file-roller-2.8.3.ebuild 1254
+MD5 9218252831e0fdddb923a875d01ea2d7 file-roller-2.10.3.ebuild 1345
+MD5 b986e172d90f3d97c7985405950bd0a6 file-roller-2.6.1.ebuild 1259
+MD5 be2eff9bfb03d405bfb0afdca0c208b7 file-roller-2.8.4.ebuild 1254
 MD5 6a793d387b553faa18187f951464acaf file-roller-2.10.0-r1.ebuild 1420
-MD5 dc47c1ebd358b70f6727451841c3834b ChangeLog 13403
+MD5 e9d680fdd4e8270e3ca1fc0f01a704c5 ChangeLog 13584
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 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 52258671fa0060fb4c537665f1be68b6 files/file-roller-2.10.3-use_bin_tar.patch 504
 MD5 d779986864325c09e5caba951a634f9a files/digest-file-roller-2.10.0-r1 72
-MD5 5b3ab144e33da2c64e45a02b79cb7d6f files/digest-file-roller-2.10.2 72
+MD5 be190f54f0aaa0ff36a6d17c56e1a5b6 files/digest-file-roller-2.10.3 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
@@ -18,7 +18,6 @@ MD5 95cec21e3d5831f9a65c3fc4bf3e40d5 files/file-roller-2.10.2-use_bin_tar.patch
 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.2.ebuild b/app-arch/file-roller/file-roller-2.10.3.ebuild
index 7cf17bb158ec..218758349fa0 100644
--- a/app-arch/file-roller/file-roller-2.10.2.ebuild
+++ b/app-arch/file-roller/file-roller-2.10.3.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.4 2005/05/09 02:50:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.10.3.ebuild,v 1.1 2005/06/06 12:42:38 foser Exp $
 
 inherit gnome2 eutils
 
@@ -37,17 +37,16 @@ src_unpack() {
 
 	# 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.10.2-use_bin_tar.patch
+	epatch ${FILESDIR}/${PN}-2.10.3-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() {
 
-	gnome2_src_install
+	# workaround #92920 FIXME
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
 	dobin ${FILESDIR}/rpm2cpio-file-roller
 
 }
diff --git a/app-arch/file-roller/file-roller-2.6.1.ebuild b/app-arch/file-roller/file-roller-2.6.1.ebuild
index 99d5fe50d2f8..a40dc3f6a8de 100644
--- a/app-arch/file-roller/file-roller-2.6.1.ebuild
+++ b/app-arch/file-roller/file-roller-2.6.1.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.6.1.ebuild,v 1.12 2005/01/01 11:44:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.6.1.ebuild,v 1.13 2005/06/06 12:42:38 foser Exp $
 
 inherit gnome2 eutils
 
@@ -39,6 +39,6 @@ src_unpack() {
 }
 
 src_install() {
-	gnome2_src_install
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
 	dobin ${FILESDIR}/rpm2cpio-file-roller
 }
diff --git a/app-arch/file-roller/file-roller-2.8.0.ebuild b/app-arch/file-roller/file-roller-2.8.0.ebuild
deleted file mode 100644
index 399937c33961..000000000000
--- a/app-arch/file-roller/file-roller-2.8.0.ebuild
+++ /dev/null
@@ -1,49 +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.8.0.ebuild,v 1.6 2005/01/01 11:44:36 eradicator Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.4*
-	>=gnome-base/libgnome-2.1
-	>=gnome-base/libgnomeui-2.1
-	>=gnome-base/gnome-vfs-2.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	>=app-text/scrollkeeper-0.3.11"
-
-DOCS="AUTHORS ChangeLog INSTALL 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}/${P}-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
-
-}
diff --git a/app-arch/file-roller/file-roller-2.8.3.ebuild b/app-arch/file-roller/file-roller-2.8.3.ebuild
index 574a95dd17ea..5f6ad418e30e 100644
--- a/app-arch/file-roller/file-roller-2.8.3.ebuild
+++ b/app-arch/file-roller/file-roller-2.8.3.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.8.3.ebuild,v 1.9 2005/04/02 04:05:06 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.8.3.ebuild,v 1.10 2005/06/06 12:42:38 foser Exp $
 
 inherit gnome2 eutils
 
@@ -43,7 +43,7 @@ src_unpack() {
 
 src_install() {
 
-	gnome2_src_install
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
 	dobin ${FILESDIR}/rpm2cpio-file-roller
 
 }
diff --git a/app-arch/file-roller/file-roller-2.8.4.ebuild b/app-arch/file-roller/file-roller-2.8.4.ebuild
index bc474e8d08d6..99dbf186fd78 100644
--- a/app-arch/file-roller/file-roller-2.8.4.ebuild
+++ b/app-arch/file-roller/file-roller-2.8.4.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.8.4.ebuild,v 1.7 2005/05/18 01:50:41 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.8.4.ebuild,v 1.8 2005/06/06 12:42:38 foser Exp $
 
 inherit gnome2 eutils
 
@@ -43,7 +43,7 @@ src_unpack() {
 
 src_install() {
 
-	gnome2_src_install
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
 	dobin ${FILESDIR}/rpm2cpio-file-roller
 
 }
diff --git a/app-arch/file-roller/files/digest-file-roller-2.10.2 b/app-arch/file-roller/files/digest-file-roller-2.10.2
deleted file mode 100644
index 8d5f77fc7952..000000000000
--- a/app-arch/file-roller/files/digest-file-roller-2.10.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56f2c0e79f6ddfb4796acdab91dcd58f file-roller-2.10.2.tar.bz2 1312427
diff --git a/app-arch/file-roller/files/digest-file-roller-2.10.3 b/app-arch/file-roller/files/digest-file-roller-2.10.3
new file mode 100644
index 000000000000..d6dbdc31e34a
--- /dev/null
+++ b/app-arch/file-roller/files/digest-file-roller-2.10.3
@@ -0,0 +1 @@
+MD5 dd152e2cb1bfe5c46930ae74c73e4f8e file-roller-2.10.3.tar.bz2 1314482
diff --git a/app-arch/file-roller/files/digest-file-roller-2.8.0 b/app-arch/file-roller/files/digest-file-roller-2.8.0
deleted file mode 100644
index 60d48e6a2c99..000000000000
--- a/app-arch/file-roller/files/digest-file-roller-2.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a26cdecb3e2ed0f94e34ef5995fa890 file-roller-2.8.0.tar.bz2 1376414
diff --git a/app-arch/file-roller/files/file-roller-2.10.3-use_bin_tar.patch b/app-arch/file-roller/files/file-roller-2.10.3-use_bin_tar.patch
new file mode 100644
index 000000000000..edaa16c1c6bb
--- /dev/null
+++ b/app-arch/file-roller/files/file-roller-2.10.3-use_bin_tar.patch
@@ -0,0 +1,12 @@
+diff -uNr file-roller-2.10.3/src/fr-command-tar.c file-roller-2.10.3.patched/src/fr-command-tar.c
+--- file-roller-2.10.3/src/fr-command-tar.c	2005-04-22 18:39:22.000000000 +0200
++++ file-roller-2.10.3.patched/src/fr-command-tar.c	2005-06-06 14:29:45.000000000 +0200
+@@ -225,7 +225,7 @@
+ 	if (command != NULL)
+ 		fr_process_begin_command (comm->process, command);
+ 	else
+-		fr_process_begin_command (comm->process, "tar");
++		fr_process_begin_command (comm->process, "/bin/tar");
+ 	g_free (command);
+ }
+