Gold linker fix

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

4 files changed, 35 insertions, 12 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 26cc3af8bfae..947fff801eed 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.303 2012/05/20 09:59:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.304 2012/06/21 09:28:30 jlec Exp $
+
+  21 Jun 2012; Justin Lecher <jlec@gentoo.org>
+  +files/gnome-desktop-2.32.1-gold.patch, gnome-desktop-2.32.1-r1.ebuild:
+  Gold linker fix
 
 *gnome-desktop-3.4.2 (20 May 2012)
 
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 0d94a5cfb99d..8e0fda85d899 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX gnome-desktop-2.32.1-gold.patch 493 RMD160 6627d282ccc39217aef68b4c776f9008c2f6839e SHA1 fe31e65a3fa4268082896ff5b0c86c274cad0ebc SHA256 6c7391376054199bfd57532e642c89b8a18396e12c79417549926e0b7e76bba6
 AUX gnome-desktop-3.4.1-gnome-bg-clock.patch 1241 RMD160 bceac7de327bf1190c7d92dd7e60f41cf149043b SHA1 57e9d2de3dfcf45566fc8dff862d197571f7b252 SHA256 ba60025d277c97c751b4ebc94866c6013f6c0cec5151f926489d9b7b0a07687e
 DIST gnome-desktop-2.30.2.tar.bz2 1665808 RMD160 bcdcc3c0483cfb438b2ae30c8f8a840a39967dc5 SHA1 92ace7dd3c017a71c9ac90d2df486ebc2ba3d2ba SHA256 089c672cd70617541a9e4a827467af43266357e0c3635fc875b86b9b902084d8
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 RMD160 c7f8ecea70d023cda1fff30253812b9ae5813f85 SHA1 95767b6696ebc406b4349b383366b9aff32e39f4 SHA256 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d
@@ -8,21 +9,18 @@ DIST gnome-desktop-3.2.1.tar.xz 924000 RMD160 55cd8bc2f412cf55aae98284ea1ad2ddb0
 DIST gnome-desktop-3.4.1.tar.xz 951132 RMD160 3d300b7953bf075d89eb9f29ff1248b7da03d6cd SHA1 4f6174714d52fa5d7e9e22505f9b40d5b9e5fab3 SHA256 7b36f16eeb36bb8feec9f51b53b50036df8d75d5b1c91e28b036e85b17fdb974
 DIST gnome-desktop-3.4.2.tar.xz 951504 RMD160 9922346292ef15609ed38652ebc8526b3643f29c SHA1 b6a03bed9dbb93acef686de83685393f6b94743a SHA256 7565e0a822132ea7b699cb8c64d42b57081ddefd0b5d911f4f4209be0c755952
 EBUILD gnome-desktop-2.30.2.ebuild 1733 RMD160 07708c4dea2495f885eac1beaaa67d577f65febc SHA1 69ed94677c981f13f7f498de9c80cdd13d716b97 SHA256 a47824acda592214044872b1e729185242c325564c97f787bd481085f6d95022
-EBUILD gnome-desktop-2.32.1-r1.ebuild 1864 RMD160 2bcfe2af475b8d568824ce81a7dd01185929f397 SHA1 df0a53794f769d5e5d33b43b539d5ba5df064e02 SHA256 2d6b2263923577e14517ff3218ea2b32b7a88f92d256a057290d943a44ef63be
+EBUILD gnome-desktop-2.32.1-r1.ebuild 1939 RMD160 97e6f89cb808a4c685c364ba3b4bfc732b9b157e SHA1 22896eccc2865e295c021a1a8f43c6116fee6057 SHA256 965ca5281fc9471d5f5c3785ff8c14b8fe3f14189a2d7a2b43d7c47b9d611360
 EBUILD gnome-desktop-2.32.1.ebuild 1570 RMD160 cafdeae14739b7411728003630ee1496f9009bed SHA1 2577b30be2d7fa990352ee823f4912d2bf1f687e SHA256 cc52caa14b971054952e0a6389171e97c8953d8a466ba55c69f83771c9114dad
 EBUILD gnome-desktop-3.2.1.ebuild 2031 RMD160 ccf46236d0928c30e4a4afccfaf42f70a5df9c31 SHA1 09b1db344ef58f47593fc6f20909665b44d6713d SHA256 4e09de65037febe432497c9bb000c203b716452d1456e5030c595526fb337d54
 EBUILD gnome-desktop-3.4.1.ebuild 2146 RMD160 18f03771a9620fd38ac0d8cd30fb218545a9a11a SHA1 891f4d693ed0fac8f6295bc3fafd0b705d491049 SHA256 63461dcacf635d630eb0ee5c4162eb060dcb962ab7547e84a28ea6176e454b47
 EBUILD gnome-desktop-3.4.2.ebuild 2040 RMD160 60834221a3f3f021222c08b40af535d2a52550dd SHA1 87dcd50b0d5f6b143be3ad8253416dbf1a0178a3 SHA256 f0149852d21dd128b7e456ab3806e0360fcf862f2496687f6322fe65ab41cbeb
-MISC ChangeLog 40484 RMD160 8b7d29840c354ce5e352acefc1fa25be9e6fd44a SHA1 85ccba49aefddd7bd0263f7acb372363256f4d35 SHA256 6a0f2e4afbc902fa68287dfb804f8203eac9a032a41a64a7b3b272e117f5c43d
+MISC ChangeLog 40619 RMD160 f3378b80d2e229c7e27ff183d29ca3f107d43b35 SHA1 6d76a93bc54e823643c7eb4b3c46bf82af11cf6b SHA256 b039d8f0813eb623d2abd864aa6e522d679d0658ae1a798f992eaa9632060886
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQEcBAEBAgAGBQJPuMCjAAoJEJ0WA1zPCt1hPKsIALBlfObKmn4eZup15ZUbyFuJ
-2k1U5YciKdOyOtSm7OmDdk/N2s4QYu+TMgT2s+F4BcYoVcsXsubNYIIbO/Ejlvjk
-Pvegpj6OfuIKVgThqffOSscOfiYllh67Cr39aFiyiT8qS5miXNQVchUKPo0Fg3TI
-YYGZTll+q4yxAPgckf3+acdHkmtS17fH+g8YoGbCztIMFs+dcdye2kin21wLHTin
-rl9ZocrxEyhYK1pXGGHfZEG/SsOUeYo0+YUscMfgwRi8YtVIrv5+InBmlm3LzoLj
-WK2eDSST5jj6CbY+DNtbr+EaqGf8ctWaOpI8rnfPKa43tsny7VdW5cyD8Zzr7T0=
-=oPUD
+iEYEAREKAAYFAk/i6UMACgkQgAnW8HDreRaiWQCgvd7Vjm7QibcsKYlkwYnAO7QF
+7nAAn1HAWvtRwUCB+25JEsJbQPnel1EQ
+=/Uhe
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch
new file mode 100644
index 000000000000..2e845da46e5b
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch
@@ -0,0 +1,16 @@
+ libgnome-desktop/Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libgnome-desktop/Makefile.in b/libgnome-desktop/Makefile.in
+index 39209f6..a57b09e 100644
+--- a/libgnome-desktop/Makefile.in
++++ b/libgnome-desktop/Makefile.in
+@@ -388,7 +388,7 @@ libgnome_desktop_2_la_SOURCES = \
+ 
+ libgnome_desktop_2_la_LIBADD = \
+ 	$(XLIB_LIBS)		\
+-	$(GNOME_DESKTOP_LIBS)
++	$(GNOME_DESKTOP_LIBS) -lm
+ 
+ libgnome_desktop_2_la_LDFLAGS = \
+ 	-version-info $(LT_VERSION) \
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild
index 9156d0e82365..eac70b35bb57 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild,v 1.2 2012/05/05 05:38:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r1.ebuild,v 1.3 2012/06/21 09:28:30 jlec Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -54,3 +54,8 @@ pkg_setup() {
 	# If USE=doc, desktop-docs will be built by gnome-desktop:3
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 }
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gold.patch
+	gnome2_src_prepare
+}