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

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

4 files changed, 34 insertions, 10 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index c4582a4eff9c..5aac0381eac1 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.393 2012/04/29 15:12:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.394 2012/04/30 15:10:14 jlec Exp $
+
+  30 Apr 2012; Justin Lecher <jlec@gentoo.org> nautilus-3.2.1-r1.ebuild,
+  +files/nautilus-3.2.1-gold-glib2.32.patch:
+  Add fix for problems with glib-2.32 and gold linker, #414121
 
   29 Apr 2012; Markus Meier <maekke@gentoo.org> nautilus-2.32.2.1-r2.ebuild:
   x86 stable, bug #410611
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 8fd6b7074c0d..24228b2e7177 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX nautilus-3.2.1-autostart-only-show-in.patch 849 RMD160 884aec1829bea9c240b092103f7ca3634f9836a2 SHA1 9299fa82f44a0370fa739e665647d642197f9c5c SHA256 1eca642ae39f0a0fac2554882a9d5ab58c122545943b81a7755e11955e2f3026
 AUX nautilus-3.2.1-delete.patch 1869 RMD160 e730dfd7754dc619327347f3b5a578c9d6dd1317 SHA1 0f40dac0184320d86df3cccbe917084a4aea48e8 SHA256 51ebfb58d3b1217796dfa79386bdeade2255f879108963962c63124cbedb4fa0
+AUX nautilus-3.2.1-gold-glib2.32.patch 437 RMD160 8c153b98289fe7023d731bb09fabea165e932b37 SHA1 07416c84d1e074a4e9243da3a660a0ff9149cf57 SHA256 ea99b3b4af8ee0907ba7d3bb59a63204416ac85b9578d56566fd33b95235b9c1
 AUX nautilus-3.2.1-key-press-forwarding.patch 1716 RMD160 b158ab5e1ee158f7481b20c672da986f702305e5 SHA1 c703365c3468696b23eb8fa4161cf504fc7e29a7 SHA256 9222c08189e01a2bfb8a72d2d4c7dfd0d841e4d159f8045e2cf15cf7857aff05
 DIST nautilus-2.32.2.1-patches.tar.bz2 6984 RMD160 44f6fd3f76dd96f265a9e47220930bf65055c4b6 SHA1 2d839f3f358828d9779a20f4792193b53c369c88 SHA256 0b756ba661d1f9ed0d2e49a469e6f390e941530309e08a7f9e6ac07b566180bb
 DIST nautilus-2.32.2.1.tar.bz2 6350203 RMD160 4498fc3c5dd2a4f13935b0366c175ad1b87bac1e SHA1 7b0a89cd965f4ca1531115d353b208bb2ba9db33 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303
@@ -10,14 +11,14 @@ DIST nautilus-3.2.1.tar.xz 4703588 RMD160 d3f2db2747cc69a06494a4d50f6ee67b8dedbf
 EBUILD nautilus-2.32.2.1-r1.ebuild 2262 RMD160 b6e47de5db54d0d6f8a5c5ff5199b5ab0ce1221b SHA1 8e46537dd0e7582ed95c6149f6f71c0f893bf38a SHA256 2f5877b556945f51b4bfc025d099b17a4cd5b8c4e747b99d54751ed445705c84
 EBUILD nautilus-2.32.2.1-r2.ebuild 2263 RMD160 c98f4ef0bde49a2e5d10a4a279a2e55bd16c9e7e SHA1 5fc6750952b9b9fa0487092dd5dd58094ebc2be0 SHA256 37d2062ea1f3e3b15bac0ad2b63c92968389574e643cac4f5f1841c9eee89bf0
 EBUILD nautilus-2.32.2.1.ebuild 2077 RMD160 649e3c582283c58d51c4be76a9e11920e308d226 SHA1 65b8bb73a3a8103503fb045736eefb39a4b6d748 SHA256 b593e355936851547e90e65c0ed608ab6e1369d4bbd485a82cc6b8c06d45f354
-EBUILD nautilus-3.2.1-r1.ebuild 3262 RMD160 9061770d56b47de847403118895b442dc5a5dde4 SHA1 8f70d4fa40394ca9ba60079fdfdd67adbaf30a17 SHA256 b01961e8512b7faee2416ba9e6acc0c233e41503a96c02a02c3fc020264de115
+EBUILD nautilus-3.2.1-r1.ebuild 3380 RMD160 d643e8c7a463eb012989a6ee52756833d84bedd8 SHA1 e13c99bcd4c68cac2a3cf5897f6eb87b1a5dc0e1 SHA256 070934f422f0ee9b5833d502023c30be61cdaee46617476a1038cab8ed727d6e
 EBUILD nautilus-3.2.1.ebuild 2836 RMD160 fe5a3f572d4e28ce3587d2072e759e37d16d1bec SHA1 134ec9d9a58539f767891bb4a8352248ef9e5062 SHA256 8cfb351e57ad832238970150e6f42e9989095a43006b4533e3db07884f231e80
-MISC ChangeLog 59108 RMD160 30e27e1812c4b7a1a89b869774a9779483fd631b SHA1 729365bc42a8d4e3061b0050906f47c83a4ca537 SHA256 52c4b81c4d3e5c13acd70c2e9c6f17563c9f8b47acd997aaa6efb11c0472ad9a
+MISC ChangeLog 59288 RMD160 f40eefea5e227582e6d649517c0f97469dc6dbe9 SHA1 5c3f743bdf715bc12bba386d33cc9aefa93930c3 SHA256 3c9cbe127c58f43e88aedca5456a467ec3e4a63043b9a188f3bcfec27f96cab7
 MISC metadata.xml 667 RMD160 4905458681c088bef4b030ee1a963a71b9cb53bd SHA1 fa3a39a43c3e54058f3996d30fa93cd8d03897aa SHA256 b2769f7911c156b0692b95f3511adb651cee0486c6d8eb37b7d0a95786aad4c5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+dWwIACgkQkKaRLQcq0GKLaQCaAiSwptu1ynhE1YJEWWxmle7g
-ZekAn0+mjx3pS6v9gonXX3FIpztWXQWJ
-=C4Dx
+iEYEAREKAAYFAk+eq1sACgkQgAnW8HDreRbpHwCdHkjbH2ooJjnTtjupFh4G9s6L
+CocAn0WAB3/J0obRCvfVnsP7f8/VhQdg
+=GO4C
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-gold-glib2.32.patch b/gnome-base/nautilus/files/nautilus-3.2.1-gold-glib2.32.patch
new file mode 100644
index 000000000000..c185d1a222d9
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-3.2.1-gold-glib2.32.patch
@@ -0,0 +1,15 @@
+ configure.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 0a83bc9..2c9ebbc 100644
+--- a/configure.in
++++ b/configure.in
+@@ -313,6 +313,7 @@ AC_SUBST(COMMON_LIBS)
+ dnl additional nautilus libs
+ PKG_CHECK_MODULES(NAUTILUS, [
+ 	gthread-2.0 >= glib_minver
++	gmodule-no-export-2.0 >= glib_minver
+ 	gio-2.0 >= glib_minver
+ 	gio-unix-2.0 >= glib_minver
+ 	gsettings-desktop-schemas
diff --git a/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild b/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild
index 7659ab0f492d..377a0418df89 100644
--- a/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-3.2.1-r1.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/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild,v 1.2 2012/04/02 05:55:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild,v 1.3 2012/04/30 15:10:14 jlec Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 virtualx
+inherit autotools eutils gnome2 virtualx
 
 DESCRIPTION="A file manager for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/Nautilus"
@@ -86,6 +86,10 @@ src_prepare() {
 	# Remove crazy CFLAGS
 	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
 		|| die "sed 1 failed"
+
+	# gold plus glib-2.32 #414121
+	epatch "${FILESDIR}/${P}-gold-glib2.32.patch"
+	AT_NOELIBTOOLIZE=yes eautoreconf
 }
 
 src_test() {