diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-21 10:25:57 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-21 10:25:57 +0000 |
| commit | ed5d81b0970741badbc1761413900628dce40d87 (patch) | |
| tree | 1c08fdc329c17d220b4a8011df5c04fd030f82c4 /media-sound | |
| parent | added net-misc/asterisk-spandsp_codec_g726 (diff) | |
| download | gentoo-2-ed5d81b0970741badbc1761413900628dce40d87.tar.gz gentoo-2-ed5d81b0970741badbc1761413900628dce40d87.tar.bz2 gentoo-2-ed5d81b0970741badbc1761413900628dce40d87.zip | |
Fix building with USE="flac -vorbis" wrt #325935 by Thomas Kahle.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/kid3/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/kid3/kid3-1.4.ebuild | 21 |
2 files changed, 19 insertions, 7 deletions
diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog index 915121862db9..e18a4809d881 100644 --- a/media-sound/kid3/ChangeLog +++ b/media-sound/kid3/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/kid3 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.50 2010/06/28 08:55:14 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.51 2010/07/21 10:25:57 ssuominen Exp $ + + 21 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> kid3-1.4.ebuild: + Fix building with USE="flac -vorbis" wrt #325935 by Thomas Kahle. 28 Jun 2010; Markos Chandras <hwoarang@gentoo.org> kid3-1.4.ebuild: Stable on amd64 wrt bug #325935 diff --git a/media-sound/kid3/kid3-1.4.ebuild b/media-sound/kid3/kid3-1.4.ebuild index 7bf92bc5650f..84f699078c10 100644 --- a/media-sound/kid3/kid3-1.4.ebuild +++ b/media-sound/kid3/kid3-1.4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.4.ebuild,v 1.3 2010/06/28 08:55:14 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.4.ebuild,v 1.4 2010/07/21 10:25:57 ssuominen Exp $ -EAPI=2 +EAPI=3 inherit kde4-base DESCRIPTION="A simple tag editor for KDE" @@ -14,23 +14,32 @@ SLOT="4" KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="flac +handbook mp3 mp4 +taglib vorbis" -DEPEND="flac? ( media-libs/flac[cxx] ) +RDEPEND=" + flac? ( media-libs/flac[cxx] + media-libs/libvorbis ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2 ) taglib? ( media-libs/taglib ) vorbis? ( media-libs/libvorbis )" +DEPEND="${RDEPEND}" src_configure() { - # tunepimp uses the old RDF WebService and should not be used... - # and -WITH_KDE=OFF doesn't compile (last checked, 1.3) + # -DWITH_TUNEPIMP is using deprecated RDF WebService + # -DWITH_KDE=OFF doesn't compile, last checked 1.4 + mycmakeargs+=( $(cmake-utils_use_with flac) $(cmake-utils_use_with mp3 ID3LIB) $(cmake-utils_use_with mp4 MP4V2) $(cmake-utils_use_with taglib) "-DWITH_TUNEPIMP=OFF" - $(cmake-utils_use_with vorbis) ) + if use flac; then + mycmakeargs+=( "-DWITH_VORBIS=ON" ) + else + mycmakeargs+=( $(cmake-utils_use_with vorbis) ) + fi + kde4-base_src_configure } |