Version bump with lcms:2 support and other bugfixes. Drop lcms:0 support from older versions, bug #526820

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

6 files changed, 69 insertions, 32 deletions

diff --git a/media-gfx/geeqie/ChangeLog b/media-gfx/geeqie/ChangeLog
index 7a9ecd654783..c5ba8c338b88 100644
--- a/media-gfx/geeqie/ChangeLog
+++ b/media-gfx/geeqie/ChangeLog
@@ -1,6 +1,14 @@
 # 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.26 2012/09/23 07:59:30 phajdan.jr Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.27 2014/10/26 21:55:20 voyageur Exp $
+
+*geeqie-1.2 (26 Oct 2014)
+
+  26 Oct 2014; Bernard Cafarelli <voyageur@gentoo.org> -geeqie-1.0-r2.ebuild,
+  geeqie-1.0-r4.ebuild, geeqie-1.1.ebuild, +geeqie-1.2.ebuild,
+  +files/geeqie-1.2-fix_version.patch:
+  Version bump with lcms:2 support and other bugfixes. Drop lcms:0 support from
+  older versions, bug #526820
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> geeqie-1.0-r4.ebuild:
   x86 stable wrt bug #429116
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 8f3e8cce920b..60adb628af06 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -10,17 +10,19 @@ AUX geeqie-1.0-ui_pathsel.patch 1307 SHA256 2a42dc2a5ee4e4d5e4636d424e1adb6a707c
 AUX geeqie-1.0-up_path_restore.patch 626 SHA256 29cdffb3d1fe2c6c4823ba55e194dac39c59f56aec7aa84814435b656d2ee27a SHA512 21a7375957050a7d5c5650475215f03f2129faef524ef9a61fdd716761e979fbb4b2c619b6d736afe84ee0340a5ebdf391cd111ca18fb7cfd0593ad8cab8abd7 WHIRLPOOL 6c57255f238b2e91d6b51fab9e8dd43c814049e27f02e744d20d397b76dfb5097fdd96af0b673479638cdb2e11999ae11524240d634ae2041558e440e80cd2ff
 AUX geeqie-1.0-vflist-refresh.patch 1968 SHA256 5f7d53a22a42ed7afcb425bf3a9bb358e40225a6a356c2b3791349a2eda67bc0 SHA512 ceb5874f895a5a0ef1e60fc97e7ec4d99c508713bffceff616839abe216b223baf3cddcc2dab431c74e75bd4a72b3ec38c9e43a018a81c46fa3bf0d949152e90 WHIRLPOOL 63b58135799dc62cd1ecd7c95ef47bd025a21687c0a15498fd9e3e13f4067441623eadffdd128cc837612387df9cc3ecc8faef55d70a609cbbbb27b1305cd344
 AUX geeqie-1.1-fix_comment_update.patch 4649 SHA256 cd1ce814ea556f51e840e36b85a2316e30f57a887531688a2b20f481a3061612 SHA512 4b6e6b25264a7b9075dc2718fb48a0eb8157f695f206a047efc94d593ed5624bd86b47f38931bee24fc8a5ec0be75f4ea51338996f8ca8be56982d5d3584a786 WHIRLPOOL 38cbfec26e7b9f477e739de87609e442439a3a1d9c2a8ba37fccff6fa77869e74e14bfbe5977cbb447cd8649e97eef98c02483cae9820eb9958a99f95b686a6d
+AUX geeqie-1.2-fix_version.patch 374 SHA256 450692df420c993f8a91a7b5b71cf40c2dcc8b21a546533b4b894b4ff6e8c353 SHA512 f9ea503a6a367838380e20ed7f102b9ce8c22286ab1c1ba6b33741ecc5d82770e0cf147462bc3a42bf3b602fc5116b9d267e8125af374ddae48352b14bb82fcd WHIRLPOOL 446ef59f4eb635c85c67cd72329e28ab004936d1a73f92ac62174bfbef9adfa8786fd88432a7fe880ec3b3d6f9489d684d8309bbe33b89643bb9ea6f64cffe8f
 DIST geeqie-1.0.tar.gz 1934236 SHA256 d1ad64666446c1d490437a9441267e8d7c1b9dc6ab640716b213e386d9211fdd SHA512 34ad22468e1faaad8842df8c172e305149415812a9421edc590bf1717ab8ce787e55152f9348d39b69e2c5642cba5abd4e574c0b46d06bc741994bcecaa8a18a WHIRLPOOL af3406b27b491fe8836f39faf5013091a3c5b74287e94d9022b2b3cc337ce338e586fc287de90e272a284400926af97b41e32af5e6e87babc770bb1b66cddc89
 DIST geeqie-1.1.tar.gz 1966211 SHA256 5544e81c29917a647f19bfe800d9f0dd1cd5b890329feebd9abd80927e1afecf SHA512 3949b2717c70adb4e6b2c6db002042bcd1c3e9a5345991d3cba41de1765709ccf70fadfcde9dd221b1da03ef14512c746ab424cbc0d09617c52dbf445ee0243d WHIRLPOOL 1c62611f597e08b51b0306dac2af5af1893d4c1b96726bbc6220b28d1779275516624ff3865dec0056d93a1af24edcce1a3a0f2891b954be19bab1b7d728a929
-EBUILD geeqie-1.0-r2.ebuild 1491 SHA256 3c5c690637fc5c2af2c9f3d0cf96cfacc0c838b04798b0ec1ec45c8fe67b69a7 SHA512 66000cd779775a1d58a7a9c320e81f69eb5a4324a9ad446e2c750d308215de38f5fa1bf4bfa38b502ee5dd191ace2ac5264806a8f862563277a4a7209a20869b WHIRLPOOL 38ea39359114494209978079a6008739955c45407676d56c1169dc6759f8c25df576db695699f70e091f19a8c64384d764cbaafd65311c386aeec9e50ad7c726
-EBUILD geeqie-1.0-r4.ebuild 1756 SHA256 6a75faa604d0c964eba3a3b0bb0dab1092e7fd3bc25183d465e7bf97e7378837 SHA512 95814b3a9d80b707e993181769cdf36b2e4adf5f866a9c2573b5da7b1855b5582ec1f8639d78732d66ccb4803e400921666e7f04b8fa1639aca4e0f8913c5b04 WHIRLPOOL 6b466406c2c8f04f0600df078250c65f60d64888c36b9bb12db9ce64a7cfb91fb7ee14c8962d27a7e5c0f5535ddb20dd9514028decefb2754b35f09f487df761
-EBUILD geeqie-1.1.ebuild 1570 SHA256 56a935197b5ddf8be08896e30806dfdc0e8c7934b12c5ed3cc390c9280dc7b64 SHA512 ca6be508d86417dae62ec3f0d11dceabfef7f5c3e15b18e63737fe36a7f12dc32d8d00d1c578aa4a82879481eda2dde96cf8d4acbc153d7e1848c8be7fa95f58 WHIRLPOOL 7c1974f96871ba41959fee455474f1dc54df57f8b1a5b1cd69e2b91de6b682908a1ec84d802be28a19c9ef86901918050ba54bee65c80e994a2c2964c93eb136
-MISC ChangeLog 4861 SHA256 065db843f3bfe060076252759f025ad7b3d5e58eb894cbecb0c5ff441f62e026 SHA512 2bf65c68c310a9135f6d5fae8bdb7a274a1b2fcdb224cbf67f7d5d7d8168b87f3027b3fdc4da8a93886ad2146a36a7e831925157e5f7ee69752af7416cfb352f WHIRLPOOL d319a89082bcc37df17703d49948fb8acaa8e0fc08d8be0fb719e5b9395be150563648459066dbae8e757b68727fd759d543ee8bfc1eda180751829dc2192d5d
+DIST geeqie-1.2.tar.gz 1904764 SHA256 f13fc2489fb9bed31ed48aec8b2a3a573c11cd6e036f1b07ed2cf6495ccc75dd SHA512 cd27cc480cc649f6ba6ea2997bf9a3dc1aa3f655e6f949de27bb4bbfa79927126851604005bf0a0e2be86683f5b9b06dbfb86b919f828e54a79bafcdd6a0be92 WHIRLPOOL 82e25e743b62566dd99a630fb347966195a93b8eba51a300907e04e7113c5bc39a0bf74da28eeba6325558ff86d1bdea80cfe8c7fedf70ce5466e224e0b648c0
+EBUILD geeqie-1.0-r4.ebuild 1714 SHA256 13b1e5dac08c772ad44d80d1c5cfa6e8036554cc918380b9795da0630607cae6 SHA512 0630e439aa0967d38f255afb182e3ecd6caf1755faf8098914714215b0e54bd1ae5231d31fcb6b9a73f2cf9e5f770e17ddb55c674fa02fc9348aed7828ad0058 WHIRLPOOL bb0988192d3bc96bd11ad06705a0e2ac8f152dd2dbff065fe9e3b2ff809b46d98272004effbc0e87c455e2a475193ad92344fafb5179f8bc4f4319a14c49889b
+EBUILD geeqie-1.1.ebuild 1530 SHA256 fdd5fe84fa8c94f1a613953e5105acd297e5f8174393621c4535e1010dcfe00d SHA512 5f4623a257a5444fe84e6065eea1051838d9e656587d4d5e6968879a76cd3545fc9ceec1e28ebb4f9074e63b8671b0aa93b33b1eee28f310636d353200c62fa7 WHIRLPOOL eae5e011e904cd31665dcfd4b932025b47b5c5a3fb6641ff961fb83d76fb8b105d707f717fad6bea384680876424cc8d8d8e0709a557c954ee02b6fdf1fedd4f
+EBUILD geeqie-1.2.ebuild 1791 SHA256 934f5bb1466cee9805dbbedfe646efc7f1736cf483f0045d2e0c4c59e51e8c5f SHA512 0e77d4c2d9ebc725eb5df2d4ea21f8e24ced5f35416243fef1132a87e082de8e3dd5735fba171f8b339aa0f094180c81f75d5a3e81b1a301367e56dd80a73676 WHIRLPOOL 451bd600034515e71d7e4624499139a3fdfd81e0542a90ee7164c35f9480959f0888a52ef4d551a17825329332adcfeca743be18a601d992f10dc14b2f0ce4ca
+MISC ChangeLog 5177 SHA256 c4dacb3deceeb07aa70567b260e99929c6c105156e81b73a1f27664603964a3c SHA512 c7fdbc772dd82dfeb2e325e1fe3a984ceff4bf018172fa3b7c96b82d6103884850c5541434db6b0899b3e965dcf8b6d677e1ed197ec14fb65812dc28e60d437d WHIRLPOOL 0b2f4c94c88f0ef0bc05e117627f8b1aefb297349b74859af7c758a6bfba4bc1445901b16fe1abc86d1503e26bb13cef590916b0433df00670d71c24426645e5
 MISC metadata.xml 527 SHA256 0d271c29ec180ce0cad2f6129d90fcbd562996c76d59d56063c3e29d6e68b877 SHA512 7ba8db75611e19112aeff58820af895493f9153916972ba088673afd0dc9c4e9dd894e34c4a0b8cab413e5c8f777827178e407e0153ebf5be31d5b9ad6810cd2 WHIRLPOOL 9720b49bf795bcd36b03eda5d616a913c8da455791dbd8c8e73e44e6690c7569153fc5eac942c157b8dfb9cc505bd700a88fbd0565d0c01faa2658cca5077e34
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlBewWgACgkQuUQtlDBCeQKt6gCdGfPqZnTD1kyfCnSmi6t0Evdf
-ERoAoIg0RGSiTFt0nLj/iYqO9/csPUy5
-=t64s
+iF4EAREIAAYFAlRNbc8ACgkQFYEBGcdFJfJBTgD/X6tAOa042uxxhb4taVSdB6qc
+mIRwKxHTP/tr0JDw2L4A/jVwRr2C+oShIEZ7oEXxeKAfH/C3pofVIBwie4PM1gtd
+=sAyJ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/geeqie/files/geeqie-1.2-fix_version.patch b/media-gfx/geeqie/files/geeqie-1.2-fix_version.patch
new file mode 100644
index 000000000000..1d40ea02b2d4
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.2-fix_version.patch
@@ -0,0 +1,11 @@
+--- configure.in.orig	2014-10-26 20:33:53.431516625 +0100
++++ configure.in	2014-10-26 20:33:58.790520392 +0100
+@@ -15,7 +15,7 @@
+ dnl GNU General Public License for more details.
+ 
+ AC_PREREQ(2.57)
+-AC_INIT(geeqie, 1.1, geeqie-devel@lists.sourceforge.net)
++AC_INIT(geeqie, 1.2, geeqie-devel@lists.sourceforge.net)
+ 
+ # Check for rightly dirs
+ AC_CONFIG_SRCDIR([src/main.c])
diff --git a/media-gfx/geeqie/geeqie-1.0-r4.ebuild b/media-gfx/geeqie/geeqie-1.0-r4.ebuild
index 75ede5c4da36..9e2475a95f23 100644
--- a/media-gfx/geeqie/geeqie-1.0-r4.ebuild
+++ b/media-gfx/geeqie/geeqie-1.0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.3 2012/09/23 07:59:30 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0-r4.ebuild,v 1.4 2014/10/26 21:55:20 voyageur Exp $
 
 EAPI=4
 inherit autotools base eutils
@@ -12,12 +12,11 @@ SRC_URI="mirror://sourceforge/geeqie/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="doc exif lcms lirc xmp"
+IUSE="doc exif 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 ) )"
@@ -45,7 +44,7 @@ src_prepare() {
 src_configure() {
 	local myconf="--disable-dependency-tracking
 		--with-readmedir=/usr/share/doc/${PF}
-		$(use_enable lcms)
+		--disable-lcms
 		$(use_enable lirc)"
 
 	if use exif || use xmp; then
diff --git a/media-gfx/geeqie/geeqie-1.1.ebuild b/media-gfx/geeqie/geeqie-1.1.ebuild
index e1e8f6b04219..9ffec1d69e12 100644
--- a/media-gfx/geeqie/geeqie-1.1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.1.ebuild,v 1.1 2012/08/28 13:45:36 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.1.ebuild,v 1.2 2014/10/26 21:55:20 voyageur Exp $
 
 EAPI=4
 inherit autotools base eutils
@@ -12,12 +12,11 @@ SRC_URI="mirror://sourceforge/geeqie/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc exif lcms lirc xmp"
+IUSE="doc exif 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 ) )"
@@ -40,7 +39,7 @@ src_prepare() {
 src_configure() {
 	local myconf="--disable-dependency-tracking
 		--with-readmedir=/usr/share/doc/${PF}
-		$(use_enable lcms)
+		--disable-lcms
 		$(use_enable lirc)"
 
 	if use exif || use xmp; then
diff --git a/media-gfx/geeqie/geeqie-1.0-r2.ebuild b/media-gfx/geeqie/geeqie-1.2.ebuild
index 2fa2d42b4091..6d50a5d38a0e 100644
--- a/media-gfx/geeqie/geeqie-1.0-r2.ebuild
+++ b/media-gfx/geeqie/geeqie-1.2.ebuild
@@ -1,42 +1,60 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0-r2.ebuild,v 1.7 2012/06/07 23:08:29 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.2.ebuild,v 1.1 2014/10/26 21:55:20 voyageur Exp $
 
-EAPI=4
-inherit autotools eutils
+EAPI=5
+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"
+SRC_URI="https://gitorious.org/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc exif lcms lirc xmp"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc exif jpeg lcms lirc lua tiff xmp"
 
 RDEPEND="x11-libs/gtk+:2
 	virtual/libintl
 	doc? ( app-text/gnome-doc-utils )
-	lcms? ( =media-libs/lcms-1* )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
 	lirc? ( app-misc/lirc )
+	lua? ( >=dev-lang/lua-5.1 )
 	xmp? ( >=media-gfx/exiv2-0.17[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )"
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )
+	tiff? ( media-libs/tiff:0 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-util/intltool
 	sys-devel/gettext"
 
+S=${WORKDIR}/${PN}-${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_version.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-automake-1.11.patch
-	epatch "${FILESDIR}"/${P}-lfs_support.patch
+	base_src_prepare
+
+	epatch_user
+
 	eautoreconf
 }
 
 src_configure() {
+	# Force disable experimental stuff
 	local myconf="--disable-dependency-tracking
 		--with-readmedir=/usr/share/doc/${PF}
+		--disable-gtk3
+		--disable-clutter
+		--disable-gps
+		$(use_enable jpeg)
 		$(use_enable lcms)
-		$(use_enable lirc)"
+		$(use_enable lua)
+		$(use_enable lirc)
+		$(use_enable tiff)"
 
 	if use exif || use xmp; then
 		myconf="${myconf} --enable-exiv2"