Add fix for problems with glib-2.32 and gold linker, #414117

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

3 files changed, 55 insertions, 5 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index f337697cebec..e1645a9a6e89 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-keyring
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.218 2011/11/18 04:41:30 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.219 2012/04/30 14:54:08 jlec Exp $
+
+  30 Apr 2012; Justin Lecher <jlec@gentoo.org> gnome-keyring-3.2.2.ebuild,
+  +files/gnome-keyring-3.2.2-gold-glib-2.32.patch:
+  Add fix for problems with glib-2.32 and gold linker, #414117
 
   18 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-keyring-3.2.1.ebuild, gnome-keyring-3.2.2.ebuild:
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.2.2-gold-glib-2.32.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.2.2-gold-glib-2.32.patch
new file mode 100644
index 000000000000..34c954d03a14
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-3.2.2-gold-glib-2.32.patch
@@ -0,0 +1,42 @@
+ configure.ac    |    8 ++++----
+ gcr/Makefile.am |    1 +
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 70be49e..0fe24a1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -69,8 +69,8 @@ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ 
+ PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0)
+-AC_SUBST(GLIB_CFLAGS)
+-AC_SUBST(GLIB_LIBS)
++AC_SUBST(GMODULE_CFLAGS)
++AC_SUBST(GMODULE_LIBS)
+ 
+ PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.8.0)
+ AC_SUBST(GTHREAD_CFLAGS)
+@@ -88,8 +88,8 @@ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ 
+-DAEMON_CFLAGS="$DAEMON_CFLAGS $GLIB_CFLAGS $GTHREAD_CFLAGS $GOBJECT_CFLAGS $GIO_CFLAGS"
+-DAEMON_LIBS="$DAEMON_LIBS $GLIB_LIBS $GTHREAD_LIBS $GOBJECT_LIBS $GIO_LIBS"
++DAEMON_CFLAGS="$DAEMON_CFLAGS $GLIB_CFLAGS $GTHREAD_CFLAGS $GOBJECT_CFLAGS $GIO_CFLAGS $GMODULE_CFLAGS"
++DAEMON_LIBS="$DAEMON_LIBS $GLIB_LIBS $GTHREAD_LIBS $GOBJECT_LIBS $GIO_LIBS $GMODULE_LIBS"
+ 
+ GETTEXT_PACKAGE=gnome-keyring
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name])
+diff --git a/gcr/Makefile.am b/gcr/Makefile.am
+index 0e40215..1f75aa3 100644
+--- a/gcr/Makefile.am
++++ b/gcr/Makefile.am
+@@ -148,6 +148,7 @@ libgcr_@GCR_MAJOR@_la_LIBADD = \
+ 	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
+ 	$(GOBJECT_LIBS) \
+ 	$(GLIB_LIBS) \
++	$(GMODULE_LIBS) \
+ 	$(LIBGCRYPT_LIBS) \
+ 	$(GTK_LIBS) \
+ 	$(P11_KIT_LIBS)
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
index 2e4696f6cee7..7eed6050b95e 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.4 2011/11/18 04:41:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.5 2012/04/30 14:54:08 jlec Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 multilib pam versionator virtualx
+inherit autotools gnome2 multilib pam versionator virtualx
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -62,7 +62,11 @@ src_prepare() {
 	sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
 		-i gcr/Makefile.* || die "sed failed"
 
+	# gold plus glib-2.32 underlinking fix
+	epatch "${FILESDIR}"/${P}-gold-glib-2.32.patch
+
 	gnome2_src_prepare
+	AT_NOELIBTOOLIZE=yes eautoreconf
 }
 
 src_test() {