aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-01-21 01:54:34 -0800
committerGregory M. Tuner <gmt@be-evil.net>2014-01-21 01:54:34 -0800
commit5388ae4fe97d3708fdb62f1d7c5bfc2142967d6c (patch)
tree6e02e076be189997933a7ce2b950d4705cd9b9f6 /dev-python
parentdev-lang/python:2.7: bump to EAPI5 for future-proof python-multilib-utils-r1 ... (diff)
downloadgmt-5388ae4fe97d3708fdb62f1d7c5bfc2142967d6c.tar.gz
gmt-5388ae4fe97d3708fdb62f1d7c5bfc2142967d6c.tar.bz2
gmt-5388ae4fe97d3708fdb62f1d7c5bfc2142967d6c.zip
dev-python/PyQt4: multilib pyconfig.h finding
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/PyQt4/Manifest3
-rw-r--r--dev-python/PyQt4/PyQt4-4.10.3-r3.ebuild (renamed from dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild)15
2 files changed, 14 insertions, 4 deletions
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 45fe785..25456fb 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,5 +1,6 @@
AUX PyQt4-4.7.3-qreal_float_support.patch 5954 SHA256 e2f86905d0d648eda5bebf50b165120bcb0f4c83e99742eeb2ed17568a6429ec SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2 WHIRLPOOL 83f8c3d00fb92099414a03492d40ddbee362e53be75b180f3842980e0dec69e1a3094e3ea7d951140de028e75c36acb040ca159d710c4a20d20da9c04e6a31dd
DIST PyQt-x11-gpl-4.10.3.tar.gz 11187362 SHA256 a713bebef394213b2c9e1fe0cad5699b869dc356bba50766e069013eba8bf630 SHA512 4edd3539e1855bc3358dcba866433e53d4b9444b867c14cc27115cf5a6c123b0af3bb0bae3085f6d71a31f0b6716da40809ac4ffcaaff415673ed7462f1a0420 WHIRLPOOL 675e324993e8f9a3b2a0a8975c9f1e2af9cd315073a68e6649a8de04e8e8a905d756be2c138a8c19b4ec16a75c7b118b32a3ffc27f8399953599a1b88ac76fad
-EBUILD PyQt4-4.10.3-r2.ebuild 5569 SHA256 6f4c8a2a7cca1faf4839c3af40028144c685c3bb8aa3dfadf40681eddf1005c7 SHA512 bac8501d9a8e7947ddf8cddb7d5b5057828601e95420e4c693a3fb6c6b5ca0bf6fd5f5df7b5831ff8de924e26cd1916293582a2d17b389ea468c3b86b66aef67 WHIRLPOOL 30b7b8627b6801035b541933e0156615ef777ded432ecf0c2541ec4db605b263d495e5fbc1638c553a9b01c4af165667bcc063787ced5c7be6a1ce2542b29b79
+EBUILD PyQt4-4.10.3-r3.ebuild 6053 SHA256 2311d79602689a43edee913135a3499d0c41305dea56219fd7586570ad47ed9e SHA512 47713b7f3fac37e45ff5d17a6f5bfe874ec20a2395e9286f7e7b189914a5236320e6e2b896387c371bc84b772cd851d52d58706086ed6c3f7361016499330847 WHIRLPOOL ec077f0eaa2c2f3d2c0ecf67f83f1a954d59b163e0045cc302a5dcb31d370ad08294a975e91c0d5171bdfdbf959c10b75cbf8f688b96e80a21231a4d71618acb
+EBUILD PyQt4-4.10.3-r4.ebuild 5882 SHA256 f2931a1660602b75594752a5f1338d5054c2aa0882e1bbf535ec8710a65ecd2d SHA512 9a87a6324aec676b217f7442030d5d53735f6303f41a0dfdd0c64349fae78811bed8be3fb275b109a43285e55f2ecf53295c84965223d0a289b751273f7e1f09 WHIRLPOOL 01c1268fb695295fc55b7df86fadf34481efac017f685b20cd6f780eaae95a7a83dd1f423d5993c87a487f27dea3313c58ada54b8d241d0b925166d2e6608d38
MISC ChangeLog 34292 SHA256 6917bb71bd9f2a9ea7f0ea5b63922924bfe6f4f4dc0382ae2051b0bf36802f42 SHA512 76e22a28f43a882a7002a11046e45d3ee7efb81800ec48d271ea943eba96f04c3d3cf5441461d7b520ec6c852298a3186a38982fd00395c65901b04d4ddebcb6 WHIRLPOOL d634fce36da5b5e8553719f595a2c46d6a837efd321bb0059dd7aa3ce9e934313787d64c2d9021f5c6e6512892c84362194f1c80d9d9dfae22511694e234310c
MISC metadata.xml 1226 SHA256 546a210961a96d0a0872aa993643899a2becaf81a6c90f6eeb7cdab789f8e2f7 SHA512 f7cbfc11447e1ec407fce921e9dcc44a6a49f013fdce380d43845e15ea45ea88963f8c0a672fa77eeb1b3f2271477c0c740d81ec4c0061cf5f5b2e9d053ca035 WHIRLPOOL fd601eb093c494fcf0730d858a44f30e36403d1f9e046f5671c6ede591d617015ff05c4d8d014be767334daa81497e1bafc0960db50c1380d683324a884f62dc
diff --git a/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild b/dev-python/PyQt4/PyQt4-4.10.3-r3.ebuild
index d7dfae5..28b7bbe 100644
--- a/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.10.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild,v 1.1 2013/12/25 21:00:36 pesa Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -106,6 +106,8 @@ pyqt4_use_enable() {
src_configure() {
configuration() {
+ local CFLAGS="${CFLAGS} $(python_get_CFLAGS)" CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
+ export CFLAGS CXXFLAGS
local myconf=(
"${PYTHON}" configure.py
--confirm-license
@@ -180,11 +182,18 @@ src_configure() {
}
src_compile() {
- python_foreach_impl run_in_build_dir default
+ compilation() {
+ local CFLAGS="${CFLAGS} $(python_get_CFLAGS)" CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
+ export CFLAGS CXXFLAGS
+ default
+ }
+ python_foreach_impl run_in_build_dir compilation
}
src_install() {
installation() {
+ local CFLAGS="${CFLAGS} $(python_get_CFLAGS)" CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
+ export CFLAGS CXXFLAGS
# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
mkdir -p "${ED}"/usr/lib/python-exec/${EPYTHON} || die