summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-08-03 21:07:52 +0000
committerJohannes Huber <johu@gentoo.org>2012-08-03 21:07:52 +0000
commit13f123386c9f8dc67ccda9df35a7f7036b1843f6 (patch)
treedff1b4341832b0eadcf6f07ab4729458ab4508d8 /media-video/bangarang
parentx86 stable, see bug 418515 (diff)
downloadgentoo-2-13f123386c9f8dc67ccda9df35a7f7036b1843f6.tar.gz
gentoo-2-13f123386c9f8dc67ccda9df35a7f7036b1843f6.tar.bz2
gentoo-2-13f123386c9f8dc67ccda9df35a7f7036b1843f6.zip
Allow to build with KDE 4.9 wrt bug #429622. Thanks to Magnus Kessler <Magnus.Kessler@gmx.net>.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'media-video/bangarang')
-rw-r--r--media-video/bangarang/ChangeLog7
-rw-r--r--media-video/bangarang/bangarang-2.0.1.ebuild35
-rw-r--r--media-video/bangarang/bangarang-2.1.ebuild9
3 files changed, 12 insertions, 39 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/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