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

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

2 files changed, 46 insertions, 17 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/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
 }