Don't try to link to unused library wrt bug #542976.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 29 insertions, 18 deletions

diff --git a/x11-themes/bespin/ChangeLog b/x11-themes/bespin/ChangeLog
index b2c9563f0cbf..dcd69b2d5f41 100644
--- a/x11-themes/bespin/ChangeLog
+++ b/x11-themes/bespin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/bespin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/bespin/ChangeLog,v 1.11 2015/06/03 20:57:30 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/bespin/ChangeLog,v 1.12 2015/06/06 19:53:05 kensington Exp $
+
+  06 Jun 2015; Michael Palimaka <kensington@gentoo.org>
+  bespin-0_p20140225.ebuild:
+  Don't try to link to unused library wrt bug #542976.
 
   03 Jun 2015; Manuel Rüger <mrueg@gentoo.org> -bespin-0_p20131020.ebuild:
   Remove old.
diff --git a/x11-themes/bespin/Manifest b/x11-themes/bespin/Manifest
index f5507a9f8726..d427bf18b26e 100644
--- a/x11-themes/bespin/Manifest
+++ b/x11-themes/bespin/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA256
 
 DIST cloudcity-code-1712.zip 5076462 SHA256 86d9edd9fa70805677577da3425f010004b5159c82da68a95519c418aa6c2004 SHA512 475b572c565559886255e0afeee4a4a8d5fb32a49dae491ededc9301c22f0bf21cdf5372df1983d9a0878b6e552f2e95d6d263fbeba9286003037626ba89ca21 WHIRLPOOL 4ce0c332f4a17f3acd27213240527fd978ebc4398dfe6b8dd1ea608156fba0e886d41a907d5954c397484805362a6c0fca2044d7ad9ac102338816211344687a
-EBUILD bespin-0_p20140225.ebuild 1459 SHA256 79f26a63232c5c41db2222b09db9ac0a54dfd8a0a9d1fba7bd48f1d6c956df43 SHA512 06be379ac55138a009f8fd4f606dc446d1df23d5b16d5c22aa83429ece80256ec97bad587d62efdf6d4dc653f3b154a3d296b03c4c02f6b6b4a74e66572bfd21 WHIRLPOOL c8a8d8731ec24bc9f409a7f55b7818555535267e0a0cb53d8d2ec972e43376407bda044fda7e02353a192d0659a4f0b964401e85ae514c26a26aba80d1801ae9
-MISC ChangeLog 2177 SHA256 91e4af173b0205bfcb78f4db21e7fc43cc9d8acddf9ca6ff05097904d868934f SHA512 8f93e90989b90c5ae28fd6e42a63be9aa745107fa22f04152d6a3032dfd7c617e5c7073e4a946f3aa4aba48efff375f0ae12db866023d5d7fbb68fe96e5a6222 WHIRLPOOL efb28d15c6048738667e7e622921df2952c0ea966348fb23e570516a6996e80dcbb2fc5f02852c697c36c0ffb07f1e69607fe413af4015dcc67e7ae56e52c035
+EBUILD bespin-0_p20140225.ebuild 1576 SHA256 fa96a53cda73463fa6235c31797a615cfd22c327aa79ff368083968f57f23bc1 SHA512 23cc90389591f6e7248c78c82fc0468accdd314395c94e2ea4eff36e5f20f2d2e2071bd5c48d5974d78e97d27c1808e15a6e38ad5a9beefc68b68fb2573080b4 WHIRLPOOL 1bef5cbfc866e956b70afd628d5bf6f8800a9f624d93b9a17ce75bb1dfc77dc8db5481f0acecafe7a92afa42e4ff9c9f3f78b9b5ab329375110282582c87b7f8
+MISC ChangeLog 2323 SHA256 ed8e776d20a5a26253268df3022bcfeb17cda32fd0dcebdeccab0d2c1c5587ca SHA512 82da5a87a272592b4e79842756da2521e99016585501d642ecc6447e8f8adf821e8fabfbcc65890202dc9d8df295452de4f6e6495bc6559ecd63bc07290df43e WHIRLPOOL 31d6e7eae3c47b47cff4b154702f070e8502ae47d1938815e674b6f8ead3ee03f2fbdd62267c66f6fd26dcda1c349da0f31a5b10815d55e013dfbc741584f450
 MISC metadata.xml 237 SHA256 8430f6b6cb37bd2478f105f3ce35c0334b5b1e8e0af5c83913ff9c404abdf21f SHA512 bba0bfba9f3cff49c7e3da566d2affaf7e55e69e44c89f07dc4e693222d5517b7dc69f32ba0fc655508871bccc97a6bf30ee013417bbb9a924b0b8925bfdf179 WHIRLPOOL 13af49219dddbc1941067ade4d2fe54cc1a912d1c4e051144529db6e7f3c50b42af2448a00f5a3a5f3cfbcff5dbdb4d8b3253dbdce6a28657ac950f96b389deb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVc0tLRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJVc0+gRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7JuND/4mbsl1778inpoxrNwzhx6w/+2uZ3DB+TLsRGQcwjF57wFQSYOkax8tfzZD
-Ds3J4tW2sCoV6hVhPWOEHdMaQWoc0oBBprudJreX/HG9EVcZ+3TfpTwjRO2viKFA
-nU8eniZoySGAl9ylo2zRrI8RnyroFv5agvMhU52q0cfzvxutPUE223vs+fe/60px
-l+TCh4YnVj9SsIxxx3HSjGhPP6blsgAG2RHMblMFx0sNOwDbYHS8ZQphfJ9JpJi+
-a5d5BmKUIwkFecv3aOCn8kJP2ybo5O5+sIIDcbKxusCBNcPvP9CZ0kmHnW+RefE7
-bMwnLSJov5Eqtxb11cHoV0uVxKu5jzGddBALQjFk1QnipIRmTeXSp3OPCBlN+3p6
-RGksfDOZmoEJYD47CEWjgp9Ry5a8LGImFbBOPs/PRd7sIwh2Z3Ffz6HkKnJVyaH8
-VvVpztVqNnKpkOYkgrtEndU/CT3vgv1TRg274jhKT4CYubCSVOLp2UMcAX8N/2Oc
-bZYD1x2oSAtJEhuxqcn3DKViYRYz9LZGOUBD11No6pykKgca1l55KX+sNs7cF7Mr
-kSmlEtDzXssH+pHgqBISsZD1Rw1GnyAYiSaV9hSwEAGNwENgKhyum3yk00P9oyxD
-kJS7hGDq7nt7u8ZQilkAsgnlo9g+hgDj8QFo3m7Aylkt+7bDxA==
-=jg9V
+7NyCD/4yLdvXkRzrM9u6iYPy1QOVOwyfuhvYzRwDSi3CPw5+yKmowl4NjTC+Gr/3
+3yXZxOjOL4oNwowaeq03eHbDHIBIZd+fvYeVx6zp1p4Q/D6bKf4jM1Wj0t1ijfbZ
+vEy0QRlLF92dTowYm4ERH7ivvm0/2oRiswdUmuG3blYizkUAmB/syzWg868M9olQ
+7q783NL/S93jIDy6073eZ5HjVl2mO1WsxLRDKHMh6XKeAtKDV01C1ou2Vku6qmn8
+xLa1uFevuazk7TOm3xX/3lnq++MJEE6aSDqhK+wGk1wDyblQV/idkV9LntWeZFfX
+S/l5AHvAH3Uu6ccKhlPnFc1tK5CKbxIly8JjGy2EDOl2UWEout2ZRtPp9M7z/tZb
+RFMrguGeDz/AuRrfjEq/tgafgV7zg1azK6245v3e+TuO/tc0ARNgC7cPG5srQ45H
+UjDOmAR2rkCrOfDkc5CBi2GFltOCpFJSy+udmM4t7dieEIthLk+Nt3w528+CXqEr
+dJc7M963bwKd1LTZHxel8m4TeGQGxIl3TogiqkzdYl1UED1zx0eoyG1+NBdn+2Ci
+5RGHWSnieZsAseqHHSkDaSpTDvtcDxozRUO7g8ZVRP3Y+JOMKSdMStI5vACgmTvE
+ofcbJUY9hZ41k3fKUp5oX18PyIRnrnlS3vz9s0pRKNfC8QkB0Q==
+=cl0q
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/bespin/bespin-0_p20140225.ebuild b/x11-themes/bespin/bespin-0_p20140225.ebuild
index a5404225b23b..589674a00aeb 100644
--- a/x11-themes/bespin/bespin-0_p20140225.ebuild
+++ b/x11-themes/bespin/bespin-0_p20140225.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/bespin/bespin-0_p20140225.ebuild,v 1.2 2014/08/10 19:56:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/bespin/bespin-0_p20140225.ebuild,v 1.3 2015/06/06 19:53:05 kensington Exp $
 
 EAPI=5
 KDE_REQUIRED="optional"
@@ -43,6 +43,13 @@ DEPEND="${RDEPEND}
 	app-arch/unzip
 "
 
+src_prepare() {
+	# bug #542976
+	sed -e "s/kworkspace//" -i XBar/CMakeLists.txt || die
+
+	kde4-base_src_prepare
+}
+
 src_configure() {
 	if use kde ; then
 		local mycmakeargs=(