Allow to build with KDE 4.9 wrt bug #429622. Thanks to Magnus Kessler <Magnus.Kessler@gmx.net>.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 22 insertions, 51 deletions

diff --git a/media-video/bangarang/ChangeLog b/media-video/bangarang/ChangeLog
index bdf3127a4d98..ebba1ecb6fa1 100644
--- a/media-video/bangarang/ChangeLog
+++ b/media-video/bangarang/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/bangarang
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bangarang/ChangeLog,v 1.9 2012/07/15 15:24:55 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bangarang/ChangeLog,v 1.10 2012/08/03 21:07:52 johu Exp $
+
+  03 Aug 2012; Johannes Huber <johu@gentoo.org> -bangarang-2.0.1.ebuild,
+  bangarang-2.1.ebuild:
+  Allow to build with KDE 4.9 wrt bug #429622. Thanks to Magnus Kessler
+  <Magnus.Kessler@gmx.net>.
 
   15 Jul 2012; Michael Palimaka <kensington@gentoo.org> bangarang-2.0.1.ebuild,
   bangarang-2.1.ebuild:
diff --git a/media-video/bangarang/Manifest b/media-video/bangarang/Manifest
index a49237dec3b9..8b79867564d8 100644
--- a/media-video/bangarang/Manifest
+++ b/media-video/bangarang/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX bangarang-2.1-gcc-4.7.patch 1439 SHA256 9e117db8b961f216de944bed9c74ec0ea10c777afd584ba2d948c8164966da3a SHA512 b8cc98d45d1ce93dd0dde3bddd45a03fb7a6b2e2418595ef7aa1584fb8c123423a512a2cbd1657764d0fd9862d5e7158f6a4f7dde81665092072d1765a97e591 WHIRLPOOL f0be97de34232f51c90f740866c913b658758c87033739d83161f5d26eeef84715583e8608cf031ac0d6f53cab5799e44443072bcc921d19fa965e239ee27668
-DIST 113305-bangarang-2.0.1.tar.gz 605261 SHA256 f275f8e2f9b7b6f8ca845599faf55f8b04295fcd3a6afe498001bc97034236c3
 DIST bangarang-2.1.tar.gz 698339 SHA256 c15366ac014e0da84432f0ee050bb3c1d2aee3c69d0c7f41c40aa399ce5597bc SHA512 849716a8897efd9fbb6e69a9ebcc85a3e3809ebef5e7f080fbd410634f1de592eca7d7d6e37db0c7d3ec5941783b974f17131ad9f3653e7878d2d60ea2e77e27 WHIRLPOOL 73151686a2e85bce185391c60f3f9ecb1b5162ae9516a225da274c70f6d27cd390689888591a9331f42c18538bbfc5e180a8b86a13798d4e215c793b0766ade3
-EBUILD bangarang-2.0.1.ebuild 965 SHA256 10f594ce5f7119f294c44228fe41293a9fad43bd0985d77b014d89970519cbbb SHA512 0776d28b11082e34ccd027c504d6fbf979af09a2b57fd25d205913776ee96fad060ec93c6724f7b4dafb91b799a5a5bf6d486565fb547c0ce47a0e2f462903d3 WHIRLPOOL b5ba2dfc76c3abdda530216046ba8badbecc21e39378f8bbf639487376ecc6623c72c43e2c6ca2be39f1a7b9aee11e4205aa8a2f0e7a3cc0e17460da349e0739
-EBUILD bangarang-2.1.ebuild 1017 SHA256 2b4c389ac6ec3b9d79eb5c26d7eabce76dfe4139f8b6ed35510e572f149d7128 SHA512 82455c0ba9da526c8f3ce4dc702fd930ee472b370b07bafd5642d867a83d9716ce018cf8108dcf08dee12c1426d8caa472cbc82496baf69bc64efccf22b5ebfc WHIRLPOOL a799e121c7e27fadec08cc9bf1be2e88adb4ae6293c0b82234d76d24cf7c7f0610a4116c9aec2d2d31bf2d8fba3851dfdb5c50b6bf90867105cf10707147b218
-MISC ChangeLog 1663 SHA256 614c6f5760f2031cd977be1defbcf5acba57407ece7b13baf407336b7eb09fbf SHA512 2535dc0cba4916a53e479cb7bc844619d8078b0b8876eba6d6ee4fb43875ee11615e5833320a1c11c2a25473099fe927b06d1a964e9fa1c3d84e3c0530793641 WHIRLPOOL e5299985b0ab8e307dda7cc1859e2ac97b6785a64910f671dab5da837c706f90ffe92ab93d34552accbe094498003b3afd0185aadd3b301921d4eb60541c4cc5
+EBUILD bangarang-2.1.ebuild 1054 SHA256 910481785d1ad68b505c0e21e2df2fe74bca52c1b09ec56055d69c4ab1d322a5 SHA512 74a243b5ad5129f36f9e4fe3ddfc2b365d1d2ba0be1e3a75ad3ce28276e4fb1974fcaed96bfe4ebfe92efb58dfb3b6972aeb5815eaf03004fd676c1e8bbadd97 WHIRLPOOL f64fc345fd6751270fe74f015f4ddd35eaada66a94480000442cc13399ad2f7f38d51a80c380ee9d4452c8aaaa458bdd93ed3072e0c413a6df6dfe87fbf1c356
+MISC ChangeLog 1856 SHA256 637bfa28098446b39bd97ef4f6fabeb37d095196e0a0adc9a006a142c20a34f9 SHA512 4fde57e24278048a0f342bb7b3da599196b8886493fef99ce13039c55b2a32a6ca257b5915947b613d7d2f6c7c8a47371e2a8304fb767fe46a76f6d1f339661d WHIRLPOOL d41e30042393e551872aadaa4bade636d9cded3ed0598c637bef3795a425db5274d1ebd2f2804c38cd362e9117d54e026e35bf9778e5ac967fcc69dc927c483a
 MISC metadata.xml 249 SHA256 1e7cc6446bce90a97976386ef3af00cb1ec2de30fc142ea4ce55abb909eee8c2 SHA512 7c5e3d617ad67820ebb4a22f497003c3149430ed1b7f2704f99420251a3a1ee8a7dae70a4ee0f568b289f1c044c6aa06a8e684e394d22e27ae299ae6160797c6 WHIRLPOOL c4b56a99913c87de6ff247f1c67de7a5989977d0618587352864c28a30e15bbafa952bc92997412afdca4009143d10424d25bc19aeacc534723f26139f7dbf5d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJQAuDGAAoJEMbwO6tnXQ0sMYcH/2SjF6EKg5I1lgMp5cYPH2U+
-OfozjM2NLs6XX3VKabSNR7s+ccbppfIfkEy1UIc/ATXv8bAkdIhCzsCrEyI9MRUB
-4gFgmzUvqO9a2DYgI85jAM4dS/5rOoHhXEPqnGPnOSj6oS65FhOcMNmAGpt86MBU
-PcjBGEcNqC7y12gtVn7IkOA6mSZaMSHIx0BMH59UuYORfQHCpyfC6FAENPbw4hRW
-hulKpk8OgSbbGS4W4CBBmlujrTVepycdfolBGgAzCWpE5CEvBpzRGYggq7MFszc+
-/0jIvJMRjBSd8qWPYL6LcruVfIB8va6VlJ9EWNJujcMbmMrO2hX0oIWXTnlaWh8=
-=TBZA
+iQEcBAEBCAAGBQJQHD2fAAoJEO+t9ga+3I3aJiwH/iacYbHVcvZvhOJh0SqtBWk8
+SQygpdzONNFO+P2d1+UiGXAEFBV7cd5GW0d7H4wfuBdB18I9hoWlMmuvrsN5aw3g
+oq7cSGM65/11pk131DfoVTaT6UcwTkEMti5ETxpVwgMwym/yDBI1Kn1ayCoqa4wy
+xodi71KOanrz4InHf9B/Kj8f1NNDD4I5XciDF5NXUjKNsFuBoMlRqohpGno5c/Kk
+tdWteS2CL/HO2LVhbkDaNlwz2jXHI7y858DexiaJjeuAVDs2Y6+9CcHA7+L8u5rG
+t0W8HGpwhJvet12WlyJPVl2clUxKP/JsdBEUkS+YbLLB3OOxFEwHFGIkpbd8CjM=
+=cA6Q
 -----END PGP SIGNATURE-----
diff --git a/media-video/bangarang/bangarang-2.0.1.ebuild b/media-video/bangarang/bangarang-2.0.1.ebuild
deleted file mode 100644
index 784c288a73cc..000000000000
--- a/media-video/bangarang/bangarang-2.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bangarang/bangarang-2.0.1.ebuild,v 1.3 2012/07/15 15:24:55 kensington Exp $
-
-EAPI=4
-
-KDE_MINIMAL="4.6"
-KDE_LINGUAS="cs da de el es fi fr it lt nl pl pt_BR uk zh_CN"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Media player for KDE utilizing Nepomuk for tagging"
-HOMEPAGE="http://bangarangkde.wordpress.com"
-EGIT_REPO_URI="git://gitorious.org/bangarang/bangarang.git"
-[[ ${PV} == 9999 ]] || SRC_URI="http://opendesktop.org/CONTENT/content-files/113305-${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="debug"
-
-RDEPEND="
-	dev-libs/soprano
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep nepomuk)
-	$(add_kdebase_dep kdemultimedia-kioslaves)
-	media-libs/taglib
-	media-libs/phonon
-	x11-libs/qt-script:4
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-S=${WORKDIR}/bangarang-bangarang
diff --git a/media-video/bangarang/bangarang-2.1.ebuild b/media-video/bangarang/bangarang-2.1.ebuild
index 7ef5f30dc3ae..b47111f69060 100644
--- a/media-video/bangarang/bangarang-2.1.ebuild
+++ b/media-video/bangarang/bangarang-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bangarang/bangarang-2.1.ebuild,v 1.3 2012/07/15 15:24:55 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bangarang/bangarang-2.1.ebuild,v 1.4 2012/08/03 21:07:52 johu Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ EGIT_REPO_URI="git://gitorious.org/bangarang/bangarang.git"
 [[ ${PV} == 9999 ]] || SRC_URI="http://bangarangissuetracking.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 SLOT="4"
 IUSE="debug"
 
@@ -23,7 +23,10 @@ RDEPEND="
 	dev-libs/soprano
 	$(add_kdebase_dep kdelibs 'semantic-desktop')
 	$(add_kdebase_dep nepomuk)
-	$(add_kdebase_dep kdemultimedia-kioslaves)
+	|| (
+		$(add_kdebase_dep audiocd-kio)
+		$(add_kdebase_dep kdemultimedia-kioslaves)
+	)
 	media-libs/taglib
 	media-libs/phonon
 	x11-libs/qt-script:4