Annotate the WAF_BINARY setting thanks to Alexander Patrakov and cleanup src_test. Bug 447856.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 17 insertions, 23 deletions

diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog
index 5bf973f24330..e130972f4c1f 100644
--- a/dev-python/pycairo/ChangeLog
+++ b/dev-python/pycairo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pycairo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.123 2013/01/03 15:37:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.124 2013/01/05 06:47:36 floppym Exp $
+
+  05 Jan 2013; Mike Gilbert <floppym@gentoo.org> pycairo-1.10.0-r3.ebuild:
+  Annotate the WAF_BINARY setting thanks to Alexander Patrakov and cleanup
+  src_test. Bug 447856.
 
   04 Jan 2013; Ian Delaney <idella4@gentoo.org> pycairo-1.10.0-r3.ebuild:
   Restricting pypy, its capacity to run the testsuite totally broken by the last
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index f39d7d0c96b7..ca1113c4c97f 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -12,14 +12,14 @@ DIST py2cairo-1.10.0.tar.bz2 402070 SHA256 d30439f06c2ec1a39e27464c6c828b6eface3
 DIST py2cairo-1.8.10.tar.gz 588459 SHA256 b15f71019e42e06d86f7e8fe5587f07c3de5a59a6c3a071b25fe100796dbcd56 SHA512 d08cf2fa03034fea8a3abad6fd60c9ca5b717bfd8322a3b584e8bb4003925516a6259d317986d2ff14b8e9356ccdb887a5ff7a50f2c341f120e8643c958bccd4 WHIRLPOOL 2261d70c63d9b6d1935cf5f5adac2a03adaac016a6cf41a4974b0ad1a481f060fb0ec5ee6f6d05c219f097caad40c5df8117750404f45740c52ebccb5d16b223
 DIST pycairo-1.10.0.tar.bz2 246556 SHA256 9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be SHA512 a03db6f04cea504985f390b0734042390f491f32ae2bee1299dabbafd369fde36bb506ebb941d22bbc11b0d008c4f758baeacf309a7336880529455092db829f WHIRLPOOL e779d56d67ef18bbd052d81acb38d8b610ca4bbf787f4b0e3982633de55ff54d6dfa3e5ce1957321fba09f0ec2d12ce12057335de9d5ff3f84c2bc0530415e76
 EBUILD pycairo-1.10.0-r2.ebuild 3384 SHA256 19035d0dbde8c82fd1e75b12811e758159b3fde619882559012b1a8dd96447a1 SHA512 43f6b5bc7d896506da111759a5a0c235f5528fa80c217fafd98451cd9544fc697d6ed3deff144113faf214711702fbcfee478677d8c4928326a9f0d1d367f5c2 WHIRLPOOL 7a8ca48f4ac75976f2a915530df8e7e6652d0913c7a9f6fc1654b1ce6fea4a331002995474bbc75a100c44b905002e96a75b0a7603f820bf7e269ee8edd73470
-EBUILD pycairo-1.10.0-r3.ebuild 4264 SHA256 4bf1a0e74034b0e77b3c529ec84455d0660fd9e308780e5ca538dbdd6a0ee1c2 SHA512 424058504a8f4a2766837f81ffc789e05a89d8b77b73e102e963fe972da67a32a46a061aa2a438cd3fb6541febcfea14bfab6faf63b5649fd2146e1b09814f4f WHIRLPOOL f91e308e9d08f6bbb4285075cd4ecb9cae1540b3e9174b3279add0d69da390d535e2b11eca903204ec0c066e396bfa5bc4edf6fb75d4b6cc5b3d0b796c64af6f
+EBUILD pycairo-1.10.0-r3.ebuild 3835 SHA256 4ee7581dc3bd277ae7d5cd0a053e6c0adda5c345dcdd2078552d6850a2016815 SHA512 45ce2ad2ff082d38b4faf9ee4b8f5196a5db4109a06df6b7fd90e0fa2cf309a250df94f95232a4cb66a25ab2fcd3c44b47c11543842d22401fc271612fff7522 WHIRLPOOL 2901b184e451aa9b8dc0171ea7637307747a8367a82dc2e54ffa7cd8177286a7912b415fd321cf0fa0c9376a51629042d62697204e2efede2bfd0dd412a3407f
 EBUILD pycairo-1.8.10.ebuild 2245 SHA256 5d0dce859b216113d97a65875b13e2a2346e6ae0aa2f2f08d3f46d5438bfa90d SHA512 f39c3170add58e0bbac59ee33fe1c0ee30f1d34314dc68d9311ea5559d5a34a13e2ab85b58adc611cfde971ac8e24408e4df5dfc5d1d19dc19aa65f8a0fc54d0 WHIRLPOOL d763f2e72f24408636906822ce0b701554ac581851be15fe1832412d7ac531fbb3a36a60cccc3aa724c06548b623823fce8cec89f655682a67c4aa646b5a4c50
-MISC ChangeLog 16427 SHA256 48dfcf9f96a45497695a4bd9d48fac93442d786fa1a28fddc1bdd935d22248f6 SHA512 7f81beba02988e34e91c720d8c59ddb4b198ae88322951eae4832c4be98bd0c30b408e0d29bf8dc32eebdc2532cffa178be5bf0630513370fd56b25def56cef0 WHIRLPOOL c808d4ff30310ffd7294d8a35cfbc19501b2c8484e52fe1f6d0457e125ec81ecefd365e4c3eeefede8291b0fac959b13c39c9071d553a4583356b98ea3eb0907
+MISC ChangeLog 16602 SHA256 d1217444a569f9624c6b5ddc9dcbaef83872d10b4fa2f4d07f902df7a8a7ca50 SHA512 433e1f4b5a7216728d98063ae2ac4b8492a23ccb17abfd76e1f0005b33e2ab4d6a186217791749e91935ba15e8f9ddbd13a52557deab2c40fe62926cad32f40b WHIRLPOOL 0cea107844c41b81c8e3ff5bd04ad39fcefe939767da044da9b67aa7d93d7a9eb16e5b4077d1157ff38fd96f013b39cc5f6363df0bed5b4e6601c20bcd26d46c
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDmhmAACgkQso7CE7gHKw33zACgsWG6fMgCDdtrC+jpYswqIU44
-jGUAnRJWMAdzMYgry9KwCxu73kgtkIGi
-=uUBm
+iF4EAREIAAYFAlDnzI0ACgkQC77qH+pIQ6ST0gD5Af610VRv2O9H4D8tFyfIu8lQ
+B95uL4gJVFVPu/CFsZ8BAKO9DYMPmv2DXqkW+VfdBLh/oRA6EeGD9BtWbjPWDgqX
+=X8Kg
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycairo/pycairo-1.10.0-r3.ebuild b/dev-python/pycairo/pycairo-1.10.0-r3.ebuild
index 97fc09b2b6c9..791c584ed305 100644
--- a/dev-python/pycairo/pycairo-1.10.0-r3.ebuild
+++ b/dev-python/pycairo/pycairo-1.10.0-r3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r3.ebuild,v 1.12 2013/01/03 15:37:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r3.ebuild,v 1.13 2013/01/05 06:47:36 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6 3:3.1"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.0 *-jython 2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="2.5 3.0 *-jython *-pypy-*"
 
 inherit eutils python waf-utils
 
@@ -67,9 +67,13 @@ src_configure() {
 		export PYCAIRO_DISABLE_XPYB=1
 	fi
 
+	# Added by grobian:
 	# If WAF_BINARY is an absolute path, the configure is different and fails to
 	# find Python.h due to a compiler misconfiguration.  If WAF_BINARY is just
 	# ./waf or python waf, it works fine.  Hooray for reinvented buildsystems
+
+	# floppym:
+	# pycairo and py2cairo bundle different versions of waf (bug 447856)
 	WAF_BINARY="./waf"
 	python_execute_function -s waf-utils_src_configure --nopyc --nopyo
 }
@@ -84,21 +88,7 @@ src_test() {
 	}
 	python_execute_function -q -s test_installation
 
-	testing() {
-		# Need a variable for the pypy minor version and a variable to set 2 distinct pythonpaths
-		local pypy_v= PyPath= exit_status=0
-		pypy_v=$(python_get_version)
-		if [[ "${PYTHON_ABI:4:4}" == "pypy" ]]; then
-			PyPath=$(find "${T}"/tests/2.7-pypy-$pypy_v/ -name site-packages)
-			PYTHONPATH="${PyPath}" py.test-${PYTHON_ABI} "${WORKDIR}/${P}-${PYTHON_ABI}"/test || exit_status=1
-		else
-			PyPath="${T}/tests/${PYTHON_ABI}${EPREFIX}"$(python_get_sitedir)
-			PYTHONPATH="${PyPath}" py.test "${WORKDIR}/${P}-${PYTHON_ABI}"/test || exit_status=1
-		fi
-
-		return $exit_status
-	}
-	python_execute_function testing
+	python_execute_py.test -P '${T}/tests/${PYTHON_ABI}${EPREFIX}$(python_get_sitedir)' -s
 }
 
 src_install() {