Add acoustid USE flag to fix bug #434176. Thanks to ci3nte for the report. Remove old.

(Portage version: 2.1.11.9/cvs/Linux i686)

4 files changed, 10 insertions, 60 deletions

diff --git a/media-sound/puddletag/ChangeLog b/media-sound/puddletag/ChangeLog
index ee590bc46e74..cfb83f10431b 100644
--- a/media-sound/puddletag/ChangeLog
+++ b/media-sound/puddletag/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/puddletag
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/puddletag/ChangeLog,v 1.20 2012/08/26 09:37:33 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/puddletag/ChangeLog,v 1.21 2012/09/13 18:41:30 billie Exp $
+
+  13 Sep 2012; Daniel Pielmeier <billie@gentoo.org>
+  -puddletag-1.0.0_beta6.ebuild, puddletag-1.0.0.ebuild, metadata.xml:
+  Add acoustid USE flag to fix bug #434176. Thanks to ci3nte for the report.
+  Remove old.
 
 *puddletag-1.0.0 (26 Aug 2012)
 
diff --git a/media-sound/puddletag/metadata.xml b/media-sound/puddletag/metadata.xml
index 5f859331b7c1..0f2b598d3f60 100644
--- a/media-sound/puddletag/metadata.xml
+++ b/media-sound/puddletag/metadata.xml
@@ -9,5 +9,6 @@
 		<flag name="cover"> Enables editing of FLAC cover art</flag>
 		<flag name="musicbrainz"> Enables support for musicbrainz, needs <pkg>dev-python/python-musicbrainz</pkg></flag>
 		<flag name="quodlibet">Enables support for editing <pkg>media-sound/quodlibet</pkg> databases</flag>
+		<flag name="acoustid">Use <pkg>media-libs/chromaprint</pkg> for acoustic fingerprinting</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/puddletag/puddletag-1.0.0.ebuild b/media-sound/puddletag/puddletag-1.0.0.ebuild
index 6c04f9bc11d6..5b6146864133 100644
--- a/media-sound/puddletag/puddletag-1.0.0.ebuild
+++ b/media-sound/puddletag/puddletag-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/puddletag/puddletag-1.0.0.ebuild,v 1.1 2012/08/26 09:37:33 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/puddletag/puddletag-1.0.0.ebuild,v 1.2 2012/09/13 18:41:30 billie Exp $
 
 EAPI=4
 
@@ -16,13 +16,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cover musicbrainz quodlibet"
+IUSE="acoustid cover musicbrainz quodlibet"
 
 DEPEND=""
 RDEPEND=">=dev-python/PyQt4-4.5
 	>=dev-python/pyparsing-1.5.1
 	>=media-libs/mutagen-1.20
 	>=dev-python/configobj-4.7.2
+	acoustid? ( >=media-libs/chromaprint-0.6 )
 	musicbrainz? ( >=dev-python/python-musicbrainz-0.7.2 )
 	cover? ( >=dev-python/imaging-1.1.7 )
 	quodlibet? ( >=media-sound/quodlibet-2.2.1 )
diff --git a/media-sound/puddletag/puddletag-1.0.0_beta6.ebuild b/media-sound/puddletag/puddletag-1.0.0_beta6.ebuild
deleted file mode 100644
index 54c5aa5be07d..000000000000
--- a/media-sound/puddletag/puddletag-1.0.0_beta6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/puddletag/puddletag-1.0.0_beta6.ebuild,v 1.1 2012/05/06 10:17:21 billie Exp $
-
-EAPI=4
-
-PYTHON_DEPEND=2
-PYTHON_MODNAME=puddlestuff
-
-inherit distutils fdo-mime python
-
-DESCRIPTION="Audio tag editor"
-HOMEPAGE="http://puddletag.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cover musicbrainz quodlibet"
-
-DEPEND=""
-RDEPEND=">=dev-python/PyQt4-4.5
-	>=dev-python/pyparsing-1.5.1
-	>=media-libs/mutagen-1.20
-	>=dev-python/configobj-4.7.2
-	musicbrainz? ( >=dev-python/python-musicbrainz-0.7.2 )
-	cover? ( >=dev-python/imaging-1.1.7 )
-	quodlibet? ( >=media-sound/quodlibet-2.2.1 )
-	>=dev-python/sip-4.11.2
-	>=dev-python/lxml-2.2.8"
-
-S=${WORKDIR}/${P/_}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -q -r 2 .
-	distutils_src_prepare
-}
-
-src_install() {
-	distutils_src_install
-	dodoc changelog HACKING THANKS
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	distutils_pkg_postrm
-}