diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2012-05-23 18:59:56 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-05-23 18:59:56 +0000 |
| commit | ec16c25082fb0997c9a39741d051a9f7ff38f888 (patch) | |
| tree | bbc194256f5cb8cdd6bcee86f2128d758517f89e /app-cdr | |
| parent | [bump] dev-perl/glib-perl-1.260.0 (diff) | |
| download | gentoo-2-ec16c25082fb0997c9a39741d051a9f7ff38f888.tar.gz gentoo-2-ec16c25082fb0997c9a39741d051a9f7ff38f888.tar.bz2 gentoo-2-ec16c25082fb0997c9a39741d051a9f7ff38f888.zip | |
Remove REQUIRED_USE in favour of letting affected use flags work on their own. Fixes bug #417235 by Samuli Suominen <ssuominen@gentoo.org>.
(Portage version: 2.1.10.62/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/k3b/ChangeLog | 6 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-2.0.2-r3.ebuild | 17 |
2 files changed, 10 insertions, 13 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index 767be5c170c1..efaccddf6d87 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-cdr/k3b # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.271 2012/05/22 21:28:00 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.272 2012/05/23 18:59:56 kensington Exp $ + + 23 May 2012; Michael Palimaka <kensington@gentoo.org> k3b-2.0.2-r3.ebuild: + Remove REQUIRED_USE in favour of letting affected use flags work on their own. + Fixes bug #417235 by Samuli Suominen <ssuominen@gentoo.org>. *k3b-2.0.2-r3 (22 May 2012) diff --git a/app-cdr/k3b/k3b-2.0.2-r3.ebuild b/app-cdr/k3b/k3b-2.0.2-r3.ebuild index d81509f9f856..785cc05152be 100644 --- a/app-cdr/k3b/k3b-2.0.2-r3.ebuild +++ b/app-cdr/k3b/k3b-2.0.2-r3.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/app-cdr/k3b/k3b-2.0.2-r3.ebuild,v 1.1 2012/05/22 21:28:00 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r3.ebuild,v 1.2 2012/05/23 18:59:56 kensington Exp $ EAPI=4 @@ -36,9 +36,9 @@ DEPEND=" $(add_kdebase_dep libkcddb) media-libs/libsamplerate dvd? ( media-libs/libdvdread ) - encode? ( lame? ( media-sound/lame ) ) ffmpeg? ( virtual/ffmpeg ) flac? ( >=media-libs/flac-1.2[cxx] ) + lame? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) @@ -55,7 +55,7 @@ RDEPEND="${DEPEND} encode? ( media-video/transcode[dvd] ) ) emovix? ( media-video/emovix ) - encode? ( sox? ( media-sound/sox ) ) + sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) " @@ -66,11 +66,6 @@ PATCHES=( "${FILESDIR}/${P}-libavformat54.patch" ) -REQUIRED_USE=" - lame? ( encode ) - sox? ( encode ) -" - src_configure() { mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF @@ -83,23 +78,21 @@ src_configure() { $(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN) $(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN) $(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN) + $(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN) $(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN) $(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN) $(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN) + $(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN) $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN) $(cmake-utils_use wav K3B_BUILD_WAVE_DECODER_PLUGIN) ) if use encode; then mycmakeargs+=( - $(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN) - $(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN) $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN) ) else mycmakeargs+=( - -DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF - -DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=OFF ) fi |