Fix python_test() to reference PYTHON properly. Remove redundant swig call.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 26 insertions, 21 deletions

diff --git a/dev-python/pydvdread/ChangeLog b/dev-python/pydvdread/ChangeLog
index c77a7191d78e..c4152878d97f 100644
--- a/dev-python/pydvdread/ChangeLog
+++ b/dev-python/pydvdread/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pydvdread
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pydvdread/ChangeLog,v 1.2 2014/07/02 03:02:40 idella4 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pydvdread/ChangeLog,v 1.3 2015/01/01 23:13:51 mgorny Exp $
+
+  01 Jan 2015; Michał Górny <mgorny@gentoo.org> pydvdread-1.0-r1.ebuild:
+  Fix python_test() to reference PYTHON properly. Remove redundant swig call.
 
 *pydvdread-1.0-r1 (02 Jul 2014)
 
diff --git a/dev-python/pydvdread/Manifest b/dev-python/pydvdread/Manifest
index 54728251ff96..1b8bbce8d014 100644
--- a/dev-python/pydvdread/Manifest
+++ b/dev-python/pydvdread/Manifest
@@ -4,13 +4,25 @@ Hash: SHA256
 AUX pydvdread-1.0-api-update.patch 9032 SHA256 c64f8c1bd346c9bece1bee0958f0d54f90799a78678e4191de0e5d7f56a65f2c SHA512 52456ce0a3b7503de4f70d0fd6b8f03cc1cc91db348dbeb41d62c246773e280869149bed30e763ecb0a4ac57413369a1a269669977a5e8465ba56be5b0536be2 WHIRLPOOL 02b233e6fd5545c34a480ff7b0092f355e49831dd73271be8a36c8155ad6d8d5ce92281906838214abcf006adf2ff02681e6aba69735261da416e9660245da02
 AUX pydvdread-1.0-py3k.patch 790 SHA256 a277e81d5ed0c7ff633daee5de4c0bba6aaf7599a5374e6c38228cc9491e0fb0 SHA512 82f8721dc618d79a0684353011a714144143d836fe742878003cfcc122fe171f1c3e11d340bbf3e9a778160a351df50ffb68b0cc858244babcf81e8595690236 WHIRLPOOL 94791a0269391940748dac2ffa7781c0736978193cb89987c137909cf4b50e45e03867afd73df8d043636e8356e24c486ad47286b8ab5cf6ff62c7ca453dd2dc
 DIST pydvdread-1.0.tar.bz2 62072 SHA256 aae9a0ad1ab4d218a52cc7cffcbbeb9c3e59f4f4286acc36d02d46f3e0b31cb2 SHA512 1d403e1b9538113bb5ab1a808147691b806ee57db3fa30f704a0fcb1dbb8e9155e470dc2fbb895788af59c2952d637a2853d613f0619deb5daf07d2e7b675eee WHIRLPOOL 5c65a36b90f68b2e72f3900954a90b99fc51ea3e70f70e06ecba9a2ee172f51f3972f4c96b240954360e85b5a8d338f1039c7e3ed279d4f20b8edc5ecff4ba3e
-EBUILD pydvdread-1.0-r1.ebuild 1252 SHA256 afdb0ca0dc9010c20e94caa8376bd0a4d66f91d0bdbfc3fa8a02361e83e2b648 SHA512 86b0cab0ff5d365df69478be3972f00eb4736e90f4eec99f7f57b11970df3d38157202bd3f2b7a95b6e2cff608700fe52e2749706e99ea667b9997d6c181a678 WHIRLPOOL 923a3d5f658da459358a852af72cc90939ca3f618c5c1ce1b993b8b28056296945147f27a00ba1edea883f75a696fe8b261984b8d9123ac21c1fa77a68f9ac30
-MISC ChangeLog 705 SHA256 78c87b7c724f88b17cf4954c06c61de6c777e1a2376f9a757d7c005bebbadcfa SHA512 c7a54e9bad1c4b2dbb4273901121e2ac0229f483ac8e1fad5b69ae0ba3887f0dce935c6a68dc6f5a080fe178c349b13ebc385dd1be6952a4b893bb68dc9c4f75 WHIRLPOOL 8a5397acabe61fa417444f5de5088dfab77a32043254532bc9a4cf914c83fdf16078e4db5f475119b2d82eac73c080d4414647b50f2c013537a78f72b6d8fc33
+EBUILD pydvdread-1.0-r1.ebuild 951 SHA256 a70e5557b092a4276f3ceb2c40d8b37944379ff12a4b0f5323b3d81feecd0387 SHA512 436ca493794920c0509de1a80abec6c61d0b5c5773493dd0e3015f1412935f20ce5fdc3309f67134b9f52c5ac03d25bc103a9d674f554b276e1e1e4188214f88 WHIRLPOOL c4d105b9a4d5050a748184ed58a1ea908ca15ebc46d7b9cb36f1dc69192cd17d763a397c5739d178d5a333cc291e0060e3d6e635a6dc6c76e0531dbeba9a552f
+MISC ChangeLog 858 SHA256 ddc1af9251121a90bf01ddac2521f5dac3f3eaeb60ecc95d39e322e9a3139542 SHA512 d6e59e615a7b228c97ec673bba4c4dce8bde023fd9eea8fadeb13534e30014657e93ce2e649248ad9999a7464f51457fec7166b5a5b4ec729bed3a5c3ff4f6e9 WHIRLPOOL d59d761df356c2fa94e5e03eb24e57459b03dec4ab56cf5e4fd835abf72d33791a376ae612d2f175db58c4645b799322f53d0782b229edb30819f6615d92764e
 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOzdGUACgkQso7CE7gHKw3hdgCfT/bhXQlbZvSeMPgbXZg1hR3X
-eToAn1Z2NNRJTYFnpatsO6GPPqCN88uY
-=AMqr
+iQJ8BAEBCABmBQJUpdSwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOR4EQAMLv33q4RBDXXZ/bRXFMjkLS
+5ACU6SjxyozFoKLWHJIeGoLUQumsFpoZkhwppGl80JVgMO9eDDd4VxxJRZsU9dmC
+gy76b0GYMXH+o6zp2j3kesRKxcYE6gC/WcvfPQ3RNf0NsWnER+t/3rpQY+2lLflC
+eXu7nCjgOhHoMrZueFxnuKLSLGPVxCKFAYXWkzqJ/eRwMnLxXNFhAjAany2bNzYt
+DnyBPMXDaTjoGaehrCk5INg7daWv7gM/m+cLIWRt3PCN4li+nF67yI4vP/bO4Evm
+WW/JYjhCMqwYyOV7XwxDQy1Y0nHriNgbQFYuurFfYdsEHR6AU0G6B2I5UBck2AQv
+WYvyHtTKraThsinBvNDsvQnnWd94g6gQmYE9Q6V35FH5fQHlCDfKOSWVSuP7sW4a
+BFfA99QwUiQn+hTYIOcqKp19BtsLMO5Nq028MZc2QmuGdjkEKppxoAdOnTklsBrL
+MSwPKBVBt7hjiwe50YutscPTnh4+Bpca/8Kvw10+xelERK6aSztwYCx5IuxR1lsK
+gNrzjMBJEWQlK7619NcevbeeaUlsfHclmNPvF6KmRfprUSxHU+hds543LPcS9spW
+4G7mJoDEpnm9tc6eQl7UH9soKuc6rioilGdStSJs+xquAw720lEv++RnqfNt2oxd
+veflGkI3N6Rqw8YIzH/s
+=jZkz
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pydvdread/pydvdread-1.0-r1.ebuild b/dev-python/pydvdread/pydvdread-1.0-r1.ebuild
index 8a563f9b4b8f..8d89ced0fe15 100644
--- a/dev-python/pydvdread/pydvdread-1.0-r1.ebuild
+++ b/dev-python/pydvdread/pydvdread-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pydvdread/pydvdread-1.0-r1.ebuild,v 1.1 2014/07/02 03:02:40 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pydvdread/pydvdread-1.0-r1.ebuild,v 1.2 2015/01/01 23:13:51 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 pypy )
@@ -24,16 +24,6 @@ RDEPEND=""
 PATCHES=( "${FILESDIR}"/${P}-py3k.patch \
 		"${FILESDIR}"/${P}-api-update.patch )
 
-src_compile() {
-	# We had to patch some of the .i files, so regen the .py
-	# so that the distutils copy doesn't import old stuff.
-	# XXX: A python/swig expert might know a better way to do this.
-	set -- swig -python -o src/dvdread/all_wrap.c src/dvdread/all.i
-	echo "$@"
-	"$@"  || die
-	distutils-r1_src_compile
-}
-
 python_test() {
-	"$(PYTHON)" tests/TestAll.py || die "Tests failed"
+	"${PYTHON}" tests/TestAll.py || die "Tests fail with ${EPYTHON}"
 }