Enable test, restrict python 2.5, add correct dependencies

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

2 files changed, 38 insertions, 18 deletions

diff --git a/media-sound/beets/ChangeLog b/media-sound/beets/ChangeLog
index 7ee35910dfff..759a940d841c 100644
--- a/media-sound/beets/ChangeLog
+++ b/media-sound/beets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/beets
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/ChangeLog,v 1.6 2012/05/29 20:57:12 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/ChangeLog,v 1.7 2012/05/30 16:48:29 xarthisius Exp $
+
+  30 May 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  beets-1.0_beta14-r1.ebuild:
+  Enable test, restrict python 2.5, add correct dependencies
 
   29 May 2012; Stanislav Ochotnicky <sochotnicky@gentoo.org>
   -beets-1.0_beta14.ebuild, beets-1.0_beta14-r1.ebuild:
diff --git a/media-sound/beets/beets-1.0_beta14-r1.ebuild b/media-sound/beets/beets-1.0_beta14-r1.ebuild
index 53cc8bbbdf5d..cc9efbdf81d5 100644
--- a/media-sound/beets/beets-1.0_beta14-r1.ebuild
+++ b/media-sound/beets/beets-1.0_beta14-r1.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.0_beta14-r1.ebuild,v 1.3 2012/05/29 20:57:12 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.0_beta14-r1.ebuild,v 1.4 2012/05/30 16:48:29 xarthisius Exp $
 
 EAPI="4"
 
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2:2.6"
 PYTHON_USE_WITH="sqlite"
+SUPPORT_PYTHON_ABIS="1"
+#There a few test failures with 2.6, worth investigating
+RESTRICT_PYTHON_ABIS="2.5 3.* 2.7-pypy-*"
 
 inherit distutils
 
 MY_PV=${PV/_beta/b}
-S="${WORKDIR}/${PN}-${MY_PV}"
+MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
-SRC_URI="http://beets.googlecode.com/files/${PN}-${MY_PV}.tar.gz"
+SRC_URI="http://beets.googlecode.com/files/${MY_P}.tar.gz"
 HOMEPAGE="http://beets.radbox.org/"
 
 KEYWORDS="~amd64 ~x86"
@@ -23,18 +24,22 @@ SLOT="0"
 LICENSE="MIT"
 IUSE="chroma doc lastgenre bpd replaygain web"
 
-DEPEND="dev-python/munkres
-		dev-python/python-musicbrainz-ngs
-		dev-python/unidecode
-		media-libs/mutagen
-		chroma? ( dev-python/pyacoustid )
-		lastgenre? ( dev-python/pylast )
-		bpd? ( dev-python/bluelet )
-		replaygain? ( media-sound/rgain )
-		web? ( dev-python/flask )
-		doc? ( dev-python/sphinx )"
+RDEPEND="
+	dev-python/munkres
+	dev-python/python-musicbrainz-ngs
+	dev-python/unidecode
+	media-libs/mutagen
+	chroma? ( dev-python/pyacoustid )
+	lastgenre? ( dev-python/pylast )
+	bpd? ( dev-python/bluelet )
+	replaygain? ( media-sound/rgain )
+	web? ( dev-python/flask )
+	doc? ( dev-python/sphinx )"
 
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	distutils_src_prepare
@@ -53,6 +58,8 @@ src_prepare() {
 				die "Unable to disable $flag plugin "
 		fi
 	done
+
+	use bpd || rm -f test/test_player.py
 }
 
 src_compile() {
@@ -60,8 +67,17 @@ src_compile() {
 	use doc && emake -C docs html
 }
 
+src_test() {
+	cd test
+	testing() {
+		PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" testall.py
+	}
+	python_execute_function testing
+}
+
 src_install() {
 	distutils_src_install
 	doman man/beet.1 man/beetsconfig.5
+
 	use doc && dohtml -r docs/_build/html/
 }