Fix Python ABI compatibility #313965; added support for covert download #295922

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

4 files changed, 123 insertions, 3 deletions

diff --git a/media-sound/picard/ChangeLog b/media-sound/picard/ChangeLog
index d1bdd5a32ea8..222203f6f642 100644
--- a/media-sound/picard/ChangeLog
+++ b/media-sound/picard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/picard
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.24 2010/03/10 09:26:24 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.25 2010/05/29 09:24:56 jlec Exp $
+
+*picard-0.12.1-r1 (29 May 2010)
+
+  29 May 2010; Justin Lecher <jlec@gentoo.org> +picard-0.12.1-r1.ebuild,
+  metadata.xml:
+  Fix Python ABI compatibility #313965; added support for covert download
+  #295922
 
   10 Mar 2010; Joseph Jezak <josejx@gentoo.org> picard-0.12.1.ebuild:
   Marked ~ppc for bug #306453.
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 60b0846e5acd..da2435fefb10 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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 2081 RMD160 fba676a82df077b227ef81131c4a4cacc3308742 SHA1 a9f8ce6795928d78bcd3a495d212926d251407dd SHA256 fdf0b95717ae4bd020fb40a2467d7b2be02c93066cf3285a4e72ebfef0adcf88
+EBUILD picard-0.12.1-r1.ebuild 2704 RMD160 cd864b189159c0f6ad9892dc774b9319bc2668c8 SHA1 49f49b2a061086f5bf419b0dd9188f2fc0ba0b92 SHA256 492c9e87f2b307469dfeff4cded78f31bae8f768cff3c41d84ea78f058a014f9
 EBUILD picard-0.12.1.ebuild 2081 RMD160 bf03c51bfd82c9ca09f9a08e8509212f4775fdf1 SHA1 c9d9393a960bfdffcc92eeb70a45fddc48ebb549 SHA256 545e5e1b574c57921b83114582a161a089f4c28ca79a3a2b5d9dc65ee8866127
-MISC ChangeLog 4081 RMD160 d76d63a674c61a2dd89d997fef414c93907bbde1 SHA1 ffd2afe4e9067658a9ebfb61ba1b58c1c78cc34f SHA256 82d12627d401e8cce4f24ee5321578574b1c787a4bf149372119d5b02d0d7a6f
-MISC metadata.xml 470 RMD160 f9ccb08a9180913f07490d1e9221f9ddd8a191a6 SHA1 93746931467bef2ca8e14ead61faf881f7ba4189 SHA256 32ce77fb118d7d7025f5a883b0a3701f20cbf38f5f2cb7888dc6ae93aa59e7a0
+MISC ChangeLog 4286 RMD160 7d45ec06b714a5ade6d3f7d78c6a82ffcd84572d SHA1 33898f168a840e8524b09c88fc51527ef5965633 SHA256 37a864dd0adb73b75b1b4e2ddb3dc56b656998a0c8051a6eed784aed33d195e0
+MISC metadata.xml 553 RMD160 aa0f6c2209114f46b535081ff6755b8580ab2de8 SHA1 2bc539d9847f8523ae99b5a819638a3d8e51d3e8 SHA256 deb9d87153b6e173691172b883e947d9c0561dc6533a7b4a2bf5569f25e32ae5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwA3XEACgkQgAnW8HDreRbyFACfclD+al/5UWN7tqHTV0Q/KQf+
+wewAoLuV1diNWbjXvlV6sChVJEgfnBZC
+=+W2m
+-----END PGP SIGNATURE-----
diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml
index 83082e61e5f4..6d0ec7d3fdf1 100644
--- a/media-sound/picard/metadata.xml
+++ b/media-sound/picard/metadata.xml
@@ -6,4 +6,5 @@
   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
   track based tagging and cross platform compatibility.</longdescription>
+<use><flag name='coverart'>Install plugin for direct coverart dowload</flag></use>
 </pkgmetadata>
diff --git a/media-sound/picard/picard-0.12.1-r1.ebuild b/media-sound/picard/picard-0.12.1-r1.ebuild
new file mode 100644
index 000000000000..efb147df519a
--- /dev/null
+++ b/media-sound/picard/picard-0.12.1-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/05/29 09:24:56 jlec Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils distutils
+
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="true"
+
+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
+	coverart? ( http://users.musicbrainz.org/~outsidecontext/picard/plugins/coverart.py )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cdda coverart ffmpeg nls"
+
+DEPEND="
+	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}"
+
+# doesn't work with ebuilds
+RESTRICT="test"
+
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS.txt INSTALL.txt NEWS.txt"
+
+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_unpack() {
+	unpack ${MY_P}.tar.gz
+	if use coverart; then
+		cp "${DISTDIR}"/coverart.py "${S}"/${PN}/plugins/coverart.py || die "Copy of coverart plugin failed"
+	fi
+}
+
+src_configure() {
+	configuration() {
+	$(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_execute_function -s configuration
+}
+
+src_compile() {
+	distutils_src_compile $(use nls || echo "--disable-locales")
+}
+
+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."
+	if use coverart; then
+		ewarn "You have downloaded and installed the coverart downloader plugin."
+		ewarn "If you expect it to work please enable it in Options->Plugins."
+	fi
+}