New version for GNOME 2.28. Clean up old revision.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 21 insertions, 91 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/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() {