Bump to 3.0.2, from gnome overlay for GNOME 3

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

4 files changed, 132 insertions, 6 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index e7988d7afe5f..2ce7aa666a0c 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.298 2011/08/13 16:31:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.299 2011/08/19 15:41:35 nirbheek Exp $
+
+*file-roller-3.0.2-r1 (19 Aug 2011)
+
+  19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +file-roller-3.0.2-r1.ebuild,
+  +files/file-roller-3.0.2-pointer-arithmetic.patch, metadata.xml:
+  Bump to 3.0.2, from gnome overlay for GNOME 3
 
   13 Aug 2011; Raúl Porcel <armin76@gentoo.org> file-roller-2.32.2.ebuild:
   alpha/ia64/sparc stable wrt #369909
diff --git a/app-arch/file-roller/file-roller-3.0.2-r1.ebuild b/app-arch/file-roller/file-roller-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..f1fa22a97515
--- /dev/null
+++ b/app-arch/file-roller/file-roller-3.0.2-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-3.0.2-r1.ebuild,v 1.1 2011/08/19 15:41:36 nirbheek Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2
+
+DESCRIPTION="Archive manager for GNOME"
+HOMEPAGE="http://fileroller.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nautilus packagekit"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-libs/glib-2.25.5:2
+	>=x11-libs/gtk+-3.0.2:3
+	sys-apps/file
+	nautilus? ( >=gnome-base/nautilus-3.0.0 )
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0
+	dev-util/pkgconfig
+	app-text/gnome-doc-utils"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		--disable-scrollkeeper
+		--disable-run-in-place
+		--disable-static
+		--disable-deprecations
+		--disable-schemas-compile
+		--enable-magic
+		$(use_enable nautilus nautilus-actions)
+		$(use_enable packagekit)"
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+}
+
+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
+	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
+
+	# Upstream patch to fix path parsing in 7z files, will be in next release
+	epatch "${FILESDIR}/${P}-pointer-arithmetic.patch"
+}
+
+pkg_postinst() {
+	gnome2_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 "  cpio    - app-arch/cpio"
+	elog "  deb     - app-arch/dpkg"
+	elog "  iso     - app-cdr/cdrtools"
+	elog "  jar,zip - app-arch/zip and app-arch/unzip"
+	elog "  lha     - app-arch/lha"
+	elog "  lzma    - app-arch/xz-utils"
+	elog "  lzop    - app-arch/lzop"
+	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/files/file-roller-3.0.2-pointer-arithmetic.patch b/app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmetic.patch
new file mode 100644
index 000000000000..d535e2cd20b7
--- /dev/null
+++ b/app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmetic.patch
@@ -0,0 +1,35 @@
+From 3d7fa24ca267e333d7406eff38ec02b519110ecc Mon Sep 17 00:00:00 2001
+From: Iain Nicol <iainn@src.gnome.org>
+Date: Sun, 29 May 2011 21:50:58 +0000
+Subject: Pointer arithmetic fixes for end of string access
+
+[bug #651416]
+---
+diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
+index 3f66338..5e505fa 100644
+--- a/src/fr-command-7z.c
++++ b/src/fr-command-7z.c
+@@ -158,7 +158,7 @@ list__process_line (char     *line,
+ 		fdata->original_path = g_strdup (fields[1]);
+ 		fdata->full_path = g_strconcat ((fdata->original_path[0] != '/') ? "/" : "",
+ 						fdata->original_path,
+-						(fdata->dir && (fdata->original_path[strlen (fdata->original_path - 1)] != '/')) ? "/" : "",
++						(fdata->dir && (fdata->original_path[strlen (fdata->original_path) - 1] != '/')) ? "/" : "",
+ 						NULL);
+ 	}
+ 	else if (strcmp (fields[0], "Folder") == 0) {
+diff --git a/src/fr-window.c b/src/fr-window.c
+index 743c8fe..db8c8c6 100644
+--- a/src/fr-window.c
++++ b/src/fr-window.c
+@@ -1236,7 +1236,7 @@ fr_window_dir_exists_in_archive (FrWindow   *window,
+ 			return TRUE;
+ 		}
+ 		else if (fdata->dir
+-			 && (fdata->full_path[strlen (fdata->full_path)] != '/')
++			 && (fdata->full_path[strlen (fdata->full_path) - 1] != '/')
+ 			 && (strncmp (dir_name, fdata->full_path, dir_name_len - 1) == 0))
+ 		{
+ 			return TRUE;
+--
+cgit v0.9
diff --git a/app-arch/file-roller/metadata.xml b/app-arch/file-roller/metadata.xml
index 706ff841f05a..d529497a7a52 100644
--- a/app-arch/file-roller/metadata.xml
+++ b/app-arch/file-roller/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<use>
-	<flag name="nautilus">Enable file-roller to integrate with
-	<pkg>gnome-base/nautilus</pkg> by providing entries in its context menu.</flag>
-</use>
+	<herd>gnome</herd>
+	<use>
+		<flag name="nautilus">Enable file-roller to integrate with
+			<pkg>gnome-base/nautilus</pkg> by providing entries in its context
+			menu</flag>
+		<flag name="packagekit">Enable support for the distro-neutral package
+			manager GUI <pkg>app-admin/packagekit</pkg></flag>
+	</use>
 </pkgmetadata>