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

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

2 files changed, 22 insertions, 22 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/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"
 }