Version bump to 1.3.1 for testing and remove deprecated ebuild

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x7B087241

5 files changed, 108 insertions, 111 deletions

diff --git a/media-sound/beets/ChangeLog b/media-sound/beets/ChangeLog
index 6f3bf1acd302..cf285203b082 100644
--- a/media-sound/beets/ChangeLog
+++ b/media-sound/beets/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/beets
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/ChangeLog,v 1.16 2013/10/20 19:27:42 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/ChangeLog,v 1.17 2013/11/05 22:42:59 sochotnicky Exp $
+
+*beets-1.3.1 (05 Nov 2013)
+
+  05 Nov 2013; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  -beets-1.0.0.ebuild, +beets-1.3.1.ebuild, metadata.xml:
+  Version bump to 1.3.1, remove 1.0.0
 
   20 Oct 2013; Stanislav Ochotnicky <sochotnicky@gentoo.org> metadata.xml:
   Move to maintainer-needed
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 911c8ccde5ed..d5e12bf38247 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST beets-1.0.0.tar.gz 532807 SHA256 ee782a1e1879a335fae6b9f381cb2ae5bc78fc7c35836014b75c811105ea0ab3 SHA512 7149610a7d224dc7afae17f7e6da647910e483fe73a991dac75fd0bf3fccd3bec5aee72d96b29399c9476a92eb79ea6dfb71c6b2636cdd893b9309e1f61dedbc WHIRLPOOL cc607cf881c934a82abbc77d98d008f7dfb444ada9d731671bd0b5e783810b3bb7017d482e520c6070b1eef8fa07b0a4f30a81548e4b42ba3a4599be252f3bb2
 DIST beets-1.1.0.tar.gz 600175 SHA256 5355345ba062b5969f18ca2d7818026ac74f2a07bfe733354b9a3d3c19918b97 SHA512 5d67d995bde87ed2f5bb556d9390acde2d9855cf4f34a3b88527895ad3cd214a7069ed2f87d539885cc0053950fce208322e53ae6e6b1617d719dbfba5de0798 WHIRLPOOL b53c258ad681853d6737e7ff1aa1c282dbe5d99d2a35d27270d20fd1fa682250bfe90d7af185a1c6bc429075472c0f82712ee837591224ac3bc1dc1cd2967d53
-EBUILD beets-1.0.0.ebuild 2315 SHA256 691abe3fbfc9dce4d458f712dd770adea86d6e2ea3e4f2b363e924e050b343e2 SHA512 f28072cc9c4cfde77c0ee5fa3299d8207df94cda2fedad831fc419d2cc15d6d1e9e6694495b62a276b5168ae84168f25de42916060855d81808065d42f57284c WHIRLPOOL 1c86f3debd71297e634f534bafb285f6b04a67f33c7ce4b7afb224f7c0ccdfdefdc1b3f7284ae716e4acdba0ebef0be02b58969f86788299fb9f6a08af9aec77
+DIST beets-1.3.1.tar.gz 648456 SHA256 62ff54ad0f5cb224df2a9bed84d1281f27dd956cafe916b09318776a4b3ca308 SHA512 ba0fe33a0ed09dae913fbfb5307e3e922cf137c26e1fcbe93f15adb227378ba42fe815c0a3a5c44eea9d64effff7f2662e73a752b52a9c10aa0e922c0540dd6b WHIRLPOOL 97318729e21ef2f6b35cf777f615263d83f1e68447d134edabf947b6e576cc26ce261e131c5d4de66c02591b46640916123da15b822615d3d347bbff554012ed
 EBUILD beets-1.1.0.ebuild 2079 SHA256 33e5197f935db7935ba5c5539799e6729bde48242f57b09c6d97ed4b4b401960 SHA512 3738d7286bb086dde21977683ddbafa05668d979e36a16e8bc7d413c1550e1433fe6ddf48cd85e512d00b547c1dac0ab54e6334ec914060ba8883af974aec005 WHIRLPOOL 4934e2b09533c05bfdc1327485b41749b53fdeea932eaf1dad2c4c87fa9c6575432282732aca739b94e9a38f5823c1e5e27a30b1ea8d6a98919021a4b43e7934
-MISC ChangeLog 3210 SHA256 3a9551cf9bc1a664a014f409d2438450c90de0011edaab8bc45d725d043d7d57 SHA512 a696e6e79d95a8447762da0cfbffd75cef25d7324b49af9278c8103191e708878d20e4dd129c25cf0673a1552736be7ee7ce64b465689b824f51e71efed140a9 WHIRLPOOL 16a757ea664fa63d25559ee0a1e475df16d0ec683f0c8a128984177a6ef0d3e7cb9b0d8dd4a0997bb043d723bdf08769619b346133e2f3f31d9033bfdf6cf721
-MISC metadata.xml 2110 SHA256 be59f32695b5d4d24d5cfcdf9ee7f801362ff6242261755f826fdc17477bb103 SHA512 eca14b41f7934bb7aed2717bb59146bba3cdeb450858b9d0019201799fee5ed69c2435759591c1b04adb8fde6b5f00d5be09c61cabb98b1778b881210aee45f9 WHIRLPOOL 67837e68a5013b5e22afc71a2ce14ca9cb0fa967929008cfd72e5315812df2ecf05f07e1c6f1e2035e6997d5bee0bcd4dd4a671cb9c13c3de10f9ba999ba854d
+EBUILD beets-1.3.1.ebuild 2260 SHA256 e9bfee75823617fa999988aaee0259e9e6bc3686774678c5af3978b1e6f78265 SHA512 dc23f9d7f7ac772a42be3d11068bbbf44c4d022ba076268cda6ed14dbce1083230a15397dd7a093739141f7f221a563b3eccfba18ff36885d757ae5284a641e2 WHIRLPOOL 1f0d569b5d3aab0b9f3ad75d63e76226cb63d513e918778c850589ef38d3f58a4f96da93b9f2e1bf102e0c3d631d98c156eb5974c7b53b3cb8f42d54cd9b551e
+MISC ChangeLog 3396 SHA256 7b17a2ca9dc4d032b7840401ceeb253a06e21c94c4264f89554cd4ccb35e3ca2 SHA512 da5baa78a13b725fbccf1c6984486243c27db98ec6d10b370692048b931b88a8b2c30296bb70348878d80cbde1cadcd28c251db4fc1de4dff498dc187daba0b2 WHIRLPOOL f918c4e7eedc56832e3b20c6d17bd9d04b12108f754377eb9426e6c888059629dd2c0a9f3cd737b2bc4e0f9bef171aa5fa8af945cde57a92e1bc908cdbe20f21
+MISC metadata.xml 2249 SHA256 07b520280cec0cada9ac84b1b7fb29a14572bf7f820fb1c0268e14c78958199f SHA512 0f66a8fdfa60e08963260cbf214581b91294308fe28b2237bfa7473eb99b73039c301cae1fa5559092da0c0544e19fec9e94c82059a72f95ae4a069d16f140c2 WHIRLPOOL 3d0ce059dbfafdef7a26c5bc577217ae747f96911306e2f057fbb29a850b6b39429ca9462d17c8795d56754eb40ed29827cb7ce913223b0aea66e261f9383603
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSZC6vAAoJELy9dS57CHJBv6EQAMnOQud8yhx88UJ+xXJ9XjY2
-wmuHFYsu/SkE8Hoaf9gMW78roRie2b07VlidDy6asjYDLTVzC+L97/jALng97m9Q
-C0c00fEOpUwKlAGwwuFWhH0QlpP+VwXBs06VHOBm1vB5P6Sik/5/pwORDvo2Vqhd
-YfDDwOUuKtYDtib2PXLgQMTjXa2MeUlq7DrGlf+FPEaO4xdn1Zp3njY6ePmZ0l8v
-kihGUbWjO8wSNRU4Yv6Jt2hz4kvFnNR+tnvD79dq/PDSksJw3OZIGHMT81kGV3nT
-M9/7hMHKZ2f+U25TGRFRfml2uen/wGd6Xv1RmMfIU4URn+J+oliCdUhpBAqDNr59
-xIemsxNhtMWi/W7DTAFGxAqKBoOSfkzVkAkpVZtlmGqFQS9P1eyvi4npCDRglLlJ
-58sHc0XNx7/Cm8YScbq9Fog6V1l7wyuuCpq8gLog6mZ4gI9rvBRD1ejnWVAPbDcv
-21gsjjs0wqVPYLbc6ciYC71zIToOhuJsp5WZGfnjssTvJtqsnfKBoCNeu94EIzf0
-TCbgBDia/QKi5etVE+JQBbGB93zf3V326RBXUxNQ28NHG/i7oq8pLOv4XG4eQvj+
-ZROou+U2eDjL2pfg4Kho/6Nkx9fiatT3mPk3GyRKcP5PdWIKiIUgdxNUGebN0ezt
-H5EdehVtbRJc6d3TGxwq
-=mYzO
+iQIcBAEBCAAGBQJSeXR5AAoJELy9dS57CHJB6WoP/1p1Egsl/SmjX46HUM3DBzOx
+ghTqrmrwAFiyKyKvH0D1YcELf2qptPdoJ1gzWtOlav69EnALkLvdVgs1S0qScPh/
+uCJy1aIuQLdhz0KLfUJYRqdQJT5Xn4lDNlyzqxqMa7KggLdRU2/tJRmQMCRZ59fW
+Tw/oLPg2Bp/sDg2jB3oPzFKVyOqZRoXl3yOxe/Mudc/VajAOhX5aRDc36p9yNn8L
+uzpz49aC96qAsrjPmXnPfFhxZtzZDBjPIYKNI10jcEi//bo0lklXNBqqj5bOIir7
+kqNrRWazBQ03X2Xm3oYEEiZiJR3UBOiGYByhDQqloVTFniUDRWeIsxk5PCadEnvV
+9RCWQV2U4srujnemMc6JGGQYBChurgBvnxDirrAwN4FznUtRy4My2U1a4Pz27teU
+l1aUf69SZrjYQl4gKvl64i20UUG8EmdGyl6ld8dcYWRIUeLrGVpUWTfyPTyjvgJa
+9h1b0oJiNP3gzX3aEZt3g9fGD5n9PHvbAVXCMnwSws2YhFx8m2so78D5E2Ia9CY4
+s/8Xad7Yozp0BooIdWJUOBpzeWa4I1Q1riQYzOJ5CGnGxFtksM59jgBJv21Rlwfg
+iKjwpJwX5zc7gJb4YTlPAhqkYJObDDe/u5fzDq0NHZdlvsktFuowIwQAzhBplNxz
+B6YrN/m/ncuDQTffPvh8
+=A5VF
 -----END PGP SIGNATURE-----
diff --git a/media-sound/beets/beets-1.0.0.ebuild b/media-sound/beets/beets-1.0.0.ebuild
deleted file mode 100644
index eb30e3336e6f..000000000000
--- a/media-sound/beets/beets-1.0.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.0.ebuild,v 1.3 2013/08/11 21:48:08 aballier Exp $
-
-EAPI="4"
-
-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 eutils
-
-MY_PV=${PV/_rc/rc}
-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 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:0[encode] )
-	doc? ( dev-python/sphinx )
-	echonest_tempo? ( dev-python/pyechonest )
-	lastgenre? ( dev-python/pylast )
-	replaygain? ( || ( media-sound/mp3gain media-sound/aacgain ) )
-	web? ( dev-python/flask )
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	distutils_src_prepare
-
-	# we'll need this as long as portage doesn't have proper python
-	# namespace support (without this we would try to load modules from
-	# previous installation during updates)
-	use test && epatch "${FILESDIR}/${PN}-1.0_rc2-test-namespace.patch"
-
-	# 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
-
-}
-
-src_compile() {
-	distutils_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/
-}
diff --git a/media-sound/beets/beets-1.3.1.ebuild b/media-sound/beets/beets-1.3.1.ebuild
new file mode 100644
index 000000000000..5dd0fb98aa90
--- /dev/null
+++ b/media-sound/beets/beets-1.3.1.ebuild
@@ -0,0 +1,81 @@
+# 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.3.1.ebuild,v 1.1 2013/11/05 22:42:59 sochotnicky 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-0.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/metadata.xml b/media-sound/beets/metadata.xml
index fdaf9586103b..c7ba9c055858 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -19,10 +19,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="beatport">Enable support for beetport.com API</flag>
 		<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>
 		<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="lastgenre">Enable support for importing music genres from last.fm tags</flag>
 		<flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>