Patch to use GNU tar by absolute PATH. On Gentoo, star installs in /usr/bin, GNU tar in /bin. But star has different options and doesn't work for file-roller. Patch to fix 32-bit-isms for bug 39829. Mark stable on alpha and ia64 since the current stable on those arches isn't working right anyway.

6 files changed, 155 insertions, 4 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index 294d609f7703..605e7f8fc4ca 100644
--- a/app-arch/file-roller/ChangeLog
+++ b/app-arch/file-roller/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/file-roller
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.58 2004/02/06 15:18:02 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.59 2004/02/07 23:22:50 agriffis Exp $
+
+*file-roller-2.4.4-r2 (07 Feb 2004)
+
+  07 Feb 2004; Aron Griffis <agriffis@gentoo.org> file-roller-2.4.4-r2.ebuild:
+  Patch to use GNU tar by absolute PATH. On Gentoo, star installs in /usr/bin,
+  GNU tar in /bin. But star has different options and doesn't work for
+  file-roller. Patch to fix 32-bit-isms for bug 39829. Mark stable on alpha and
+  ia64 since the current stable on those arches isn't working right anyway.
 
   06 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org>
   file-roller-2.4.2-r1.ebuild:
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index c7fe60e4d093..598933ac1a30 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,12 +1,16 @@
 MD5 4b2a453b2a0a1314f1cf7a8fa6a966f1 ChangeLog 7459
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 62f1ba61e4d2bda5097c72d76fbccb02 file-roller-2.4.0.1.ebuild 770
-MD5 e369d526a531578895ee89aea01ed0ae file-roller-2.2.5.ebuild 763
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 56fc687515d3dfa4dd1a268c70074d7e file-roller-2.4.1.1.ebuild 783
-MD5 9bcf8ffe7f4f71d208c6c297a8e77a1c file-roller-2.4.2-r1.ebuild 765
+MD5 e369d526a531578895ee89aea01ed0ae file-roller-2.2.5.ebuild 763
 MD5 36538269b00e404b982da5511dbb061c file-roller-2.4.4-r1.ebuild 767
+MD5 9bcf8ffe7f4f71d208c6c297a8e77a1c file-roller-2.4.2-r1.ebuild 765
+MD5 8aac2a735c8f75cb18398f46e9946604 file-roller-2.4.4-r2.ebuild 1064
 MD5 4a66bd9acf3487bfdc870b10e9651c3e files/digest-file-roller-2.2.5 70
+MD5 7c3bf595636ee254e23445ccf07c4075 files/file-roller-2.4.4-64bit.patch 2808
 MD5 536a1f52837bff281231232d6dfa63d3 files/digest-file-roller-2.4.0.1 72
 MD5 a6f8d0b17e3702e108a0883bc71f6da8 files/digest-file-roller-2.4.1.1 72
 MD5 0f93a45120509a0c59b2703e1b4c6170 files/digest-file-roller-2.4.2-r1 70
+MD5 0a8f1b361ffded42281e52d734654f48 files/file-roller-2.4.4-gentoo.patch 566
 MD5 07fa4739c733d5e4453bfb797cf6a279 files/digest-file-roller-2.4.4-r1 70
+MD5 07fa4739c733d5e4453bfb797cf6a279 files/digest-file-roller-2.4.4-r2 70
diff --git a/app-arch/file-roller/file-roller-2.4.4-r2.ebuild b/app-arch/file-roller/file-roller-2.4.4-r2.ebuild
new file mode 100644
index 000000000000..0c40700bbfb8
--- /dev/null
+++ b/app-arch/file-roller/file-roller-2.4.4-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.4.4-r2.ebuild,v 1.1 2004/02/07 23:22:50 agriffis Exp $
+
+inherit gnome2
+
+DESCRIPTION="archive manager for GNOME"
+HOMEPAGE="http://fileroller.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc alpha ~sparc ~hppa ~amd64 ia64"
+
+DEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2.1
+	>=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"
+
+RDEPEND="${DEPEND}
+	dev-util/pkgconfig
+	>=app-text/scrollkeeper-0.3.11"
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
+
+src_unpack() {
+	unpack ${A} && cd ${S} || die
+
+	# 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}/fileroller-2.4.4-gnutar.patch
+
+	# Fix 64-bit problems
+	epatch ${FILESDIR}/fileroller-2.4.4-64bit.patch
+}
diff --git a/app-arch/file-roller/files/digest-file-roller-2.4.4-r2 b/app-arch/file-roller/files/digest-file-roller-2.4.4-r2
new file mode 100644
index 000000000000..4fe9ce2ebe92
--- /dev/null
+++ b/app-arch/file-roller/files/digest-file-roller-2.4.4-r2
@@ -0,0 +1 @@
+MD5 47bc36dce2d64b2bc5eb058492562605 file-roller-2.4.4.tar.bz2 947224
diff --git a/app-arch/file-roller/files/file-roller-2.4.4-64bit.patch b/app-arch/file-roller/files/file-roller-2.4.4-64bit.patch
new file mode 100644
index 000000000000..afecb96324ee
--- /dev/null
+++ b/app-arch/file-roller/files/file-roller-2.4.4-64bit.patch
@@ -0,0 +1,88 @@
+--- file-roller-2.4.4/src/fr-command-arj.c.64bit	2004-02-07 17:59:56.000000000 -0500
++++ file-roller-2.4.4/src/fr-command-arj.c	2004-02-07 18:00:25.000000000 -0500
+@@ -374,7 +374,7 @@
+ GType
+ fr_command_arj_get_type ()
+ {
+-        static guint type = 0;
++        static GType type = 0;
+ 
+         if (! type) {
+                 GTypeInfo type_info = {
+--- file-roller-2.4.4/src/fr-command.c.64bit	2004-02-07 17:59:56.000000000 -0500
++++ file-roller-2.4.4/src/fr-command.c	2004-02-07 18:00:25.000000000 -0500
+@@ -49,7 +49,7 @@
+ GType
+ fr_command_get_type ()
+ {
+-        static guint type = 0;
++        static GType type = 0;
+ 
+         if (! type) {
+                 GTypeInfo type_info = {
+--- file-roller-2.4.4/src/fr-command-cfile.c.64bit	2004-02-07 17:59:56.000000000 -0500
++++ file-roller-2.4.4/src/fr-command-cfile.c	2004-02-07 18:00:25.000000000 -0500
+@@ -326,7 +326,7 @@
+ GType
+ fr_command_cfile_get_type ()
+ {
+-        static guint type = 0;
++        static GType type = 0;
+ 
+         if (! type) {
+                 GTypeInfo type_info = {
+--- file-roller-2.4.4/src/fr-command-lha.c.64bit	2004-02-07 17:59:56.000000000 -0500
++++ file-roller-2.4.4/src/fr-command-lha.c	2004-02-07 18:00:25.000000000 -0500
+@@ -337,7 +337,7 @@
+ GType
+ fr_command_lha_get_type ()
+ {
+-        static guint type = 0;
++        static GType type = 0;
+ 
+         if (! type) {
+                 GTypeInfo type_info = {
+--- file-roller-2.4.4/src/fr-command-rar.c.64bit	2004-02-07 17:59:56.000000000 -0500
++++ file-roller-2.4.4/src/fr-command-rar.c	2004-02-07 18:00:25.000000000 -0500
+@@ -357,7 +357,7 @@
+ GType
+ fr_command_rar_get_type ()
+ {
+-        static guint type = 0;
++        static GType type = 0;
+ 
+         if (! type) {
+                 GTypeInfo type_info = {
+--- file-roller-2.4.4/src/fr-command-tar.c.64bit	2004-02-07 17:59:56.000000000 -0500
++++ file-roller-2.4.4/src/fr-command-tar.c	2004-02-07 18:00:25.000000000 -0500
+@@ -670,7 +670,7 @@
+ GType
+ fr_command_tar_get_type ()
+ {
+-        static guint type = 0;
++        static GType type = 0;
+ 
+         if (! type) {
+                 GTypeInfo type_info = {
+--- file-roller-2.4.4/src/fr-command-zip.c.64bit	2004-02-07 17:59:56.000000000 -0500
++++ file-roller-2.4.4/src/fr-command-zip.c	2004-02-07 18:00:25.000000000 -0500
+@@ -444,7 +444,7 @@
+ GType
+ fr_command_zip_get_type ()
+ {
+-        static guint type = 0;
++        static GType type = 0;
+ 
+         if (! type) {
+                 GTypeInfo type_info = {
+--- file-roller-2.4.4/src/fr-command-zoo.c.64bit	2004-02-07 17:59:56.000000000 -0500
++++ file-roller-2.4.4/src/fr-command-zoo.c	2004-02-07 18:00:25.000000000 -0500
+@@ -370,7 +370,7 @@
+ GType
+ fr_command_zoo_get_type ()
+ {
+-        static guint type = 0;
++        static GType type = 0;
+ 
+         if (! type) {
+                 GTypeInfo type_info = {
diff --git a/app-arch/file-roller/files/file-roller-2.4.4-gentoo.patch b/app-arch/file-roller/files/file-roller-2.4.4-gentoo.patch
new file mode 100644
index 000000000000..2e5aaa932791
--- /dev/null
+++ b/app-arch/file-roller/files/file-roller-2.4.4-gentoo.patch
@@ -0,0 +1,12 @@
+--- file-roller-2.4.4/src/fr-command-tar.c.gnutar	2004-02-07 17:45:13.000000000 -0500
++++ file-roller-2.4.4/src/fr-command-tar.c	2004-02-07 18:00:25.000000000 -0500
+@@ -177,7 +177,8 @@
+ 				      comm);
+ 
+ 	fr_process_clear (comm->process);
+-	fr_process_begin_command (comm->process, "tar");
++	/* On Gentoo, /usr/bin/tar is star, /bin/tar is GNU tar */
++	fr_process_begin_command (comm->process, "/bin/tar");
+ 	fr_process_add_arg (comm->process, "--force-local");
+ 	fr_process_add_arg (comm->process, "-tvf");
+ 	fr_process_add_arg (comm->process, comm->e_filename);