Fix several dep issues by Nikoli <nikoli@lavabit.com> wrt bug #472140.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

6 files changed, 140 insertions, 45 deletions

diff --git a/media-sound/cantata/ChangeLog b/media-sound/cantata/ChangeLog
index 4d248e59c956..743840d5d57a 100644
--- a/media-sound/cantata/ChangeLog
+++ b/media-sound/cantata/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/cantata
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.17 2013/06/02 06:12:25 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.18 2013/06/14 23:23:18 johu Exp $
+
+  14 Jun 2013; Johannes Huber <johu@gentoo.org>
+  +files/cantata-1.0.3-audiocd-automagic.patch,
+  +files/cantata-1.0.3-system-qjson.patch, cantata-1.0.3.ebuild, metadata.xml:
+  Fix several dep issues by Nikoli <nikoli@lavabit.com> wrt bug #472140.
 
 *cantata-1.0.3 (02 Jun 2013)
 
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 8114d9659455..370dce3330dd 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cantata-1.0.3-audiocd-automagic.patch 1689 SHA256 8b4dfdc7c1c853143e6dd596496d545dcb07080948c8afdbe9d3691c2ee68a92 SHA512 0e18db874cf089e39ae91dcd2322afdb613ba7339dd02158e486044cf3feece357ab4e3f5314d542b3ad0e7f67195850f647a2b88f31ec7b651c1bf0c5ad23d1 WHIRLPOOL 3210fefb76709663171b32555e3659e61f5f7d808cca949c1b8d719cc4732570ef47f7f72f2b48cf368dc0fcbea038ec1e2c2c0aea9e72906e052b4251a45dd5
+AUX cantata-1.0.3-system-qjson.patch 1016 SHA256 b9bcaf3372b0092fe98438b6d1ff8a28518754892ff6d20a2c26177a802cb5c1 SHA512 dbf52a25dbd016131e1606206ca1affe7d6483a549ef1de93af5dbfd1b17384f1cde03cfe98cd8d0516d2ebaae3db4a7492d0b27203ef04e8621c25e909ee1a8 WHIRLPOOL 2add549138ffdacb2d77d185b2e21c51dd12c200ceda8030e7ff8c78a32de7395149d6eaf45e234ad1acbebbfc8028fb3f92e31a196c5c845a39df1b76127090
 DIST cantata-0.9.2.tar.bz2 676023 SHA256 448d52973168a0a017a6ec3c4b2f1895b832048df7c2e747b06f138be31e1cf0 SHA512 0f9d1a8f34ba2404402879a87cad31951bb9deb77757ac3d1cc96d445f626e937f5ed95ebcd2bdb07bbd6e363c2cffca86239499f968b069e8af559c77675500 WHIRLPOOL 805e5c7f0e1fe8b950a8b99ec077fb83c8999ab96c7c957a1406c95a5409bba980c92f67e8a360f92c14c5f6e73082857f9c3971ec26fadfc2404087788a41f9
 DIST cantata-1.0.3.tar.bz2 1296129 SHA256 853dc62b9cdf6ffbf554f094c4836511ccfadeaa8e056fc23b5308b95322d135 SHA512 23fc6cc1c1e27ef04b299d7dacf1b3bf31a4731b9e7ad52e24a062a5367a9f2ec713ce90a9af4ee4029c06207771847b57eea4bb1326f789295241be2b96546b WHIRLPOOL f8155b056223ca49d7f8d860f6caf1263d8ba7b92d550813464aa2c2e0e76483ee08d9a15f0fecd5a5268d0e3e075af1c9c0d4bbbe188ec6352b339d65236fa4
 EBUILD cantata-0.9.2.ebuild 1534 SHA256 74436e0730e1dee6de752f54caba3779bf0c1cbcd11ca4de67778e59db543d77 SHA512 c14ed68e3864f7361b7c72e0b0f40dc4f2cb84104b78282243f0e5df19a25735429fadb7b3eabd593060fd9bd82cd8d23807e7a28c8c8d56a27d27cff8e40173 WHIRLPOOL d61e6766ce1a3a3313ff38bf0e6ce99cc03ec00455dcd474379273478e42e71ae4c8e6f19c0990a8c7dfbde85d90de8cc8ee11e4faa5176a40b1afa2034b0b57
-EBUILD cantata-1.0.3.ebuild 1782 SHA256 d10335ff30eafec49cd8a4e67d648834b4b46fc6ea42e5411e12a4242ce8dae3 SHA512 ae29beacb9c1a6b02ed31c7448584222dc563a80a325373a895c1a860b026c940a3fc3befb3afaea580a84925105fb9d319f3996cb9889328aed96a15164b7ef WHIRLPOOL ef9028d50bce2ece2bfb630c0c3180f32362f362f96da475059e6ecc657377ff7c426fc14904ccf786382ac9c66abb43c774f77c07d14549314525b80d63ce2d
-MISC ChangeLog 2837 SHA256 8cc5e309ab74ec16fa06f5d4f8a08360381c93afaf20455351a2ed68c99fed96 SHA512 09022b2d56dfd9f87a7bf3c938594640e68d31d2d0744edbda1721e9f23ca53c7ded6c5dafaa2d86633bc910f4f87d0e72e6c25f0e24cacfeaa71a31873e5474 WHIRLPOOL a6f12e6804ecbb08fe294f6cdfe927b7c174a03c96ec6a3ad986ab4968f4fd521e58b2544015b5bc1ba87f448818f8f15166c09c5091bbb0258586f8a907bc1f
-MISC metadata.xml 345 SHA256 346808dcd4f52ca4cb193648c60b57f51a8bcf159d9cd9c91c3f9d77f3afff2f SHA512 6d70cfc8c605ac968bde736d7be31576d836d5480e447f9c96dd8176e6d2b717b9ab94d29c598ea9681fef5ae37abc8b85d3f947633152aa62f2c849394c86de WHIRLPOOL 344c14491c3ed33840c55cf4566ad7cd2f19b5d24d9d6248ba335a9b48cf2f319b247412a7a6455973f649fff23aee06d5d5837cd2c1ac397696179b1ea08100
+EBUILD cantata-1.0.3.ebuild 2291 SHA256 745e1ce2f878c45516797d7b55b51228c9ca2e31d16c45bb606489cd579fe28f SHA512 a292577d3be694aa1aefa3526ffcd9157296186e71849b560e5092378a9fc5accbfb3810e945de2f4e0f0d622a0452d2bcd469d037889dcd5ab4bf3172a49b73 WHIRLPOOL 50d4cf79080b7bc858e39cf3beda9573191bf16428b6f2269e32b91b5550cd84a2f0c1cfbe6628bcfa0726cde52fac27cf6ba219ac8cf24b966217ebb7234f26
+MISC ChangeLog 3084 SHA256 e795af4822e6f4fbd93c77365e9662da66460374447fd0e89189de1f38a34af9 SHA512 c51935e8e47d1b64f74b2f917d86603b8236cd0fea45c8c9725dad3055e14cbcbfda4e9754aeaf79c85a0a0cca55404eb85c1499ea257fb4ff4a422585291659 WHIRLPOOL 214c1c6042bd2f76ba61b5f57025e99ba9b07d992febdaad39043c2de98c04143665ee9f118ee9b3d78540cb385e94e3c96a3a2641f3ca1472debd9a8aec2a4c
+MISC metadata.xml 441 SHA256 158e424cf8dacb42d1c6eb8560914a5902c26cc4392d70776e3ab4d35d2549e9 SHA512 20acf3d035260a414ade54d973afe880e5413c29056a51362feb7316cef7489a13d5fe29c807ccf14113a0af8adbc452e6b215e39a132beec55cbc8f590ef151 WHIRLPOOL 4bd23398ef11efdb39cedbf39963832d7a9d9bf1cacde9d6fe268dfb721bee87d6e919b59cd2bae6e992a5bf9ad194f89c5d0a820b1011bfa1b7d282e9c6f7ae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRquJPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1Dziluhl0P/isZrT+x8hq7BywLRKDh55pv
-TT/P+OnZX/VRVy6fdzTsLppfN2eNH0SFa8VFnfXGYgOJtsRol9Ch1kdPslwF9EDv
-wubKzlE17Pob9MusvDleT42i98KrYrVWhK2vabjHtxb2WsUGRWMy2DbhfQw98GrN
-lfKA5ItSzgCsw/5l6SzraBePHU6rns97E5gTQW4PV0fHxoX+nOnCNXZYqyEY0l05
-or8PH+btZ13r0STiaC2vH1kZO8oBFPtpedmcKTYRu4SemxmpSYqg9x2jUoyk1yqO
-W7lrbgc7RdGA6YGzB+7qztuhGbgvXWmHazJddwCfwI7ORSTO0pfmWByltvHnPNA+
-lPIEwQTJPsegERpClBdZdP0msuVajG3kaah60oTkQ6UTHEzUreZzmylkGL81mabW
-4CgMzoRpb4T3S6iW5tswHE+MfAUkjbioRxDxv9GFcnAT6chVJVuyapkh6H2ORleP
-QTmlLM1EtvH0DUFJZDh6gcp3WHnmmAjGaC8g62Euy5Pe7Ed0VnkRzjea3Qh/VhPS
-CdXlc1MJYPjvlA7be/BvaZVc7+B3XKlLlF/iqpElw2+YKG4t6KGiLRkOI7HomI6H
-73jRsdfrIo9JgY7XkSyp0P4AxA1T6l7RBzhPUeD3oo435mLUwwk5ebc5VhQXhoCi
-8Cb181d5sMM1enIp9kiO
-=CJ//
+iQEcBAEBCAAGBQJRu6XwAAoJEO+t9ga+3I3a/FUIAMynmQIZ9KSW/JDA1QmdAQsR
+AlWZjOg8FzjQuTHCNXffBAhyoMb33LEI8ITgkvqxv2rcI/GCnI3u6DdoLpZ5+PiG
+taAC4IT/TA2FLBRbh2Vww2DKNrl0Ec+ouazUSE88fRjWsV0gEV07p4GOxI4Fjol/
+2R6/8Sf9dzFfCuZA20pztO2yc/QITxMAq2WhcSguL5qkDQm9GIgYwUE96SbnHoJs
+fMw5jev5IapUS8Z3TTmeEVMT31s6DeZjEBCgwBWLxY0G5D988wuHGdYBBwaHk/wh
+eHoaAdWmru8v8+EB6y12HSnaJJb/u51PH3pz49bxurZFyvxeDp2gLD+LME9y2I8=
+=+bsW
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cantata/cantata-1.0.3.ebuild b/media-sound/cantata/cantata-1.0.3.ebuild
index e8b7fb323bc9..e93495fbb940 100644
--- a/media-sound/cantata/cantata-1.0.3.ebuild
+++ b/media-sound/cantata/cantata-1.0.3.ebuild
@@ -1,27 +1,33 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.0.3.ebuild,v 1.1 2013/06/02 06:12:25 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.0.3.ebuild,v 1.2 2013/06/14 23:23:18 johu Exp $
 
 EAPI=5
 KDE_REQUIRED="optional"
 inherit kde4-base
 
 DESCRIPTION="A featureful and configurable Qt4 client for the music player daemon (MPD)"
-HOMEPAGE="http://kde-apps.org/content/show.php?content=147733"
+HOMEPAGE="https://code.google.com/p/cantata/"
 SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="kde mtp phonon qt5 replaygain webkit"
-REQUIRED_USE="mtp? ( kde ) qt5? ( !kde !phonon )"
+IUSE="cddb cdparanoia kde lame mtp musicbrainz online-services phonon qt5 replaygain taglib"
+REQUIRED_USE="
+	cddb? ( cdparanoia taglib )
+	cdparanoia? ( || ( cddb musicbrainz )  )
+	lame? ( cdparanoia taglib )
+	mtp? ( taglib )
+	musicbrainz? ( cdparanoia taglib )
+	online-services? ( taglib )
+	qt5? ( !kde !phonon )
+	replaygain? ( taglib )
+"
 
 DEPEND="
-	kde? (
-		media-libs/taglib[asf,mp4]
-		media-libs/taglib-extras
-		mtp? ( media-libs/libmtp )
-	)
+	lame? ( media-sound/lame )
+	mtp? ( media-libs/libmtp )
 	phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) )
 	qt5? (
 		dev-qt/qtconcurrent:5
@@ -36,40 +42,52 @@ DEPEND="
 	)
 	replaygain? (
 		media-libs/speex
-		media-libs/taglib[asf,mp4]
-		media-libs/taglib-extras
 		media-sound/mpg123
 		virtual/ffmpeg
 	)
-	webkit? ( dev-qt/qtwebkit:4 )
+	taglib? (
+		media-libs/taglib[asf,mp4]
+		media-libs/taglib-extras
+		!kde? ( sys-fs/udisks:2 )
+	)
+	dev-libs/qjson
+	sys-libs/zlib
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep oxygen-icons)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-audiocd-automagic.patch"
+	"${FILESDIR}/${P}-system-qjson.patch"
+)
+
 src_prepare() {
+	kde4-base_src_prepare
+
+	rm -rf 3rdparty/qjson/
+
 	# make desktop file pass validation
-	sed -e 's/MPD/MPD;/' -i ${PN}.desktop || die 'sed failed'
+	sed -e 's/MPD/MPD;/' -i ${PN}.desktop || die
 }
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake-utils_use_enable cddb)
+		$(cmake-utils_use_enable cdparanoia)
 		$(cmake-utils_use_enable kde)
+		$(cmake-utils_use_enable lame)
+		$(cmake-utils_use_enable mtp)
+		$(cmake-utils_use_enable musicbrainz)
+		$(cmake-utils_use_enable online-services ONLINE_SERVICES)
 		$(cmake-utils_use_enable phonon)
+		$(cmake-utils_use_enable qt5)
 		$(cmake-utils_use_enable replaygain FFMPEG)
 		$(cmake-utils_use_enable replaygain MPG123)
 		$(cmake-utils_use_enable replaygain SPEEXDSP)
-		$(cmake-utils_use_enable mtp)
+		$(cmake-utils_use_enable taglib)
+		$(cmake-utils_use_enable taglib TAGLIB_EXTRAS)
+		-DENABLE_UDISKS2=ON
 	)
-
-	# kde fails to build without taglib
-	# taglib is required to enable replaygain
-	if use kde || use replaygain; then
-		mycmakeargs+=(
-			-DENABLE_TAGLIB=ON
-			-DENABLE_TAGLIB_EXTRAS=ON
-		)
-	fi
-
 	kde4-base_src_configure
 }
diff --git a/media-sound/cantata/files/cantata-1.0.3-audiocd-automagic.patch b/media-sound/cantata/files/cantata-1.0.3-audiocd-automagic.patch
new file mode 100644
index 000000000000..311aac1a3b74
--- /dev/null
+++ b/media-sound/cantata/files/cantata-1.0.3-audiocd-automagic.patch
@@ -0,0 +1,42 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 2749)
++++ CMakeLists.txt	(revision 2750)
+@@ -33,6 +33,10 @@
+ OPTION(ENABLE_UDISKS2 "Build UDisks2 backend, and NOT UDisks, for Qt builds" OFF)
+ OPTION(ENABLE_OVERLAYSCROLLBARS "Enable support for overlay style scrollbars when using QGtkStyle (Linux only)" OFF)
+ OPTION(ENABLE_ONLINE_SERVICES "Enable support for online services (Jamendo and Magantune)" ON)
++OPTION(ENABLE_CDPARANOIA "Enable CDParanoia libraries (required for AudioCD support)" ON)
++OPTION(ENABLE_CDDB "Enable CDDB libraries (either this or MusicBrianz required for AudioCD support)" ON)
++OPTION(ENABLE_MUSICBRAINZ "Enable MusicBrianz libraries (either this or CDDB required for AudioCD support)" ON)
++OPTION(ENABLE_LAME "Enable LAME libraries (required for AudioCD playback support)" ON)
+ 
+ if (ENABLE_QT5)
+     set(ENABLE_PHONON FALSE)
+@@ -142,12 +146,20 @@
+     SET( CANTATA_UIS ${CANTATA_UIS} online/onlineservicespage.ui)
+ endif (ENABLE_ONLINE_SERVICES)
+ 
+-find_package( Cdparanoia )
+-if (CDPARANOIA_FOUND) 
+-    find_package( CDDB )
+-    find_package( MusicBrainz5 )
+-    find_package( Lame )
+-endif (CDPARANOIA_FOUND)
++if (ENABLE_CDPARANOIA)
++    find_package(Cdparanoia)
++    if (CDPARANOIA_FOUND) 
++        if (ENABLE_CDDB)
++            find_package(CDDB)
++        endif (ENABLE_CDDB)
++        if (ENABLE_MUSICBRAINZ)
++            find_package(MusicBrainz5)
++        endif (ENABLE_MUSICBRAINZ)
++        if (ENABLE_LAME)
++            find_package(Lame)
++        endif (ENABLE_LAME)
++    endif (CDPARANOIA_FOUND)
++endif (ENABLE_CDPARANOIA)
+ 
+ if (ENABLE_TAGLIB)
+     set(TAGLIB_MIN_VERSION "1.6")
diff --git a/media-sound/cantata/files/cantata-1.0.3-system-qjson.patch b/media-sound/cantata/files/cantata-1.0.3-system-qjson.patch
new file mode 100644
index 000000000000..3bae049af2e5
--- /dev/null
+++ b/media-sound/cantata/files/cantata-1.0.3-system-qjson.patch
@@ -0,0 +1,35 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 2794)
++++ CMakeLists.txt	(revision 2795)
+@@ -166,6 +166,10 @@
+     find_package(Taglib)
+ endif (ENABLE_TAGLIB)
+ 
++if (NOT ENABLE_QT5 AND NOT WIN32)
++    find_package( QJSON )
++endif (NOT ENABLE_QT5 AND NOT WIN32)
++
+ if (ENABLE_OVERLAYSCROLLBARS)
+     add_definitions(-DENABLE_OVERLAYSCROLLBARS)
+ endif (ENABLE_OVERLAYSCROLLBARS)
+@@ -495,9 +499,17 @@
+ endif (NOT WIN32)
+ 
+ add_subdirectory(3rdparty/qtiocompressor)
+-add_subdirectory(3rdparty/qjson)
+-TARGET_LINK_LIBRARIES(cantata qtiocompressor qjson)
+ 
++if (QJSON_FOUND)
++    include_directories(${QJSON_INCLUDE_DIR})
++    TARGET_LINK_LIBRARIES(cantata ${QJSON_LIBRARIES})
++else (QJSON_FOUND)
++    add_subdirectory(3rdparty/qjson)
++    TARGET_LINK_LIBRARIES(cantata qjson)
++endif (QJSON_FOUND)
++
++TARGET_LINK_LIBRARIES(cantata qtiocompressor)
++
+ ADD_SUBDIRECTORY( icons )
+ 
+ target_link_libraries(cantata support sha2 ${QTLIBS} ${ZLIB_LIBRARIES})
diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
index a7742c06462f..696f16127be7 100644
--- a/media-sound/cantata/metadata.xml
+++ b/media-sound/cantata/metadata.xml
@@ -4,7 +4,8 @@
   <herd>kde</herd>
   <herd>qt</herd>
   <use>
-    <flag name="phonon">Enable support for Phonon</flag>
+    <flag name="online-services">Enable support for online services (Jamendo and Magantune)</flag>
+	<flag name="phonon">Enable support for Phonon</flag>
     <flag name="replaygain">Enable ReplayGain support, for relative volume adjustments.</flag>
   </use>
 </pkgmetadata>