summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-05-31 13:25:49 +0000
committerJustin Lecher <jlec@gentoo.org>2012-05-31 13:25:49 +0000
commit85cae613aa029d05afb40ed4c3f430a5d1aa3ff4 (patch)
tree33f92bf63303839d86fa913b1fadc876ee5ff89c /x11-libs/wxGTK
parentFixing RDEPEND (diff)
downloadhistorical-85cae613aa029d05afb40ed4c3f430a5d1aa3ff4.tar.gz
historical-85cae613aa029d05afb40ed4c3f430a5d1aa3ff4.tar.bz2
historical-85cae613aa029d05afb40ed4c3f430a5d1aa3ff4.zip
Correct searchpath to be sane on prefix without influence on plain installations
Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/wxGTK')
-rw-r--r--x11-libs/wxGTK/ChangeLog6
-rw-r--r--x11-libs/wxGTK/Manifest13
-rw-r--r--x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild5
3 files changed, 16 insertions, 8 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index f78d6e2a06a0..a91eddc84258 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,10 @@
# 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.290 2012/05/29 14:37:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.291 2012/05/31 13:25:49 jlec Exp $
+
+ 31 May 2012; Justin Lecher <jlec@gentoo.org> wxGTK-2.8.12.1.ebuild:
+ Correct searchpath to be sane on prefix without influence on plain
+ installations
29 May 2012; Alexis Ballier <aballier@gentoo.org> wxGTK-2.8.12.1.ebuild:
keyword ~amd64-fbsd
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 370da6bc6dab..46e974631751 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
AUX wxGTK-2.8.10.1-odbc-defines.patch 1341 RMD160 2444b56d28dacf4def2e329419596a491e88f2a2 SHA1 80039dc3e6a796c6fa86088d0c2d6ccda1a3d040 SHA256 db875bf122cac00b1283debe3a92851ec7d91f481198736041bba5e4dce22698
AUX wxGTK-2.8.11-collision.patch 5710 RMD160 fd89803d48791e2900fec6ef4de1db8c650b3cdf SHA1 1a8c83d14fd8035843095cd18ecbc277bd63bf88 SHA256 b4a34748a0e3c8f784d777b197f903de9d681baf12395fa1b8a5d2b2636c9ffe
@@ -16,15 +16,16 @@ DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c35
DIST wxPython-src-2.9.3.1.tar.bz2 49131100 RMD160 cd19b1d07d39c7918c72cf124f4f5cd48836d781 SHA1 0202f64e1e99fb69d22d7be0d38cf7dcf3d80d79 SHA256 7bae5bf45e98eba836472bdb358330f867c69de3a347860edd48fcb53690040d
EBUILD wxGTK-2.8.11.0.ebuild 3608 RMD160 cb4e86a00c05d815764a3e7ca8fc41688489cfd0 SHA1 8045c818037c7a66d6e761421c25e635ab26eb29 SHA256 38c53a310aab6caa9775e2877c1525a9e1273e4f6b7dc2123c8a634f85fbc684
EBUILD wxGTK-2.8.12.0.ebuild 3980 RMD160 b52b831f22077e898b3a24189bf0143f002f6355 SHA1 fbbdfec69e9bfed5313a3cb76fffd2c03e673523 SHA256 85634f081f5dfd59fb2e9e7685dba4ec98befd76266b1527ed0b72ac5386291d
-EBUILD wxGTK-2.8.12.1.ebuild 3921 RMD160 18a49fe96d35de8e79e7655419ef7260cef40dce SHA1 ea6c528ab1567886df2853c10e54a370ff620556 SHA256 c9f1f9e461617cf7f1547405166f7cce3b8173cd5250d8923296e07a95be3f4c
+EBUILD wxGTK-2.8.12.1.ebuild 4000 RMD160 26c02ec89f894b91734dcafcb223861d11b5e497 SHA1 41a00f3b1a351ce8ef42de7e846f9be8b5ad63d1 SHA256 442b1d81767b315e1dfa3af3642ef283447b45fdf0f5e46a3ca92e41ad15573e
EBUILD wxGTK-2.9.1.1.ebuild 4174 RMD160 f374e21f9d2562d8553d3f96d50cf2f845e862b9 SHA1 552fe92efcef4310787a92120ef4003316fbd360 SHA256 aa01ecd93fc3863fe157921abee1f91ba68529e007f37a037dbbe0501871c797
EBUILD wxGTK-2.9.3.1.ebuild 4122 RMD160 1f713cfe15cddf9e71cfe796a1c0be0b6c19ef1f SHA1 91adf8c7c853dc8f2013717fcb019ba19557e844 SHA256 d29f7b3dc974fad6c4253b5ef7c0a207ebb308356b73be0233a12855f2b97e28
-MISC ChangeLog 45462 RMD160 0dd37a00866823abf1f2352b922f60b1a49b1044 SHA1 5c38b2a77aa9fa0acc2133885e53d90a97ec1aa8 SHA256 e0312e0b133fb638249563a414c8cd6210de5ff31a7e0bec7c17bcacaf907d90
+MISC ChangeLog 45614 RMD160 7abce9bb94d671d940f3376a19693f518be25fa2 SHA1 5af9e51454c75a5b5d8ffb961f17df90ad361faa SHA256 4d4dd0a1f9dbd3d5d7e72aba5975977d10f7ee811b8d0f77f0ab09596ef2810f
MISC metadata.xml 670 RMD160 af633c7a38fd8d4fce77e2e05836d38c3ecccf54 SHA1 a463ce81e4784cb35f53a5fb7551a508fa5fce19 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
-iEYEARECAAYFAk/E3z4ACgkQvFcC4BYPU0pFZgCgmMkBv05Ws8fGpwtFbLGriCh8
-/qIAn1dVbO6ynwIIXQcKbBZECAB+FrUH
-=+mGp
+iEYEAREKAAYFAk/HcWIACgkQgAnW8HDreRbaggCeIw00Aq1xBXTs6fPoXSfedajK
+lJQAoJ5quCpHE2vYBhqrbHQN+a3xJN5o
+=bUFQ
-----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 d335c1d008f4..711dd7e7c6cf 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
# 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.10 2012/05/29 14:37:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.11 2012/05/31 13:25:49 jlec Exp $
EAPI="4"
@@ -70,6 +70,9 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
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" \
+ -i configure || die
}
src_configure() {