Fix scrolling when walking up directory list with upstream bugtracker patch, bug #420891. Switch to base eclass and PATCHES list

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 105 insertions, 5 deletions

diff --git a/media-gfx/geeqie/ChangeLog b/media-gfx/geeqie/ChangeLog
index bafc5ef1d494..4cf0a2f9da89 100644
--- a/media-gfx/geeqie/ChangeLog
+++ b/media-gfx/geeqie/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/geeqie
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.22 2012/06/07 23:08:30 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.23 2012/06/15 09:36:53 voyageur Exp $
+
+*geeqie-1.0-r4 (15 Jun 2012)
+
+  15 Jun 2012; Bernard Cafarelli <voyageur@gentoo.org> +geeqie-1.0-r4.ebuild,
+  +files/geeqie-1.0-up_path_restore.patch:
+  Fix scrolling when walking up directory list with upstream bugtracker patch,
+  bug #420891. Switch to base eclass and PATCHES list
 
 *geeqie-1.0-r3 (07 Jun 2012)
 
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index c6ba8e0c41d7..cf0f00cef623 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -7,17 +7,19 @@ AUX geeqie-1.0-filedata_compare.patch 1690 RMD160 69da274332b06d386896efefd8b76e
 AUX geeqie-1.0-fix_fullscreen.patch 4917 RMD160 984c6fa92dc69636c28c00e18612e145f1b97637 SHA1 57c8b058e6ec1fc2f691650b212acc5dafcd5891 SHA256 b1e612f8373eb1dc457c64fdd5082edf988a63c9deefaf4c7bfd1d564c3f4bb2
 AUX geeqie-1.0-lfs_support.patch 227 RMD160 5e4a5e99a89e9c5e1a345452bba4a92553e23186 SHA1 268acab4e6aec94a4dfd13781f188ba0594dc9b4 SHA256 1a12a99df42636cac424fc901bc7ce74c23b477b818812319986e1dcbb00c03e
 AUX geeqie-1.0-ui_pathsel.patch 1307 RMD160 fd0f0ca851633350173742fb9b3ec3d6842f5be0 SHA1 4da55b832adf3e133d8bafe00cc38b63cee4199c SHA256 2a42dc2a5ee4e4d5e4636d424e1adb6a707c74bde4a5ec28b24ff8fafee164ed
+AUX geeqie-1.0-up_path_restore.patch 626 RMD160 00d9ff22e017a44ebc46afa07f032e6a33625259 SHA1 94dcb0d10dbf4b5be9e8c64cb1c565eab0e5e9d4 SHA256 29cdffb3d1fe2c6c4823ba55e194dac39c59f56aec7aa84814435b656d2ee27a
 AUX geeqie-1.0-vflist-refresh.patch 1968 RMD160 e68d6b04ade9fc9c039589eceaf4dd966818270b SHA1 8de73c82c28c76b11fd29caf87952a3b54a513a6 SHA256 5f7d53a22a42ed7afcb425bf3a9bb358e40225a6a356c2b3791349a2eda67bc0
 DIST geeqie-1.0.tar.gz 1934236 RMD160 f410b5f7bca872f4e67dc2b9f9ffe8e0cedf291a SHA1 8494a557d67d20e6ad720645ec789dd2b33a3266 SHA256 d1ad64666446c1d490437a9441267e8d7c1b9dc6ab640716b213e386d9211fdd
 EBUILD geeqie-1.0-r1.ebuild 1392 RMD160 bc7e45f0abdab24af63a9a2627fa541edf7f8d4d SHA1 e90b4deba8f0bb97c7cbf71c3c4ea27404376435 SHA256 ff0d3de3092295bb295229d170ae9395f6b2c04648cbe34cdb7774b9f6d1f326
 EBUILD geeqie-1.0-r2.ebuild 1491 RMD160 34139e4327afa872d30e13a4d3155c6aefcc3922 SHA1 67fe2add5efb1c00805dede94c0ccce58c80fd58 SHA256 3c5c690637fc5c2af2c9f3d0cf96cfacc0c838b04798b0ec1ec45c8fe67b69a7
 EBUILD geeqie-1.0-r3.ebuild 1728 RMD160 d6f3ed50369e9d87a7fd2bb7489031613a44f305 SHA1 1f4deb4d014ec49e50882db2d57798e57f275ee9 SHA256 a0df327c856d675117740b902b4fa74ce68a30a544bcbab22309cde2e9ddb69c
-MISC ChangeLog 3972 RMD160 75c4ac2abd8d3b0b090f2a2b506f5afb40b17777 SHA1 3880662ce6ea8d76ddc18a31cbb6109bab88a546 SHA256 206cf2fcc756b63d2e0c2f8b55270dfcb023488d2d41653a18e3714cfd18e242
+EBUILD geeqie-1.0-r4.ebuild 1756 RMD160 ac1ca52153ab5eecd57f2e34e22eff31fc7224e0 SHA1 f94fd82f95b820a071ab2ee59d086ca8550687b7 SHA256 bac95aab7f4f5dd27f6414554d11f4cd7af0e1218c509a474099c78606d78d75
+MISC ChangeLog 4257 RMD160 df5d8bc3ca9db829e7a096ac1315c895e810e0e3 SHA1 df5827b16cf639fc2e77db146b36976645d7b215 SHA256 cefd7d5276af18b9a5afb736321df8aba2940f1ea4cef7efcc5c0a1da513b532
 MISC metadata.xml 527 RMD160 74ad34c80eac1c0603bb78439eaebcd522d88fe6 SHA1 ce09664156edf3e65864c383c59cb12afe226961 SHA256 0d271c29ec180ce0cad2f6129d90fcbd562996c76d59d56063c3e29d6e68b877
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/RNHcACgkQFYEBGcdFJfIEYwD+JmH2+pEozaFPI0gnytbtLeJn
-hkkNHahjmJJhAHUB3jMA/1z2LIBAT7pc2TNd8lCj/QowUMqs+OqubvaUIbeKO7Je
-=qprX
+iF4EAREIAAYFAk/bAkAACgkQFYEBGcdFJfKvQAEAp6/ihf/vG7o95Y0A42tpoBbt
+bE/PcfgY4k6dLWl97SkA+wRT1bTxjT0MQhNI50ID74iSRn8zqap4UqiOuQAJThxj
+=j+ZU
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/geeqie/files/geeqie-1.0-up_path_restore.patch b/media-gfx/geeqie/files/geeqie-1.0-up_path_restore.patch
new file mode 100644
index 000000000000..22cc71d129f5
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.0-up_path_restore.patch
@@ -0,0 +1,22 @@
+Index: src/view_dir_list.c
+===================================================================
+--- src/view_dir_list.c	(revision 1917)
++++ src/view_dir_list.c	(working copy)
+@@ -309,7 +309,7 @@
+ 		base = remove_level_from_path(vd->dir_fd->path);
+ 		if (strcmp(base, dir_fd->path) == 0)
+ 			{
+-			old_path = g_strdup(vd->dir_fd->name);
++			old_path = g_strdup(vd->dir_fd->path);
+ 			}
+ 		g_free(base);
+ 		}
+@@ -329,7 +329,7 @@
+ 		while (work && !found)
+ 			{
+ 			FileData *fd = work->data;
+-			if (strcmp(old_path, fd->name) == 0) found = fd;
++			if (strcmp(old_path, fd->path) == 0) found = fd;
+ 			work = work->next;
+ 			}
+ 
diff --git a/media-gfx/geeqie/geeqie-1.0-r4.ebuild b/media-gfx/geeqie/geeqie-1.0-r4.ebuild
new file mode 100644
index 000000000000..f5375c5f38a9
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.0-r4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0-r4.ebuild,v 1.1 2012/06/15 09:36:53 voyageur Exp $
+
+EAPI=4
+inherit autotools base eutils
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://geeqie.sourceforge.net/"
+SRC_URI="mirror://sourceforge/geeqie/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc exif lcms lirc xmp"
+
+RDEPEND="x11-libs/gtk+:2
+	virtual/libintl
+	doc? ( app-text/gnome-doc-utils )
+	lcms? ( =media-libs/lcms-1* )
+	lirc? ( app-misc/lirc )
+	xmp? ( >=media-gfx/exiv2-0.17[xmp] )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-automake-1.11.patch
+	"${FILESDIR}"/${P}-copy_chown.patch
+	"${FILESDIR}"/${P}-filedata_compare.patch
+	"${FILESDIR}"/${P}-fix_fullscreen.patch
+	"${FILESDIR}"/${P}-lfs_support.patch
+	"${FILESDIR}"/${P}-ui_pathsel.patch
+	"${FILESDIR}"/${P}-vflist-refresh.patch
+	"${FILESDIR}"/${P}-up_path_restore.patch
+)
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--disable-dependency-tracking
+		--with-readmedir=/usr/share/doc/${PF}
+		$(use_enable lcms)
+		$(use_enable lirc)"
+
+	if use exif || use xmp; then
+		myconf="${myconf} --enable-exiv2"
+	else
+		myconf="${myconf} --disable-exiv2"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -f "${D}/usr/share/doc/${MY_P}/COPYING"
+}
+
+pkg_postinst() {
+	elog "Some plugins may require additional packages"
+	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+	elog "- RAW images plugin: media-gfx/ufraw"
+}