Version bump by Nikoli <nikoli@gmx.us>, bug #507260. Remove old.

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

3 files changed, 62 insertions, 33 deletions

diff --git a/media-sound/cantata/ChangeLog b/media-sound/cantata/ChangeLog
index 0acccc50fe5d..0f9fda77757f 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.25 2014/04/05 20:53:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.26 2014/04/09 22:29:33 johu Exp $
+
+*cantata-1.3.4 (09 Apr 2014)
+
+  09 Apr 2014; Johannes Huber <johu@gentoo.org> +cantata-1.3.4.ebuild,
+  -cantata-1.2.2.ebuild:
+  Version bump by Nikoli <nikoli@gmx.us>, bug #507260. Remove old.
 
 *cantata-1.3.3 (05 Apr 2014)
 
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index bbcb4fd3c063..c48b2b696558 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
+DIST cantata-1.3.4.tar.bz2 1587599 SHA256 985ffa0ccb5651f7733ee3760a7d4b0830ef69b249c73f1c328d5b4276203a66 SHA512 7bd8886d194d5a7c83d4cf41cbaae1f216cb2fa41642588f4be903e1f03fcdddcaa809ac56d061859ed570f54e52fa2c42ac49d742eb636d2b3b29352e3e2343 WHIRLPOOL 96d24387aa5b6d568baa4fe7bdb9736a1d6f940d65c967f107d5b27121232327bec96178fbe5641c1f888714bb6c5f43a94d1e841b4cfcf10f9cf1747acc1253
 EBUILD cantata-1.3.3.ebuild 3014 SHA256 8e40a82db832ecea8e355f7bf38fae0372a3a5ad694eb0149c46989c33bda48d SHA512 c5f009689a4a9b4216019735606c05127662856cd03e57698f8dbfd150d8921cdd0d5c5f7606100abd29638143bbca97055de248145ecc4fba2111926c25efa8 WHIRLPOOL 98a8294d5b4c7e2634123856f0155783bf0ed65e8060afb4f27b44375d449df31fefeb6da5b1315e02563ec4c78835a954ad668481ad8078e7fbbd073eccb3a6
-MISC ChangeLog 4237 SHA256 cc2d20b8c1d17cc8fa948cea77c20df9c7c8ad8894473b5a4d94d3e5e366265e SHA512 298cabf35c66c046b46961824b9089a77dc6e51dc82f229de069c26801d74b519b2ebaa48a38835073d0f02dd15aeb0393690b0ad8a4a9c14ed97689b2719b17 WHIRLPOOL 6a160be6a88bc39d7dea7ead4e8ca949aca04479cb631a01d1b0c0c9186e39f0a16f9c73cb231d8736eee38a883dbaa2843cf2acf6c699f3206a225063873213
+EBUILD cantata-1.3.4.ebuild 3014 SHA256 47a8ca65c2eb2203f0f2304f5c605437022de4bb6dec03b1eef266d0a0c29ff5 SHA512 d14e4e81afe764684faa92711bee79a9ea2904ea3f1c16214adb12f105caaad0feeab1134bcf9fc309caf1ae0d19e1cecefbf3893b90a7300af01fb2f0007504 WHIRLPOOL 823bdd29bd3d044e39750d4905b95d3a72fbb8bdf677fe3ff2fff0e34dc142875b1de7da78a1e45dd9313a4a68fc1bcd7169f9dd872e49d2cf42a2f24ee012d9
+MISC ChangeLog 4431 SHA256 921ed7c784ff89bf0aa294b62fe1c45968abdf23994f907ecd7d53a82186288e SHA512 9e80b8b9a621fb458c4eed9c2d87296ab9ee56a61174b1f8ec8b468b595e08590a38aa530c8c6c05ca84b825f62a276c3de972e8b9ff8339c872b924fe9be18b WHIRLPOOL e76952e18ef5a13f132ad85be0da4dea75d62baf796cb048cbde0e77942528a9dabd6708db0e332c722029bfa0723672a3c575312e3f14db4504b845199d5641
 MISC metadata.xml 729 SHA256 f198c440241bb4cf1c93c1801b93c2a1ddbdd0e3a792df5bc75608ababb332c2 SHA512 949a86a3cc9b7ac4d728659dd8ceefb063996cf36f2023b99e32379ec42171386f8aecf1b98b874f11c9cc5629775441219f46437127dfd6bba95409bc1d33ba WHIRLPOOL 7a4e90ffc355666f4ea200d0ba1676de5bb39959301556f534f48d9080c774b7b50da08440bee59733c9b02ab35d0511a97d29cd0a90cbc67fddd1fd1f3bca32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJTRcnOAAoJEGVpnaTzz9K9bdQP/3hIBFWOKJKRKqMguaiMyaba
+EB4I+FhApsvLwvoDyzZuJnvrbUXl//5YOq13nd1cHtIhtoJolx/UilV6BtEMVIfX
+x2Co08yj6E1zX20SGfrcZhKOlw8JF2YQqlvDqJ+InmXFAtrgYOTOd46Mn3s1nmWc
+Lyo7WFNGp+Ki5g9wR55jUaOj/3FYZetNHByfcav6i6X1X/3gLsaqxYJuAp2x7/HY
+KfPmQ+Ictm5zkr9FtcnWCxN0THqW1zi9ItVMyFg9FvUDbYERowu4Geh1IOIzG9Kp
++svK73fKgGqWdUbUiN+KRHrnneWlDtlpA+iOH2eANFdTL5ScYog/qbhbUbPPHQUi
+BkntgxheGRDKwdnswBHAMhzI7sVQ1YkpsPQrqkt1lalsSf/29MjOWn6ToLfzleLv
+psZEKA+q8pEfet6D8lNHf5ktKa58X/akQvaFgGNcDmgwHecHJm/b9j2NwmzVLmAJ
+eS1YqGAaGGf4s+4JpBNhEbeFO2refVRtlndHH+I/DbD6/SFhrvhOTWF64btiQWY8
+Bf4QI4HPFXAWpUIwuD2LILSCDrqK5R5mh/pxxJ2KUz9BpF4bfxuVBCRKErc2vh2T
+/U6IPJcqKVThGr9XyPaThvMdEGc5VdYWrDvW5ROS1e+DdY/feDWv6BfLiHNxKE1c
+Dq+1yU3jHjCzMzjbMfHG
+=RVrh
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cantata/cantata-1.2.2.ebuild b/media-sound/cantata/cantata-1.3.4.ebuild
index 4c05d589bef2..db9a7bd0b0e0 100644
--- a/media-sound/cantata/cantata-1.2.2.ebuild
+++ b/media-sound/cantata/cantata-1.3.4.ebuild
@@ -1,31 +1,37 @@
 # 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.2.2.ebuild,v 1.1 2014/01/08 04:20:06 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.3.4.ebuild,v 1.1 2014/04/09 22:29:33 johu Exp $
 
 EAPI=5
+
 KDE_REQUIRED="optional"
-KDE_LINGUAS="cs de en_GB es hu ko pl ru zh_CN"
-inherit kde4-base
+PLOCALES="cs de en_GB es hu ko pl ru zh_CN"
+inherit kde4-base l10n
 
-DESCRIPTION="A featureful and configurable Qt4 client for the music player daemon (MPD)"
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
 HOMEPAGE="https://code.google.com/p/cantata/"
-SRC_URI="https://cantata.googlecode.com/files/${P}.tar.bz2"
+SRC_URI="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60WTYtaXk3c1IzNVU -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="cddb cdda kde lame mtp musicbrainz qt5 replaygain taglib"
+IUSE="cddb cdda devices dynamic http-server kde lame mtp musicbrainz online-services qt5 replaygain streams taglib"
 REQUIRED_USE="
 	cddb? ( cdda taglib )
-	cdda? ( || ( cddb musicbrainz )  )
+	cdda? ( devices || ( cddb musicbrainz )  )
 	lame? ( cdda taglib )
-	mtp? ( taglib )
+	mtp? ( devices taglib )
 	musicbrainz? ( cdda taglib )
+	online-services? ( taglib )
 	qt5? ( !kde )
 	replaygain? ( taglib )
 "
 
-DEPEND="
+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) )
@@ -35,6 +41,7 @@ DEPEND="
 	qt5? (
 		dev-qt/qtconcurrent:5
 		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
 		dev-qt/qtxml:5
 	)
@@ -42,6 +49,7 @@ DEPEND="
 		dev-qt/qtcore:4
 		dev-qt/qtdbus:4
 		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
 	)
 	replaygain? (
 		media-libs/speex
@@ -51,32 +59,44 @@ DEPEND="
 	taglib? (
 		media-libs/taglib[asf,mp4]
 		media-libs/taglib-extras
-		!kde? ( sys-fs/udisks:2 )
+		!kde? ( devices? ( sys-fs/udisks:2 ) )
 	)
-	dev-libs/qjson
-	sys-libs/zlib
-	x11-libs/libX11
 "
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep oxygen-icons)
+DEPEND="${RDEPEND}
+	sys-devel/gettext
 "
 
+# cantata has no tests
+RESTRICT="test"
+
 src_prepare() {
 	kde4-base_src_prepare
 
-	rm -rf 3rdparty/qjson || die
+	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)
@@ -85,7 +105,10 @@ src_configure() {
 		$(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
 }