New version, cleaned up old versions

9 files changed, 31 insertions, 107 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index cd40aeb1c79f..015815f24848 100644
--- a/app-arch/file-roller/ChangeLog
+++ b/app-arch/file-roller/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/file-roller
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.85 2004/11/12 03:10:37 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.86 2004/11/24 17:20:10 obz Exp $
+
+*file-roller-2.8.3 (25 Nov 2004)
+
+  25 Nov 2004; Mike Gardiner <obz@gentoo.org> -file-roller-2.4.4-r2.ebuild,
+  -file-roller-2.6.0.ebuild, -file-roller-2.6.2.ebuild,
+  +file-roller-2.8.3.ebuild:
+  New version, cleaned up old versions
 
   12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   file-roller-2.8.0.ebuild:
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 1642173a4a48..625961227cc8 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,18 +1,21 @@
-MD5 08d1b31dc744af9f1d4a385ee57c9476 ChangeLog 10522
+MD5 a5ffac070668eb553f3e3b1b7266c302 file-roller-2.6.2.ebuild 1224
+MD5 3d96084eac8e0855d6070c78f1606f01 file-roller-2.8.3.ebuild 1093
+MD5 c379da7b683e0590298e868e44a7837f file-roller-2.8.0.ebuild 1199
+MD5 c444ca26f2e51e84fa67edd059fd2da9 .file-roller-2.8.3.ebuild.swp 12288
+MD5 fbc6175ba717b2c620b0def6b8f9314f file-roller-2.6.1.ebuild 1207
 MD5 3db60db955c065e4d8fd4560080f661b file-roller-2.4.4-r2.ebuild 1071
 MD5 b068979a95a33018cdda757f010ccea3 file-roller-2.6.0.ebuild 1206
-MD5 fbc6175ba717b2c620b0def6b8f9314f file-roller-2.6.1.ebuild 1207
+MD5 08d1b31dc744af9f1d4a385ee57c9476 ChangeLog 10522
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 a5ffac070668eb553f3e3b1b7266c302 file-roller-2.6.2.ebuild 1224
-MD5 c379da7b683e0590298e868e44a7837f file-roller-2.8.0.ebuild 1199
-MD5 07fa4739c733d5e4453bfb797cf6a279 files/digest-file-roller-2.4.4-r2 70
-MD5 9a6c274d4965d6aa2e83abe0e57133b1 files/digest-file-roller-2.6.0 71
-MD5 a2afcaf32ad39410e36d24188021895e files/digest-file-roller-2.6.1 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 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 7c3bf595636ee254e23445ccf07c4075 files/file-roller-2.4.4-64bit.patch 2808
+MD5 9a6c274d4965d6aa2e83abe0e57133b1 files/digest-file-roller-2.6.0 71
+MD5 a2afcaf32ad39410e36d24188021895e files/digest-file-roller-2.6.1 71
 MD5 a2d30ce698b5120d01da4d3593bbf2c2 files/digest-file-roller-2.6.2 71
 MD5 519fed8816b9e6198b4cd9f6cdf9e525 files/digest-file-roller-2.8.0 71
-MD5 67f58f96b7c00be703c9bf9cf38cd191 files/file-roller-2.8.0-use_bin_tar.patch 405
+MD5 08b8885901c763ef33125b33b52e890f files/digest-file-roller-2.8.3 71
+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
deleted file mode 100644
index 43fdf8face01..000000000000
--- a/app-arch/file-roller/file-roller-2.4.4-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 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.4.4-r2.ebuild,v 1.12 2004/06/29 19:54:19 agriffis Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/"
-IUSE=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64 mips"
-
-RDEPEND=">=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"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=app-text/scrollkeeper-0.3.11"
-
-DOCS="AUTHORS 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}/file-roller-2.4.4-gentoo.patch
-
-	# Fix 64-bit problems
-	epatch ${FILESDIR}/file-roller-2.4.4-64bit.patch
-}
diff --git a/app-arch/file-roller/file-roller-2.6.0.ebuild b/app-arch/file-roller/file-roller-2.6.0.ebuild
deleted file mode 100644
index 9277bf2a6549..000000000000
--- a/app-arch/file-roller/file-roller-2.6.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 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.0.ebuild,v 1.11 2004/07/03 14:47:16 kloeri 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"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.3.6
-	>=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}/file-roller-2.6-use_bin_tar.patch
-	# use a local rpm2cpio script to avoid the dep
-	epatch ${FILESDIR}/file-roller-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.6.2.ebuild b/app-arch/file-roller/file-roller-2.8.3.ebuild
index 3a81b2640488..97c01af50060 100644
--- a/app-arch/file-roller/file-roller-2.6.2.ebuild
+++ b/app-arch/file-roller/file-roller-2.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.2.ebuild,v 1.1 2004/09/13 08:30:15 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.8.3.ebuild,v 1.1 2004/11/24 17:20:10 obz Exp $
 
 inherit gnome2 eutils
 
@@ -19,28 +19,31 @@ RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/gnome-vfs-2.2
 	>=gnome-base/libglade-2
 	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/gconf-2"
+	>=gnome-base/libbonoboui-2"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.29
 	>=app-text/scrollkeeper-0.3.11"
 
-DOCS="AUTHORS ChangeLog NEWS README TODO"
+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}/file-roller-2.6-use_bin_tar.patch
+	epatch ${FILESDIR}/${PN}-2.8.0-use_bin_tar.patch
 	# use a local rpm2cpio script to avoid the dep
-	epatch ${FILESDIR}/file-roller-2.6-use_fr_rpm2cpio.patch
+	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/files/digest-file-roller-2.4.4-r2 b/app-arch/file-roller/files/digest-file-roller-2.4.4-r2
deleted file mode 100644
index 4fe9ce2ebe92..000000000000
--- a/app-arch/file-roller/files/digest-file-roller-2.4.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 47bc36dce2d64b2bc5eb058492562605 file-roller-2.4.4.tar.bz2 947224
diff --git a/app-arch/file-roller/files/digest-file-roller-2.6.0 b/app-arch/file-roller/files/digest-file-roller-2.6.0
deleted file mode 100644
index 4a67c4a1a6d4..000000000000
--- a/app-arch/file-roller/files/digest-file-roller-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c858a7cc4ab0f2844fd2148a2cfd954 file-roller-2.6.0.tar.bz2 1241766
diff --git a/app-arch/file-roller/files/digest-file-roller-2.6.2 b/app-arch/file-roller/files/digest-file-roller-2.6.2
deleted file mode 100644
index 10c2d0f2fd6d..000000000000
--- a/app-arch/file-roller/files/digest-file-roller-2.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88c6441d286c8f0810a37a3f3107f985 file-roller-2.6.2.tar.bz2 1294588
diff --git a/app-arch/file-roller/files/digest-file-roller-2.8.3 b/app-arch/file-roller/files/digest-file-roller-2.8.3
new file mode 100644
index 000000000000..4987a20f80ef
--- /dev/null
+++ b/app-arch/file-roller/files/digest-file-roller-2.8.3
@@ -0,0 +1 @@
+MD5 841f0cc0eab979d98c25c16725c18745 file-roller-2.8.3.tar.bz2 1380060