Enable test, restrict python 2.5, add correct dependencies

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

3 files changed, 55 insertions, 35 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/Manifest b/media-sound/beets/Manifest
index 9de27c1564fb..55c746f6eada 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST beets-1.0b14.tar.gz 500373 RMD160 1d4e9de5f7f8f11f9101c12da2d2469bbc4b2e4c SHA1 6cd4a3eff6fd5f7d340a5dc9ff57647bd23f4720 SHA256 7bb71cdc2e3b6a523fab5d650776643d31b638ff97ad3c36ac34b2e4f92dde5c
-EBUILD beets-1.0_beta14-r1.ebuild 1635 RMD160 6c1909eef98995fab095f70d58c26854cf31ccb5 SHA1 ce241087512415aae19bba18b5ff400b1ef1c4ba SHA256 e50e1c9e1a088ba44d0627f4e6961ccbfbfe4b6a2d79272010c468a7767f82f0
-MISC ChangeLog 1116 RMD160 0b2391bb0c3e8750c2ee89440bd9b1eb1bb647a9 SHA1 0417f83929d1a77b591a8952c91df7beb784bdd3 SHA256 49f9313b5962e96306950145930b74bef6926762eb47cd5fb97f0d59da331255
+EBUILD beets-1.0_beta14-r1.ebuild 1911 RMD160 77401494a8fc4a96a18829668b39534029178a83 SHA1 9b58f271c4e1004b643221764b980014567e800f SHA256 eca0167580bb679a07c51d42f1072ee640d38c6556705904e9852378856ba8b1
+MISC ChangeLog 1261 RMD160 10df7fd4272ec88d6d15f9d095dfab586ffee533 SHA1 841b75ae217e2b5a9cd27add115b636f5b8242f2 SHA256 b8576e395adf14ac2c7ae6690d5feb1e44b05de3fdbd8a052f4c99d528a06600
 MISC metadata.xml 1932 RMD160 0f182eedac3c9c98351e0f2dcdbb7441a9ecf41b SHA1 89244c3634930bc6e5716cf99926c32b34bfcc95 SHA256 3cfff4b6a0d42c75afb04e45a6c190e3f763ba5331e78edef3100eefbdba5209
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPxTgyAAoJELy9dS57CHJBHwAQALeNW2bdENSuYf3lrzqvxYJL
-6DJcs+DqZFvzbjNJLw0apIqd1THJqWOq+Gzh3jhzFDv8+1opj8ptWSYDyX0tPNmf
-RpFg7E8VHs6NPHaKKiyZ++B0lkVLFguJ1z6mV7+tFX3IPJPhmh5DEfQkQeynocd4
-fUwNLmHkoYlTgoY1PlltsbrfHzua1tgWXK7te9IIZuPi/djif+7cLJn8Cg/q2srj
-cih9IxgnFX3d4r/beZADXKEaEcvg1c9F4RE5YtclBILOJywbzz7juEVo9eiRmh0B
-AdWmu97wnhZ9wqgrw6hmZOhumdrToXgn3P1KA4ERWfB+buZYwyoWucSJ1JckNJO2
-3lVJtY/6N+2CZKXaMor/YEJhEzS9/h6sVd+kEYJQe3m40TxepWyx/LMa2SNzhpv4
-7OJq3BFAvJ4I7EpCiHDPIUgREWt4jhr3AcDvBzf+TfjmFd3qUnPbR2ODbM0y4LeL
-laXbCFkQMdGGtKlvZ0h5TtSQ5Ya3uFTA/QPt+XPMDBKbKAXmAJlbxt92lkJSs+kP
-Tr/BRmG4RD4f8iyPcOMJ18T1o1evg25HR+sD/pe2iBiglhaKr2jzZIHSq1jXqA86
-d0iemWxf1t2/MiSCn1OReKV1zYxVHD4iG1+wsmECpXygET2P/94dTvnq2zTXWS8Z
-dEByp08RzwB5trt32lXz
-=2+/x
+iQIcBAEBCAAGBQJPxk9iAAoJEF0huFKJUZL5BUkP/1mhSm8nE4oUKenEJgznHkDH
+XdxUUwrgCoOc39Y60gU5IKgl4SWdPR6YPMYRya1SDrxzW5PoOw/NqTyGeZmcfb/Z
+xW0f3zLH0MIvcFHQRc1Tr5g2LkU5t2StdFC+VMRLEzR+Lx6kWnLE2K2Dc4dHRnRg
+oSxZKPXSgEskZqrm0xC8hOr5Aua1hdYUWXQAzt6GovQEuHunYtlsywRpPNRDL1L0
+8k9LT0Fco3L6KWwiRzMOoPXt060iWL05YvxsZsFQXsyCXvtiCzh/Izk2L9vltj4S
+1cO0Y12ATAV5nfakQB9fOvZQUQgy1QRDYmFpsn0CSeGqVLYUG9YK8GvxVbhYRfwF
+dagi93EY8UijZ5C2C1nCegCgVPf/Nqk4DLy+1otYiGccTT10uLWQ/+vEdeA52jS3
+3qNdxxV3q2mdPcVOHl6YhtuRfFm0umKUkzVln/yoW+WJlxka3n8BqYlmrvj2vAxo
+HPbJ5618xJmnkXbttC5yE8uVvGpSlUfCQcJVnayPy/durUtykMOcUr8jqNeVLZQL
+djOHBoXEphiKZh7LM+c9Ly+ZK8+hT2+GYJ+hojutXrJZjED4Z0q3NIBdC7JYN1/M
+vpJPOE+fI1m5IYa+5nfuVolFm/pa6RW8BQvkqfv7m9P+NXT2lW5fbUZqx/z/ZtK/
+j6I56Bss7dBHJ6LAa9o0
+=licY
 -----END PGP SIGNATURE-----
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/
 }