Version bump to latest stable release

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

3 files changed, 42 insertions, 27 deletions

diff --git a/media-sound/beets/ChangeLog b/media-sound/beets/ChangeLog
index ef92b4cb7713..ed5e37a506ac 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.10 2013/01/03 00:08:39 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/ChangeLog,v 1.11 2013/02/19 22:22:59 sochotnicky Exp $
+
+*beets-1.0.0 (19 Feb 2013)
+
+  19 Feb 2013; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  -beets-1.0_beta15.ebuild, +beets-1.0.0.ebuild:
+  Version bump to latest stable release
 
   03 Jan 2013; Stanislav Ochotnicky <sochotnicky@gentoo.org>
   +files/beets-1.0_rc2-test-namespace.patch, beets-1.0_rc2.ebuild:
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 0e6db53c384f..0e08e4cf42d0 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -2,26 +2,26 @@
 Hash: SHA256
 
 AUX beets-1.0_rc2-test-namespace.patch 418 SHA256 7d4d901ddda7077139664210857ba7c01b063ae0ff4241b9d56eed4e5d871635 SHA512 d76a39674dfe867d3ac3a0e9df365da23ed5398f4ae64abffbf58863116bd0aa5d92f4c83de85668231bdeb073a91e3566385ea637dea798b82099e292dc0ec8 WHIRLPOOL 6e03070751dc60590c7443522a0b4871e30e23c2779b2a8a7989b91b168f6afbae9a0f411f2f805dc2e360c34cc7f945f8a9c91e7e41222b4fdd29f89ade5955
-DIST beets-1.0b15.tar.gz 474108 SHA256 a670153ccbc143387d83e549bfa35be1ae17d98d3db0fc299867c2bb3a8ac864 SHA512 0324827259cdfd1a09b6eaf7703204634aeca0739e5b0007c418d787c5ead240bc9529e616e2bfe8182bda95e8debdb1b4f953d011b8b71d8e9c91dea5aa3366 WHIRLPOOL 294bbfb743034aaeaf9fcc3cbdf52f58e768fa6793ba18ab008f1e6f7ee3c298a3fd753bd026d17bd70ca8ae233407c5808e18bfc0d2596fe0eb9ad61c070004
+DIST beets-1.0.0.tar.gz 532807 SHA256 ee782a1e1879a335fae6b9f381cb2ae5bc78fc7c35836014b75c811105ea0ab3 SHA512 7149610a7d224dc7afae17f7e6da647910e483fe73a991dac75fd0bf3fccd3bec5aee72d96b29399c9476a92eb79ea6dfb71c6b2636cdd893b9309e1f61dedbc WHIRLPOOL cc607cf881c934a82abbc77d98d008f7dfb444ada9d731671bd0b5e783810b3bb7017d482e520c6070b1eef8fa07b0a4f30a81548e4b42ba3a4599be252f3bb2
 DIST beets-1.0rc2.tar.gz 532076 SHA256 d8ef81d542d66108d5102ecf5f74a056c9898d5ab6f236c8a46f24814838a471 SHA512 9c56941776d9a60e2ceca57e3494d373339737a2407d6e77c98ee96707ea3b80c76840b62829d2e70d4b5c07d072321b80e2176d67345fc7ad26c07a768d9513 WHIRLPOOL af804c03e629de19552bd7abf23ec885e38b7238acd5cd0546fbe185218e6ae0fc589698c47747a82cbac3cddeb0447b9e43c35077cc23f3d16ed2d98987aaab
-EBUILD beets-1.0_beta15.ebuild 1909 SHA256 065b1b50bab6b7050bfcb0af7b1e460db4df5b45f828b7c7d00529d6903d74ad SHA512 460f380d245471d3e06224fa011ec45fd3c33bc9f3a26240e683398d6734cc8dcef40df3b3583e06cc1a644f2edcb0afe6d9f18922300805572cf034d71aff4a WHIRLPOOL 94e7175264147d03456f541b5ec311fe17e6b74d82835fddef84b5598afb71ec77a9b47719f498da39df83cbf7770b9c7f0d1be796d2865e8267b6cb9ad92c4e
+EBUILD beets-1.0.0.ebuild 2307 SHA256 11c025879b73861e67ea0162d89fbfecae3b9b51680433199675e59e27302b48 SHA512 6d07370e508a1dde2c4c93376cfa2b81e43ecde7fdc65b8ee28e8bed30f8da420d7d997d52a92ac9273dabeeea07a1584e6397dedc9f58560cac5838f3491d95 WHIRLPOOL ffd977c160af821009252de31b09c0b106672e3031665f07d21e2f0e788556d82adf523062523b988a7c9aec594be68088bff294e6490244b80b6171b83ab331
 EBUILD beets-1.0_rc2.ebuild 2309 SHA256 2252b66e1a818ca78f65bbf007ec1fd0768a443639ce4bbe2c8d92b87ca7c669 SHA512 83bb42969d3d803f1ec70ba508c04e7e1be488e47e8869c561a159f9c41bcc0f1b0c9b097b4d7baafe62a8046e762d0f73940feb0c2500be4234b68a7e0d2f2e WHIRLPOOL f56cf55079ba376d1bf704519feca6a77e14e41785c36725e77828c42007a9127917b66186bf508d5fc04d9aeed387fc65e2763d505eb4750155bc91622d00a4
-MISC ChangeLog 2093 SHA256 6e139a30b422760286c6694f1a2ba3bde43caa1a6ecb4e08d31ea273d7c1361e SHA512 2fbaeff1718adbb97f7132216d26be593c6adab03ad969fabaa428024562a826e36d9962e03ac1f6671243de054904c21ecb11a2776c09d158344a087fb2294d WHIRLPOOL 6d566dd0f43fe539d97a7aebb2d032fb5774da4426f065a1e1cb20db17095616faa5cc79b15b7c08d0fbd03f6f700644b552302ff39ed243a42ea3cf29625c0c
+MISC ChangeLog 2272 SHA256 dacc3589dce2367f00d77aa366b4e915d54de7e0acdb59aa83bda530f87e78d1 SHA512 b986303ab76e2adbb28158848b817c2769536a3ceb30d60900078e86d8b4f6bde909da8eee127699ce6da3ebf6f6c81b6306eba9b0851838d675fc34b6a05d05 WHIRLPOOL caa684d4c66cc236d0d7c937655af81256e813cced3bc68e0602ded2c77a45e8e9f15bd879657e08badb7bb377bd3cc983f98cbd65689d6b32f98b39010ffd74
 MISC metadata.xml 2143 SHA256 08635999d29fa0496674c211c17671e32c392180f6f4432209797d5545a2df1e SHA512 a2ac8b557dcf75764e0b0076525a1b78dfc7101391ae7bd0d9dacb4cd0ff5f95683a030e1f8b98e12cdefd37559150472ecd39461ca7496166fcfc8fea540169 WHIRLPOOL 41755f3c2c447c73ec09327b50703d3f941f8316f95ef45faac3c61b7b3a39909711b3d494361e6c3b6dbb73be13385e1e85158f506171ba69c7a35b928905b1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ5MwNAAoJELy9dS57CHJBpcEQAMgJJNf0w4/DGAnFjRZdIu/I
-+gAlTh6tBgkx0RgSOXQThbEVeyWoZyHnbu6DwkD0p91AbENMaZy9dAO9DsEIV5jG
-XNmB+M8KTVwX5SHjMM+u+6RWomoxBFi/PMx3QGcnQXQq5gVldpQjJQFb5UhDL/iN
-P9Tfv5VeGIaoZww3SWzV/nnvr0B6Gre801zuZYVA2S0HV9NNUuK8tbPSANgZxsKK
-EiELyU7aWsKQJudo+Cw6rCL6T5phvBO6J5WHgnJg8j+YylTP9Od7f8MlOPk1tmc6
-iRLNPs5I+rf7WHzPNCDyemlbZAm8a527QMP/6oz5qmPV5anTVyImyw/4qwuzymYo
-YzcSLZ2oO1ecq1CO+kvgyffR6ZWmGbbi/crrDNL7vSlIVv0Vep22yK/SZrFoYq40
-n81O/DcvVPp3Xf/p6x6HhpQvYCmWnZCxKlJT0/hpQkJI+1WsJszqZAaAD0Rhsnlp
-plXlymdntx8roUkOK5G+QkywlqdSt0YwFfj+PNmb81O+Ug83rrvYN9epaGvtg5ej
-dljCF50VkEKbXFTjBG6FSwTmYFVoezxiQ1LVrENNd0CxPKa19Tv+vl35KQdT6Og6
-Ac61nR3oFtyP3+AOM0q7Rr4StlNknFa6svNnUcjNv5dzQXM3UXwty9JfNB4kVBxY
-cbpHJvBuaH97/8b4VBHy
-=eUqQ
+iQIcBAEBCAAGBQJRI/tJAAoJELy9dS57CHJBMPUQAIdoZHfBJ12LCccmG1+GAlFB
+9T7gXOYaWZGvZFoO3MuvqVhCgt+BZyjoHGqngXwS6kWLQ6lRHnx3xCKxd4jPthHR
+X7NMVsVrQPbXBzEvQobyihfC0ZX+OAVnAxPI4eaQYeCpgs4mPIvR+21O0gA3VDVe
+mzMyyMEDSI9FmhY4dF/hG5jScd2/mnf9uZfwPLf89cZ0zIrcD9R6ygEXrMZ1885p
+81GXiRU4+ediMyBYgVLy8M3aWW9QRgNn7ODBdha7omrSAGvk4+gfZ0AFOIqmlSf4
+wgrtAkA1fAzJfAFBcMqFE+5SVmX6H1mdTuAxxVhMfI3PSPHi8jygBkEOQvNY70mu
+SxMT5mWibfQhP8q3l+V8Po4DJkP8guApxNLT1JQplkzMvDGlYBux0TL4Kiqe3UkF
+jNlmTASgdVa+sPBwE3xwpikoZHF5xUtoPQI6TVwA+47+lx3Gql7i8P8CKPXhFtiW
+F3Yo5tkXO+wHos6FSX7SugVuTaCOniA/dKAmxjmR27qcJKfe+Q4FTkIsZGpLqj9p
+yPpQneibgqZnQw1ebL0YP0FxP+OGn5dOpNnShq39rae3qbbxoafN/tGBTZHmVEgj
+2sug14cbNrbOYu80yvqBW0RzF240zEsP11kw1l7unGDzFuBRTUlcGIUKVUEfpOYC
+otGSfO9u2OeXuOG0nV9d
+=pvsj
 -----END PGP SIGNATURE-----
diff --git a/media-sound/beets/beets-1.0_beta15.ebuild b/media-sound/beets/beets-1.0.0.ebuild
index cd6e60ab8be4..23b65f28ac8c 100644
--- a/media-sound/beets/beets-1.0_beta15.ebuild
+++ b/media-sound/beets/beets-1.0.0.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_beta15.ebuild,v 1.1 2012/08/21 21:23:33 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.0.0.ebuild,v 1.1 2013/02/19 22:22:59 sochotnicky Exp $
 
 EAPI="4"
 
@@ -10,9 +10,9 @@ 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
+inherit distutils eutils
 
-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"
@@ -44,15 +47,20 @@ 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}/${P}-test-namespace.patch"
+
 	# 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 "
@@ -60,6 +68,7 @@ src_prepare() {
 	done
 
 	use bpd || rm -f test/test_player.py
+
 }
 
 src_compile() {