Version bump, bug #521370. Fix missing USE=dynamic deps, https://bugs.funtoo.org/browse/FL-2074.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 150 insertions, 3 deletions

diff --git a/media-sound/cantata/ChangeLog b/media-sound/cantata/ChangeLog
index 8192fe4c579a..6fdfdcda2e72 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.29 2014/12/07 12:41:07 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.30 2015/02/03 16:23:20 mgorny Exp $
+
+*cantata-1.5.1 (03 Feb 2015)
+
+  03 Feb 2015; Michał Górny <mgorny@gentoo.org> +cantata-1.5.1.ebuild:
+  Version bump, bug #521370. Fix missing USE=dynamic deps,
+  https://bugs.funtoo.org/browse/FL-2074.
 
   07 Dec 2014; Manuel Rüger <mrueg@gentoo.org> cantata-1.3.3.ebuild,
   cantata-1.3.4.ebuild:
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 75646e6e7f45..2c418d6eb236 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,6 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST cantata-1.3.3.tar.bz2 1587518 SHA256 74a4bbfaa1472f551f95b09236ebd3b45191df3c55c2b6c8498039b135f2b5e2 SHA512 1f50abf9e92316ba3cd8da0a542a6fbdabfa58bb8dd7349058ffeffa5f95a4db31e4810e580497fea5c08f31f8e891c1c7b600f66f81f400527d40c58f14148a WHIRLPOOL 1f66a415d1e0d0e91a2fe05ef27587a736523a385fcee9333609a301457169c4bc982e2be3f34d5bc924828d070ac6201739756d78b0ed5e60ac382988aa6fae
 DIST cantata-1.3.4.tar.bz2 1587599 SHA256 985ffa0ccb5651f7733ee3760a7d4b0830ef69b249c73f1c328d5b4276203a66 SHA512 7bd8886d194d5a7c83d4cf41cbaae1f216cb2fa41642588f4be903e1f03fcdddcaa809ac56d061859ed570f54e52fa2c42ac49d742eb636d2b3b29352e3e2343 WHIRLPOOL 96d24387aa5b6d568baa4fe7bdb9736a1d6f940d65c967f107d5b27121232327bec96178fbe5641c1f888714bb6c5f43a94d1e841b4cfcf10f9cf1747acc1253
+DIST cantata-1.5.1.tar.bz2 1986772 SHA256 57173bdd0033a2c0c2829a6e05f7579b0f13ae7794d843167c013e1c971dfe78 SHA512 bd41bbe3a9c2fa6a4e653deb62a82b928febe3876a6023d4c9bff4fb71133aca5a8e34ae77b440d10ae42c0d024ebd1c460b367a75cefa29858275d707cf4e38 WHIRLPOOL 55054c1e8d95f1dc9322b7224dfa04fd8e8430b89c5a21883fdecf0829eca60720186e6b549d80216c4035429208e2191d2e5ae31608ede3a6afc8e5046e173f
 EBUILD cantata-1.3.3.ebuild 3039 SHA256 c2ea06a40213aca711f07832bfb1b4d92e780292980528a9e9932e54739f41b4 SHA512 f5269d15ba1176ad01674358d6525cfc9bd23b54884858941b300c65a59e1dc17e487e6e135cd7d1f3059f297a416476dc329a433d9de912424eaae321a9f778 WHIRLPOOL 7dfb2f5ab5d82ea3ec8eddae539ee26c1c391c31df6426fdb9514591c2e24bca45191ed57450aa2459879ec708844ff2a3eb71b76829c584d4ccbfa923e8858f
 EBUILD cantata-1.3.4.ebuild 3039 SHA256 ad9fb3746548d02ba3588f5536c9a50e2074f25920f761678e782cf9a4d4aca5 SHA512 05e49373d2c06b9a8b0ee2721de5d6d5dba025ba7bad25bcb98bdcc627167565f2b622c7c0bc1dbc8eff0038e5bcae4a632a702e75bcdc84bfe830accccc0f09 WHIRLPOOL 9d577bc37c2cf4324a18c7f59270867062e985a1cf859031526debc5e34245ddd82364e034b9f09d1c815263b082978fbfdb00d0c4d93487f287d13d16574262
-MISC ChangeLog 4829 SHA256 eb987f2b542455467a8b2514e4fe41e87d0e3ac5fcc5616cfaab6399416ec3f1 SHA512 9168f68260c1ad6a7b0e4dd574558d1ce760a323f0d8ed5926a30730d1e1202c530402145eee3cf39211e9ca6f80090a78eb308277599c265d854c78b9205633 WHIRLPOOL 74b23349709d90a0688940ff405f0764269586ff5f73b905522ea66bda81311d22206e1460992c36ac6f4a2bee7777d2b765cbd38cad1ce8bc9c377b212be938
+EBUILD cantata-1.5.1.ebuild 3023 SHA256 6c940bc670f308886f8aaf4e00930721050e5e2a09e9a6b36a9a7d43efbfa38e SHA512 e730b85dc60fbee506a5a8d7d1bb34480311d68720fef93e9a786b03cd301bbc2ffea5721b420faec5a7d5c4ad3eabbe5c576369d65be0bc9b1c514b083e5e23 WHIRLPOOL b90e6f87e2c9b3e7267d503ed69c0d50e075ba76e1710603907f02d415acda53a330efd88f57ede7c33e0c616d842508382086647b61b798cbbf47d34f318d9a
+MISC ChangeLog 5035 SHA256 8791b509482b73531cf532bbee95569be0eacd99eac266f5e04c050923e3cd44 SHA512 65889adfc72d65f9f78385a61be32bb2f98629717262f6177da96595238badb227d8aa24ee0997f87b03906093b5fceab8a3fd788f86af117544ad74bb426db6 WHIRLPOOL 7a3028220dbfb5367e42924872fd27d45e30e17a3ec24f2637b4ea545326a89b1c8ef657cc65461ef712fbcca95e9b575be43fe000dc153305c0bd575daeaaa1
 MISC metadata.xml 647 SHA256 c2a0e4d1db640c37173b448d2141c70f7a7ab91d11f3ce2cf915c7e947c0ed24 SHA512 c7184d26e4c0a260c8baa3e4552bafdac72cf0cde99e5797dbe4e325b56a6c72acc1098ae8b8eb29723e5478cd6a9ecda05026ec19a17ef719ed6b171c019e76 WHIRLPOOL b4f65ad0cb4ee54beaf2d6016d4cf8e09c67d6de986b598f89e631f6cd836a6498ed72b837bb64e60abf15f7194505476ed36adcc690977c824468bc00ad0550
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJU0PX5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOsVwP/03/NVlUd/AQhpp39TSoPGPv
+srqimkGroTvBfiYQDDAkhtKU6NZC29vHVqS5VpcwhDFsP2bIXMGpFdVVba0TEs5z
++gqLHnyuvOJ/DEY8Ax3PuO3EvdGrK7T2OCNoiuACvOFDkNv9cp0NAWHf2nl3v402
+EQnYjW+HmZh9CP/+GY0Mjdx7hiVgZ1ewgbnAwOvx1KwAf4DFVYKrraeEZgOQ2J0H
+lLO1vviD1tiqTsOhhz26X0O/6r6BXBwdExcb6F9DssHTMxCVWr70g/EuOvugEcN+
+xHht9X1mUm0/qjZUE9NNDke1d7UG56ffm3HQEZhSKxkbxoSNim6jeN5B04krjlDN
++bq+bitmgyQ61mVF/HO0VPbY1m16G+3jvTUYTzQem2zQnjVJo3AaqTBd2UC6hJHw
+GyicYCgMELe3RRFHuzWJBhgcqSLPH7AstHAT41NePIcus46mFMvP1cIocxPN3QRN
+LlEyN14pQNzCFz04lgtjmFH0JridRZuogIz6vZpUbpmRnaD9AACxAera9OpapAiv
+YdBjyOB9DJAG2VDQ30iSSwO00fUReWhwJ7eJrmXZX8MORWAf5xKYhrCEZW3wHged
+CfkxBFVd+dPf3Z1gIUnRi6XLIwkbLNEGC/CLyEpjL/SxMLeq78hXcg2Xo8WggpeX
+D5nmYvgKDNL/HxVj+lK+
+=aKCq
+-----END PGP SIGNATURE-----
diff --git a/media-sound/cantata/cantata-1.5.1.ebuild b/media-sound/cantata/cantata-1.5.1.ebuild
new file mode 100644
index 000000000000..baf9f283299a
--- /dev/null
+++ b/media-sound/cantata/cantata-1.5.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-1.5.1.ebuild,v 1.1 2015/02/03 16:23:20 mgorny 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=0Bzghs6gQWi60UktwaTRMTjRIUW8 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="cddb cdda dynamic http-server kde lame mtp musicbrainz online-services qt5 replaygain streams taglib udisks"
+REQUIRED_USE="
+	cddb? ( cdda taglib )
+	cdda? ( udisks || ( cddb musicbrainz )  )
+	lame? ( cdda taglib )
+	mtp? ( taglib udisks )
+	musicbrainz? ( cdda taglib )
+	online-services? ( taglib )
+	qt5? ( !kde )
+	replaygain? ( taglib )
+"
+
+RDEPEND="
+	dev-libs/qjson
+	sys-libs/zlib
+	x11-libs/libX11
+	|| ( kde-apps/oxygen-icons $(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-sound/mpg123
+		virtual/ffmpeg
+	)
+	taglib? (
+		media-libs/taglib[asf,mp4]
+		media-libs/taglib-extras
+		!kde? ( udisks? ( sys-fs/udisks:2 ) )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${RDEPEND}
+	dynamic? (
+		dev-lang/perl[ithreads]
+		dev-perl/URI
+	)
+"
+
+# 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 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 taglib)
+		$(cmake-utils_use_enable taglib TAGLIB_EXTRAS)
+		$(cmake-utils_use_enable udisks DEVICES_SUPPORT)
+		-DENABLE_HTTP_STREAM_PLAYBACK=OFF
+		-DENABLE_REMOTE_DEVICES=OFF
+		-DENABLE_UDISKS2=ON
+		-DUSE_SYSTEM_MENU_ICON=OFF
+	)
+
+	kde4-base_src_configure
+}