3 files changed, 13 insertions, 150 deletions
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index e3c9c0eb5a5b..c868ad75775c 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -2,17 +2,24 @@
 Hash: SHA1
 
 DIST coverart.py 6476 RMD160 49b833a0cf663632d1c02a102eeda2660e00dec9 SHA1 c16d8238f958da8bcf69f7a7f69dbc93dc0f32d4 SHA256 91ac249a120be52b335fb8e615e8396be0519aac87fdbce2ce259970c9363dba
-DIST picard-0.11.tar.gz 442371 RMD160 208e45621e10706fe7f5198718659b3b85eba4aa SHA1 702e6be6d0e595c87b21e7a20894d004efc3693f SHA256 c7b5170edcafc35daafd8b990efddfda57816349432d0a6a37869f0c483156ab
 DIST picard-0.12.1.tar.gz 1361157 RMD160 9d91e53f6ea0fd4c4a25bd1dbd8036a413971aef SHA1 965412de954d2a73487a1332b49ac7725e719f0c SHA256 7ffb28a47b610c45cfd972eacbb65c95a224aeaed0750d57c61a47d29f9a8183
-EBUILD picard-0.11.ebuild 2078 RMD160 8a69b5ec29ff48c7b149a26d8a8173791f88a60a SHA1 cdf654572396b4dd666f18fb94aa10217022bb3a SHA256 217da000a168a367793c79b07ca680004ef47798fa8830f363b3bee622465415
 EBUILD picard-0.12.1-r1.ebuild 2588 RMD160 620cf6159716bdfb5043e67912604c0382415c01 SHA1 8ae4fbe769c28ec7672b5def70d98b4e9bd3a591 SHA256 a6b25f96d0d88c0c962bf2a7be5fee089bfd2e2d97e1fd0980cfbad557961556
-EBUILD picard-0.12.1.ebuild 2078 RMD160 2400a2f621e1e46726f801212e8b0f2eb521bc92 SHA1 be199f972984e2200ddecaea20ef042dae500963 SHA256 b425e219b24ae55b707a09fe73084744e46e80ed87361efe5a2cd9530f268ea6
 MISC ChangeLog 4775 RMD160 2d7f81281d1a09c17e55d0a2b2c56e23ee55c979 SHA1 9d80297093c39fc39cf6766c20725e8d71af04d4 SHA256 a24f1aa585bcb03c30d36f7df4ac6fa7e2786eacb589629e80a60bd8705b914e
 MISC metadata.xml 553 RMD160 aa0f6c2209114f46b535081ff6755b8580ab2de8 SHA1 2bc539d9847f8523ae99b5a819638a3d8e51d3e8 SHA256 deb9d87153b6e173691172b883e947d9c0561dc6533a7b4a2bf5569f25e32ae5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2hSwkACgkQnZsgo/h8kNblMwCfaFAG55qR3ItHpWHWKeXyp3PZ
-XVEAnAvd4kpwleRdaOwCfBA5B9jNLim9
-=AAUI
+iQIcBAEBAgAGBQJNobOnAAoJENgZr6v6gHY0K3kQAMFfzoJAcT8dy28mE3pWSiH5
+N2D7X3SgyJm9TZhDTvJ8b6Dwrq33UJKd4C189pewaHZxsvRsFlEoe1w1aM/r3lBU
+XeXqyGcU06doLTFZ3qLde4lTuRoXAumGb6PrLSMDY++zaDldBPA+60VvYpUY+jzC
+YPGazV7V7TLtm19Aim7zkIFE83OW98ex16I9cCFqdQVkHQqZHF9rKxNZNjNRNMBM
+5Fv0yj/7ar/XJFZFRXF9WtVrN9+ugyA/d4n8Xs39su/mTzHEci9wegFOcLry7Ktc
+2wSo0fRA1sKDwjigJQ/8c94/7Id2qezBYgVfOllxJFiwW9tQZaIREHxO0GIMnou0
+QGkp17m3SkIcAwQhiMwNjzut8n/hBf7KI6VJM+lV6v57J1xGIHKGYao0bA7oaDqA
+xuy0Rj3cGqylEQ+Ny6BQlyYqDCXR9WC8JffItJjqUldMjCWR6TcdbB79NDRacg/H
+KbugKa4Agl4C/M/nwPEDI6BnUvo3efS/nprZQ6TaTyhOKIqC+jCWS2j98uT69qQk
+Cwb/MAdh94iYxxbVeGXmazR1CEkubhnN8moeYLB5WL2wtPAsDuDlry1/xj8KJ+u5
+CeGy+KiHXcyBQv/Y2EZBHO24c5Gk5DBLXZ8085iNG9raTyg1XnakPzeR2BnKiSEz
+ZoLoLdzN9EYvD7NXGx+x
+=wuq7
 -----END PGP SIGNATURE-----
diff --git a/media-sound/picard/picard-0.11.ebuild b/media-sound/picard/picard-0.11.ebuild
deleted file mode 100644
index 9a569c0fa7ff..000000000000
--- a/media-sound/picard/picard-0.11.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/picard-0.11.ebuild,v 1.7 2011/04/04 10:02:00 scarabeus Exp $
-
-EAPI="2"
-inherit eutils distutils
-
-MY_P="${P/_/}"
-DESCRIPTION="An improved rewrite/port of the Picard Tagger using Qt"
-HOMEPAGE="http://musicbrainz.org/doc/PicardQt"
-SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/picard/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cdda ffmpeg nls"
-
-RDEPEND=">=dev-lang/python-2.5
-	dev-python/PyQt4[X]
-	media-libs/mutagen
-	cdda? ( >=media-libs/libdiscid-0.1.1 )
-	ffmpeg? ( virtual/ffmpeg
-		>=media-libs/libofa-0.9.2 )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS.txt INSTALL.txt NEWS.txt"
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! use ffmpeg; then
-		ewarn "The 'ffmpeg' USE flag is disabled. Acoustic fingerprinting and"
-		ewarn "recognition will not be available."
-	fi
-	if ! use cdda; then
-		ewarn "The 'cdda' USE flag is disabled. CD index lookup and"
-		ewarn "identification will not be available. You can get audio CD support"
-		ewarn "by installing media-libs/libdiscid."
-	fi
-}
-
-src_configure() {
-	${python} setup.py config || die "setup.py config failed"
-	if ! use ffmpeg; then
-		sed -i -e "s:\(^with-avcodec\ =\ \).*:\1False:" \
-			-e "s:\(^with-libofa\ =\ \).*:\1False:" \
-			build.cfg || die "sed failed"
-	fi
-}
-
-src_compile() {
-	${python} setup.py build $(use nls || echo "--disable-locales") \
-		|| die "setup.py build failed"
-}
-
-src_install() {
-	distutils_src_install --disable-autoupdate --skip-build \
-		$(use nls || echo "--disable-locales")
-
-	doicon picard-{16,32}.png || die 'doicon failed'
-	domenu picard.desktop || die 'domenu failed'
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	echo
-	ewarn "If you are upgrading Picard and it does not start"
-	ewarn "try removing Picard's settings:"
-	ewarn "	rm ~/.config/MusicBrainz/Picard.conf"
-	elog
-	elog "You should set the environment variable BROWSER to something like"
-	elog "\"firefox '%s' &\" to let python know which browser to use."
-}
diff --git a/media-sound/picard/picard-0.12.1.ebuild b/media-sound/picard/picard-0.12.1.ebuild
deleted file mode 100644
index 30f388b21d02..000000000000
--- a/media-sound/picard/picard-0.12.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/picard-0.12.1.ebuild,v 1.5 2011/04/04 10:02:00 scarabeus Exp $
-
-EAPI="2"
-inherit eutils distutils
-
-MY_P="${P/_/}"
-DESCRIPTION="An improved rewrite/port of the Picard Tagger using Qt"
-HOMEPAGE="http://musicbrainz.org/doc/PicardQt"
-SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/picard/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cdda ffmpeg nls"
-
-DEPEND=">=dev-lang/python-2.5
-	dev-python/PyQt4[X]
-	media-libs/mutagen
-	cdda? ( >=media-libs/libdiscid-0.1.1 )
-	ffmpeg? ( virtual/ffmpeg
-		>=media-libs/libofa-0.9.2 )"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS.txt INSTALL.txt NEWS.txt"
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! use ffmpeg; then
-		ewarn "The 'ffmpeg' USE flag is disabled. Acoustic fingerprinting and"
-		ewarn "recognition will not be available."
-	fi
-	if ! use cdda; then
-		ewarn "The 'cdda' USE flag is disabled. CD index lookup and"
-		ewarn "identification will not be available. You can get audio CD support"
-		ewarn "by installing media-libs/libdiscid."
-	fi
-}
-
-src_configure() {
-	${python} setup.py config || die "setup.py config failed"
-	if ! use ffmpeg; then
-		sed -i -e "s:\(^with-avcodec\ =\ \).*:\1False:" \
-			-e "s:\(^with-libofa\ =\ \).*:\1False:" \
-			build.cfg || die "sed failed"
-	fi
-}
-
-src_compile() {
-	${python} setup.py build $(use nls || echo "--disable-locales") \
-		|| die "setup.py build failed"
-}
-
-src_install() {
-	distutils_src_install --disable-autoupdate --skip-build \
-		$(use nls || echo "--disable-locales")
-
-	doicon picard.ico || die 'doicon failed'
-	domenu picard.desktop || die 'domenu failed'
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	echo
-	ewarn "If you are upgrading Picard and it does not start"
-	ewarn "try removing Picard's settings:"
-	ewarn "	rm ~/.config/MusicBrainz/Picard.conf"
-	elog
-	elog "You should set the environment variable BROWSER to something like"
-	elog "\"firefox '%s' &\" to let python know which browser to use."
-}