New version for GNOME 2.28. Clean up old revision.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 34 insertions, 96 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index f367a553d575..9945ecd44384 100644
--- a/app-arch/file-roller/ChangeLog
+++ b/app-arch/file-roller/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/file-roller
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.261 2009/10/24 16:55:05 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.262 2009/10/29 20:57:11 eva Exp $
+
+*file-roller-2.28.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -file-roller-2.26.1.ebuild, -file-roller-2.26.2.ebuild,
+  +file-roller-2.28.1.ebuild:
+  New version for GNOME 2.28. Clean up old revision.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> file-roller-2.26.3.ebuild:
   ppc stable #281427
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 2b985e47de23..947c084caefd 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,13 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX file-roller-2.10.3-use_bin_tar.patch 504 RMD160 0af7af1c83953554e58c3a2f82ae3edb2e6b7e55 SHA1 a40077b5ace4be970dae46b44aa5b8ce19a75780 SHA256 c22e742893800c4302df40af66b1eabeab700fea7326eada849f919bdd76c052
 AUX file-roller-2.26.3-typedefs-header-typo.patch 657 RMD160 0983884e248c8a74575d9227e634eaca33f9281a SHA1 009191a3c8aa4e1baa39b202e1ca47a9bfcddb86 SHA256 59ed9069d44da40ea496659fb7eacab76c59f7308b09f399bf7150c323f72e27
 AUX rpm2cpio-file-roller 2556 RMD160 c123c4f046a5844d75a90f4a1edb308b17d99bd9 SHA1 81558e086339f4bdb373ebd4bc33215ec31debae SHA256 75dc7413d516d1f315534662c5a098c7973866b4d125547cd2696190818b8b6a
 DIST file-roller-2.24.3.tar.bz2 1484687 RMD160 494bb520c86cb81d543370a7c621783b8a42ef0e SHA1 afba08f5b09414506a42dd5d8679748392dfa7a3 SHA256 c15956b5348b4066f4e244be10db6f4ef802d316103d1d870c56d4347eb4dca1
-DIST file-roller-2.26.1.tar.bz2 1563081 RMD160 c930052e98957a7f4cc29897c0d6a880fa9a46b9 SHA1 a95c3add34612ad8f5423989bc421ffb682665f0 SHA256 4bfc1cd9405c91850034e07b1c0c69c4e1067e4bda5c8135f70085e578cf6918
-DIST file-roller-2.26.2.tar.bz2 1565897 RMD160 7697cc08cb493da99d21afb913f5e1a57ca8de9c SHA1 4989d1e2d5c7f13e9e5612625ae9ea5770f551cb SHA256 e93055dfb149396903204539d0754a9e3b76e52e7668ac2f744b0820041a61ac
 DIST file-roller-2.26.3.tar.bz2 1561967 RMD160 4c8cb579c4849a6cdc92250df5b447f575be76a6 SHA1 92760312c9dddec695851170c289f692c2521176 SHA256 06ec16ab8b1c9d0a1b3d40d2d63cd8170776bcc44ffa1f48e0403a9e23aef769
+DIST file-roller-2.28.1.tar.bz2 1736551 RMD160 82c8fa9e2125d1512c20f0609fb6661a04f783b6 SHA1 96341fd6e97253dee8052a068523b61ba36c6560 SHA256 ce1b18d0ec5e383ef64def91b67c96cebd8adfb99ac3b4bcac0ae40c90a12250
 EBUILD file-roller-2.24.3.ebuild 2167 RMD160 6325392bc460fea18ce511c2e7689c8be13bfa52 SHA1 951e1d7f2aa05bbfbe566024720346dabc77fd13 SHA256 f3683c9ed9e179007d93cc335a35e83bf685ef13b2b62888b574cc775965f078
-EBUILD file-roller-2.26.1.ebuild 2300 RMD160 972301dad142cf095ed1448e55e07289d6dbf797 SHA1 5097083c969bf83e311d8760225e6c43edbb7917 SHA256 df7851b34cdc2c48c2177daff7ae69476cc05c4af359f8edb501d2e739d03871
-EBUILD file-roller-2.26.2.ebuild 2291 RMD160 ffe24c681bf491f6a175d4d689de63d89ea86c08 SHA1 74be4b4978366eb40e592a78a40fd734691779ef SHA256 f36591ac80341482abd5020fa843486d8427da04d5a196f1c8cba34c292251dc
 EBUILD file-roller-2.26.3.ebuild 2429 RMD160 2a9ddbd712fc1984bc94bb96c705d6f623644b9c SHA1 501a551c60ac0dfb4bda04ee14276c7eeb649e61 SHA256 fbe27cc51407f22013d2269d872e9e0eadae194849ef13aa871a0ddc8402a733
-MISC ChangeLog 33964 RMD160 cf20368c16885e5d1008600fafbdd6ffc0214646 SHA1 f559b0856c7f249d149c51efa1ec5559fd3a7db6 SHA256 8023ece896b5578cbb9ff5f3b459380bffc1a197c80d52653f0c4879bc339071
+EBUILD file-roller-2.28.1.ebuild 2301 RMD160 69161c7f3b5ee1413ac5929965514c5c2b7294a9 SHA1 c2c9aac1863ef74294456ab3535c8293d9126f91 SHA256 00d3d93b3c89352ca14eef6f959a2082690066eaec7fbae4e4dfa1328703cfcc
+MISC ChangeLog 34192 RMD160 a77fbf251987e97f5291f97cb728c8522f71f924 SHA1 b0ffbcd247bd100058028122534acaadacc6aca0 SHA256 fb0e1b16e10ab0bedc465f8b1d5eabf5d371ff60300c8b2ae6a8e4b327241d2d
 MISC metadata.xml 312 RMD160 3826a5dad37bd2c9a06bc83d820ad73fc982cbe9 SHA1 3b783bbd0a5e2ac14242664bc3b21d4753086121 SHA256 96d7fa4361428c9ed083d5a4a0294091735633b8f4a03ffa58413e417b3bfba6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrqAa0ACgkQ1fmVwcYIWAbu8wCZAbeiCZIJU3JeXmQ951m/PrmN
+/kIAoL6KvS6xE/fQ0oy/xlD2IaMZnqko
+=Wj9Y
+-----END PGP SIGNATURE-----
diff --git a/app-arch/file-roller/file-roller-2.26.2.ebuild b/app-arch/file-roller/file-roller-2.26.2.ebuild
deleted file mode 100644
index bacb7e340e28..000000000000
--- a/app-arch/file-roller/file-roller-2.26.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2009 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.26.2.ebuild,v 1.1 2009/05/18 21:27:15 eva Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="nautilus"
-
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.13
-	>=gnome-base/gconf-2.6
-	nautilus? ( >=gnome-base/nautilus-2.22.2 )"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-run-in-place
-		--disable-static"
-
-	if ! use nautilus ; then
-		G2CONF="${G2CONF} --disable-nautilus-actions"
-	fi
-}
-
-src_unpack() {
-	gnome2_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.3-use_bin_tar.patch
-
-	# use a local rpm2cpio script to avoid the dep
-	sed -e "s/rpm2cpio/rpm2cpio-file-roller/g" \
-		-i src/fr-command-rpm.c || die "sed failed"
-
-	# Fix intltoolize broken file, see upstream #577133 and #579464
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
-
-src_install() {
-	gnome2_src_install
-	dobin "${FILESDIR}/rpm2cpio-file-roller" || die "dobin failed"
-}
-
-pkg_postinst() {
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format support, see ${HOMEPAGE}"
-	elog "and install the relevant package."
-	elog
-	elog "for example:"
-	elog "  7-zip   - app-arch/p7zip"
-	elog "  ace     - app-arch/unace"
-	elog "  arj     - app-arch/arj"
-	elog "  lzma    - app-arch/lzma"
-	elog "  lzop    - app-arch/lzop"
-	elog "  cpio    - app-arch/cpio"
-	elog "  iso     - app-cdr/cdrtools"
-	elog "  jar,zip - app-arch/zip and app-arch/unzip"
-	elog "  lha     - app-arch/lha"
-	elog "  rar     - app-arch/unrar"
-	elog "  rpm     - app-arch/rpm"
-	elog "  unstuff - app-arch/stuffit"
-	elog "  zoo     - app-arch/zoo"
-}
diff --git a/app-arch/file-roller/file-roller-2.26.1.ebuild b/app-arch/file-roller/file-roller-2.28.1.ebuild
index 1489867c31e0..ceae97f8db88 100644
--- a/app-arch/file-roller/file-roller-2.26.1.ebuild
+++ b/app-arch/file-roller/file-roller-2.28.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 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.26.1.ebuild,v 1.2 2009/05/05 20:24:35 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.28.1.ebuild,v 1.1 2009/10/29 20:57:11 eva Exp $
 
+EAPI="2"
 GCONF_DEBUG="no"
 
 inherit eutils gnome2
@@ -15,20 +16,21 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nautilus"
 
 RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.13
-	>=gnome-base/gconf-2.6
-	nautilus? ( >=gnome-base/nautilus-2.22.2 )"
+	>=x11-libs/gtk+-2.16
+	gnome-base/gconf
+	nautilus? ( gnome-base/nautilus )"
 DEPEND="${RDEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	>=app-text/gnome-doc-utils-0.3.2"
+	dev-util/intltool
+	dev-util/pkgconfig
+	app-text/gnome-doc-utils"
 
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		--disable-dependency-tracking
 		--disable-scrollkeeper
 		--disable-run-in-place
 		--disable-static"
@@ -38,8 +40,8 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 
 	# 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
@@ -50,7 +52,8 @@ src_unpack() {
 		-i src/fr-command-rpm.c || die "sed failed"
 
 	# Fix intltoolize broken file, see upstream #577133 and #579464
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
 }
 
 src_install() {