Version bump (bug #468570); ebuild from kde overlay with slight improvements

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B2474AD43CE296E!

3 files changed, 106 insertions, 2 deletions

diff --git a/media-sound/cantata/ChangeLog b/media-sound/cantata/ChangeLog
index cf5bec0e2f4f..4d248e59c956 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.16 2013/05/12 07:45:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.17 2013/06/02 06:12:25 yngwin Exp $
+
+*cantata-1.0.3 (02 Jun 2013)
+
+  02 Jun 2013; Ben de Groot <yngwin@gentoo.org> +cantata-1.0.3.ebuild:
+  Version bump (bug #468570); ebuild from kde overlay with slight improvements
 
   12 May 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Remove obsolete useflag from metadata.xml
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 793ce08f122e..8114d9659455 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,4 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
-MISC ChangeLog 2657 SHA256 518ae42884482dd4cc4862ace36e4e91af5979aab1452ad356899e68c299648e SHA512 9ab747f20e60cdc1c89d679e94cbdb9e7efa62779c1f19e6288f32ea07be2947d21ed24db72c6f349bdb15e567a63c75ba979105d1315dae77a21a7af941685b WHIRLPOOL 428d0a23d9341e660d214a13d74d9a74519089d026bfab44e15f77f87c55560d427ac588fecce89fd3a991a52e8b1e08fa48ef3ab1a9ebf2e029169cc1a264a7
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (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//
+-----END PGP SIGNATURE-----
diff --git a/media-sound/cantata/cantata-1.0.3.ebuild b/media-sound/cantata/cantata-1.0.3.ebuild
new file mode 100644
index 000000000000..e8b7fb323bc9
--- /dev/null
+++ b/media-sound/cantata/cantata-1.0.3.ebuild
@@ -0,0 +1,75 @@
+# 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 $
+
+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"
+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 )"
+
+DEPEND="
+	kde? (
+		media-libs/taglib[asf,mp4]
+		media-libs/taglib-extras
+		mtp? ( media-libs/libmtp )
+	)
+	phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) )
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+	)
+	replaygain? (
+		media-libs/speex
+		media-libs/taglib[asf,mp4]
+		media-libs/taglib-extras
+		media-sound/mpg123
+		virtual/ffmpeg
+	)
+	webkit? ( dev-qt/qtwebkit:4 )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep oxygen-icons)
+"
+
+src_prepare() {
+	# make desktop file pass validation
+	sed -e 's/MPD/MPD;/' -i ${PN}.desktop || die 'sed failed'
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable kde)
+		$(cmake-utils_use_enable phonon)
+		$(cmake-utils_use_enable replaygain FFMPEG)
+		$(cmake-utils_use_enable replaygain MPG123)
+		$(cmake-utils_use_enable replaygain SPEEXDSP)
+		$(cmake-utils_use_enable mtp)
+	)
+
+	# 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
+}