New version for GNOME 2.26. Drop libgnome{,ui} dependencies, bug fixes and translation updates. Clean up old revisions.

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

3 files changed, 30 insertions, 46 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index 793a0cf780a2..949387d640f3 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.254 2009/04/27 13:09:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.255 2009/05/02 19:15:31 eva Exp $
+
+*file-roller-2.26.1 (02 May 2009)
+
+  02 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/file-roller-2.10-use_fr_rpm2cpio.patch, -file-roller-2.22.4.ebuild,
+  +file-roller-2.26.1.ebuild:
+  New version for GNOME 2.26. Drop libgnome{,ui} dependencies, bug fixes and
+  translation updates. Clean up old revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> file-roller-2.24.3:
   Stable for HPPA (bug #260063).
diff --git a/app-arch/file-roller/file-roller-2.22.4.ebuild b/app-arch/file-roller/file-roller-2.26.1.ebuild
index c726f15a792d..9b868050ea1e 100644
--- a/app-arch/file-roller/file-roller-2.22.4.ebuild
+++ b/app-arch/file-roller/file-roller-2.26.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.22.4.ebuild,v 1.7 2008/11/13 19:18:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.26.1.ebuild,v 1.1 2009/05/02 19:15:31 eva Exp $
+
+GCONF_DEBUG="no"
 
 inherit eutils gnome2
 
@@ -9,18 +11,15 @@ HOMEPAGE="http://fileroller.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nautilus"
 
-RDEPEND=">=dev-libs/glib-2.15.0
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/libgnome-2.6
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-vfs-2.10
-	>=gnome-base/libglade-2.4
-	>=gnome-base/gconf-2
+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
@@ -29,7 +28,10 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
 
 pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper"
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-run-in-place
+		--disable-static"
 
 	if ! use nautilus ; then
 		G2CONF="${G2CONF} --disable-nautilus-actions"
@@ -40,20 +42,24 @@ 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
+	# 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
-	epatch "${FILESDIR}"/${PN}-2.10-use_fr_rpm2cpio.patch
+	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
+	dobin "${FILESDIR}/rpm2cpio-file-roller" || die "dobin failed"
 }
 
 pkg_postinst() {
-	elog "${PN} is a frontend for several archiving utility. If you want a"
+	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
diff --git a/app-arch/file-roller/files/file-roller-2.10-use_fr_rpm2cpio.patch b/app-arch/file-roller/files/file-roller-2.10-use_fr_rpm2cpio.patch
deleted file mode 100644
index 6b9ce2d521a6..000000000000
--- a/app-arch/file-roller/files/file-roller-2.10-use_fr_rpm2cpio.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -uNr file-roller-2.10.0/src/fr-command-rpm.c file-roller-2.10.0.patched/src/fr-command-rpm.c
---- file-roller-2.10.0/src/fr-command-rpm.c	2005-03-07 13:29:37.000000000 +0100
-+++ file-roller-2.10.0.patched/src/fr-command-rpm.c	2005-03-29 12:40:38.000000000 +0200
-@@ -131,7 +131,7 @@
- 				      list__process_line,
- 				      comm);
- 
--	fr_process_begin_command (comm->process, "rpm2cpio");
-+	fr_process_begin_command (comm->process, "rpm2cpio-file-roller");
- 	fr_process_add_arg (comm->process, comm->e_filename);
- 	fr_process_add_arg (comm->process, "| cpio --list --force-local --verbose");
- 	fr_process_end_command (comm->process);
-@@ -150,7 +150,7 @@
- {
- 	GList *scan;
- 
--	fr_process_begin_command (comm->process, "rpm2cpio");
-+	fr_process_begin_command (comm->process, "rpm2cpio-file-roller");
- 	if (dest_dir != NULL)
-                 fr_process_set_working_dir (comm->process, dest_dir);
- 	fr_process_add_arg (comm->process, comm->e_filename);
-@@ -240,7 +240,7 @@
- {
- 	FRCommand *comm;
- 
--	if (!is_program_in_path("rpm2cpio")) {
-+	if (!is_program_in_path("rpm2cpio-file-roller")) {
- 		return NULL;
- 	}
-