Fix linking failure with ld.gold and glib-2.32.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 52 insertions, 13 deletions

diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index 8b66fd57f4d4..22a4193a02c6 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/eog
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.294 2012/10/11 14:12:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.295 2012/10/27 08:33:28 tetromino Exp $
+
+  27 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> eog-2.32.1.ebuild,
+  +files/eog-2.32.1-gmodule.patch:
+  Fix linking failure with ld.gold and glib-2.32.
 
 *eog-3.4.3-r1 (11 Oct 2012)
 
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 9ab096aa69bf..0b0529203b17 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX eog-2.32.1-gmodule.patch 818 SHA256 e52e773b630d4f37f27c27237b9f4ad76767ab10cbc047170469e45758cedfd3 SHA512 da3cb2d52b7ffd07a0470fc371d0a979da70492e4ef058b89b0662ebc8c090c4e7d8b1a5d7710be8f2592f522b1eb584ce8d57ae23b55ec8266561b143d1beed WHIRLPOOL 23d76c72bdd76d943f72f3e2277dd6d201889f185f98c12e715c341063cfbf21f60873cbe3e2df51b8a4d2ff883ca774093de11d4f4263a7255a0d4d3fef2daa
 AUX eog-3.4.3-libm.patch 949 SHA256 9b627e1067c29cb1cbab71584ebcdc31de9d677bd87b5abd9783d87ab4910cb7 SHA512 637844f741a376c8385be5a6be3dd9dd7e738bc6b531388e98a3c2396bee416bc637e553653ced068951e897e9cb91ac93e12581af9df5ce322ad15886572706 WHIRLPOOL febfcd638d6e0483547c6af8e2416da77cf87fe6648d65c14a7771083900106ba6766b68569b92c23c686ec20e4755fceda88a526fa608eb8fd9f4d62b8d6a55
 AUX eog-3.4.3-require-librsvg-2.36.2.patch 2746 SHA256 21292ab1f697750bcbe82c637108c02d38b2b31ab0b134c227985f12436b6476 SHA512 b372db726b51af3a2e069183e4b699fc80c5afdeceafa0da116cdc5fd5c5f80a1cc14693d146991a7648210bd90f7bdf15dee836ed20cd890772fe78802c4a00 WHIRLPOOL e16c195e477e95d2244eb731420bc70ae58dd9f09587a9c7200044e1ee294804107093b24c729883d8ef59e9f0c0f84d0212eb88ca059db4cd5105bc56090cea
 AUX eog-3.6.0-eog.desktop.patch 867 SHA256 f928973df284bdcd548466f82756350a88b3ef0fcfb8145ef4d3280aa503875e SHA512 b089c0eb550c66046592670a5013838cd5d91a05b3e55592260a5502e7706f9b55db6814f5590275c514813dead022a1f2b393a8d64b24d9aa183f8983055726 WHIRLPOOL ead259720a96768037819527a386847f6830ac93a4d9d3096227fcc757cdc5d5fdc7f71d6eb02f25b79b48f980fe7ba0c101f7d059d0103bfc028026561dd5e4
 DIST eog-2.32.1.tar.bz2 2804681 SHA256 543672fb8e8e300bf2cf4c7eef43b5b1624e2e48e6aa0801a083ae7beb2d7078 SHA512 d14a7287389e10d0356ea2a0ed5771b8ba94fa8b7c3eca3bbb003d535a5416b84b02d4868faa3a7eeddb99c70a0d46a6bd0fdc59fc1170f4447d4967b1d63834 WHIRLPOOL 328203520aa0c831da2af4aa8e83400d4b4dd4c5d8d7c707e38610c19c63426c5ae4f22c457ae931c31b9d006e91c16fd7a1898290c69d82b7fbd3d76b0eac4d
 DIST eog-3.4.3.tar.xz 3255192 SHA256 66e468f09de4b8097671cb6e56cd057c0e7869d836a2345e640b6cf4c404d5d9 SHA512 10120dfe3827529b50b62414f911283ca699242e8362dabb40dc13c253d55e40cbaf018e8f066dfbc20e2318bff2a78ebd8e92910b9a07bab633ed15b66424e4 WHIRLPOOL f5a6b697f3aefbfe977b779418efe81cd4c61deb3c7a88be08260e8dada1c8b1da49c80509f8f51e03200274373d28bcae1a1122891ff2201ea735bacdff93ec
-EBUILD eog-2.32.1.ebuild 1673 SHA256 31ebae695b452e2caf35e5c18f2e22e11eae47913eb9da979eb988f67760d19d SHA512 738797cb866f70d4d6dacad9bf286e1f92e629580e07b9230181ab63168285491687311029e1f691a3b6e2312c4e05a9a36617da63053b184c7412627bb68919 WHIRLPOOL 9f3fdb6623ca6b08271a2af065a46693fac2d8583a1abe18346608ebd8e070baf8282b443924f324825dd1db45abb8aae85de5506cc9284e16edd46a15b97a48
+EBUILD eog-2.32.1.ebuild 1850 SHA256 0db2206f10a4c5eb62536d6af152865896c0228b16d03a56217bc97cd59fb37e SHA512 d30edff807e8d31232b4b2543f503a2379e2b50238f789f3956816283530f6484b33514049d0fec5ccf1c76b3fad510bfeb140413dcede5419599ef58224484c WHIRLPOOL c533d39e5caa25e6694663d279d00f753a218f6073b2cf77a2a9bd582d17d368f241b15847571a707ebce051b31f05a4831d7cc958f1a376965a64b93c093e62
 EBUILD eog-3.4.3-r1.ebuild 1933 SHA256 9490fcc80ab7698c6eb49e165cb1b1de0b0f9d5f71def7a75830c8573be81b6b SHA512 6344650e46646c07cd3243dcfdb314d14a55faebe16dc544cce8834a7bd14acfad4580ddfa2fb2c365a88b62cf07e56591e30175c5ef4491950108abcc78c405 WHIRLPOOL cd42237107dde8cfeb30ead308143a521560cf1c25d034cd0bd86f41aac9691031424d05a32dbcc448ed521e8e7984c0118ccad3b96b44ad8be48b0fd06486ea
 EBUILD eog-3.4.3.ebuild 1512 SHA256 3f71dd9e3bf657c2d4468ae974a3603bdf8b8b923a3da7bc6c46684d971763ce SHA512 66ed331f466d8ac05382a0d068141bef9cda8e937993f8843db5da1bc75d1cdc7c60b3d163a6ab20d47971183c6c244b6840ba3bbf980a8f54b3b58f40f5e433 WHIRLPOOL c08d5d797e05e9254305c3d9a04914eef8a44c918020d7b508436ee64b468a64fc9e39d8087bdd1c511c02f75052777a94882997ac986186913bdbe09f6a682d
-MISC ChangeLog 35886 SHA256 8b1b92c51ef66092f61ecc4a3fe2c500e8cedde81e94a7e853d112174e3e27a5 SHA512 14a50102ea8c4d55dc29d72b6383d9a5693b6bd79e2132e51526524f0e4552af0957f012f79f95b81a0a34cf86a2ca9b6ea15401108bf25542d79763fc14202c WHIRLPOOL 0862c2b7731756632f715dd2429289448b8e6fb0fb648aafd800144658f7d5618ab4f7eb26d6262f736256878ad036c6603ecd855308ae068c169dae1ebe8f46
+MISC ChangeLog 36050 SHA256 df25328e9a8941ad10037452d07d85488a7da4c1232b0e1cca18d42e30d13977 SHA512 8dea114ab6b3412cf1ed438e4ae84b97fefe53a7f78011766cb10f1580f5aa85f2155dbee0ca831372ec19f6d5f72a855c4227c20cee665e97164658a2e4d3b7 WHIRLPOOL 617f7ac7b450466567006b83bec25cff6a75bd105b225f6603a229734003453007bb7f0499c807dba11bd3ad02a58f13d391fe1748ded72062b7a9ec5e1135ee
 MISC metadata.xml 510 SHA256 a02223cd4a5873a3cc367cd863bb3c096c9be3cf65de0ed3df07b6fd3c59d6aa SHA512 4a86e0fd0d1833ee1ef39a1965b8f8c578d4119398602f6b3643cf202175f2cbe1ded834d0e001262ee3570305e6bc286c8a3f82626944ef8ab68b9fa76e3f63 WHIRLPOOL 0736e0544c4eb715bdff8adb6167e3868cc28cb6cdc1861a065d516c3bdf990d2389ccc642aa5efd155fd7501b2f54d4b5a662b68c610366ad0eea4b16f1b0d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQdtPFAAoJEJ0WA1zPCt1hmxkH/i+lB+eUreP3lxiXiuXAzXZ5
-pWsW8YVbrmiFR7796qLpFYJiL6LThT1nQ/azQL5uPEQ+jwTOn7rgMOnK7qh11jA1
-NFyTjIb/nCB6vwIoq852bI9P8ZhXGXrDroqXd6piB7QmINKLC82EMPfhfmAIFkJV
-JvVQaBGvJPpFFfpcVwMBy3uOos1CZqN4VZg12iNWxJeikUqASURWNzYIOZNNVm0w
-1Xi1vT1jX7v0hkAy/KpMIE7SbRvoaQYiiETAbrtvkmjgEko0A7zdA9snsm5Qwr0+
-DQAjtHaSruBEe1SfDztXLeNbmpmnz8kH1d12oiqPr+M5OlnKqXf06KXNqyR+ovs=
-=2PTv
+iQEcBAEBCAAGBQJQi5xZAAoJEJ0WA1zPCt1hE2cIAJygpNkTZpnZ204pKvKwyAHj
+fjq/5AHM47jke17KBuY/HBCowNmm/hCZY85NYtzuIPHxofxJWR2GgcM5Fb+A2gqf
+Jw56anWeYHFp9QgTDXKbrPQJB4dOaLq4wRdcccYu1NeLveDwzVDaIWD9GITjUdCv
+l8VAIjdT2uCt73eKep+gYbNJe+H49NknVcbH5xksBvLy+qduphI11OilFOGAXJ0a
+uvQfbQwzIv0c35rztaGJ6qdaDKpD1n9L9WCLpLjL6NGLUEFNVuAY0q6MPe4IP2s0
++QmiAqdk2BXxxZMm5GUBjUlhWZGRpaAOp6dLBlDDRZxwSjyjsfE0g+cJpCy0FLg=
+=PHWP
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/eog/eog-2.32.1.ebuild b/media-gfx/eog/eog-2.32.1.ebuild
index 272e1f9b49c0..3fb433e5de60 100644
--- a/media-gfx/eog/eog-2.32.1.ebuild
+++ b/media-gfx/eog/eog-2.32.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.32.1.ebuild,v 1.13 2012/10/11 14:12:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.32.1.ebuild,v 1.14 2012/10/27 08:33:28 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
 PYTHON_DEPEND="2:2.5"
 
-inherit gnome2 python
+inherit autotools eutils gnome2 python
 
 DESCRIPTION="The Eye of GNOME image viewer"
 HOMEPAGE="http://www.gnome.org/projects/eog/"
@@ -46,6 +46,11 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	G2CONF="${G2CONF}
 		$(use_with jpeg libjpeg)
 		$(use_with exif libexif)
@@ -57,7 +62,11 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-schemas-install"
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
-	python_set_active_version 2
+
+	# Fix build failure with ld.gold and glib-2.32
+	epatch "${FILESDIR}/${P}-gmodule.patch"
+	eautoreconf
+	gnome2_src_prepare
 }
 
 src_install() {
diff --git a/media-gfx/eog/files/eog-2.32.1-gmodule.patch b/media-gfx/eog/files/eog-2.32.1-gmodule.patch
new file mode 100644
index 000000000000..01552669b0ff
--- /dev/null
+++ b/media-gfx/eog/files/eog-2.32.1-gmodule.patch
@@ -0,0 +1,25 @@
+From 1bb022ffc624fcf17cb36d4639d057bc040bc44f Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 27 Oct 2012 04:24:07 -0400
+Subject: [PATCH] Explicitly link to gmodule
+
+Required for building with ld.gold and glib-2.32
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 886fe6b..ee875a0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,6 +96,7 @@ EXEMPI_REQUIRED=1.99.5
+ EOG_MODULES="gtk+-2.0 >= $GTK_REQUIRED \
+              glib-2.0 >= $GLIB_REQUIRED \
+              gio-2.0 >= $GLIB_REQUIRED \
++             gmodule-no-export-2.0 >= $GLIB_REQUIRED \
+              gthread-2.0 >= $GLIB_REQUIRED \
+              gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED \
+              gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED \
+-- 
+1.7.12.4
+