Version bump. Updated metadata. Fixes bug 290786.

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

4 files changed, 84 insertions, 18 deletions

diff --git a/media-sound/picard/ChangeLog b/media-sound/picard/ChangeLog
index fa616e4ad998..6505116ec315 100644
--- a/media-sound/picard/ChangeLog
+++ b/media-sound/picard/ChangeLog
@@ -1,6 +1,12 @@
 # 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.21 2009/10/25 17:12:20 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.22 2009/11/17 23:35:31 yngwin Exp $
+
+*picard-0.12.1 (17 Nov 2009)
+
+  17 Nov 2009; Ben de Groot <yngwin@gentoo.org> +picard-0.12.1.ebuild,
+  metadata.xml:
+  Version bump. Updated metadata. Fixes bug 290786.
 
   25 Oct 2009; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove coldwind from metadata.xml (#181764)
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 36b8a8db7e1b..3232d74a0495 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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 2139 RMD160 bbfb12160129e05eb68d811b368c78ec164e3910 SHA1 f7c574460eccabeb59f8b2c848e871d2a6762e37 SHA256 9085c20fc4a705953daa430644ef5547ddd059498e0694d664e2bdb17168b494
-MISC ChangeLog 3661 RMD160 16a00120c84a68236206de12c5547a3c19ea52a3 SHA1 76fc529960a07b7a682bf3fa6966b306cafb967d SHA256 8fa54fcc049b490b3e4dc7b8bde978d6fa5138ee19a0ffe2fd46dfd5f854ac4f
-MISC metadata.xml 616 RMD160 6bd96d66533a76c240081842407f1a671d2d767d SHA1 6c0fe6eed91152e91502503e902fb6ca0881e57b SHA256 074c40346934b7915bfd0851546a7ea381197ee1d847dd24e284f6448822fd73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrkhvkACgkQV3J2n04Eauzf1QCfaeqSDKCMuIKBW6q/WpQBTKto
-wuQAoLk84rsyU/q3e8b0knlVXKJZuMNI
-=iWfO
------END PGP SIGNATURE-----
+EBUILD picard-0.12.1.ebuild 2128 RMD160 754f306609609e391d12eccb3663271bf0fc5623 SHA1 edf4328a2f3659135cdad0524cde6e01022f9499 SHA256 f3c269483cefd6ea8d266a5ed5e934372531829491c87d9b3eec46f313e34068
+MISC ChangeLog 3833 RMD160 fd1aa5661d710a7b46de2c84f146b6b97216b1e8 SHA1 4cb0f1354741987474f58192adec5a4f6884e9eb SHA256 3a1af5b7c66a2d59d21ffaf2e89f66516f1f5a24cec255e0f17c5d8013e91d1d
+MISC metadata.xml 470 RMD160 f9ccb08a9180913f07490d1e9221f9ddd8a191a6 SHA1 93746931467bef2ca8e14ead61faf881f7ba4189 SHA256 32ce77fb118d7d7025f5a883b0a3701f20cbf38f5f2cb7888dc6ae93aa59e7a0
diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml
index 9261054b7636..83082e61e5f4 100644
--- a/media-sound/picard/metadata.xml
+++ b/media-sound/picard/metadata.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sound</herd>
-  <maintainer>
-    <email>marti@juffo.org</email>
-    <name>Marti Raudsepp</name>
-    <description>Proxy maintainer</description>
-  </maintainer>
   <longdescription>MusicBrainz Picard is a cross-platform MusicBrainz tag editor
   written in Python. Picard Tagger is intended to be the next generation of
   tagger for MusicBrainz, with a focus on album oriented tagging as opposed to
diff --git a/media-sound/picard/picard-0.12.1.ebuild b/media-sound/picard/picard-0.12.1.ebuild
new file mode 100644
index 000000000000..b7e1eeb7bc56
--- /dev/null
+++ b/media-sound/picard/picard-0.12.1.ebuild
@@ -0,0 +1,73 @@
+# 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.12.1.ebuild,v 1.1 2009/11/17 23:35:31 yngwin Exp $
+
+EAPI="2"
+inherit 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"
+
+DEPEND="|| ( >=dev-lang/python-2.5
+		( dev-lang/python:2.4[cxx] =dev-python/ctypes-0.9 )	)
+	dev-python/PyQt4[X]
+	media-libs/mutagen
+	cdda? ( >=media-libs/libdiscid-0.1.1 )
+	ffmpeg? ( media-video/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."
+}