Fix underlinking failure (bug #497112, thanks to d_dart).

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

4 files changed, 69 insertions, 13 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 35c8e9d4afcd..3330f46578da 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-control-center
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.141 2013/12/24 17:55:10 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.142 2014/01/05 07:39:55 tetromino Exp $
+
+  05 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-control-center-2.32.1-r1.ebuild,
+  +files/gnome-control-center-2.32.1-gmodule.patch:
+  Fix underlinking failure (bug #497112, thanks to d_dart).
 
 *gnome-control-center-3.10.2 (24 Dec 2013)
 
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index ec9cc8b67e63..d23974ef4d29 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX gnome-control-center-2.32.1-duplicated-background.patch 3053 SHA256 8223542f9db11769e8ab73f88f434598bb9f740e42993bcc7cb6035eaadc986d SHA512 753b142ba24075276117a475453a4f2f083720fb13398d250c3a18f9047b4a429bb7a178076111f0c5b846c4cdca62824ad380a2db3d2a561c51f14a6df83b93 WHIRLPOOL 36027ef7289a94f2a477f1d2ea5d338c3205611b7d1684d8b36f2a088c3c5e9d58b1fc3a388305b50f1452f8e833e67d564bf67ef2537b0b38c5abaa8b7167bd
 AUX gnome-control-center-2.32.1-erase-background.patch 1899 SHA256 95bc536d5b08191222acd63af0d2f626ef6ec3a54f7823a471e0b329f40de3f8 SHA512 6f5c9aa935d74648b90fdaa8a3cf992e88f05d8f4bf02349760dd355313aa18ee3eefcadecdff585d67a6ba9b4df0851ddfc7bccf3c8e2780c749444707cd838 WHIRLPOOL 7d4b063a3e27a9c11a20c8e62fdc25a000c42fc4d22a1ec206b291571ccd9f9f11c4a3810700c043cbd5c758de70e713e55729c4de52aef8eee0451193cdd229
+AUX gnome-control-center-2.32.1-gmodule.patch 1403 SHA256 5ff83a6ed423900ce726aa9df25fc5c8d81863ad1bd30609d9af1ed916b55328 SHA512 0cc8bb97a8820e000e9a1043bed8c020c82c55b8f39974397edb6e22a3ef8ad502f175390984cf0fa709bf3d0cbed5a1e042c0e457b531968edee64c6fb13875 WHIRLPOOL 1776e3d91b80ef9c6d93e1c7cfff666a12738a139a9592f98a5073b8743c4229e02842c1dbac7bcf252bac8af99de8f9e6adb9e9f667266aa53e28a6fbfde615
 AUX gnome-control-center-2.32.1-mime-handler.patch 55290 SHA256 49c034e437493f1639e97b31e0a38b1921536abfe31d8b3c7917d0b8495994cd SHA512 990849500fd5317ec6fbf58e03db3754c5e9111757d28d83bd4f7655068efb25fbe793f9d5171f227070dfde7b688163eab8c011edacb5435b4a788e8349aee6 WHIRLPOOL 8683316623e0059cec6278b7f0b0a23ea46dff73ca4ad2bc9ffe14b139072bfb4ea2589a76b74ccfb14170cff9cd756f1772ae356cdaa6779aee930907553130
 AUX gnome-control-center-2.32.1-mime-handler2.patch 2229 SHA256 3a49a66bb08cbcd24cf750894d156ba85686128e83561df40f8cfe88075ca99d SHA512 ea81dc45ef7f2b5c14e9a094a9a8601c6631ad1df60a9316ea2f2fe8c922979bbb23e1a3a13adb3ca909eed1b489a7eb521b85cf7bd0dd7e09ce528c0a38d751 WHIRLPOOL 1b8450b5073ddb44b30964373024005c6fadd58f3246cdf37290e8350cc3d9ca54754c6ac1eca5fcedbd06e288495e8657102d8c8200e30e83c07702eb34531a
 AUX gnome-control-center-2.32.1-mime-handler3.patch 11957 SHA256 8637fdb6039d43d085cf7cf2915b46e744522b7a3976d1b64035a6be22491538 SHA512 c4a59d44853ce81c067626d1a51f3566a3cf754e98584d1a836072d8ea6b8a89fb6542f92b2237a4675c1f5cc296c76d28e39fb3e441cb8d6cc7f42877304307 WHIRLPOOL 20e47d5aa6670bee3a3e1dee8cd176e9c3909de2d60614b8d058a3c09b929e32761abd345592dc92f6cab32e2fb677ed4d87dfc63fc9b231a902b5dc4b3ed822
@@ -16,15 +17,19 @@ AUX gnome-control-center-3.8.6-flickr-linking2.patch 1085 SHA256 f2259e7e4c7ccf9
 DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 SHA512 dc84bd222d1a2db0c4d10c56739e1d9da18945c579ae184f69080aa4b6fa0f0b908c5beafe82a82b6277630d685bed98fe8418421db4275653afbe302d810872 WHIRLPOOL 9b0fe4ed2bb741496642a57e178ca43049d53c71d9a82d311dc5a3ab6dfaf28019a8fa1b41a218b2ede11b4d0ac735034604dd9d952cb215e12327e71d0e69f4
 DIST gnome-control-center-3.10.2.tar.xz 6832928 SHA256 f67a9e88cda62c25e1aa1fbbb36d4fa632e8da11e98ac030e0e40437f12483a9 SHA512 3095af95a9d9cbb3b636f2e3c845f8c5df1cd943b60afca2e89506e3f80719ae4277068576e59d9bed602bc5b75380627b689ce71f84fbb4a2f6590ed5affe69 WHIRLPOOL 8d90153af8fdf921322d016413b8f95e130a1ec4e0a203dc9ed99a06239b51e08a9f5e51d1a325583974780039a9541850d54b7483f3fba202c54f8e8b315a3c
 DIST gnome-control-center-3.8.6.tar.xz 6723440 SHA256 8dba7eb3fa720580e84bb1a8241c745abacaa8999bbf9c28902819d5584fa42a SHA512 7c917d9527b178352148eb746a4e99aa154d3c2aa13973e0e638cd4a6d977b1f4448ee010897617d4d06faa568c6cda43bcd334c014352b3d8f68df75cdb880a WHIRLPOOL bc8de5b336862640f66c883e0da8e02c8bb4f16b6557ce351e27c9e10d93dcfd449bf33d0c1d6ce09c4cd6f19b50c9b8478bc1143ccce61418bb1ec2c2ff7e24
-EBUILD gnome-control-center-2.32.1-r1.ebuild 2686 SHA256 575724aa369631c48fef3810bc831abc687fe38e30df4f25e7af600fc998e270 SHA512 2b792066b1c09eb4433a87222732c9dc4e3df593699454da57e9d4f3939f0c593429c8b2b3e712d2508700fc03b8e8e1066efa65348bc2016dee0d21c4089a92 WHIRLPOOL 8b7f2d6b9a66581efb5b31b8573d67acbce8d450ca303eab36641ef429e8fa6e88aa299c525cd223155ad67299926c56a0dfd432b8414672284424642117d92a
+EBUILD gnome-control-center-2.32.1-r1.ebuild 2823 SHA256 2dfa1f6402c7ab7f4539183e15448a234cb6f80e38310c50f222536291d4d4c1 SHA512 562dcadbf348f7e0a25796fa03b5a32786549537fa2213c6ac279b942269a0e8c62a7a977da54c6939d82e87460ee77422032b337dd1959e26403312d82cf081 WHIRLPOOL 099ea3c37bba16bbc94308961365123ccdc80e8b0ec291e3d50a2607ea59fb6b2ce2deba45d1e66be0c3cb99f86b9c0ad55d087c20f90ae7fd93fe8983c8a722
 EBUILD gnome-control-center-3.10.2.ebuild 5461 SHA256 ea88381cbe2e85bc4624fbd22f5f7a2a674e1b205ecf2e941d1365e707b5a0f3 SHA512 7ad83421123ae6c6cfd9097a47d12398ae82264988d6921e4d48045acb0ba0e6c39454a097088c3b5e9271dc9f7d54ecccf4f0767693572b7c26882ed24048af WHIRLPOOL 3eabeaef016a3957b8f6db68499ae4c9f1c1d22e6ade1bcf5a60254753508da48d0a32ee7f6a7baecb88a2853afa828e9c4cc0fa0bbd82e8bfa8ed9a2b66a71d
 EBUILD gnome-control-center-3.8.6.ebuild 5512 SHA256 4a39d96ff68e81ea9cae0542b190a3f945ef1b5084378a739add91461b4cb970 SHA512 8283282c2593bee4f7f920a985114ce7450a42529f43c6d10f8b26c664339e27f5c3d5342fb9fa4c684947542d16ced0444e934838b2f75aeef6d9b045f3f85f WHIRLPOOL 02bc7eff6b2d9a3c9a820aee1f6c5891a710a05aa0822a82b1cfb8c71a2be1fe7e88473ab124a988d823672f1611463d90b98d38ea10efa4f1439fc8005e4519
-MISC ChangeLog 67012 SHA256 0feea27c442cac43dd42fdad536b19aa1b06403d927bf6f68f8726a10775055a SHA512 c04ac546bca4629578f838f38c6d1046e1ac6376d51f0ad07f6131ee1e3db6fd1529de96e90ec9abc74d146c7ee615cd0e33521b5cb8c296a80caf476bcab023 WHIRLPOOL d846f1555c088e7c60c67f0d4894b774e53f11d0a66c24f3e58d3261c377c96a76c48a7b5e6ecbc3ba0d1a2e360ac7b495e8c1abef4c418e9b87d0133cc54590
+MISC ChangeLog 67229 SHA256 cf7a17469765db8a1c693acabc28f9e304742eab09e489f87d12396446a34284 SHA512 a2869c9f69fcbfb63cf3f1e0348d8f1b28d9dfb57a9f2796e6ef8411383c4a0b8ccd6baf3833e8f63cde977835f90f2ed5e44c0aaa05d34c945209e5538c12c4 WHIRLPOOL dcf86e0f282f227bc5733799c7fa442e0b42902b4bca41d3b2cf0005d5a6381ff9daa5c6a5a330f41b2bf892261c613f547d65ca75f1db0f49d15e79db4ecdb1
 MISC metadata.xml 747 SHA256 1780f48a525b476ec5d3472ceab620769f7498980b57d2f5b55787832ac3912e SHA512 2c90dc956fd5a5462432fe1ac537851bf848b1d109fa190dea47ed58b0f44422895e5f4ea6bbafbd31d2121c5ad9c7870b3ef4e20eb7396a905f68a10ae0d0f3 WHIRLPOOL 80276e19b1d4d24263d8dbfc1e0425365115fd94d34977f146309aea893163936cf0d3f7d1fbe68ba3caa4209e4dacf95d4d8ee266a5dfe30e16a3fd2c7a6e9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK5yn8ACgkQCaWpQKGI+9Q56ACePPHGKPJBDdTC+ZNpbCc5V7n/
-4c4AoIfNejgyMSKHJZ801Q6Ro9HD6pjD
-=EQaj
+iQEcBAEBCAAGBQJSyQxMAAoJEJ0WA1zPCt1huAcIAI/c5c7KqYRsD7U6Ybbrs4sa
+tNZdnq6aydiG1xI65yviK20SevltH0pTpggNeVIWkuidbGv211a1C10pK2bAHTuz
+klACaTIsSpWLn/kNO5vKyrDaMB5tUgQdanQiC3XDOtLhQhTzT5d5gEUk8v7OfTKA
+upSIMvHEv/qJ8S2cN44SuVlIJRvbxszxm/CYgCo9mJ+pk6u9QoYjrS3b7Hj/6rGe
+fRVjN2wkgBo7fBYzGAylYUcnq6BWKLoYgrdQUg+5sY6hmlE9gWrFVy2tmFvZtcFL
+cge8jeSTO6I4pEiLFBgCK4WkD1KqV0xiYLI6jTuIh6oI6UxhU/2ROzRKjqiN7+c=
+=9HUz
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch
new file mode 100644
index 000000000000..7eed7a309085
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch
@@ -0,0 +1,41 @@
+diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am
+index 70ad44f..52ea6e6 100644
+--- a/capplets/common/Makefile.am
++++ b/capplets/common/Makefile.am
+@@ -48,7 +48,8 @@ libcommon_la_LIBADD =							\
+ 	$(METACITY_LIBS)						\
+ 	$(DBUS_LIBS)							\
+ 	$(GNOME_DESKTOP_LIBS)						\
+-	$(GIO_LIBS)
++	$(GIO_LIBS)							\
++	$(GMODULE_LIBS)
+ 
+ gnome_theme_test_SOURCES = \
+ 	gnome-theme-test.c
+diff --git a/configure.ac b/configure.ac
+index 4bc8d9b..f869f93 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -132,6 +132,7 @@ PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1)
+ PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
+ PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
+ PKG_CHECK_MODULES(GIO, gio-2.0)
++PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
+ 
+ gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
+ gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
+diff --git a/libwindow-settings/Makefile.am b/libwindow-settings/Makefile.am
+index ee6984d..0464597 100644
+--- a/libwindow-settings/Makefile.am
++++ b/libwindow-settings/Makefile.am
+@@ -17,7 +17,9 @@ libgnome_window_settings_la_LDFLAGS = 	\
+ 	-no-undefined			\
+         -version-info 1:0:0
+ 
+-libgnome_window_settings_la_LIBADD = $(GNOMECC_LIBS)
++libgnome_window_settings_la_LIBADD = \
++	$(GNOMECC_LIBS) \
++	$(GMODULE_LIBS)
+ 
+ libgnome_window_settings_la_SOURCES = \
+ 	gnome-window-manager.c	\
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild
index 9250578fc454..94a3c94d072b 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild
@@ -1,11 +1,11 @@
-# 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/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild,v 1.8 2012/05/05 05:38:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild,v 1.9 2014/01/05 07:39:55 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
 
-inherit gnome2 eutils
+inherit autotools gnome2 eutils
 
 DESCRIPTION="The gnome2 Desktop configuration tool"
 HOMEPAGE="http://www.gnome.org/"
@@ -79,8 +79,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Use URL handlers for browser and mailer applications
 	epatch "${FILESDIR}/${P}-mime-handler.patch"
 
@@ -95,11 +93,18 @@ src_prepare() {
 
 	# Don't erase backgounds.xml, bug #344335
 	epatch "${FILESDIR}/${P}-erase-background.patch"
+
+	# Fix underlinking failure, bug #497112
+	epatch "${FILESDIR}/${P}-gmodule.patch"
+
+	rm missing || die # old missing script causes autoreconf warnings
+	eautoreconf
+	gnome2_src_prepare
 }
 
 src_install() {
 	gnome2_src_install
 	# gmodule is used to load plugins
 	# (on POSIX systems gmodule uses dlopen)
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
+	prune_libtool_files --modules
 }