Version bump by Nikoli <nikoli@gmx.us>, bug #506856.

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

4 files changed, 144 insertions, 11 deletions

diff --git a/media-sound/cantata/ChangeLog b/media-sound/cantata/ChangeLog
index 8c0e188ec4c7..0acccc50fe5d 100644
--- a/media-sound/cantata/ChangeLog
+++ b/media-sound/cantata/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/cantata
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.24 2014/01/20 10:37:11 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.25 2014/04/05 20:53:20 johu Exp $
+
+*cantata-1.3.3 (05 Apr 2014)
+
+  05 Apr 2014; Johannes Huber <johu@gentoo.org> +cantata-1.3.3.ebuild,
+  metadata.xml:
+  Version bump by Nikoli <nikoli@gmx.us>, bug #506856.
 
   20 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> -cantata-1.1.2.ebuild,
   -files/cantata-1.1.2-no-taglib.patch, -cantata-1.1.3.ebuild, metadata.xml:
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 2eff3785958d..bbcb4fd3c063 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -2,17 +2,25 @@
 Hash: SHA256
 
 DIST cantata-1.2.2.tar.bz2 1556225 SHA256 3136dbee31f1b13b12413bfee634e7d7d187af5677ba80aaba4b9201bb7226a6 SHA512 002eaf79bfda37f41aa0e7b219b8b59d166df399eb7fdfc39a8a1ccffc145754f6f0f70f976fe2c21d162b284f5e0f36b87697f977fee56e8d3bf7e4571b4f9e WHIRLPOOL 462b347d0d05634c388b38e9d0484c76c7ba13e44c93ecf884b51b3c74d0ae4ebb034907f2e8a4226faf75ca63dca5279810b873c550df7b647cb63fc3316bb9
+DIST cantata-1.3.3.tar.bz2 1587518 SHA256 74a4bbfaa1472f551f95b09236ebd3b45191df3c55c2b6c8498039b135f2b5e2 SHA512 1f50abf9e92316ba3cd8da0a542a6fbdabfa58bb8dd7349058ffeffa5f95a4db31e4810e580497fea5c08f31f8e891c1c7b600f66f81f400527d40c58f14148a WHIRLPOOL 1f66a415d1e0d0e91a2fe05ef27587a736523a385fcee9333609a301457169c4bc982e2be3f34d5bc924828d070ac6201739756d78b0ed5e60ac382988aa6fae
 EBUILD cantata-1.2.2.ebuild 2250 SHA256 b3eb86e926c4fdb2821c27877d75522b8fd6bc973a9d13a1f1086e6c6820b5f3 SHA512 7f90e7f5b09f588bf8c74c69aca31da6c9d4f0d4a1136789f9cdc102cd347f86aaec8774c48ba9bec84669bf7ba09049d15414961951fb2f2370da5e1ec7fed7 WHIRLPOOL bc579b81883b5c3c34ed5d7f78e2bd604943cb483af2a6f8c9664dd6723d43ed38aac16799a0ac8cb95c87f37d99981571ddc6f16380c1ca63eb293ed7b9a675
-MISC ChangeLog 4068 SHA256 f0b26a17396fef419d16a4f33aadcf030bffd9c1f56999d8b00dcaacfcada62f SHA512 7c430bb36f2665f2b9b665b7bf5ff3a092eb36d475f2594865a5ea32e4bfd0586c190a774c6b288296d91917a60d467edc6a6ff11613e241b15ad173ae847d58 WHIRLPOOL 778c527614d5b74e0ede2e8d28973ea56defb9273eaa0cbd8e09d0cfb82e304b3e6886ccfcf455c4990d3a351369de09a876f21f2279566ea6b9470002b82a73
-MISC metadata.xml 282 SHA256 070e0571268a1170d5718ee0eb2bb904d84d338764c399e849d222c002bda946 SHA512 4c8f9052de03996594be5cbee766e8d9403126ccaa4624c447ef3bc4c11ffead001e240034067ea78b5bde0fa6978754410708f76415b6336d1e6aa52c6bbea3 WHIRLPOOL c5d93fac2cc6fd934a852b6729b6c7e6b07dde8b7e8cf9bf42a376b4626d0290b6542dee18985f2a61d097f677168e574f34487669c58a3c4f11e9c12b79881b
+EBUILD cantata-1.3.3.ebuild 3014 SHA256 8e40a82db832ecea8e355f7bf38fae0372a3a5ad694eb0149c46989c33bda48d SHA512 c5f009689a4a9b4216019735606c05127662856cd03e57698f8dbfd150d8921cdd0d5c5f7606100abd29638143bbca97055de248145ecc4fba2111926c25efa8 WHIRLPOOL 98a8294d5b4c7e2634123856f0155783bf0ed65e8060afb4f27b44375d449df31fefeb6da5b1315e02563ec4c78835a954ad668481ad8078e7fbbd073eccb3a6
+MISC ChangeLog 4237 SHA256 cc2d20b8c1d17cc8fa948cea77c20df9c7c8ad8894473b5a4d94d3e5e366265e SHA512 298cabf35c66c046b46961824b9089a77dc6e51dc82f229de069c26801d74b519b2ebaa48a38835073d0f02dd15aeb0393690b0ad8a4a9c14ed97689b2719b17 WHIRLPOOL 6a160be6a88bc39d7dea7ead4e8ca949aca04479cb631a01d1b0c0c9186e39f0a16f9c73cb231d8736eee38a883dbaa2843cf2acf6c699f3206a225063873213
+MISC metadata.xml 729 SHA256 f198c440241bb4cf1c93c1801b93c2a1ddbdd0e3a792df5bc75608ababb332c2 SHA512 949a86a3cc9b7ac4d728659dd8ceefb063996cf36f2023b99e32379ec42171386f8aecf1b98b874f11c9cc5629775441219f46437127dfd6bba95409bc1d33ba WHIRLPOOL 7a4e90ffc355666f4ea200d0ba1676de5bb39959301556f534f48d9080c774b7b50da08440bee59733c9b02ab35d0511a97d29cd0a90cbc67fddd1fd1f3bca32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS3PxUAAoJECo/aRed9267g1kH+wbuQ8jmsD63OZKvC3D0nyeE
-3ZQ+jATZ5HZ5dtFXPQJ0AISNRT3wBNi5MZfWAKK+nC0+RxMpBWPNNyIQbLanzSPs
-VrAwl4auODar1kVZronNa7DxnLFo+9yf6DL9JoAOynL/ObfSh3Xy85T3qP5yiteA
-AFkbEMqkOffpEU+Qi90QU90u4NN+sw+4aHCrouTO41D2GUKpR/5hoB8R9W6JnUtk
-OBu9kRrmchQy6Or1I9qNH1cRLbfcydPXgA5n5waJnp9rEIzEIT74MnaWCqJBwGyb
-UDn45jJYvMXIctuuZGwDgpEw9BsnO67p1Ek/fIOmsKEkczVMhXYSfs6DYvkpzxM=
-=VGOf
+iQIcBAEBCAAGBQJTQG1FAAoJEGVpnaTzz9K9+TQP+wTQWDgIh5oRkIB2Qs6CDVC3
+MF2VCtoN316Wr2ytDyM8ahjred6R5jpIASz7HVI0t5hyewYRME3N3B+XdjDc6WOx
+Cur9aCwZokPl2JXmfGhZ2d6ZC3C8LbGFRoNtaYKSffpxilXP9HshkoMR6JYziLey
+nrcMbLUeYnBcdylgmBq6chr/EB9ZWJWU/ImjkKnM/h73Loc4xVwdKU5Xyk2teq7y
+TioYw9dwllAv+tzbatKTnNQhAt+MLQPQpx9n2c6vE7UokE98/J6q2e6SS4bLCh8D
+o+J/PtAb8ALSPmjhAyMryGeO+NDsUaqn1wSDTlAL52tZv6o8jrVTxCYDQ/UO1DXA
+sYJJm7K3ir3H+xeW05jJoH/s80XxhZXe8xvpv89SHHN5MjM7918RWoNNmhU3vQdP
+zugq/Gzhh8+hMP7+8bbhmqkaZPTqCzSCuei4HNjNZR/nQSH1C21yO0D3hDh1p3DZ
+10ZUrhbxH4LSSh5HWJjP4p7/ajljUjpFFDVTfzef14bVlilKTJVLPDPiDxEmAdRv
+MNdLWCTLO8imrhoKM/K1IdmsROJfN057D8fF3WxgN736tLQbw226itsUuTTnsd30
+xItPfKCzGVP6jLRN6XZXtK+eXmrdtendabPuc+VgSoGsucQ7DmOqcjKyV5Q8k8z4
+7+85vypgGTNsrvXxKqGr
+=l8fx
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cantata/cantata-1.3.3.ebuild b/media-sound/cantata/cantata-1.3.3.ebuild
new file mode 100644
index 000000000000..56edf1b52993
--- /dev/null
+++ b/media-sound/cantata/cantata-1.3.3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.3.3.ebuild,v 1.1 2014/04/05 20:53:20 johu Exp $
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+PLOCALES="cs de en_GB es hu ko pl ru zh_CN"
+inherit kde4-base l10n
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
+HOMEPAGE="https://code.google.com/p/cantata/"
+SRC_URI="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60ZUN1NThacGFrdFE -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="cddb cdda devices dynamic http-server kde lame mtp musicbrainz online-services qt5 replaygain streams taglib"
+REQUIRED_USE="
+	cddb? ( cdda taglib )
+	cdda? ( devices || ( cddb musicbrainz )  )
+	lame? ( cdda taglib )
+	mtp? ( devices taglib )
+	musicbrainz? ( cdda taglib )
+	online-services? ( taglib )
+	qt5? ( !kde )
+	replaygain? ( taglib )
+"
+
+RDEPEND="
+	dev-libs/qjson
+	sys-libs/zlib
+	x11-libs/libX11
+	$(add_kdebase_dep oxygen-icons)
+	cdda? ( media-sound/cdparanoia )
+	cddb? ( media-libs/libcddb )
+	kde? ( $(add_kdebase_dep kwalletd) )
+	lame? ( media-sound/lame )
+	mtp? ( media-libs/libmtp )
+	musicbrainz? ( media-libs/musicbrainz:5 )
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+	)
+	replaygain? (
+		media-libs/speex
+		media-sound/mpg123
+		virtual/ffmpeg
+	)
+	taglib? (
+		media-libs/taglib[asf,mp4]
+		media-libs/taglib-extras
+		!kde? ( devices? ( sys-fs/udisks:2 ) )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	rm -rf 3rdparty/qtsingleapplication/ || die
+	# qjson ebuild does not support Qt5 yet
+	use qt5 || { rm -rf 3rdparty/qjson/ || die ;}
+	use kde && { rm -rf 3rdparty/solid-lite/ || die ;}
+
+	l10n_find_plocales_changes 'po' '' '.po'
+}
+
+src_configure() {
+	local langs="$(l10n_get_locales)"
+
+	local mycmakeargs=(
+		-DCANTATA_TRANSLATIONS="${langs// /;}"
+		$(cmake-utils_use_enable cdda CDPARANOIA)
+		$(cmake-utils_use_enable cddb)
+		$(cmake-utils_use_enable devices DEVICES_SUPPORT)
+		$(cmake-utils_use_enable dynamic)
+		$(cmake-utils_use_enable http-server HTTP_SERVER)
+		$(cmake-utils_use_enable kde)
+		$(cmake-utils_use_enable kde kwallet)
+		$(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 streams)
+		$(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 taglib)
+		$(cmake-utils_use_enable taglib TAGLIB_EXTRAS)
+		-DENABLE_HTTPS_SUPPORT=ON
+		-DENABLE_HTTP_STREAM_PLAYBACK=OFF
+		-DENABLE_REMOTE_DEVICES=OFF
+		-DENABLE_UDISKS2=ON
+		-DUSE_SYSTEM_MENU_ICON=OFF
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
index 0cd175cc3799..4e55efe971e6 100644
--- a/media-sound/cantata/metadata.xml
+++ b/media-sound/cantata/metadata.xml
@@ -4,6 +4,11 @@
 	<herd>kde</herd>
 	<herd>qt</herd>
 	<use>
-		<flag name="replaygain">Enable ReplayGain support, for relative volume adjustments.</flag>
+		<flag name="devices">Enable suport for external devices</flag>
+		<flag name="dynamic">Enable support for dynamic playlists</flag>
+		<flag name="http-server">Enable internal HTTP server to play non-MPD files</flag>
+		<flag name="online-services">Enable support for online services (Jamendo, Magnatune, SoundCloud, and Podcasts)</flag>
+		<flag name="replaygain">Enable ReplayGain support, for relative volume adjustments</flag>
+		<flag name="streams">Enable support for streams tab (to save favourite streams, and search for others)</flag>
 	</use>
 </pkgmetadata>