Prevent build system from considering preserved libs when checking wxGTK

features. (bug #376339).

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

6 files changed, 42 insertions, 24 deletions

diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index ea3a541d0ea8..22a796d6f027 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/wxpython
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.177 2013/03/19 06:41:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.178 2013/03/26 03:23:52 dirtyepic Exp $
+
+  26 Mar 2013; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.12.1-r1.ebuild,
+  +files/wxpython-2.8-no-preservatives-added.patch, wxpython-2.9.3.1.ebuild,
+  wxpython-2.9.4.1-r1.ebuild:
+  Prevent build system from considering preserved libs when checking wxGTK
+  features. (bug #376339).
 
   19 Mar 2013; Michał Górny <mgorny@gentoo.org> wxpython-2.8.12.1-r1.ebuild,
   wxpython-2.9.4.1-r1.ebuild:
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index b7e2da347b70..587782f04884 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX wxpython-2.8-cache-writable.patch 538 SHA256 caf371fdd36ae60b36754f6fa66df3887c3ee2e1dd509f8cc8bc92525942f429 SHA512 e0232ff7bcb713358a2981b84b0eac3b3b0825d43b43dd6f19d3d21f9b45a9e63fbf39dc87c2fedc0342a88007ef43fcd9d890177dc38e15b4f89576fdf363a0 WHIRLPOOL c2c0488d0d5a840d1be68c95a2f53d3bce7d58798f0e09f2116f16655d73c8a5b525af7d7b836c7f820bd729acff441942510055b8f455a9b2f742361effd6c3
+AUX wxpython-2.8-no-preservatives-added.patch 525 SHA256 590ef2435f3bb24ce061213628467652509aa39992d9b0f94e1c784952d523b8 SHA512 83e066d6798aea833304004d7270e3b7698e51581e9ac9c934b96fb438bbafb16cea15cc73297961893fd73fd18f95cade22c134aea6556962025fc3c12bdedd WHIRLPOOL 218e72aa785c762f0171987c79cb7d998864252ebd259537e463f134caabca17d8f5d5d75f2ec7791cf5353edb8331d173eb6f08d4fbb7f7713d9ca14ad91831
 AUX wxpython-2.8-wxversion-demo.patch 219 SHA256 19618386cf750f56051541c403153bf1c7e90764199e53818eb0c9557d026f1c SHA512 a20e79dc2f96400046dd5d5697533466529c30bde96a2e8ace1984c7e3fb42a6b38375cacddeb319253dbaabff6571b52af41da5268d22cfb294b11da56421f8 WHIRLPOOL 3af6ad578fcc1144f0172b4a959665441880ba20b9d471049f9c48602987e4265df34b180cd98727d0beadef66e6603fbdad7f1d0b0358a795b3372a8f46d2df
 AUX wxpython-2.8.11-drop-editra.patch 2197 SHA256 a0774e4c273485711cb3da4d70cf7bf0766a9f189fafdc7bae07186d553f341b SHA512 3800b68ba13c52e81a4411940e297f83f9e98c76b4d8d9d3e53ac55564a38b1376b57df337e4f009b1cbbd44199293554058341aa2122ec329c3a42dd38593a6 WHIRLPOOL c79b106c6cbcbc1089bcbdb13bc7e5aeb613a8f374edf7a3d4680d3240b27de2f1d8a0e15ddf13257d7878cc2828b8fe49b2db8ff23eeb1bf7f7ebcf69c9f885
 AUX wxpython-2.8.12-drop-categories.patch 1554 SHA256 37c4e706e5a63e51995bbd99ceceace0cf12789aacbb6a8cc4ed6e13c2c22531 SHA512 d622cdd72db26ff44a058b9c4dd0a0a20b504d4799933636ffa3fd131e4746ae993ec80a74dc7a6496cb1306187222fb075004db547937b7c91857b8c18fe0e1 WHIRLPOOL 49fa7a4e53402d4fc4a77213fe3760ae271e85680fcc5d6a1623ef4a7621b926d672a760313c33b5450c7256b4964b8203bd6ce8543f55033a09ccd41f1cee23
@@ -19,29 +20,21 @@ DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e94
 DIST wxPython-src-2.9.3.1.tar.bz2 49131100 SHA256 7bae5bf45e98eba836472bdb358330f867c69de3a347860edd48fcb53690040d SHA512 16e5be3a2a98d64637866ecae7afb3a2835d21684077bb8a1b87d3c0cf37b75eb1169f3b8e16e38c5b85c04cce974dbfd5ba25d3d0a3016a47c005a05e5dbfc5 WHIRLPOOL ccae768ff87a95ee88d6259821be5e2073928278155743c0c16c75dd9b2262ac49ccb322dd4aa77ccfdac12d7de0e874a92b41171adacfa26ffb216f170751a7
 DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507
 DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811
-EBUILD wxpython-2.8.12.1-r1.ebuild 5485 SHA256 5df69c09c35ddc1525b8c93969c32ea6c2793680ded0a2e2363bfb8789e6da24 SHA512 20904b7684c55087223094279837eb9a6d53dd5ec09186c9877443c9d9828a0a5f9d0c399b7829d51ae3bed6c39a0c2626fe301f551bb01002378b936ec7c6fe WHIRLPOOL cd282730f5f62454c5286846cfd1eccc33e1cb8f49e18cde06f36370006fd95af8c37c967cd0239f929d6ab608bd47dedda2ebb8899ecd8e481c32cd1871026c
+EBUILD wxpython-2.8.12.1-r1.ebuild 5543 SHA256 3244852c04f286424f55b791fc2b689a0f06d3107d27bb6b8af645c9608976d1 SHA512 be49e527fe92fb0a327b6a5a609bd7c955c5feb5702929b9dc89059e7dc55fda2734857a81fcff6dfa4e4b186db379f8874606d3215f5df57dac6ca60f423518 WHIRLPOOL 10bcee699ee99cfe766a9e5572b11577f580d8647ba6ecb5f6eca566d8f5d9ae88480c9a9ca9c5d097e9cf0eb63b4eaee1b0095575f3436410ef3b4447c1554b
 EBUILD wxpython-2.8.12.1.ebuild 5151 SHA256 36b7e6c3622539299e15bc5c4aa30a00dde859fc4e5b4ab754ecad0eedc0112e SHA512 e2b9c8ed35535b2ff66b62343b67a6fa814eea9c685549cfdfab02f83433b1905191b633a8f7507ed9d8e4820af99af39a80761816d10a11f96d06342d2d51af WHIRLPOOL 7b8893dcde348dc355f83fc8a347305c4b390e2f0b8272ea74e9c9a70efcef1ad054fe4aa329365986e7493df8a4b235b11d3d1359f3a531377a868851cbcf79
-EBUILD wxpython-2.9.3.1.ebuild 4357 SHA256 376646a25640952cd34e65bba00dafa0f2135f852eab9eb74073ccb437124405 SHA512 8a59a4b070e23a3d2faad2e6ad8ff2ad9ef7b28a84450b03a2a2ee1a01ba04a48a14649e32e6ca960c46d5d73ac010b811f4d0897cba9619e6f2a0fc017ef05c WHIRLPOOL bc3b733221f1cd78e417b5a9aff491d2efc84a3a56bf983572ef9ab02a17f5e0cf7a48d020b3994f6577ce59da5d1f1d76bff5b0dcdd018b33ec1299833840a6
-EBUILD wxpython-2.9.4.1-r1.ebuild 4649 SHA256 9a1a56424cfe3dd3a6ffa7d608b0e1b26863656a7ef543e8e8c2bb08bf311d57 SHA512 0f229d88647708fed0c6777f362dfedefc2efe202390d2a3d19096f5d8370109491c6c0bc284290f39a9f928563d31fe9e85e778c474d06e8f7330f7fab117bf WHIRLPOOL cfcdba08ea3f6841f5852a46c0d81e97db3743ef8e1e8184a53dc574fa51313eba5f24b94327d9b204b8a61f7473c14025dd2e841c514121594f13201510ee68
+EBUILD wxpython-2.9.3.1.ebuild 4423 SHA256 d373c252954d78fe241755d6e43757cb6c4e465fc00212411d282c5d9d65ce9c SHA512 0f1d00e47641d00b1d912754124fc9f39e31f9aa658f9680012ecbc6706065f4fc6c9f0266e13f916033ce1bf91b9dbdddcc11d28c270577cff89c005699ba29 WHIRLPOOL 60c1a4906c209407126836e21e62c51dcc97e72b592725a6d299f960793139795e104e08068e79926a15c2db0b94f45129f1596b32d0bd59fd53a23a1a83ddc3
+EBUILD wxpython-2.9.4.1-r1.ebuild 4707 SHA256 7ed4a54a09cda81f18c611362b5208844e9d5d5c1d596ecf548357bfa2506003 SHA512 23fa87c610cdf8f4425b0ef50b5dfe83771a51c2eaaae12374426cf71053ef630fa3c0c243d841723e8209c5d56aad08b5eb4c4b83393844d58c6b4f54779b57 WHIRLPOOL e82eaea5774b442a9cddd7ed4e7cdc986e9eddbe8d852ad402b172b26d8b0f537360f6d61cdab1b5a16dc9d14fcd9e8812ce21966f312c5c48e0b07cd829efdb
 EBUILD wxpython-2.9.4.1.ebuild 4344 SHA256 e885f7b2c67644a64d1d162394fc62f7305bcf5635e2b21222313e6ae4af3e1d SHA512 b3a104f03f65c83952299a60a1101f56c6f1aeb675811275fc57e5d4c4d4bcff8a6215742fb624473566e4d1382b2fd9f8d6baa7de580176ab9560921935b1a2 WHIRLPOOL 509f43cef7e41c00d1e0ec4a3c1d43b4eaf9903090671e128140502b3de1791417ec670496a17c31d52658b325739564942145959ac1d932cfd973b66a4642e1
-MISC ChangeLog 31526 SHA256 e3e91d3dc3afda1885fc7ebff5a262f976335cb83283244cb44a5ab718e4b041 SHA512 58b14832d55316e7310f6bbb0cd8b7304c3c2541ed786429377c427cac24df7debaef53789d545b048c93fff7bd55f31f0b4222b859b6b30cf55010046fd919a WHIRLPOOL b02a06ad1b6f97558372292fac90bd12e2d82e863a542e7a7e6b9cc294e71d85403625a7db7f1d10b4c506ff047d1c869c668c88c59d927c52aef6a2beb10e4d
+MISC ChangeLog 31816 SHA256 c09e31387b9e28c397e390bc390c8e382cef7f21a44228a6b3b1ac888b9dcbaf SHA512 47383ac3540eeffcd252cb17ea0a79f189bbf7d0c23204e82bbb74bb2ecd7b2bb5ff8a83d5c5a3042a277ee50cd581ab8c73571a887fb8f66887acfb927c03ea WHIRLPOOL 68da96a33c1093f67f39f3977707af7c15510b3e8a53af1924f82e9d2aa3ff7c5f917c84a671af2dc74ff1881b63553d40df53af087c3b0a0055469a7cf4b5e5
 MISC metadata.xml 366 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff SHA512 260bafb8c2fba6a3d1b6c0dcb0fa4f1db5ccff7319395d9856997df816d3cfc69dc38859835eeafb693f22da6179e73227c87d820019793e639987085e596c6f WHIRLPOOL f8619bf36512bc3debe4fd4d810f5512485fe5f6041af2704898cef0123c9ba9512864763dc6fca78f400931a120b43f494e7384a567a79d42db507cd74b8062
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRSAjiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDOeAQAMC2492YgYnDHwm9T5n1Jrsq
-WxKnxxFGu6nH9bZW79P2hvwfcSNIb2WpZL12bkkHM+fJ/XoMqaaxC85R0FFwxPLi
-S2kEWyDbIhKqowQipj2o1Ey7O3vpPnTT5gPAOkQEzyjHbnxK6YPufCzjWaR7MXYE
-UaaKB9Q3TX23n7EXfqj1Sy4d7lcB9mUbe/oErp76xGSGct4V7BDPROdJTEMiHJSF
-zZSFpLGzwlnBnF2SPEJWCA6/ffp7XnDWj8i5kQ6qSB9Lg24Hd1CInoICnz8EC1X7
-HYy8wlYusd4/GUeDV/AT+m4Y7U92YHNXgzvuvlvx+Ps+8l43ZE3btL69A2EFADYl
-PrfN4h5PA5pPpl/kkBmaZjsAcniDsPVo71m5n1j8090d8EBe8BkyRgs+3J7pIYaF
-1I0yc0o55vpvq2F1tAgmcHMzil3fWrAi4CoizhxdcsKIFr1JMWqYiq+MOcSWHJMW
-I6AIMRe+JWIX0V4kII2CE7RLhwPUdJEX1iOZYT4b70/RGdvmxt/2/itKRWJz9fR1
-buzymi0tBZ7Uud7Lobbrws1KM2REHmbyglq6AdJUk1hIMyS3yJbfbNlaK8s9m9rR
-VjGuciL2vDvEnUbaIIBV8MxuUdUpcI1Hy/FoiCzWseDftsdve9yZ9SYb7E5t3Zz8
-LpoHf3iAYK4L+eLAt0d1
-=nudz
+iQEcBAEBCAAGBQJRURdTAAoJEO04vUmVeoRjOKAH/1YrhWUCszxDqp/j4yRMZCsU
+9eaGhhCeajHTCIKj0Gd06nfGDWl3RyF7M6MTDhM6ufXLmSdAtnJWpDXThFdjJmXS
+Cw1drw7cERIJUb/Dy07ejMjR9nR6Sj9lUZgZlrJh2IJY07sCsPr+kDfHjmjziu3n
+FcGMS8Ix1tuVX+0xDEuidSY2MEwmP3+EAjpDdJjiKtA/gUjQS24TsgshlbOdCG0/
+lpa7sIUHcp0MBkoBX7YkrFe1YA+QcScFt3jFk6i9iLIuEvVERR2+tV/Nmkauks3o
+64vv7iHkNibsXKLcZsj2Ynh0X2tzm0dKzR9jtPZPnUwSuVUON3eFr1SwZO+hwNY=
+=3tir
 -----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch b/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch
new file mode 100644
index 000000000000..5e4221d51506
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch
@@ -0,0 +1,16 @@
+Portage preserve-libs removes the linker name (.so) of a library but leaves
+the soname (.so.4) and realname (.so.4.0) installed.  findLib searches for 
+mywxlibname.* and returns true if anything is found.  Disaster ensues.
+
+
+--- a/wxPython/config.py
++++ b/wxPython/config.py
+@@ -612,7 +612,7 @@ def findLib(name, libdirs):
+         dirs = libdirs[:]
+     for d in dirs:
+         p = os.path.join(d, name)
+-        if glob.glob(p+'*') != []:
++        if glob.glob(p+'*.so') != []:
+             return True
+     return False
+ 
diff --git a/dev-python/wxpython/wxpython-2.8.12.1-r1.ebuild b/dev-python/wxpython/wxpython-2.8.12.1-r1.ebuild
index 85f04f8c3206..4480cffef6ac 100644
--- a/dev-python/wxpython/wxpython-2.8.12.1-r1.ebuild
+++ b/dev-python/wxpython/wxpython-2.8.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1-r1.ebuild,v 1.3 2013/03/19 06:41:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1-r1.ebuild,v 1.4 2013/03/26 03:23:52 dirtyepic Exp $
 
 EAPI=5
 
@@ -65,6 +65,7 @@ python_prepare_all() {
 		# drop editra - we have it as a separate package now
 		"${FILESDIR}"/${PN}-2.8.12-drop-editra.patch
 		"${FILESDIR}"/${PN}-2.8.12-drop-categories.patch
+		"${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
 	)
 
 	distutils-r1_python_prepare_all
diff --git a/dev-python/wxpython/wxpython-2.9.3.1.ebuild b/dev-python/wxpython/wxpython-2.9.3.1.ebuild
index 79e4ab7ba233..0e7f0deafb5f 100644
--- a/dev-python/wxpython/wxpython-2.9.3.1.ebuild
+++ b/dev-python/wxpython/wxpython-2.9.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.3.1.ebuild,v 1.5 2012/09/05 09:36:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.3.1.ebuild,v 1.6 2013/03/26 03:23:52 dirtyepic Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -51,6 +51,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-scripts.patch
 	# drop editra - we have it as a separate package now
 	epatch "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
+	epatch "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
 
 	if use examples; then
 		cd "${DOC_S}"
diff --git a/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild b/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild
index a8948d6f07d1..bdcd9c8e7d8b 100644
--- a/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild
+++ b/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild,v 1.2 2013/03/19 06:41:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.4.1-r1.ebuild,v 1.3 2013/03/26 03:23:52 dirtyepic Exp $
 
 EAPI=5
 
@@ -60,6 +60,7 @@ python_prepare_all() {
 		"${FILESDIR}"/${P}-wxversion-scripts.patch
 		# drop editra - we have it as a separate package now
 		"${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
+		"${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
 	)
 
 	distutils-r1_python_prepare_all