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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 59 insertions, 8 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/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
 }