Remove old, migrate 0.11 to eapi-2 with use deps, check for X useflag in PyQt4. Fixes bug 272175.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 22 insertions, 108 deletions

diff --git a/media-sound/picard/ChangeLog b/media-sound/picard/ChangeLog
index e47513494ca7..7ab7d2d716c9 100644
--- a/media-sound/picard/ChangeLog
+++ b/media-sound/picard/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/picard
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.18 2009/05/14 20:32:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.19 2009/06/06 14:22:40 yngwin Exp $
+
+  06 Jun 2009; Ben de Groot <yngwin@gentoo.org> -picard-0.10-r1.ebuild,
+  picard-0.11.ebuild:
+  Remove old, migrate 0.11 to eapi-2 with use deps, check for X useflag in
+  PyQt4. Fixes bug 272175.
 
   14 May 2009; Markus Meier <maekke@gentoo.org> picard-0.11.ebuild:
   amd64/x86 stable, bug #269737
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 0eacf343ac4e..a9d128b6a661 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX picard-0.10.0_rc1-ffmpeg-headers.patch 594 RMD160 9d7dbf3a4c8802269e478a2585498fe3f2860dc4 SHA1 61cda19d72af8500cdeac5fb710db6e4e2dca295 SHA256 1f7860958dd735f8b1abeebd9c0d271216a874c1ad3dee19ce88933c2a984f1c
-DIST picard-0.10.tar.gz 459526 RMD160 0c7bf4ac4471d8bf8faa56be6bb59ee0f6bca790 SHA1 e519d0b63a7e64d3c9131afa20a7ffca6a8a813c SHA256 dc86f5defcfef8e750e404369bdd1184b41cb944f3c37bb5bc5112ebab065777
 DIST picard-0.11.tar.gz 442371 RMD160 208e45621e10706fe7f5198718659b3b85eba4aa SHA1 702e6be6d0e595c87b21e7a20894d004efc3693f SHA256 c7b5170edcafc35daafd8b990efddfda57816349432d0a6a37869f0c483156ab
-EBUILD picard-0.10-r1.ebuild 2269 RMD160 57da0acd61b5a4d571265164f222f2ede58da4ee SHA1 33c9139941a7378addcabfb4006baac788d09332 SHA256 bfd478ec6a328de7d94bc6b1bf24ec2d874a4e94055f963d440bed1260a35fee
-EBUILD picard-0.11.ebuild 2243 RMD160 19870601c4937b8a68cd4ae8ddf7afb267177172 SHA1 230be70f3bb6f0be23e76ec941c11efefe3a8d4e SHA256 3c5ce43d33d4d8207a6817514d4273671fb38621514b5a78e596e73aa71a66f8
-MISC ChangeLog 3248 RMD160 181ecdd430a2bd100b66b2911b3583bc313ee5a3 SHA1 8da1af04b77d7caea5c590fd61ccd02f92d73036 SHA256 fb3937b39d7421c15c78dd178e4e410f98da3828014de7662365c943d2b15011
+EBUILD picard-0.11.ebuild 2148 RMD160 caf0bae8c9e68655062adfb15673556353acb62f SHA1 a50bda05cdc75afc69487bd588211ea1ef1760fb SHA256 273236f9ff944e83cee8cc7bb66d197bb1296efb4ae62a5424f417e0c70394c2
+MISC ChangeLog 3445 RMD160 87d73cee194217ea09a49c71688741e031c0289b SHA1 2afd4dd66e9ed4ed576759d338ba258fa161467c SHA256 47efd3700ae3d77291d049590e13f380db68099532fe33287c919430281d2800
 MISC metadata.xml 806 RMD160 0aa68fa3348f1b73ac7af38d538357999b8efb6a SHA1 2ab1c62d1c765e1d5d79935309c9c1efc9867801 SHA256 08cb60249ced18a24e2a17fd2bccc19260875170022373e2193acaee779a8625
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoMf9wACgkQkKaRLQcq0GKKTACfVUEXDO7eDNBN6nzZpfQbojJ3
-/W0AnRaTU7s+sRnEPelOOBgwpA1WuUUh
-=KJSj
------END PGP SIGNATURE-----
diff --git a/media-sound/picard/picard-0.10-r1.ebuild b/media-sound/picard/picard-0.10-r1.ebuild
deleted file mode 100644
index 3d967f2531c7..000000000000
--- a/media-sound/picard/picard-0.10-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/picard-0.10-r1.ebuild,v 1.2 2008/11/09 11:16:36 maekke Exp $
-
-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="cdaudio ffmpeg nls"
-
-RDEPEND=">=dev-lang/python-2.4
-	|| ( >=dev-lang/python-2.5 >=dev-python/ctypes-0.9 )
-	>=dev-python/PyQt4-4.2
-	media-libs/mutagen
-	cdaudio? ( >=media-libs/libdiscid-0.1.1 )
-	ffmpeg? ( media-video/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 cdaudio; then
-		ewarn "The 'cdaudio' 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
-
-	if ! built_with_use --missing true dev-lang/python cxx ; then
-		eerror "Please, rebuild dev-lang/python with USE=\"cxx\"."
-		die "dev-lang/python built without cxx support"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if has_version '>=media-video/ffmpeg-0.4.9_p20080326' ; then
-		epatch "${FILESDIR}"/${PN}-0.10.0_rc1-ffmpeg-headers.patch
-	fi
-}
-
-src_compile() {
-	${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
-	${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
-	domenu picard.desktop
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	echo
-	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.11.ebuild b/media-sound/picard/picard-0.11.ebuild
index ade26eeeeae6..1411dec5be8e 100644
--- a/media-sound/picard/picard-0.11.ebuild
+++ b/media-sound/picard/picard-0.11.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 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.2 2009/05/14 20:32:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/picard-0.11.ebuild,v 1.3 2009/06/06 14:22:40 yngwin Exp $
 
+EAPI="2"
 inherit distutils
 
 MY_P="${P/_/}"
@@ -14,18 +15,19 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="cdaudio ffmpeg nls"
 
-RDEPEND=">=dev-lang/python-2.4
-	|| ( >=dev-lang/python-2.5 >=dev-python/ctypes-0.9 )
-	>=dev-python/PyQt4-4.2
+RDEPEND="|| (
+		>=dev-lang/python-2.5
+		( dev-lang/python:2.4[cxx] =dev-python/ctypes-0.9 )
+	)
+	dev-python/PyQt4[X]
 	media-libs/mutagen
 	cdaudio? ( >=media-libs/libdiscid-0.1.1 )
 	ffmpeg? ( media-video/ffmpeg
 		>=media-libs/libofa-0.9.2 )"
-
 DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS.txt INSTALL.txt NEWS.txt"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	if ! use ffmpeg; then
@@ -37,20 +39,18 @@ pkg_setup() {
 		ewarn "identification will not be available. You can get audio CD support"
 		ewarn "by installing media-libs/libdiscid."
 	fi
-
-	if ! built_with_use --missing true dev-lang/python cxx ; then
-		eerror "Please, rebuild dev-lang/python with USE=\"cxx\"."
-		die "dev-lang/python built without cxx support"
-	fi
 }
 
-src_compile() {
+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"
 }
@@ -59,8 +59,8 @@ src_install() {
 	distutils_src_install --disable-autoupdate --skip-build \
 		$(use nls || echo "--disable-locales")
 
-	doicon picard-{16,32}.png
-	domenu picard.desktop
+	doicon picard-{16,32}.png || die 'doicon failed'
+	domenu picard.desktop || die 'domenu failed'
 }
 
 pkg_postinst() {