Version bump and remove old alpha, #203177 thanks to Marti Raudsepp.

(Portage version: 2.1.3.19)

5 files changed, 28 insertions, 95 deletions

diff --git a/media-sound/picard/ChangeLog b/media-sound/picard/ChangeLog
index 9c4b007ec285..104aa56a38a0 100644
--- a/media-sound/picard/ChangeLog
+++ b/media-sound/picard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/picard
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.4 2007/10/28 17:24:35 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.5 2007/12/23 22:13:02 coldwind Exp $
+
+*picard-0.9.0 (23 Dec 2007)
+
+  23 Dec 2007; Santiago M. Mola <coldwind@gentoo.org>
+  -files/picard-0.9.0_alpha14-disable-locales.patch,
+  -picard-0.9.0_alpha14.ebuild, +picard-0.9.0.ebuild:
+  Version bump and remove old alpha, #203177 thanks to Marti Raudsepp.
 
 *picard-0.9.0_beta1 (28 Oct 2007)
 
diff --git a/media-sound/picard/files/digest-picard-0.9.0 b/media-sound/picard/files/digest-picard-0.9.0
new file mode 100644
index 000000000000..3485ad4842fc
--- /dev/null
+++ b/media-sound/picard/files/digest-picard-0.9.0
@@ -0,0 +1,3 @@
+MD5 51c6f1d512b5a4e95d385e1dfe2b8aab picard-0.9.0.tar.gz 401571
+RMD160 6e42ab1bea1ffe9dc7ca964f7080fea7c1fc24ad picard-0.9.0.tar.gz 401571
+SHA256 5235de52a8e537b24be774a2ebdabd84679bf5adccf8a28766f8be9153a726b3 picard-0.9.0.tar.gz 401571
diff --git a/media-sound/picard/files/digest-picard-0.9.0_alpha14 b/media-sound/picard/files/digest-picard-0.9.0_alpha14
deleted file mode 100644
index 3fb8793ec84d..000000000000
--- a/media-sound/picard/files/digest-picard-0.9.0_alpha14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 212e9e0efc2e2e5a78e04f52301cb4b2 picard-0.9.0alpha14.tar.gz 399318
-RMD160 694405552411e0e212614609eeed9344cbad47b1 picard-0.9.0alpha14.tar.gz 399318
-SHA256 5f2c4eb71ae20ccc3511be5f90d75f10a5a12e2311a02661dfff0e3d0ac8836e picard-0.9.0alpha14.tar.gz 399318
diff --git a/media-sound/picard/files/picard-0.9.0_alpha14-disable-locales.patch b/media-sound/picard/files/picard-0.9.0_alpha14-disable-locales.patch
deleted file mode 100644
index 378babae48a6..000000000000
--- a/media-sound/picard/files/picard-0.9.0_alpha14-disable-locales.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -uBr picard-0.9.0alpha11/setup.py picard-0.9.0alpha11.new/setup.py
---- picard-0.9.0alpha11/setup.py	2007-05-27 16:04:25.000000000 +0200
-+++ picard-0.9.0alpha11.new/setup.py	2007-06-20 15:01:09.000000000 +0200
-@@ -181,17 +181,17 @@
-          "installation directory for locales"),
-         ('localedir=', None, ''),
-         ('disable-autoupdate', None, ''),
-+        ('disable-locales', None, ''),
-     ]
- 
--    sub_commands = install.sub_commands + [
--        ('install_locales', None),
--    ]
-+    sub_commands = install.sub_commands
- 
-     def initialize_options(self):
-         install.initialize_options(self)
-         self.install_locales = None
-         self.localedir = None
-         self.disable_autoupdate = None
-+        self.disable_locales = None
- 
-     def finalize_options(self):
-         install.finalize_options(self)
-@@ -205,6 +205,8 @@
-         self.distribution.get_command_obj('build').disable_autoupdate = self.disable_autoupdate
-         if self.root is not None:
-             self.change_roots('locales')
-+        if self.disable_locales is None:
-+            self.sub_commands.append(('install_locales', None))
- 
-     def run(self):
-         install.run(self)
-@@ -216,17 +218,17 @@
-         ('build-locales=', 'd', "build directory for locale files"),
-         ('localedir=', None, ''),
-         ('disable-autoupdate', None, ''),
-+        ('disable-locales', None, ''),
-     ]
- 
--    sub_commands = build.sub_commands + [
--        ('build_locales', None),
--    ]
-+    sub_commands = build.sub_commands
- 
-     def initialize_options(self):
-         build.initialize_options(self)
-         self.build_locales = None
-         self.localedir = None
-         self.disable_autoupdate = None
-+        self.disable_locales = None
- 
-     def finalize_options(self):
-         build.finalize_options(self)
-@@ -236,6 +238,8 @@
-             self.localedir = '/usr/share/locale'
-         if self.disable_autoupdate is None:
-             self.disable_autoupdate = False
-+        if self.disable_locales is None:
-+            self.sub_commands.append(('build_locales', None))
- 
-     def run(self):
-         log.info('generating scripts/picard from scripts/picard.in')
diff --git a/media-sound/picard/picard-0.9.0_alpha14.ebuild b/media-sound/picard/picard-0.9.0.ebuild
index 2f36641fab39..cf2d128e6a9d 100644
--- a/media-sound/picard/picard-0.9.0_alpha14.ebuild
+++ b/media-sound/picard/picard-0.9.0.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/picard-0.9.0_alpha14.ebuild,v 1.3 2007/09/16 21:43:33 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/picard-0.9.0.ebuild,v 1.1 2007/12/23 22:13:02 coldwind Exp $
 
 inherit eutils distutils
 
-MY_P="${P/_/}"
-
-DESCRIPTION="the next generation of tagger for MusicBrainz"
+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/users/luks/picard-qt/${MY_P}.tar.gz"
+SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/picard/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,7 +15,7 @@ IUSE="cdaudio ffmpeg nls"
 
 RDEPEND=">=dev-lang/python-2.4
 	|| ( >=dev-lang/python-2.5 >=dev-python/ctypes-0.9 )
-	>=dev-python/PyQt4-4.1
+	>=dev-python/PyQt4-4.2
 	>=x11-libs/qt-4.2
 	>=media-libs/mutagen-1.9
 	cdaudio? ( >=media-libs/libdiscid-0.1.1 )
@@ -27,37 +25,34 @@ RDEPEND=">=dev-lang/python-2.4
 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!"
+		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
-}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-disable-locales.patch"
 }
+
 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"
+			-e "s:\(^with-libofa\ =\ \).*:\1False:" \
+			build.cfg || die "sed failed"
 	fi
-
-	local myconf
-	use nls || myconf="--disable-locales"
-	${python} setup.py build ${myconf} || die "setup.py build failed"
-
+	${python} setup.py build $(use nls || echo "--disable-locales") \
+		|| die "setup.py build failed"
 }
 
 src_install() {
-	local myconf
-	use nls || myconf="--disable-locales"
-	distutils_src_install --disable-autoupdate --skip-build ${myconf}
+	distutils_src_install --disable-autoupdate --skip-build \
+		$(use nls || echo "--disable-locales")
 }
 
 pkg_postinst() {
@@ -65,10 +60,4 @@ 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."
-	echo
-	if ! use cdaudio; then
-		ewarn "The 'cdaudio' USE flag is disabled. CD index lookup and"
-		ewarn "identification won't be available unless you install"
-		ewarn "media-libs/libdiscid"
-	fi
 }