summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2012-10-27 15:45:53 +0000
committerBen de Groot <yngwin@gentoo.org>2012-10-27 15:45:53 +0000
commit8eb778dbc302fd6fbc5e3b6b821ca080a3495fcc (patch)
treeaf79aff0f10db7ad6ce70c390ed4d98efdce573b /media-sound/cantata
parentAdd ~amd64-linux keyword (diff)
downloadgentoo-2-8eb778dbc302fd6fbc5e3b6b821ca080a3495fcc.tar.gz
gentoo-2-8eb778dbc302fd6fbc5e3b6b821ca080a3495fcc.tar.bz2
gentoo-2-8eb778dbc302fd6fbc5e3b6b821ca080a3495fcc.zip
Some useflag and deps adjustments. Bump to eapi-5. Add to qt herd.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-sound/cantata')
-rw-r--r--media-sound/cantata/ChangeLog6
-rw-r--r--media-sound/cantata/cantata-0.8.3.1.ebuild25
-rw-r--r--media-sound/cantata/metadata.xml20
3 files changed, 29 insertions, 22 deletions
diff --git a/media-sound/cantata/ChangeLog b/media-sound/cantata/ChangeLog
index 0f7321bce669..3872567128b7 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.8 2012/10/27 15:10:23 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/ChangeLog,v 1.9 2012/10/27 15:45:53 yngwin Exp $
+
+ 27 Oct 2012; Ben de Groot <yngwin@gentoo.org> cantata-0.8.3.1.ebuild,
+ metadata.xml:
+ Some useflag and deps adjustments. Bump to eapi-5. Add to qt herd.
*cantata-0.8.3.1 (27 Oct 2012)
diff --git a/media-sound/cantata/cantata-0.8.3.1.ebuild b/media-sound/cantata/cantata-0.8.3.1.ebuild
index 4502c0dc183f..5e895a77ba06 100644
--- a/media-sound/cantata/cantata-0.8.3.1.ebuild
+++ b/media-sound/cantata/cantata-0.8.3.1.ebuild
@@ -1,38 +1,39 @@
# 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.3.1.ebuild,v 1.1 2012/10/27 15:10:23 kensington Exp $
-
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cantata/cantata-0.8.3.1.ebuild,v 1.2 2012/10/27 15:45:53 yngwin Exp $
+EAPI=5
KDE_REQUIRED="optional"
inherit kde4-base
-DESCRIPTION="Cantata is a client for the music player daemon (MPD)"
+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 replaygain"
+IUSE="kde mtp phonon replaygain webkit"
+REQUIRED_USE="mtp? ( kde )"
DEPEND="
x11-libs/qt-core:4
x11-libs/qt-dbus:4
x11-libs/qt-gui:4
- x11-libs/qt-webkit:4
kde? (
- media-libs/taglib
+ media-libs/taglib[asf,mp4]
media-libs/taglib-extras
+ mtp? ( media-libs/libmtp )
)
- mtp? ( media-libs/libmtp )
+ phonon? ( || ( media-libs/phonon x11-libs/qt-phonon:4 ) )
replaygain? (
media-libs/speex
- media-libs/taglib
+ media-libs/taglib[asf,mp4]
media-libs/taglib-extras
media-sound/mpg123
virtual/ffmpeg
)
+ webkit? ( x11-libs/qt-webkit:4 )
"
RDEPEND="${DEPEND}
$(add_kdebase_dep oxygen-icons)
@@ -41,15 +42,15 @@ RDEPEND="${DEPEND}
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_enable kde)
- $(cmake-utils_use_enable kde PHONON)
+ $(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 and to build without taglib
- # taglib is is required to enable replaygain
+ # kde fails to build without taglib
+ # taglib is required to enable replaygain
if use kde || use replaygain; then
mycmakeargs+=(
-DENABLE_TAGLIB=ON
diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
index aa578a260188..a131b3fa12ed 100644
--- a/media-sound/cantata/metadata.xml
+++ b/media-sound/cantata/metadata.xml
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <maintainer>
- <email>dastergon@gmail.com</email>
- <name>Pavlos Ratis</name>
- </maintainer>
- <use>
- <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123.</flag>
- <flag name="replaygain">Enable ReplayGain support, for relative volume adjustments.</flag>
- </use>
+ <herd>kde</herd>
+ <herd>qt</herd>
+ <maintainer>
+ <email>dastergon@gmail.com</email>
+ <name>Pavlos Ratis</name>
+ </maintainer>
+ <use>
+ <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123.</flag>
+ <flag name="phonon">Enable support for Phonon</flag>
+ <flag name="replaygain">Enable ReplayGain support, for relative volume adjustments.</flag>
+ </use>
</pkgmetadata>