version bump and fix build with ffmpeg trunk

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 127 insertions, 15 deletions

diff --git a/media-sound/picard/ChangeLog b/media-sound/picard/ChangeLog
index 137e64473f2e..ea41aa69a715 100644
--- a/media-sound/picard/ChangeLog
+++ b/media-sound/picard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/picard
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.29 2011/04/10 06:14:34 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.30 2011/04/28 14:37:51 aballier Exp $
+
+*picard-0.13 (28 Apr 2011)
+
+  28 Apr 2011; Alexis Ballier <aballier@gentoo.org> +picard-0.13.ebuild,
+  +files/picard-0.13-ffmpeg.patch:
+  version bump and fix build with ffmpeg trunk
 
   10 Apr 2011; Thomas Kahle <tomka@gentoo.org> picard-0.12.1-r1.ebuild:
   x86 stable per bug 358449
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index c868ad75775c..4a8560e38636 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,25 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX picard-0.13-ffmpeg.patch 639 RMD160 3059a5826d86595b870078f6af6db53bcb1fdb99 SHA1 5b0c307d0ecd90afe2f47535bc802b690317e6e7 SHA256 dd0e122da536a00397e60c26ff1103ed075c54a574e42162276abf60fdb70f08
 DIST coverart.py 6476 RMD160 49b833a0cf663632d1c02a102eeda2660e00dec9 SHA1 c16d8238f958da8bcf69f7a7f69dbc93dc0f32d4 SHA256 91ac249a120be52b335fb8e615e8396be0519aac87fdbce2ce259970c9363dba
 DIST picard-0.12.1.tar.gz 1361157 RMD160 9d91e53f6ea0fd4c4a25bd1dbd8036a413971aef SHA1 965412de954d2a73487a1332b49ac7725e719f0c SHA256 7ffb28a47b610c45cfd972eacbb65c95a224aeaed0750d57c61a47d29f9a8183
+DIST picard-0.13.tar.gz 1370119 RMD160 49df33059bbde85e4be9f5aab772e50405e2ddb2 SHA1 c40b05ab46f97e7dae8f3178ac12212d8b004317 SHA256 4826c490b3f120eeb90bb118e9277a716795852f4be24187a977365347fe4dc3
 EBUILD picard-0.12.1-r1.ebuild 2588 RMD160 620cf6159716bdfb5043e67912604c0382415c01 SHA1 8ae4fbe769c28ec7672b5def70d98b4e9bd3a591 SHA256 a6b25f96d0d88c0c962bf2a7be5fee089bfd2e2d97e1fd0980cfbad557961556
-MISC ChangeLog 4775 RMD160 2d7f81281d1a09c17e55d0a2b2c56e23ee55c979 SHA1 9d80297093c39fc39cf6766c20725e8d71af04d4 SHA256 a24f1aa585bcb03c30d36f7df4ac6fa7e2786eacb589629e80a60bd8705b914e
+EBUILD picard-0.13.ebuild 2670 RMD160 5b9d4762904e3ed88a8d2cd14bd6e9b7d351db73 SHA1 5c17af0d3911f159e5d44f6a4ce557ddbdb18dbb SHA256 6d8a6b95ee24498a6bfd8b07e96e46f31f645975bf4bc1e551ac3c776ec31be6
+MISC ChangeLog 4962 RMD160 1b1485c3c41ca4c7e2bb9a9d7fefd0382429cb18 SHA1 09dce4df0b9c94e052e6fe8b5ac3090b61257f48 SHA256 53cabde38c64bf7861cadf4a689e3e460cb0c5f7b0cd1c11a76d959eca02d4c0
 MISC metadata.xml 553 RMD160 aa0f6c2209114f46b535081ff6755b8580ab2de8 SHA1 2bc539d9847f8523ae99b5a819638a3d8e51d3e8 SHA256 deb9d87153b6e173691172b883e947d9c0561dc6533a7b4a2bf5569f25e32ae5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNobOnAAoJENgZr6v6gHY0K3kQAMFfzoJAcT8dy28mE3pWSiH5
-N2D7X3SgyJm9TZhDTvJ8b6Dwrq33UJKd4C189pewaHZxsvRsFlEoe1w1aM/r3lBU
-XeXqyGcU06doLTFZ3qLde4lTuRoXAumGb6PrLSMDY++zaDldBPA+60VvYpUY+jzC
-YPGazV7V7TLtm19Aim7zkIFE83OW98ex16I9cCFqdQVkHQqZHF9rKxNZNjNRNMBM
-5Fv0yj/7ar/XJFZFRXF9WtVrN9+ugyA/d4n8Xs39su/mTzHEci9wegFOcLry7Ktc
-2wSo0fRA1sKDwjigJQ/8c94/7Id2qezBYgVfOllxJFiwW9tQZaIREHxO0GIMnou0
-QGkp17m3SkIcAwQhiMwNjzut8n/hBf7KI6VJM+lV6v57J1xGIHKGYao0bA7oaDqA
-xuy0Rj3cGqylEQ+Ny6BQlyYqDCXR9WC8JffItJjqUldMjCWR6TcdbB79NDRacg/H
-KbugKa4Agl4C/M/nwPEDI6BnUvo3efS/nprZQ6TaTyhOKIqC+jCWS2j98uT69qQk
-Cwb/MAdh94iYxxbVeGXmazR1CEkubhnN8moeYLB5WL2wtPAsDuDlry1/xj8KJ+u5
-CeGy+KiHXcyBQv/Y2EZBHO24c5Gk5DBLXZ8085iNG9raTyg1XnakPzeR2BnKiSEz
-ZoLoLdzN9EYvD7NXGx+x
-=wuq7
+iEYEARECAAYFAk25e8QACgkQvFcC4BYPU0rY/QCfWRBtlBUxjDyh4MqTrXY+27Ax
+VCsAoKfiHjDlnpdKzehRo+vm9z9A4N54
+=Mdlf
 -----END PGP SIGNATURE-----
diff --git a/media-sound/picard/files/picard-0.13-ffmpeg.patch b/media-sound/picard/files/picard-0.13-ffmpeg.patch
new file mode 100644
index 000000000000..bf254bd12adc
--- /dev/null
+++ b/media-sound/picard/files/picard-0.13-ffmpeg.patch
@@ -0,0 +1,13 @@
+Index: picard-0.13/picard/musicdns/avcodec.c
+===================================================================
+--- picard-0.13.orig/picard/musicdns/avcodec.c
++++ picard-0.13/picard/musicdns/avcodec.c
+@@ -251,7 +251,7 @@ decode(PyObject *self, PyObject *args)
+     codec_context = NULL;
+     for (i = 0; i < format_context->nb_streams; i++) {
+         codec_context = (AVCodecContext *)format_context->streams[i]->codec;
+-        if (codec_context && codec_context->codec_type == CODEC_TYPE_AUDIO)
++        if (codec_context && codec_context->codec_type == AVMEDIA_TYPE_AUDIO)
+             break;
+     }
+     if (codec_context == NULL) {
diff --git a/media-sound/picard/picard-0.13.ebuild b/media-sound/picard/picard-0.13.ebuild
new file mode 100644
index 000000000000..bbac40333882
--- /dev/null
+++ b/media-sound/picard/picard-0.13.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/picard-0.13.ebuild,v 1.1 2011/04/28 14:37:51 aballier Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+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
+	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? (
+		virtual/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_prepare() {
+	epatch "${FILESDIR}/${P}-ffmpeg.patch"
+	distutils_src_prepare
+}
+
+src_configure() {
+	$(PYTHON -f) 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() {
+	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
+}