fix underlinking wrt #429272

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

3 files changed, 34 insertions, 22 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 947fff801eed..1cade03d9402 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,9 @@
 # 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.304 2012/06/21 09:28:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.305 2012/08/26 08:49:57 hasufell Exp $
+
+  26 Aug 2012; Julian Ospald <hasufell@gentoo.org> gnome-desktop-2.32.1.ebuild:
+  fix underlinking wrt #429272
 
   21 Jun 2012; Justin Lecher <jlec@gentoo.org>
   +files/gnome-desktop-2.32.1-gold.patch, gnome-desktop-2.32.1-r1.ebuild:
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 8e0fda85d899..ec0c28a1efea 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,26 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-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
-DIST gnome-desktop-3.2.1.tar.xz 924000 RMD160 55cd8bc2f412cf55aae98284ea1ad2ddb0ecfbde SHA1 6ddfeaf9149d05881373e3726a771cbd35fd503d SHA256 4cb00d22360f9ae4bc3fb79efe7868fd54fcbfcd4f7050c71fc97699ec3a86a2
-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 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 40619 RMD160 f3378b80d2e229c7e27ff183d29ca3f107d43b35 SHA1 6d76a93bc54e823643c7eb4b3c46bf82af11cf6b SHA256 b039d8f0813eb623d2abd864aa6e522d679d0658ae1a798f992eaa9632060886
-MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
+AUX gnome-desktop-2.32.1-gold.patch 493 SHA256 6c7391376054199bfd57532e642c89b8a18396e12c79417549926e0b7e76bba6 SHA512 1ceb79f150cc271547766044277cb38c45cb8ebaab9edaf5fd7bfc29ed25920c80d4a0331fdc6ed91f5b47cb51d820270714d72d3bec7cd55939f1a1ef7a9c0b WHIRLPOOL 2ade696dfb67f6e12c4db3c1d82d85a22177a56eace8266ffc40d184e3c923c0b6c0d029a2733e783d8d012913cefd1e13feb2fc0a7b5f74dc75794ca84d4408
+AUX gnome-desktop-3.4.1-gnome-bg-clock.patch 1241 SHA256 ba60025d277c97c751b4ebc94866c6013f6c0cec5151f926489d9b7b0a07687e SHA512 154a28d262b38a06165d7afe8da27f35703b24d73f023c447ca30d7d77e32efd441e3c0cbf33fb9bfcf57ce11226df3548db31d9ceccad5a648a83a1f2776170 WHIRLPOOL 36f5de4e831edfed71ee32f532dec0ecb1251837137bfe87b83110fcc91d3424e52ba8da17266e01885ca9c066ba723154d47732385343def367ac51fc8e603c
+DIST gnome-desktop-2.30.2.tar.bz2 1665808 SHA256 089c672cd70617541a9e4a827467af43266357e0c3635fc875b86b9b902084d8
+DIST gnome-desktop-2.32.1.tar.bz2 1633847 SHA256 55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28 WHIRLPOOL 0889e79b1b3956b0ef1330f661676b77bdb40e8110657ea7f4035618ea023fc4b35364629d68741f042c0b971db9fa4c7731065717612486f7546e07fe048a0d
+DIST gnome-desktop-3.2.1.tar.xz 924000 SHA256 4cb00d22360f9ae4bc3fb79efe7868fd54fcbfcd4f7050c71fc97699ec3a86a2
+DIST gnome-desktop-3.4.1.tar.xz 951132 SHA256 7b36f16eeb36bb8feec9f51b53b50036df8d75d5b1c91e28b036e85b17fdb974
+DIST gnome-desktop-3.4.2.tar.xz 951504 SHA256 7565e0a822132ea7b699cb8c64d42b57081ddefd0b5d911f4f4209be0c755952
+EBUILD gnome-desktop-2.30.2.ebuild 1733 SHA256 a47824acda592214044872b1e729185242c325564c97f787bd481085f6d95022 SHA512 a9f99014cacbc4088af05da9c12ae3ce9ed5f1c68ff458adf73b3742d12a3616062456090d7d5515d42e9ce550fe1406099afb38747d02dcf68b96cdc65f9e17 WHIRLPOOL 58a91f4513168f01c216cac07b7d7959ffaab28b205fa094db89a9af0ec6494a9e4b55d0a2994961aa7a0753561a193cd783322a1840bcd1156aad4479af7049
+EBUILD gnome-desktop-2.32.1-r1.ebuild 1939 SHA256 965ca5281fc9471d5f5c3785ff8c14b8fe3f14189a2d7a2b43d7c47b9d611360 SHA512 021a5af69681a7adfe6a5d60ee3dee80fcc92814e47d8c0059bc68f608d7aab03ce3c1d05ae62be01e7f5edde3ce047b797bd60e73fbebbf79550e5d19564b34 WHIRLPOOL b388c56a63cfbd423fbb92d278511bccdb5a49ebd0fea47d27fecbebedeecfc78ecc0f316449dadfbb073d519fe17b6ee18243a92c5856859ec730881fa72fe6
+EBUILD gnome-desktop-2.32.1.ebuild 1674 SHA256 1df1f369041d32cdbd284f8e15381943905480a821c7cba27e37f2a96043dddd SHA512 572a9aa89b5f80861e697ade424292d8495fa9c7a1bee1c9987bb8a54712f48902aa0f3d1cc7ee27d8a9a61c7edc407a1c76b194ef9f7aa93bcbfdeb568d9e0f WHIRLPOOL 3d24bb789da43bd92d5f4e5a1995c3ca1764e674209627875a0a8f2c80b139154b9c6599f0a0f14b31ce1e51423c46063509436ad4349cb71657798e7fe54209
+EBUILD gnome-desktop-3.2.1.ebuild 2031 SHA256 4e09de65037febe432497c9bb000c203b716452d1456e5030c595526fb337d54 SHA512 4791df888b5e964a7bbb806422fa92f6e950fcad5afc5bd7e862f6aca32ad87a338f9d4c0a01be87a102d52840fba11cc937bf946a02e699a8ed55781ecdf217 WHIRLPOOL 547fcba1bcdb8aeffc3d2eefcbaab92f1f1024786a7022895b50525ac53feba93c49ca90588770b81cdf3908c07212bae2716b80fd0612ddcfd612be50f8b52c
+EBUILD gnome-desktop-3.4.1.ebuild 2146 SHA256 63461dcacf635d630eb0ee5c4162eb060dcb962ab7547e84a28ea6176e454b47 SHA512 dbe02ee253766f9126986d12671f1922628f3f3ba6ff3c51f60bd66d8fa9547a31a9f83db2b1c72fb97e215b2b5b5794892d7d19c021af154eceb5eb23ede9be WHIRLPOOL a6042407c1bbe5eb76f891197ed99bba53946d427c91ad290f6bcba3763e103878753f4d805194e62481f88366ba6eba84b64479cd9abb2a706101f8efb6c65f
+EBUILD gnome-desktop-3.4.2.ebuild 2040 SHA256 f0149852d21dd128b7e456ab3806e0360fcf862f2496687f6322fe65ab41cbeb SHA512 b91059aebd74cfca9c04279f2aa1e4b1ebdcfa254bad13fd11d02cb46e688eac9459e8b3035ac5429ec9eae8464b4e1e8cf84c10225259727ae3a108d79d1de0 WHIRLPOOL 4df1731d7452ccde7dcc8ada01c2087fea6a194e3b113b6fcc7ef70235114122e09abd05f3c74ade19fb5db068d08b0895a12a909ea213cf6d84e5ec53492039
+MISC ChangeLog 40735 SHA256 3908b51378f43163bcc6923675b8b499b2a93020ed82592d7b323c0846ce2df5 SHA512 bda8e018bfc784dab848d315dffd448a28a85a936eacb0982ba908649db2fdd84d88ee55c1c2b0a416c64b9d82211cca0916b785933af2644313784d603054bd WHIRLPOOL 606bbd6ed0975266b3e953ebe20a90e3b19f2b9b2f4b2c4ce505bbfc4dc2a5764dd3f386fb58d57fc576d3a8f1a388a0832a9fd8393ee697256ea7876320c1b5
+MISC metadata.xml 277 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb SHA512 ca1d5e77776eb584f9e897f4abb7b4a1e2bc7942564d81c812ff94d64593c6e1e0a7996c0be8f6493cce579c815024e006bf5642b8fc57d59e3818d960b9cb0c WHIRLPOOL ea0c213f488fd7c0cf1783f9542feaed34859244150a79926029bad19b066db2ce6d2cd3e539c860e9eee50b3138bfe32c520e8c663dbe9a86999c04b28b140f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk/i6UMACgkQgAnW8HDreRaiWQCgvd7Vjm7QibcsKYlkwYnAO7QF
-7nAAn1HAWvtRwUCB+25JEsJbQPnel1EQ
-=/Uhe
+iQEcBAEBCAAGBQJQOeH/AAoJEFpvPKfnPDWzEJoH/3m+OVsQQ3ApgyzYljCeImJd
+obh/u8rnljn5P20wgo2ALn9GgkJP8zFPfMSgHVXaFZik7gkCC11qfOYqRJJa48Ve
+fVCERhuX1zWZHLWSQQEFmnW5j/a3cu7YshcYNHHeGzqoJfdeFwRvDrNWwmuSriSI
+U4FBiEGueVq4QDS377tSFya7gaGyu3D8MRE0VNBD0fCDyQHkRtFyucbbjqpNYKii
+k48MQ5rTVOguigITnuiKNQVKR3jziMqMWsQ/pE6HqBXT3JnATlMuAi+TjT2/+9or
+1PSqMkSFFzAmGWD1n/3x9xMVYtm8+pRwPzvNN86wo1Gzf9ySZaN4VktNl/CZiEs=
+=0XtT
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1.ebuild
index 5ce411ed325b..a8800f60427e 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1.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.ebuild,v 1.11 2012/05/05 05:38:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.32.1.ebuild,v 1.12 2012/08/26 08:49:57 hasufell Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -40,6 +40,7 @@ pkg_setup() {
 	python_set_active_version 2
 
 	G2CONF="${G2CONF}
+		--disable-silent-rules
 		PYTHON=$(PYTHON -a)
 		--with-gnome-distributor=Gentoo
 		--disable-scrollkeeper
@@ -49,6 +50,11 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gold.patch
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
 	find "${ED}" -name '*.la' -exec rm -f {} +