summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-09-25 03:49:06 +0000
committerMike Frysinger <vapier@gentoo.org>2012-09-25 03:49:06 +0000
commit28a2bbc3796f0828474b788cf7fcbfe28489cc8d (patch)
tree11e2d0b2fe8173d71f86f46af100f97ce7fec35f /x11-libs/wxGTK
parentRemove old. (diff)
downloadhistorical-28a2bbc3796f0828474b788cf7fcbfe28489cc8d.tar.gz
historical-28a2bbc3796f0828474b788cf7fcbfe28489cc8d.tar.bz2
historical-28a2bbc3796f0828474b788cf7fcbfe28489cc8d.zip
Fix setup of wx_cv_std_libpath #421851 by Xavier Miller.
Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/wxGTK')
-rw-r--r--x11-libs/wxGTK/ChangeLog5
-rw-r--r--x11-libs/wxGTK/Manifest20
-rw-r--r--x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild6
3 files changed, 22 insertions, 9 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 613194c5064e..0cd4277df70c 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.295 2012/09/16 17:07:18 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.296 2012/09/25 03:49:06 vapier Exp $
+
+ 25 Sep 2012; Mike Frysinger <vapier@gentoo.org> wxGTK-2.8.12.1.ebuild:
+ Fix setup of wx_cv_std_libpath #421851 by Xavier Miller.
17 Sep 2012; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.9.3.1.ebuild:
SLOT gstreamer deps.
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index e8dbc3bd5215..f3da34acfb09 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -13,15 +13,25 @@ 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 4001 SHA256 0974eb8593353c307d622108f700e440e9e0731e5efe4b9ad5dedd76e9e64dc7 SHA512 d15241b99ba93626f17bdf4809c63b3da5b08aecf42dd3f2e798dc82b17590b0edd548e5f243dec24d62c23b3d773f114dc449d34370cfaddfef430482b74803 WHIRLPOOL 1002e24127eab8ecd3be63bdb45d23e39af564f5269afc58041c724e53ae67dbb57e43d6f7f721868d82b552004ab8102b5539d5237e03d9591aadf34b42cd14
+EBUILD wxGTK-2.8.12.1.ebuild 4004 SHA256 d52888c999d07ebc01706504413c28bf9245d07b17b89bfe96fedff1a4ceb8ea SHA512 d9614e8aaba6b92e7cf802ec0295018d29203db3a38479a02e3a72ac6f57db03b0e4fc37701f0a2ce5f0bba3e90a8b68ac5290e77e4425f3000a9a0d7daff934 WHIRLPOOL b7f6f8d49a9c883033a188adab27c442bdd0afca00b048b05e3194af1142c93ae69bce381e7b1a9459f412988f939423a7ab07d2340ae808ac7902311f93627d
EBUILD wxGTK-2.9.3.1.ebuild 4121 SHA256 2b1ad8548d1d1ce4b802ffd7f56329cdfb30413261eafcbee9670f8ab704b8c7 SHA512 02131be2fd24b0d518c0820c78f78835238f9f9347a42c78d4d61ded87e6d4866fe1bacf70142f75d6bbc95e18fa162c476201cb7f8397c72e8ace4d44dea01e WHIRLPOOL 702cc97c300ff31dfcc1bbd94ce32fe7a964894b71146348192bede9a5690f05d2d1c5e7537d2a249e3593830de3d1d1da01359990dcfc39b9a94fe9f05518fb
EBUILD wxGTK-2.9.4.1.ebuild 4170 SHA256 d04ce9ad777525f42081af4310343b9b7800294c4dbc219a7f2cd6dc9f8181ec SHA512 6657d9d677bcff171540a2450de13183430bce0af54c192e826836dc0ee19a3b04e99271836dc0a7b88988417e5925d1967fc207d23b4945c6936dbc9012abd0 WHIRLPOOL db117ab6d7414af7b46aa69dcfefe024be490e3be602a7b61dfc61e3527fb7fdcb0751bafa71c80e30365330ee14f58de97483ec98c90e7effa704d4e017c621
-MISC ChangeLog 46280 SHA256 e5d43efa20a649845df036814699efcd4f8c81280fb4b87c9911e9e38ebde1e0 SHA512 b0db8497f4f6dda47b001a20c89478fd7e67e41dcdcea143e35b7e118443200dece45ae55f39bdd787ca0dae3ded36aed37ceed6235c0f6636cc78a37df03299 WHIRLPOOL ea2bf5830659adad2bd2a3f278053562f94c2eadfd2627e48abcc6dd63363de3a2fd8e84825496f2fda0218c345c4dacbb9272fa24904762181d4c5d430e519c
+MISC ChangeLog 46410 SHA256 9f266cb5985105088272c0035f44e14e5f6d9a8ed711f21b881f4f29a5f56e88 SHA512 1939597b2f7447e02b3756c390a966f31d18b6366eb77d002127f07c9219a9990d73a8452702ba6aff803c943d6a8252960e9e2282246bf4f1c89aebf50adbce WHIRLPOOL 5ab3ce72bca70bc329b58eb4f54e07bd25f8a0eb84cc9deb3424e910cde3395553c4257398ba91da18d6ebc4861aa1a865b3c023637eb29e2ce16058f54bb80b
MISC metadata.xml 670 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75 SHA512 37ec56d00b488857a285a61c894f8c28dde61efce48d79b7767a207f5c533ad01f2ef09ebecc98dd5b803b4545e1d7f513ffb48e5ead4818ecb607129339c907 WHIRLPOOL cbcc9d2aea988f0b8e1a0615918903cf332976b192156296051c9f5ac5563e9ab512376453a52ad02db0fe3465b9b30d88d6808e38bea52bb58abe6fed316586
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlBXBuUACgkQiqiDRvmkBmIoPwCfVzBeAERCZlWUAFharO7asIbR
-NUkAoKXGf1ilX4KKXhPcx6YhQTniwdot
-=iuBh
+iQIcBAEBCAAGBQJQYSm+AAoJELEHsLL7fEFWmNoP/3v0UYi9kLteZdMOt/d/OQ+n
+rySHgqNj4lUtPl/RSOcoiuMPl7c3cQLVPEHlEDkmC1TTIBLqVCuEIlR7QuH+tKG4
+ibOtyD/KBmF1oabsasc/3Dy8jfliIzTmc+/3IpBcXsOLPeKa1WjOv4pRf3eHbE0m
+i6GMbdOdOW7AB6z8zsTzrGkDkEEnoU3eZNdhVBW8s5WnhisPgIhusBLkgX/RFwgG
+E3wbSxYaSSEc0oe8mBqLQSQ86omG9O3m53GUv+0SGPLk1EQdIuQogj+MTgZz50vH
+X8s7sqUHkMbrJzdN2VGXANGsLrbPIB1nCOI7d7pRagj8x9Vj1pv/G0eChx1SQn0d
+BG+xF/eNaz1PxZWQS/6l7pMnB6UjrsvQ413rg0JPRyGj8d0XuKuVwsN+qbXja3M/
+4btWn1p+VhWFQxwJEWZmjdVaWSCHj77faNR+sFfb57TcOG9IgfzB102Jad26P8cG
+JSXfBzt/gDzT5SU60gfpCkbl9oT0+6RvBJ0gv293jy+K863jJzwb6H/t//jnuiJ4
+grmmZiAnafoC7cNrKB1TI9SawdhSW1gD9D53W11ZPAUy1HN6XjXNbJWwa6H7kNGK
+LAmjPJcnb9KZPkKXbgwQhZsoXbwBCaNA+qB4oFdlqihQWRtWIKF6MD9RxxRhhUev
+gLK0Ne3wFB+TMvM6Vvgv
+=cwxE
-----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 c20aeeb98d6f..832d2acc88be 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 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.12 2012/09/16 02:54:04 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.13 2012/09/25 03:49:06 vapier Exp $
EAPI="4"
-inherit eutils versionator flag-o-matic
+inherit eutils versionator flag-o-matic multilib
DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
HOMEPAGE="http://wxwidgets.org/"
@@ -71,7 +71,7 @@ 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: /usr: ${EPREFIX}/usr:g" \
+ -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" \
-i configure || die
}