diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2012-05-23 21:52:24 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2012-05-23 21:52:24 +0000 |
| commit | 4836ea5eff972b8cb1d1fc97bf2d06f9754e37d5 (patch) | |
| tree | 7c4cfaec285775cec730f859f9847cd1977e1ea4 /app-cdr/k3b | |
| parent | Stable for x86, wrt bug #411449 (diff) | |
| download | gentoo-2-4836ea5eff972b8cb1d1fc97bf2d06f9754e37d5.tar.gz gentoo-2-4836ea5eff972b8cb1d1fc97bf2d06f9754e37d5.tar.bz2 gentoo-2-4836ea5eff972b8cb1d1fc97bf2d06f9754e37d5.zip | |
Remove encode and wav USE flags.
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr/k3b')
| -rw-r--r-- | app-cdr/k3b/ChangeLog | 5 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-2.0.2-r3.ebuild | 26 |
2 files changed, 12 insertions, 19 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index efaccddf6d87..01241cb1146a 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -1,6 +1,9 @@ # 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.272 2012/05/23 18:59:56 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.273 2012/05/23 21:52:24 reavertm Exp $ + + 23 May 2012; Maciej Mrozowski <reavertm@gentoo.org> k3b-2.0.2-r3.ebuild: + Remove encode and wav USE flags. 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. diff --git a/app-cdr/k3b/k3b-2.0.2-r3.ebuild b/app-cdr/k3b/k3b-2.0.2-r3.ebuild index 785cc05152be..b855ef8494a8 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.2 2012/05/23 18:59:56 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r3.ebuild,v 1.3 2012/05/23 21:52:24 reavertm Exp $ EAPI=4 @@ -30,7 +30,7 @@ HOMEPAGE="http://www.k3b.org/" LICENSE="GPL-2 FDL-1.2" SLOT="4" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="debug dvd emovix encode ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis +wav" +IUSE="debug dvd emovix ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis" DEPEND=" $(add_kdebase_dep libkcddb) @@ -52,7 +52,7 @@ RDEPEND="${DEPEND} virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 - encode? ( media-video/transcode[dvd] ) + media-video/transcode[dvd] ) emovix? ( media-video/emovix ) sox? ( media-sound/sox ) @@ -69,34 +69,24 @@ PATCHES=( src_configure() { mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF + -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON -DK3B_BUILD_K3BSETUP=OFF + -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF $(cmake-utils_use debug K3B_DEBUG) $(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING) - $(cmake-utils_use taglib K3B_ENABLE_TAGLIB) - $(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 flac K3B_BUILD_FLAC_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 taglib K3B_ENABLE_TAGLIB) $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN) - $(cmake-utils_use wav K3B_BUILD_WAVE_DECODER_PLUGIN) + $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN) ) - - if use encode; then - mycmakeargs+=( - $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN) - ) - else - mycmakeargs+=( - -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=OFF - ) - fi - kde4-base_src_configure } |