fix Prefix library location in configure. bug 394123

Package-Manager: portage-2.1.11.34/cvs/Linux x86_64

3 files changed, 12 insertions, 28 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index b3992bad3c83..41530f1bd015 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/wxGTK
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.297 2012/11/23 04:53:30 zerochaos Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.298 2013/02/04 01:50:56 heroxbd Exp $
+
+  04 Feb 2013; Benda Xu <heroxbd@gentoo.org> wxGTK-2.8.12.1.ebuild:
+  fix Prefix library location in configure. bug 394123
 
   23 Nov 2012; Rick Farina <zerochaos@gentoo.org> wxGTK-2.8.12.1.ebuild,
   wxGTK-2.9.3.1.ebuild, wxGTK-2.9.4.1.ebuild:
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index bfbfab8c7798..d052efe7ad78 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX wxGTK-2.8.10.1-odbc-defines.patch 1341 SHA256 db875bf122cac00b1283debe3a92851ec7d91f481198736041bba5e4dce22698 SHA512 119e99f06f238d0982bc1a5fac834ef0ca7c09dc5a97f612cf3f0fffd9e01eebb0d8bfe122ebff6f3857cf6518a226477d2cb5959c47c4fd5c50ea5040abe6b2 WHIRLPOOL ac8f565adeaee0110e6e2b229cd9c5afd3edf3bc3b7abb8aba5347dac64021a255a63dbf879b5ddcbc658f6f78518c988435399af0af1f5fd437f36dc102cfc8
 AUX wxGTK-2.8.11-collision.patch 5710 SHA256 b4a34748a0e3c8f784d777b197f903de9d681baf12395fa1b8a5d2b2636c9ffe SHA512 9eb4fd8f783d073236364acb322c2d3315d75d01197d119ae4760a97e5ce6d3c700b28b5516ffda856c9decd1ad05ec063941855fa18cf5f9927a5a72fcaf4ae WHIRLPOOL 391a8c2e319742bca1a32f71c82f8b14653a3c91dc0b11ba87e8cd99905ffe5ed6897da67c5e5ae2711e30ae0aea5d9d3bc93a7275f39aca5ef6635a771feacd
 AUX wxGTK-2.8.11-unicode-odbc.patch 624 SHA256 2e2cbeb2240770497611bf845127f737e67311c4b898d21446fc3d739941cb65 SHA512 e58e661ae95deb7da31c7742088c6e8b8705494261d00975a7dd0eba0fc720ae7d91017616152915849b747c96f3a0302cd958946db886d7491520883f311a86 WHIRLPOOL 710ac8ada38a42d762ea1d271540b9eb47aae36a072b1b63310b4c1e970afc7b0b485cc55a50691d69f92712e3b772d35d72ae1e24dc550a9e0b60db8c20ace5
@@ -13,25 +10,8 @@ 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 wxGTK-2.8.12.1.ebuild 4033 SHA256 aa570418e96034e156a72b3fed7d883174bb4f2f27a2c157021fba9d3d31f976 SHA512 7e2795e9c7da84881f2443e1c697eb0d1762b5309695d7df6210f0b6c8a9d624f4e0a929166348dd8dd9de2b880057c3bbd0655791dc3885435aedc6e3af1b3a WHIRLPOOL c1e66fe7c8fdb3f67454aa75ea0e039f3a2e6a8fdc62a85726bf7a36ddbc84632122ba48b520101f6298d30c9f781d52a68b6e87f303e28925809829afa6e149
+EBUILD wxGTK-2.8.12.1.ebuild 4115 SHA256 aa81865193740be0455ed613ae39a112bb6622ea50bc36023d72693d5c8d7022 SHA512 5e401e0dd2702d2e74ce43992a6b6e0147d43852273eb929bdae231fd05f30b18c51581e535fb1377fa405aac9d5277eb18d6266f2e25fb90d3b463ffb5ba467 WHIRLPOOL 8781c3976aa543d91e6dd0fe0c69b23cd04db6601d98786ec5e3d0b530594090d8bc23826fc90efdbb93696e229bb5ecf283dec5388435600807f080daf8736a
 EBUILD wxGTK-2.9.3.1.ebuild 4146 SHA256 b7a41d6be730440d83156c63fe9fa9bdf6de0dd88d2acd79cb87aacedb1c5d9f SHA512 6e7bf9870ad7f3ae9f6226486458cfeb69305299d69779c37eb74bf80bdec9b70f5e42a62795e785dd3c4f79fe8fac62beb31031dd45ce737e2d4322479cc547 WHIRLPOOL 2c5a76ebf360204605a2bfc9b91404e99bde06b2bc8b17cf3b6d9ae3e930671a76408ca888aab9a01210068f3f7fe102a9d145092591bad11eb589ea430be5f2
 EBUILD wxGTK-2.9.4.1.ebuild 4195 SHA256 98f59a9cb73ac8bb673a38cee60ebd1c89bf48b5b5221e05e7b244e7aac5ce16 SHA512 5a54aa6c035f4adf1498444e64b668da7ca70d44bcfb9cf20d3ca67da083494aa88e16e795fe16a790a99afd55795591b6602fa7b496d33c394bd1d48d420ac2 WHIRLPOOL 83a3b5071d97aec93e0499182afd140214df3eb1821ccc7d58a7366d34d10302c4c9ca46e82c3befadd86889e5799642e51b3dc477d139aaaf5bdeaa1de3f2b6
-MISC ChangeLog 46614 SHA256 79223ed1e1867f471948948ebc22ad502daa30e148efc64ca0fe79a34da39ffa SHA512 6894f6a7e0f525ad17d112af422f691bff4f5c1fa0f9ada649908f953335a3eb6a894d4c3a0c067100a243291fb2c3c42eb8b6fa222fe33f538c75a9199d6a7e WHIRLPOOL f1c1c7f698f3f058700f0833fc35c343bbb7057d3c77e8cd948515fb78c655ad3374d80c12b01c7162f79c913c5a1d8c859767f4721cbaa700fbeec77980f814
+MISC ChangeLog 46736 SHA256 c776ba15792580a771a9ae569abdbdd9bff02bea11d23d6833f110041710c7ed SHA512 ffc3edae07b1736a7288684ed0ca7dc810737ed5ac83ff088ecba0e35875d7806c3be4f4dffc478533c4954e31d6fb57846a630eefc296ff53e5500c331138b1 WHIRLPOOL a90411fe1b9a5fb477d7c2d0b9f8c81bb0f84cb3da1ac1a8b1e0b63d5df3951fc3d8f40a1ff9771b8b981b2bc18a66f7974c7a13f9969e7835f93172fa2080fb
 MISC metadata.xml 670 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75 SHA512 37ec56d00b488857a285a61c894f8c28dde61efce48d79b7767a207f5c533ad01f2ef09ebecc98dd5b803b4545e1d7f513ffb48e5ead4818ecb607129339c907 WHIRLPOOL cbcc9d2aea988f0b8e1a0615918903cf332976b192156296051c9f5ac5563e9ab512376453a52ad02db0fe3465b9b30d88d6808e38bea52bb58abe6fed316586
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCgAGBQJQrwFwAAoJEKXdFCfdEflKrbEQAIWaIgp05MOBnVjM4TuDLCy9
-oaD0wSmiorP9hzdXLzCfme70c8urridg+saHrhF3WqshPlmWaCQ9d43MEpNI09S/
-WIvYAdjuMRnvoiT+jX0Wt8yWwolxf0G6BWUNeDqCz4qnn06zlAgwELMhkyFW8TTH
-R+QtAvx+HCOxnnd61PX8BcVW5dnCEi/pM3oJdxllGkD1spBtlWFJVG5OZ97QFbEi
-fCWYyW+uEnqfsgw73+jyS51PrfhuT+Oy+oJzvAW95AKLs0tSCq1HSk1U3MnRJpfQ
-QV8hDqpf3linUM6+ni1XUlc2CbwuSmZTanIt/WUdMz/34RJnpWKoOqKMxuO++7Sx
-4RjQcBZtGt+5apS5eB9SgtsPVVnn3KL0/JUumyBpg0oZTEun7AuL9Mbc6oivxsaT
-p8Pm+uiHq7VrYpdNyNPsm/mS4Z0u45wpGDMSXR8ZCnc22SBN0ss7UngwNM9P4MAt
-pv3p44x6k8ggpQkHWQEChw1YnOzke6TsunvBNXG1yCWgCTHb4Q7SbVqqcY5C6eJN
-PlGaVjeSdq7xHIlC5gL37S/deyQ/bc3g0fGXiFPTDlBaHaMUJXBatBjwi5VN8ckK
-FPUUTcOx55ccCTn7BLl11beY7o4ohlyNOxS6citYQaSJbfuh6tMdnb0BOgCydrIe
-HS5CXj1jY51g/RBw8n4b
-=zt3c
------END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
index d42e6887b80b..540c2f1ccbe8 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.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/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.14 2012/11/23 04:53:29 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.15 2013/02/04 01:50:56 heroxbd Exp $
 
 EAPI="4"
 
@@ -72,8 +72,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
 	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
 	sed \
-		-e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" \
-		-i configure || die
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		-e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \
+		-i configure || die "sed on configure failed"
 }
 
 src_configure() {