From cc347b5d7bbe813fc1a9de932573f4afa2ee9262 Mon Sep 17 00:00:00 2001
From: Ben de Groot <yngwin@gentoo.org>
Date: Sun, 15 Mar 2015 10:24:27 +0000
Subject: [PATCH] Adjust USE=cdda dependency to python-discid (bug #535746)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!
---
 media-sound/picard/ChangeLog                  |  8 ++++-
 media-sound/picard/Manifest                   | 32 +++++++++----------
 ...rd-1.3.2.ebuild => picard-1.3.2-r1.ebuild} |  4 +--
 3 files changed, 25 insertions(+), 19 deletions(-)
 rename media-sound/picard/{picard-1.3.2.ebuild => picard-1.3.2-r1.ebuild} (93%)

diff --git a/media-sound/picard/ChangeLog b/media-sound/picard/ChangeLog
index 2d755baa8028..40708eb7022a 100644
--- a/media-sound/picard/ChangeLog
+++ b/media-sound/picard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/picard
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.52 2015/02/02 17:03:41 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/ChangeLog,v 1.53 2015/03/15 10:24:23 yngwin Exp $
+
+*picard-1.3.2-r1 (15 Mar 2015)
+
+  15 Mar 2015; Ben de Groot <yngwin@gentoo.org> +picard-1.3.2-r1.ebuild,
+  -picard-1.3.2.ebuild:
+  Adjust USE=cdda dependency to python-discid (bug #535746)
 
 *picard-1.3.2 (02 Feb 2015)
 
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 0ae67fdb975e..b2915993e485 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -6,25 +6,25 @@ DIST picard-1.3.1.tar.gz 2047677 SHA256 f83ec4ab703134a3dbd8203a2b30c15ea87bec79
 DIST picard-1.3.2.tar.gz 2047760 SHA256 e728234560b82eb33d3143a53d3bbb92833455fd130f8d2083193cffceea4120 SHA512 d5613dd0b29f67a754a9449c6ebb29e4f7a519137dbcd29b03e64678ba49c75542573487c1f95047c0ab43630794fd92365a46dc9820347ffd2eae5a04e531be WHIRLPOOL 5c3cbd5860162ede0150f7e680d7732f38c875e5475fb16dfac2f6f7d51979678567fe677a2887197db963fdf1a75f1ba4f45d132e9fc0923a2d726ffe30a019
 EBUILD picard-1.1.ebuild 2186 SHA256 7c9a2994daa1a9490a14dc019e1cd3ee6c1d365fbf448708803b6705a1830695 SHA512 b4f4f0a65ef41a2eea5ed4b597357884585d4c03b27228f881f2e235caec54f24fd09aa698d1aff209d7358a966fc520b665e1f81a6efaf8f47e23296a107e02 WHIRLPOOL 63c749fe2e5691a0a11bbd93b7e6e5754c6b071ca378c0ef5b33dc4817377d54ebde34f22b67552ce79affb6cda164f45354d289b2446c034997d24298ab7969
 EBUILD picard-1.3.1.ebuild 1412 SHA256 44417d6f49e9d7f539ac210e683c363fcfd2f67edd76f40f7f43032754077541 SHA512 a5f58db1ea3289c0b94e1f24017fb74b5923dc32874d4e675a0cd6297a2d6ad1af593c761fc443fbfeceabe0d2df6d826a3742bba928a2fbfaf00f7c07335e16 WHIRLPOOL 6296a3b24945ef6b0af99ed7d80255c02d94978527fff75729745b4fe9c2b1932e8d7ffe8a7d16de256ed853c72333f5827e5d31028352a24a5e76fe27161047
-EBUILD picard-1.3.2.ebuild 1447 SHA256 bb8f95dbf0037fb577c649f34d00fcf270d3151a60cb143d4780d9b768838d98 SHA512 c61f1df6a011a9b14219d217e7d0d71a2cb1aa88ed4be367ea2f17a8d87afccf0d14d3326bba6c48f9b5eccf64788edc34edca761e48212b8b948747aa847ce2 WHIRLPOOL 1a38b6233fdd6cc604ac1e9b16e9836db8391f15450f583c857a3d319cf805008fb31141cef1177919133db722d8c48cd8b45a4a32c99ab46b1e838523203e48
-MISC ChangeLog 8121 SHA256 ac14cddd6579cdd1264534b3fc1b45141f9e7c15f3cdf957a7cafeb8df9862f3 SHA512 a35a0533713d85c5c6f714054b02d51dbf7d4b30e0981aa1c2c7f6d937973ebaa80e01248f07fb06b24d9fdb4b3a59eed2eed4cab0c7b53212ea58d6816adc39 WHIRLPOOL edf99cfbeca3a8b18d8fe92038b3f6aaeaf0ad25a893ebdf69d526b8ff1afc485199106861a35f478442369723f92e9e589940326137c9063b522e81e5f9e7e4
+EBUILD picard-1.3.2-r1.ebuild 1446 SHA256 d5cc7289ac3934b179e1cdab0598bc2c9f504d0b2db11cd2c592d728bc5c63b8 SHA512 4cbe2bfbf0954ca83853d6d74971919d768820cf2e0b76d4f220e8950b0c7fcd9c988f7fac29f11dfa1aef1f5883536f29e1fae7b12058b0b02ee6611f24c195 WHIRLPOOL 4fca57e847abe28c64c1aefee331b2a76e26cada2c8c0ae3d144b24979e43fbace9918a759338050bd80649166c9486a53814f0b0e8eab62a8bcd1e9ee2e1ad4
+MISC ChangeLog 8311 SHA256 e720335df168eb890a8d81d30f08ce7c5e57bd0ccdd3d0e00d5fccb4a3db5112 SHA512 4789eaa259bdb25c08e9ea0334f02c4fa519e95329133d04c011e08a380fd4ad3f3b0fafe6449ce80c1ec2a782c59ffa60877578379d80d534c7240cafe3bfc0 WHIRLPOOL 3c99ad22c1427d976262a98ad04bf509357c8c79f4a17a985abedfda1f5115e4710b2e7d1f1edbbebbaf3accfff24ec86cd92421ccf745ad57eb90a4aa73f8a6
 MISC metadata.xml 569 SHA256 c0c94318f3c727cd50656b29185eb962044af1edadaafd276bbff5fb6f12784e SHA512 0b7309841df310f9ec20f29429ef4efe36c7567f0c86b72b8796ce25bdb04ec02db4bb21dda6c41d2915abc9b411a929939823e9e0acc2e13f1951b855cf2357 WHIRLPOOL b2fb10475d77c83d497e219957c7ee0634b090a28e4fef9c18a5ca57a52440cef6c46b99d5a7c1bb4cd7292d4739ddba547f022e36303d8048846c91edc0fe10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUz630XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVBV3ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOf+cP/RB7ILQ04BACg8kM1aNbtsOB
-GzAiN4El5WtEp0MLNelygal0mnUpRI6dF9E8A8TbVxqysBGg1mVa0aVDBvIVWngF
-oXfvzPDdC/+TJGRnCpJENINHBn3v9XMNBOQfv6C5QTgvk4MUPQnY2H5mY6/0/Dzv
-xQKAdhGXCOpGNh/Lt9siETFV/kPMmZ31K6x3h42UfcBtoR62uH5V0l3T0W7LRrAT
-lz6zYAlJ9t75pyBUjt7YfYAXp71y64hvvgwMzWDwXPDHeSIobmTyrlbHLbevaGb2
-5KNDOXpp9a0Luy0D/Oy6+d3PqH1cXfsiGLKW5xL+SMqFYcuG9XVvr0CGC2SIsuNd
-Wq3nwMBUTbXkhYhqGJoi+iYq9oXtWjN0U8Ftu22/JSU5UVONr918d3hA2N+9TQBj
-xHL2n7zZpQ5ZKjPWRQGvgnLPpED4JI7+rvT9dTjJKA6r89BuGCkg1IEdto9nFO5q
-1OMXOKD09TaIYdDTQJZebeMu1LagD5y34Krbhk+GnbYeO51JPBxr1h0Qk9YpvqOR
-4Sr7cbcl0/MDtMbv+0EiG53Y4sRQLsGHaL755CUSkWs0J6r+0Eyb2UJkWLEAlPkO
-O7y3puepu8G6pDkx7Q60ZqaTLNfa+sEGDPJNvu1rlpJVbO4TlpuvxbCQCgGIez0k
-TDBHJ1gMLYuip7UQ2g9e
-=7iqt
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOXQkP/1PbBonIjJWIdpmk3t6mlovj
+9NGZXG3hUhpebAGOn8nMd8Kjc4HrlAy538QhbZzB0BQiQoQq7WPBlT9DsyjqAYUS
+J7CDd8CECq02Ogt4Trt8myzAJq+j44qPTEFTfnHs7QEynTDTMc71e2UYIyes93Uq
+CBCPm+hLWHbsZPSZ1lRQv8CZc5IWMULZ297MB8k98SbDdZlTzU6bcBNQNqIt2dlU
+EMuDbEk65NuKzn7Ftm997mlgv8vVFOp0d/jm1VfPzQxrIR6SCaCuHE525pL4VF8v
+O1ylAstGVXbeSKzurvupE1R+ofov2UMLYnU4yVQDEGZcQJpD9H+TeOKYwwKUrIs3
+/+d4ZIPniE1DbTpYS0qVqVIR/XThJzfKsSFMcH4vrmhjOwwPjrapAsPiVolLcrjd
+vUsVNNwpAmZ61iq3hFpa4+mqSaJcHCQIKaJHejVaT2rrzmEk4vs2gPTuovits2nA
+D6FAkqSzK20HaEC5dhK44rbqB5fWmKs8M7jiomKES42kOcGLiBdyRbAi6/kxrQdo
+0Z4QnhE5ONPotck8YUEyRZ89LLH24JCa64YHyNaZnBlGjF82ZNZjoaz6N2dYuecQ
+NLiCGLb7b859y4cfaWNYy/f/8W+yJEZMyYPZJ7HOqwu6Ti6/qiokfEN93PVJ+AoY
+HZWFVovUgga0OJUzmZXS
+=Z7eq
 -----END PGP SIGNATURE-----
diff --git a/media-sound/picard/picard-1.3.2.ebuild b/media-sound/picard/picard-1.3.2-r1.ebuild
similarity index 93%
rename from media-sound/picard/picard-1.3.2.ebuild
rename to media-sound/picard/picard-1.3.2-r1.ebuild
index 7a1a11b41df1..d7c53ebb928e 100644
--- a/media-sound/picard/picard-1.3.2.ebuild
+++ b/media-sound/picard/picard-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/picard-1.3.2.ebuild,v 1.1 2015/02/02 17:03:41 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/picard/picard-1.3.2-r1.ebuild,v 1.1 2015/03/15 10:24:23 yngwin Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -21,7 +21,7 @@ DEPEND="dev-python/PyQt4[X,${PYTHON_USEDEP}]
 	dev-qt/qtgui:4[accessibility]
 	media-libs/mutagen
 	acoustid? ( >=media-libs/chromaprint-1.0[tools] )
-	cdda? ( >=media-libs/libdiscid-0.1.1 )"
+	cdda? ( dev-python/python-discid )"
 RDEPEND="${DEPEND}"
 
 RESTRICT="test" # doesn't work with ebuilds
-- 
2.26.2