Fix building with dev-libs/glib >= 2.31 wrt #415325 by Paul Hartman

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

4 files changed, 44 insertions, 9 deletions

diff --git a/media-gfx/pqiv/ChangeLog b/media-gfx/pqiv/ChangeLog
index 6b747ba89d1b..2f155c6ac078 100644
--- a/media-gfx/pqiv/ChangeLog
+++ b/media-gfx/pqiv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/pqiv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pqiv/ChangeLog,v 1.28 2012/05/05 07:00:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pqiv/ChangeLog,v 1.29 2012/05/10 07:44:14 ssuominen Exp $
+
+  10 May 2012; Samuli Suominen <ssuominen@gentoo.org> pqiv-0.11.ebuild,
+  +files/pqiv-0.11-glib-2.31.patch:
+  Fix building with dev-libs/glib >= 2.31 wrt #415325 by Paul Hartman
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> pqiv-0.10.1.ebuild,
   pqiv-0.11.ebuild:
diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest
index 944a7cebdbaf..59d4640b94e1 100644
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@@ -1,6 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pqiv-0.11-glib-2.31.patch 239 RMD160 1157937d155e0e753d773b695858ca5c8fa58702 SHA1 1756defb6a0c7fa9de50a99feb119cce7e8f5a27 SHA256 87d788b0e7db495109628762b6311a1a52a5f4321de6517a93e26f57d8b2b984
 DIST pqiv-0.10.1.tbz 31995 RMD160 2e44347ebefd824688cfc9f8b65b2c34fa87258a SHA1 a74913ff483bbdc0a723ad24dce63ebafbadbfe3 SHA256 72a222e3a1eb929aa8f921b3384c30660e9bc04197f57ce20bbee1e2ee46fa7e
 DIST pqiv-0.11.tbz 32918 RMD160 16b218ebefa32651f34a84cadb6b200afe60aca4 SHA1 42fd480ca55c6f5a7bdbcbee528da87cfe1b0b0a SHA256 2f0815105c6c550c2886a8f196b653926e2fd934f51cca3f3b1a87ba84359851
 EBUILD pqiv-0.10.1.ebuild 749 RMD160 a6dff396dc9218ed4a2410e94564198b543312de SHA1 12664381746a2c0661c7175ef18b199c53ba7a11 SHA256 bea92564a948d40194b4bc3469ad8f0b5edf53cd974ce85f4d16166b600f917d
-EBUILD pqiv-0.11.ebuild 733 RMD160 af0324a7e1f489a4cd8a182d723c14082b2ef799 SHA1 f7c7d105b98f255903c9b498f8a2c95373337648 SHA256 596c6c9b922e70e9e9029ab5d9591c2b312769a3afe56190ba16e926abd1549c
-MISC ChangeLog 3585 RMD160 2931d305b39a8cdb573d2702b6c3bc8b857d5174 SHA1 b6a8cb6b1b7f5c476b496d124c842218abcae8cb SHA256 da59c9634762748c6c4517ca7e41c2a3884e7c25450b64fed4e0846332d2f044
+EBUILD pqiv-0.11.ebuild 785 RMD160 7c790fb6192f4674cf9d77f245f2c11a22774fe7 SHA1 8da9c2676aecc7ab1df89fdade7bc5d567f8688a SHA256 d406d411adae47b95eb6440478d7f9f2da6ee69faee0227474ad597519c942a8
+MISC ChangeLog 3767 RMD160 5df6e4cc6f13c20f9bb73d27f9051259d5f69c6d SHA1 960fb360e3229c7faae4c15c2f16526ff7aecd22 SHA256 632693b6883a39878388ca79a6b2cf01459f473e2b9562e43ac8c01f35dbada5
 MISC metadata.xml 345 RMD160 b053fdcb518ec85dcca4295037054e9dd7403cd9 SHA1 44e1938dc337c59671574650ff606a57cf14b0c0 SHA256 1dcfa31ec7426c4d4aa823cb587d962da7038ee549d869843133bca7a8ea6c22
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPq3EgAAoJEEdUh39IaPFN64kH/29N1kVbcM6FjAQaJ5H0amwr
+Jg80NDlji9OV7cnJD28fs2UbaZbMLLRKSwQKwH4oKG57JNbHlqrUbeZN4ml1lHxE
+Kqmnz9oJ2vfb62sKjUGVc40lMw7lyeBuNg9QzLHjHHutUcSzdRXTdAmiWUeFFDVq
+obOkDZkRS/o/XKqRAXLxCiAzw9di+J8mbYnGxwci65jH+XT3toD3ksTt3+sHIQXT
+seXi2vrOS/+devjgFOlqi5puqPNuqoXC/6auvuhAEaY43Nu6lS1+Xlxlrxf4q+sg
+oZgJyN3ra/Gt9XdZ4nQ9dwsY1nfzxbarJAG6koDc/cLIPwiWbUnETKBFtTsKudM=
+=OiKa
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/pqiv/files/pqiv-0.11-glib-2.31.patch b/media-gfx/pqiv/files/pqiv-0.11-glib-2.31.patch
new file mode 100644
index 000000000000..035a3f564c53
--- /dev/null
+++ b/media-gfx/pqiv/files/pqiv-0.11-glib-2.31.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/415325
+
+--- pqiv.c
++++ pqiv.c
+@@ -24,7 +24,6 @@
+ #include <stdio.h>
+ #include <gtk/gtk.h>
+ #include <glib.h>
+-#include <glib/gconvert.h>
+ #include <glib/gstdio.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <sys/types.h>
diff --git a/media-gfx/pqiv/pqiv-0.11.ebuild b/media-gfx/pqiv/pqiv-0.11.ebuild
index 9dd43af03841..f4d04f549cbd 100644
--- a/media-gfx/pqiv/pqiv-0.11.ebuild
+++ b/media-gfx/pqiv/pqiv-0.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pqiv/pqiv-0.11.ebuild,v 1.2 2012/05/05 07:00:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pqiv/pqiv-0.11.ebuild,v 1.3 2012/05/10 07:44:14 ssuominen Exp $
 
-EAPI=2
-inherit toolchain-funcs
+EAPI=4
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Modern rewrite of Quick Image Viewer"
 HOMEPAGE="http://www.pberndt.com/Programme/Linux/pqiv"
@@ -14,20 +14,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.8:2"
+RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glib-2.31.patch
+}
+
 src_configure() {
 	./configure --prefix=/usr --destdir="${D}" || die
 }
 
 src_compile() {
 	tc-export CC
-	emake || die
+	emake
 }
 
 src_install() {
-	emake install || die
+	emake install
 	dodoc README
 }