summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-08-01 12:36:09 +0000
committerJohannes Huber <johu@gentoo.org>2012-08-01 12:36:09 +0000
commitcdfe19da396bb8836cb9e18b13e59a9c7b53a2b4 (patch)
tree503df75bcef0c2845e3a6fd13bb91b9d2c4bbeb1 /media-sound/cantata
parentBump to geany-plugins-1.22 for bug #429056. (diff)
downloadgentoo-2-cdfe19da396bb8836cb9e18b13e59a9c7b53a2b4.tar.gz
gentoo-2-cdfe19da396bb8836cb9e18b13e59a9c7b53a2b4.tar.bz2
gentoo-2-cdfe19da396bb8836cb9e18b13e59a9c7b53a2b4.zip
Fix automagic dependencies by Pavlos Ratis <dastergon@gmail.com>, bug #428524.
(Portage version: 2.2.0_alpha120/cvs/Linux i686)
Diffstat (limited to 'media-sound/cantata')
-rw-r--r--media-sound/cantata/ChangeLog6
-rw-r--r--media-sound/cantata/cantata-0.8.2.ebuild22
-rw-r--r--media-sound/cantata/metadata.xml3
3 files changed, 22 insertions, 9 deletions
diff --git a/media-sound/cantata/ChangeLog b/media-sound/cantata/ChangeLog
index daedcea5fa66..8ab969b46c4d 100644
--- a/media-sound/cantata/ChangeLog
+++ b/media-sound/cantata/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/cantata
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.6 2012/07/27 08:02:40 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.7 2012/08/01 12:36:09 johu Exp $
+
+ 01 Aug 2012; Johannes Huber <johu@gentoo.org> cantata-0.8.2.ebuild,
+ metadata.xml:
+ Fix automagic dependencies by Pavlos Ratis <dastergon@gmail.com>, bug #428524.
*cantata-0.8.2 (27 Jul 2012)
diff --git a/media-sound/cantata/cantata-0.8.2.ebuild b/media-sound/cantata/cantata-0.8.2.ebuild
index f0aba7e5be9c..4573b590a596 100644
--- a/media-sound/cantata/cantata-0.8.2.ebuild
+++ b/media-sound/cantata/cantata-0.8.2.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-sound/cantata/cantata-0.8.2.ebuild,v 1.1 2012/07/27 08:02:40 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-0.8.2.ebuild,v 1.2 2012/08/01 12:36:09 johu Exp $
EAPI=4
@@ -14,19 +14,25 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="~amd64 ~x86"
-IUSE="kde"
+IUSE="ffmpeg kde mpg123 mtp taglib"
DEPEND="
media-libs/speex
- media-libs/taglib
- media-libs/taglib-extras
- media-sound/mpg123
- virtual/ffmpeg
+ ffmpeg? ( virtual/ffmpeg )
+ mpg123? ( media-sound/mpg123 )
+ mtp? ( media-libs/libmtp )
+ taglib? ( media-libs/taglib )
+"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep oxygen-icons)
"
-RDEPEND=${DEPEND}
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
+ $(cmake-utils_use_enable ffmpeg)
+ $(cmake-utils_use_enable mpg123)
+ $(cmake-utils_use_enable mtp)
+ $(cmake-utils_use_enable taglib)
$(cmake-utils_use_want kde KDE_SUPPORT)
)
diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
index c877cada2e5e..ade892bd4e33 100644
--- a/media-sound/cantata/metadata.xml
+++ b/media-sound/cantata/metadata.xml
@@ -6,4 +6,7 @@
<email>dastergon@gmail.com</email>
<name>Pavlos Ratis</name>
</maintainer>
+ <use>
+ <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123.</flag>
+ </use>
</pkgmetadata>