revbump, drop old, add missing dep, conversion -> distutils-r1, rm code re tests since test restricted (see comment), fixes Bug #514354

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

3 files changed, 28 insertions, 38 deletions

diff --git a/dev-python/pydvdread/ChangeLog b/dev-python/pydvdread/ChangeLog
index e8131f88ea17..c77a7191d78e 100644
--- a/dev-python/pydvdread/ChangeLog
+++ b/dev-python/pydvdread/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pydvdread
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pydvdread/ChangeLog,v 1.1 2012/12/31 08:30:05 vapier Exp $
+# 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 $
+
+*pydvdread-1.0-r1 (02 Jul 2014)
+
+  02 Jul 2014; Ian Delaney <idella4@gentoo.org> +pydvdread-1.0-r1.ebuild,
+  -pydvdread-1.0.ebuild:
+  revbump, drop old, add missing dep, conversion -> distutils-r1, rm code re
+  tests since test restricted (see comment), fixes Bug #514354
 
 *pydvdread-1.0 (31 Dec 2012)
 
diff --git a/dev-python/pydvdread/Manifest b/dev-python/pydvdread/Manifest
index fc43f55efcb9..54728251ff96 100644
--- a/dev-python/pydvdread/Manifest
+++ b/dev-python/pydvdread/Manifest
@@ -4,23 +4,13 @@ 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.ebuild 1452 SHA256 dd360a85c226e78e7fd3179f4c3b3292b5532678521fe3d4366592cfbbd6a7d5 SHA512 eb40731ff954be6d68c7be9df75777ec990801248ce388def1597191c51de6eb05e30b0005bce0e476f93054adb0fff09b3ffe15ef9aae6a1217ecef05b7ba63 WHIRLPOOL 20d355775d66fb12f4e54a32c62d16b0d83e72684337ba3774797a6879d40daba148e0b19c1d2911dd91cf86e810509476cbbec12d40d97b3c897de09eaff359
-MISC ChangeLog 431 SHA256 8e4eb0dfd6b8fb3cd6eafdd73aa9a6ff76cdb8f99f7cdd2ed6015b2587a8f82d SHA512 4bbc06be24de110770d374741a9257e6d75be3f366aa6f5e36ffb4c1016adb4e05f674f6bbca8719c23ffd6fad63cc94e268a68e7f10807abce67e7acf1e9501 WHIRLPOOL 6c98c8202c78c8455b4cb93b810b509b4d108ccafcc322f49fa6f191fcb3d8b9233cf59abb418a6d3a4b11eb27952e91b7354ae60bd1bca7786c7cfbce7b663b
+EBUILD pydvdread-1.0-r1.ebuild 1252 SHA256 afdb0ca0dc9010c20e94caa8376bd0a4d66f91d0bdbfc3fa8a02361e83e2b648 SHA512 86b0cab0ff5d365df69478be3972f00eb4736e90f4eec99f7f57b11970df3d38157202bd3f2b7a95b6e2cff608700fe52e2749706e99ea667b9997d6c181a678 WHIRLPOOL 923a3d5f658da459358a852af72cc90939ca3f618c5c1ce1b993b8b28056296945147f27a00ba1edea883f75a696fe8b261984b8d9123ac21c1fa77a68f9ac30
+MISC ChangeLog 705 SHA256 78c87b7c724f88b17cf4954c06c61de6c777e1a2376f9a757d7c005bebbadcfa SHA512 c7a54e9bad1c4b2dbb4273901121e2ac0229f483ac8e1fad5b69ae0ba3887f0dce935c6a68dc6f5a080fe178c349b13ebc385dd1be6952a4b893bb68dc9c4f75 WHIRLPOOL 8a5397acabe61fa417444f5de5088dfab77a32043254532bc9a4cf914c83fdf16078e4db5f475119b2d82eac73c080d4414647b50f2c013537a78f72b6d8fc33
 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ4U1jAAoJELEHsLL7fEFWIK4P/04u/qABAcHzhAfZLGAMdkR7
-vcZMtVdu/EOPevYSTwgqcBAU6bC1tzyCHwnuUd8AU91JcfDFaJP/b61me5Der9Vn
-rWiwoDiPF10xVYsvVr5Y38O62FmwMD8LVe5eznPZgyKTybPalTbyoppqrrTDc8VE
-HoHxRG/4xeWD4koXmVdDs29JSv4envrzLg/ynvEw6NWoHPey7NfPCgV4mrWMf3PO
-gHnk2GJVuchjSSDffOn7J3kMOZWec4ZXynQKDqhKC/rap0HiI3b3n3TU6aNSkKjk
-YgFU0Gtg0nwVMDBvHxVcKCOQc6ouZYRtbMn/Ln/vTOixfzvSOvn/J5bVbR7CcPvo
-WiVNzQ+bAa6qEFTYVpFutkqnXoTB+ym3n/FeDyA/0J0C8YEBdBpfy/NJglOMKc38
-nr2qlZqKnh9VfZP8OsBRBOStI4/vOrejXFcDKI8d1C++T579xeD9baHrbah7hrki
-Gg89Y5H27uw8Lze4zz36AUDZ53oZ8W4IGviT93KXiQ5nzij1pCVIyLtlOf8iI6ze
-dqAQv8U73wkdDyZbbrdiRby49OfD69QpFq77wMI7ISUNcHb1NYAoxesc5sloj8Ai
-xwce5YC6qMDeKWPP96OSGmael6rTuq5Bhk193vL6B7buGXwTPNR4qKP/vIUZSQ81
-+1an5maGG6ue5sjFZ3Bi
-=2GDy
+iEYEAREIAAYFAlOzdGUACgkQso7CE7gHKw3hdgCfT/bhXQlbZvSeMPgbXZg1hR3X
+eToAn1Z2NNRJTYFnpatsO6GPPqCN88uY
+=AMqr
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pydvdread/pydvdread-1.0.ebuild b/dev-python/pydvdread/pydvdread-1.0-r1.ebuild
index 98933f085d36..8a563f9b4b8f 100644
--- a/dev-python/pydvdread/pydvdread-1.0.ebuild
+++ b/dev-python/pydvdread/pydvdread-1.0-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pydvdread/pydvdread-1.0.ebuild,v 1.1 2012/12/31 08:30:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pydvdread/pydvdread-1.0-r1.ebuild,v 1.1 2014/07/02 03:02:40 idella4 Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
 
-inherit distutils eutils
+inherit distutils-r1
 
 DESCRIPTION="A set of Python bindings for the libdvdread library"
 HOMEPAGE="http://pydvdread.sourceforge.net/"
@@ -18,15 +17,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
 IUSE=""
 RESTRICT="test" # Requires an actual DVD to test.
 
-DEPEND="media-libs/libdvdread"
-RDEPEND="${DEPEND}"
+DEPEND="media-libs/libdvdread
+		dev-lang/swig"
+RDEPEND=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-py3k.patch
-	epatch "${FILESDIR}"/${P}-api-update.patch
-	sed -i '/assert_(isinstance(.*, int))/s:int))$:(int, long))):' tests/*.py || die
-	distutils_src_prepare
-}
+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
@@ -35,12 +31,9 @@ src_compile() {
 	set -- swig -python -o src/dvdread/all_wrap.c src/dvdread/all.i
 	echo "$@"
 	"$@"  || die
-	distutils_src_compile
+	distutils-r1_src_compile
 }
 
-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" tests/TestAll.py -q
-	}
-	python_execute_function testing
+python_test() {
+	"$(PYTHON)" tests/TestAll.py || die "Tests failed"
 }