Fix dependencies for #504534 and #504534, add related use flags to

metadata. Cleanup unused older ebuilds.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 7B087241)

5 files changed, 22 insertions, 165 deletions

diff --git a/media-sound/beets/ChangeLog b/media-sound/beets/ChangeLog
index bf115b8ea240..419b3950df0f 100644
--- a/media-sound/beets/ChangeLog
+++ b/media-sound/beets/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/beets
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/ChangeLog,v 1.21 2014/05/05 20:49:59 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/ChangeLog,v 1.22 2014/05/13 16:48:34 sochotnicky Exp $
+
+*beets-1.3.3-r1 (13 May 2014)
+
+  13 May 2014; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  -beets-1.1.0.ebuild, -beets-1.3.1.ebuild, -beets-1.3.2.ebuild,
+  +beets-1.3.3-r1.ebuild, metadata.xml:
+  Fix dependencies for #504534 and #504534, add related use flags to
+  metadata. Cleanup unused older ebuilds.
 
   05 May 2014; Stanislav Ochotnicky <sochotnicky@gentoo.org> metadata.xml:
   Fix a typo in metadata
diff --git a/media-sound/beets/beets-1.1.0.ebuild b/media-sound/beets/beets-1.1.0.ebuild
deleted file mode 100644
index 201279d6dc1f..000000000000
--- a/media-sound/beets/beets-1.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.1.0.ebuild,v 1.3 2014/01/25 15:59:21 kensington Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 eutils
-
-MY_PV=${PV/_beta/-beta.}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
-SRC_URI="http://beets.googlecode.com/files/${MY_P}.tar.gz"
-HOMEPAGE="http://beets.radbox.org/"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="MIT"
-IUSE="bpd chroma convert doc echonest_tempo lastgenre replaygain test web"
-
-RDEPEND="
-	dev-python/munkres[${PYTHON_USEDEP}]
-	>=dev-python/python-musicbrainz-ngs-0.3[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.21[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	bpd? ( dev-python/bluelet[${PYTHON_USEDEP}] )
-	chroma? ( dev-python/pyacoustid[${PYTHON_USEDEP}] )
-	convert? ( media-video/ffmpeg:0[encode] )
-	doc? ( dev-python/sphinx )
-	echonest_tempo? ( dev-python/pyechonest[${PYTHON_USEDEP}] )
-	lastgenre? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	replaygain? ( || ( media-sound/mp3gain media-sound/aacgain ) )
-	web? ( dev-python/flask[${PYTHON_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# remove plugins that do not have appropriate dependencies installed
-	for flag in bpd chroma convert echonest_tempo lastgenre replaygain web;do
-		if ! use $flag ; then
-			rm -r beetsplug/$flag* || \
-				die "Unable to remove $flag plugin"
-		fi
-	done
-
-	for flag in bpd lastgenre web;do
-		if ! use $flag ; then
-			sed -i "s:'beetsplug.$flag',::" setup.py || \
-				die "Unable to disable $flag plugin "
-		fi
-	done
-
-	use bpd || rm -f test/test_player.py
-
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd test
-	"${PYTHON}" testall.py || die "Testsuite failed"
-}
-
-python_install_all() {
-	doman man/beet.1 man/beetsconfig.5
-
-	use doc && dohtml -r docs/_build/html/
-}
diff --git a/media-sound/beets/beets-1.3.2.ebuild b/media-sound/beets/beets-1.3.2.ebuild
deleted file mode 100644
index d30da19e4477..000000000000
--- a/media-sound/beets/beets-1.3.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.3.2.ebuild,v 1.2 2014/01/25 15:59:21 kensington Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 eutils
-
-MY_PV=${PV/_beta/-beta.}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beets.radbox.org/ http://pypi.python.org/pypi/beets"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="MIT"
-IUSE="beatport bpd chroma convert doc discogs echonest_tempo lastgenre replaygain test web"
-
-RDEPEND="
-	dev-python/munkres[${PYTHON_USEDEP}]
-	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.22[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	beatport? ( dev-python/requests[${PYTHON_USEDEP}] )
-	bpd? ( dev-python/bluelet[${PYTHON_USEDEP}] )
-	chroma? ( dev-python/pyacoustid[${PYTHON_USEDEP}] )
-	convert? ( media-video/ffmpeg:0[encode] )
-	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx )
-	echonest_tempo? ( dev-python/pyechonest[${PYTHON_USEDEP}] )
-	lastgenre? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	replaygain? ( || ( media-sound/mp3gain media-sound/aacgain ) )
-	web? ( dev-python/flask[${PYTHON_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# remove plugins that do not have appropriate dependencies installed
-	for flag in beatport bpd chroma convert discogs echonest_tempo lastgenre \
-				replaygain web;do
-		if ! use $flag ; then
-			rm -r beetsplug/$flag* || \
-				die "Unable to remove $flag plugin"
-		fi
-	done
-
-	for flag in bpd lastgenre web;do
-		if ! use $flag ; then
-			sed -i "s:'beetsplug.$flag',::" setup.py || \
-				die "Unable to disable $flag plugin "
-		fi
-	done
-
-	use bpd || rm -f test/test_player.py
-
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd test
-	"${PYTHON}" testall.py || die "Testsuite failed"
-}
-
-python_install_all() {
-	doman man/beet.1 man/beetsconfig.5
-
-	use doc && dohtml -r docs/_build/html/
-}
diff --git a/media-sound/beets/beets-1.3.1.ebuild b/media-sound/beets/beets-1.3.3-r1.ebuild
index 958861588f94..56c5db05a294 100644
--- a/media-sound/beets/beets-1.3.1.ebuild
+++ b/media-sound/beets/beets-1.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.3.1.ebuild,v 1.2 2014/01/25 15:59:21 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.3.3-r1.ebuild,v 1.1 2014/05/13 16:48:35 sochotnicky Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://beets.radbox.org/ http://pypi.python.org/pypi/beets"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="MIT"
-IUSE="beatport bpd chroma convert doc discogs echonest_tempo lastgenre replaygain test web"
+IUSE="beatport bpd chroma convert doc discogs echonest echonest_tempo lastgenre mpdstats replaygain test web"
 
 RDEPEND="
 	dev-python/munkres[${PYTHON_USEDEP}]
@@ -33,7 +33,9 @@ RDEPEND="
 	convert? ( media-video/ffmpeg:0[encode] )
 	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx )
+	echonest? ( dev-python/pyechonest[${PYTHON_USEDEP}] )
 	echonest_tempo? ( dev-python/pyechonest[${PYTHON_USEDEP}] )
+	mpdstats? ( dev-python/python-mpd[${PYTHON_USEDEP}] )
 	lastgenre? ( dev-python/pylast[${PYTHON_USEDEP}] )
 	replaygain? ( || ( media-sound/mp3gain media-sound/aacgain ) )
 	web? ( dev-python/flask[${PYTHON_USEDEP}] )
@@ -46,10 +48,11 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	# remove plugins that do not have appropriate dependencies installed
-	for flag in beatport bpd chroma convert discogs echonest_tempo lastgenre \
-				replaygain web;do
+	for flag in beatport bpd chroma convert discogs echonest echonest_tempo lastgenre \
+				mpdstats replaygain web;do
 		if ! use $flag ; then
-			rm -r beetsplug/$flag* || \
+			rm -r beetsplug/${flag}.py || \
+			rm -r beetsplug/${flag}/ ||
 				die "Unable to remove $flag plugin"
 		fi
 	done
@@ -71,6 +74,9 @@ python_compile_all() {
 
 python_test() {
 	cd test
+	if ! use web;then
+		rm test_web.py || die "Failed to remove test_web.py"
+	fi
 	"${PYTHON}" testall.py || die "Testsuite failed"
 }
 
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 9d25240af79a..35fa1222d186 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -26,7 +26,9 @@ If beets doesn’t do what you want yet, writing your own plugin is shockingly s
 		<flag name="convert">Enable support for the convert plugin which makes it possible to transcode files</flag>
 		<flag name="discogs">Enable support for the discogs API plugin</flag>
 		<flag name="echonest_tempo">Enable support for writing the BPM of a track into its metadata</flag>
+		<flag name="echonest">Enable support for fetching and storing acoustic attributes of a track from Echo Nest</flag>
        	<flag name="lastgenre">Enable support for importing music genres from last.fm tags</flag>
+		<flag name="mpdstats">Enable support for collecting statistic about listening habits from <pkg>media-sound/mpd</pkg></flag>
 		<flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
 		<flag name="web">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
 	</use>