Version bump to 1.0_rc2, small ebuild cleanups

Thanks to Elias Probst for updated ebuild

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

3 files changed, 26 insertions, 13 deletions

diff --git a/media-sound/beets/ChangeLog b/media-sound/beets/ChangeLog
index a92076adcedd..ee3caee52c15 100644
--- a/media-sound/beets/ChangeLog
+++ b/media-sound/beets/ChangeLog
@@ -1,6 +1,14 @@
 # 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.8 2012/08/21 21:23:33 sochotnicky Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/ChangeLog,v 1.9 2013/01/02 23:18:22 sochotnicky Exp $
+
+*beets-1.0_rc2 (02 Jan 2013)
+
+  02 Jan 2013; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  -beets-1.0_beta14-r1.ebuild, +beets-1.0_rc2.ebuild, metadata.xml:
+  Version bump to 1.0_rc2, small ebuild cleanups
+
+  Thanks to Elias Probst for updated ebuild
 
 *beets-1.0_beta15 (21 Aug 2012)
 
diff --git a/media-sound/beets/beets-1.0_beta14-r1.ebuild b/media-sound/beets/beets-1.0_rc2.ebuild
index cc9efbdf81d5..39466a1895b5 100644
--- a/media-sound/beets/beets-1.0_beta14-r1.ebuild
+++ b/media-sound/beets/beets-1.0_rc2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.4 2012/05/30 16:48:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.0_rc2.ebuild,v 1.1 2013/01/02 23:18:22 sochotnicky Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ RESTRICT_PYTHON_ABIS="2.5 3.* 2.7-pypy-*"
 
 inherit distutils
 
-MY_PV=${PV/_beta/b}
+MY_PV=${PV/_rc/rc}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
@@ -22,19 +22,22 @@ HOMEPAGE="http://beets.radbox.org/"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="MIT"
-IUSE="chroma doc lastgenre bpd replaygain web"
+IUSE="bpd chroma convert doc echonest_tempo lastgenre replaygain web"
 
 RDEPEND="
 	dev-python/munkres
 	dev-python/python-musicbrainz-ngs
 	dev-python/unidecode
 	media-libs/mutagen
+	bpd? ( dev-python/bluelet )
 	chroma? ( dev-python/pyacoustid )
+	convert? ( media-video/ffmpeg[encode] )
+	doc? ( dev-python/sphinx )
+	echonest_tempo? ( dev-python/pyechonest )
 	lastgenre? ( dev-python/pylast )
-	bpd? ( dev-python/bluelet )
-	replaygain? ( media-sound/rgain )
+	replaygain? ( || ( media-sound/mp3gain media-sound/aacgain ) )
 	web? ( dev-python/flask )
-	doc? ( dev-python/sphinx )"
+"
 
 DEPEND="${RDEPEND}
 	dev-python/setuptools"
@@ -45,14 +48,14 @@ src_prepare() {
 	distutils_src_prepare
 
 	# remove plugins that do not have appropriate dependencies installed
-	for flag in lastgenre bpd web chroma replaygain;do
+	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 lastgenre bpd web;do
+	for flag in bpd lastgenre web;do
 		if ! use $flag ; then
 			sed -i "s:'beetsplug.$flag',::" setup.py || \
 				die "Unable to disable $flag plugin "
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 4a18317ecc9e..48dccd150958 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -20,10 +20,12 @@ Because beets is designed as a library, it can do almost anything you can imagin
 If beets doesn’t do what you want yet, writing your own plugin is shockingly simple if you know a little Python.		
 	</longdescription>
 	<use>
+		<flag name="bpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation</flag>
 		<flag name="chroma">Enable support for acoustic fingerprinting plugin using
-				(<pkg>media-libs/chromaprint</pkg>)</flag>
+			(<pkg>media-libs/chromaprint</pkg>)</flag>
+		<flag name="convert">Enable support for the convert plugin which makes it possible to transcode files</flag>
+		<flag name="echonest_tempo">Enable support for writing the BPM of a track into its metadata</flag>
        	<flag name="lastgenre">Enable support for importing music genres from last.fm tags</flag>
-		<flag name="bpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation</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>