Bump to 3.2.1 from the gnome overlay, drop old. Notable changes: UI fixes, some 7zip bugfixes.

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

4 files changed, 50 insertions, 43 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index 3edb2b9bef12..5338f7c7a8a8 100644
--- a/app-arch/file-roller/ChangeLog
+++ b/app-arch/file-roller/ChangeLog
@@ -1,6 +1,14 @@
 # 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.302 2011/10/05 22:08:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.303 2011/11/06 03:28:11 tetromino Exp $
+
+*file-roller-3.2.1 (06 Nov 2011)
+
+  06 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +files/3.1.2-packages.match, -file-roller-3.0.2-r1.ebuild,
+  -files/file-roller-3.0.2-pointer-arithmetic.patch, +file-roller-3.2.1.ebuild:
+  Bump to 3.2.1 from the gnome overlay, drop old. Notable changes: UI fixes,
+  some 7zip bugfixes.
 
   05 Oct 2011; Pacho Ramos <pacho@gentoo.org> -file-roller-2.32.1.ebuild,
   file-roller-2.32.2.ebuild:
diff --git a/app-arch/file-roller/file-roller-3.0.2-r1.ebuild b/app-arch/file-roller/file-roller-3.2.1.ebuild
index a16f49d89a8f..54ec8f3489dc 100644
--- a/app-arch/file-roller/file-roller-3.0.2-r1.ebuild
+++ b/app-arch/file-roller/file-roller-3.2.1.ebuild
@@ -1,11 +1,10 @@
 # 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.2 2011/09/05 19:47:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-3.2.1.ebuild,v 1.1 2011/11/06 03:28:11 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
 
 inherit eutils gnome2
 
@@ -17,9 +16,15 @@ SLOT="0"
 IUSE="nautilus packagekit"
 KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
-RDEPEND=">=dev-libs/glib-2.25.5:2
-	>=x11-libs/gtk+-3.0.2:3
+# gdk-pixbuf used extensively in the source
+# cairo used in eggtreemultidnd.c
+# pango used in fr-window
+RDEPEND=">=dev-libs/glib-2.29.14:2
 	sys-apps/file
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.0.2:3
+	x11-libs/pango
 	nautilus? ( >=gnome-base/nautilus-3.0.0 )
 	packagekit? ( app-admin/packagekit-base )
 "
@@ -32,13 +37,14 @@ DEPEND="${RDEPEND}
 #	gnome-base/gnome-common
 
 pkg_setup() {
+	# --disable-debug because enabling it adds -O0 to CFLAGS
 	G2CONF="${G2CONF}
 		--disable-dependency-tracking
 		--disable-scrollkeeper
 		--disable-run-in-place
 		--disable-static
-		--disable-deprecations
 		--disable-schemas-compile
+		--disable-debug
 		--enable-magic
 		$(use_enable nautilus nautilus-actions)
 		$(use_enable packagekit)"
@@ -52,8 +58,8 @@ src_prepare() {
 	# 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"
+	# File providing Gentoo package names for various archivers
+	cp -f "${FILESDIR}/3.1.2-packages.match" data/packages.match || die
 }
 
 pkg_postinst() {
diff --git a/app-arch/file-roller/files/3.1.2-packages.match b/app-arch/file-roller/files/3.1.2-packages.match
new file mode 100644
index 000000000000..be34bc6c0575
--- /dev/null
+++ b/app-arch/file-roller/files/3.1.2-packages.match
@@ -0,0 +1,28 @@
+[Package Matches]
+arj=app-arch/arj
+binutils=sys-devel/binutils
+bzip2=app-arch/bzip2
+cpio=app-arch/cpio
+genisoimage=virtual/cdrtools
+gzip=app-arch/gzip
+lha=app-arch/lha
+lrzip=app-arch/lrzip
+lzip=app-arch/lzip
+lzma=app-arch/xz-utils
+lzop=app-arch/lzop
+ncompress=app-arch/ncompress
+p7zip=app-arch/p7zip
+p7zip-full=
+p7zip-rar=
+rar=app-arch/rar
+rpm=app-arch/rpm
+rzip=app-arch/rzip
+tar=app-arch/tar
+unace=app-arch/unace
+unalz=
+unrar=app-arch/unrar
+unstaff=
+unzip=app-arch/unzip
+xz=app-arch/xz-utils
+zip=app-arch/zip
+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
deleted file mode 100644
index d535e2cd20b7..000000000000
--- a/app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmetic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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