Version bump, thanks to Benedikt Waldvogel in bug #419425 and Laurent Bachelier in bug #401193 for suggested ebuild improvements. Also fixes bug #323007.

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

4 files changed, 104 insertions, 25 deletions

diff --git a/media-sound/picard/ChangeLog b/media-sound/picard/ChangeLog
index f202b34f7f5f..025adebf8854 100644
--- a/media-sound/picard/ChangeLog
+++ b/media-sound/picard/ChangeLog
@@ -1,6 +1,14 @@
 # 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.37 2011/11/04 17:09:06 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.38 2012/07/12 15:29:33 yngwin Exp $
+
+*picard-1.0 (12 Jul 2012)
+
+  12 Jul 2012; Ben de Groot <yngwin@gentoo.org> +picard-1.0.ebuild,
+  metadata.xml:
+  Version bump, thanks to Benedikt Waldvogel in bug #419425 and Laurent
+  Bachelier in bug #401193 for suggested ebuild improvements. Also fixes bug
+  #323007.
 
   04 Nov 2011; Tim Harder <radhermit@gentoo.org> -picard-0.12.1-r1.ebuild,
   -picard-0.13.ebuild, -files/picard-0.13-ffmpeg.patch, -picard-0.14.ebuild:
@@ -171,4 +179,3 @@
   +files/picard-0.9.0_alpha14-disable-locales.patch, +metadata.xml,
   +picard-0.9.0_alpha14.ebuild:
   Initial ebuild wrt bug #80312. Thanks to Marti Raudsepp.
-
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 8d17be0f57e2..483bea9708a8 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-DIST picard-0.15.1-coverart.py.gz 2430 RMD160 dab3c0a1e81854d868700a901084cfcd0e8a6ee4 SHA1 c15bc403251d39e39861a34763c11fae7a11e2d5 SHA256 3547364a578ebdf6b81cf7edba50131ec1d3f67aac5eea98097072468b7b3aa7
-DIST picard-0.15.1.tar.gz 1549887 RMD160 195902699349d27af268180f45312a4d3ce1ac80 SHA1 91b461430add978f0b07ae738ce1b9de616998f4 SHA256 227bd6a55a59e4d9e1cd79e1608de378fa044e6d547e923d1fe72b402873546d
-DIST picard-0.16.tar.gz 1828595 RMD160 375610cfd8ff03825e22af726730fa85c7cb54fd SHA1 274071410550ee29051bb0137d72602921a015f9 SHA256 5623216feddf6000187cead3746b3aebe5f603837e313c7dfc99783576f54b18
-EBUILD picard-0.15.1-r1.ebuild 2618 RMD160 e69ffa78e8c8a14121ebaf9bd5eb794c330cd1bd SHA1 3cbf4891e5d1059771ab20d40e6c9d57f5837cd5 SHA256 60690c8a60fdf97193587a50d2950c7819389788425638b802407f20ce7ce0c8
-EBUILD picard-0.16.ebuild 2632 RMD160 783846170ec94c141627a9c8117fcf2832a5e920 SHA1 250f5e063bd215ff04aa0a2744fef35ebd036731 SHA256 fc55bfa3fdc8898c9b1f8690f787b36567fb5ac62cbeddb2ca8f7fca9a66e060
-MISC ChangeLog 6040 RMD160 c1056dab2533d4efb872cdbc6e10280cdb380517 SHA1 1985e2f415aa9a3b02106b9923166aa718c029e6 SHA256 eac08d06ef768a6e2bac37926454531206230ad11447bd2691411f3857974a7e
-MISC metadata.xml 553 RMD160 aa0f6c2209114f46b535081ff6755b8580ab2de8 SHA1 2bc539d9847f8523ae99b5a819638a3d8e51d3e8 SHA256 deb9d87153b6e173691172b883e947d9c0561dc6533a7b4a2bf5569f25e32ae5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQEcBAEBCgAGBQJOtBw/AAoJEEqz6FtPBkyj4VkH/iM6sYIxcESd3pZztJsM41rk
-KeMDZPeyG/eSVktI8L+PKLQGt5zSVHRKeCM0JRJUwrB4530gn6sKG64UPQwmpuvV
-zXUxVqkruGCh0BPV1j19GoLEIzmD3RjY9x9F52OFlyAD4opOW3HAzWuV86I0Etq1
-9p0qg4gZyo9EYCGmSQuFQwe+N20iTeMD7mDgYNN0irQJo/XM00ceOQNYNVrXVauX
-E9KiPD06b8/QwrgRqwZZt7D8EPYVYX7Mq4k8+XDZ1HzM9zz9o/DVeoD2ogQnJrfI
-MMauh+H0DbFiOkif2RBiQO+5dsJAyjgL06a4xv5pGWZaAEhle+MOki5WMj+K+Fs=
-=qJO9
------END PGP SIGNATURE-----
+DIST picard-0.15.1-coverart.py.gz 2430 SHA256 3547364a578ebdf6b81cf7edba50131ec1d3f67aac5eea98097072468b7b3aa7
+DIST picard-0.15.1.tar.gz 1549887 SHA256 227bd6a55a59e4d9e1cd79e1608de378fa044e6d547e923d1fe72b402873546d
+DIST picard-0.16.tar.gz 1828595 SHA256 5623216feddf6000187cead3746b3aebe5f603837e313c7dfc99783576f54b18 SHA512 c6bc25fc19be46b0e35540bbf2cfeaf9b0ec5cb81defbd660f6249174a41f6cf1f26833a20bd3d4e4ab5e26bb52bd19808d8a8db19a2b32dd0cb2255e1a973cd WHIRLPOOL 9910f79d3f06b106a16c064051eaaa81dfecb0d858c4cf4c26cfeb7f1a4635d3d7685289b055b42ce4a125e904f71833d0295c6c81816d61b7865e60b6db2173
+DIST picard-1.0.tar.gz 1668228 SHA256 a8e3f2d54bbf707b3027c7c8fafcb0c52d034d36d7c45baa3e4d56c7a630bd10 SHA512 6a2b8d1acd0239fcf648492f34b8b9cd9fc259c749ec29f7960631cc1d83bafd221a82c0e22fe4f68d81eecc4ccb6ff57f8cc31a49b2ce2ce479e4601883b3a5 WHIRLPOOL 3f2ddff6f920742d5c7580933ed624995963bb31112ba45a89282d05404c03c4927d2d7365234b600d575860ffa8f3cced3315fc47261d686c6a7a500d5700fa
+EBUILD picard-0.15.1-r1.ebuild 2618 SHA256 60690c8a60fdf97193587a50d2950c7819389788425638b802407f20ce7ce0c8 SHA512 5cb316217eb9c408f3dccded47a21238280586c55c14307c384bb2d6f92a5a871cdfb04a1a869c50f35bb14bdff790ca961e5ce3a96d857564dfc9ba0cc9e18e WHIRLPOOL 9d249781f1269c33981fa64a7a8ea8859ec420af5373e80aaf40d5cffa31ce19ca837e4ed2b6c20c69a62be0bf30a973d81134bec50c12aa1ccdc2f9d3880481
+EBUILD picard-0.16.ebuild 2632 SHA256 fc55bfa3fdc8898c9b1f8690f787b36567fb5ac62cbeddb2ca8f7fca9a66e060 SHA512 5cb50445deab708f2a9421e071b23433644f0fdc212e608b04b81444d9e7efb12a7bb13f709961d7642472dd1b654561da29f68bf769fa295afbe84c4e140cc8 WHIRLPOOL 9ceca4dabeb7a5399db4d001c1669ba1d4048e341d8ab36bc7525694fdd5e391ba712acb3d5f3064280c5cca78c0137a373bf49287de7422808861efe2ae692b
+EBUILD picard-1.0.ebuild 2188 SHA256 91a2e4aed02d924ad15c1dfbaa82d75dc46ff45aed23f4ac1240a191111395ac SHA512 6e1279f432cd73855acf212b74237209e293018f66366be526ba82d29f1d021ef2cb8ac46c430eff3e52623cdab6906de3c6f3cd906b17447865304ca00ea975 WHIRLPOOL ad1cccce5de019719a7854aea6ccc97e405b5834a51c1e3d512e34ded1508713eb1be801ca9a094411c7d59356a5248b0658c7e69887e06251b879f0ca84bf31
+MISC ChangeLog 6308 SHA256 cbcb1d67f7fa0731945141d115eddfaed846722f1b8b4df9faa947bae7facf9d SHA512 25c5889facdd62527528d54a52e23cb98f4fbff5196bf36df2a4fb1c1e24bc0798d987371dc8592061560966a61886d6ba75d4b74569e8b6fc9a7ab9ea8088c8 WHIRLPOOL 744e0354f2bc8a8e852bfd1385823d4ef41e112447f3b43147a1030a266b80bb9fd39888b2a1fb8b2bfd833e4241385279bba6f65130bbf21bae10a111f60a98
+MISC metadata.xml 643 SHA256 eb581b55836d5fb4aaebf85d58df6f8489e0340f55ac615e0ac238bcca46bbf5 SHA512 19248dc88b8ac2830b5c7854718c162f506c0b6313675a092e05d37354ed00262918b5b25a584820bbaa55814aaba745c83ce62e384117e94d2efe94ba3894f8 WHIRLPOOL 8e8666c8bbcb7554eedf7634b597b8220d64d193464641426f6207e12ef866d11493651bbb63186bffdc8c14fead6629ba4f79b2b048f41e1662acd7e8876ce7
diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml
index 6d0ec7d3fdf1..7576d2c00537 100644
--- a/media-sound/picard/metadata.xml
+++ b/media-sound/picard/metadata.xml
@@ -6,5 +6,8 @@
   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>
+<use>
+  <flag name='acoustid'>Use media-libs/chromaprint for acoustic fingerprinting</flag>
+  <flag name='coverart'>Install plugin for direct coverart dowload</flag>
+</use>
 </pkgmetadata>
diff --git a/media-sound/picard/picard-1.0.ebuild b/media-sound/picard/picard-1.0.ebuild
new file mode 100644
index 000000000000..bc90a94921ed
--- /dev/null
+++ b/media-sound/picard/picard-1.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/picard-1.0.ebuild,v 1.1 2012/07/12 15:29:33 yngwin Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+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 ~ppc ~x86"
+IUSE="+acoustid +cdda +ffmpeg nls"
+
+DEPEND="dev-python/PyQt4[X]
+	media-libs/mutagen
+	acoustid? ( media-libs/chromaprint[tools] )
+	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"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS.txt NEWS.txt"
+
+pkg_setup() {
+	if ! use acoustid && ! use ffmpeg; then
+		ewarn "The 'acoustid' and 'ffmpeg' USE flag are disabled."
+		ewarn "Acoustic fingerprinting and 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
+	python_pkg_setup
+}
+
+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
+	domenu picard.desktop
+}
+
+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."
+}