diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2012-05-22 21:28:00 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-05-22 21:28:00 +0000 |
| commit | c61af8c14cf204c19e91fa462fc85917ec073c2e (patch) | |
| tree | 6003ae46577ed66619a54fd088ce90f5927c183c /app-cdr | |
| parent | Marking cups-1.5.2-r4 ~ppc64 for bug 411887 (diff) | |
| download | gentoo-2-c61af8c14cf204c19e91fa462fc85917ec073c2e.tar.gz gentoo-2-c61af8c14cf204c19e91fa462fc85917ec073c2e.tar.bz2 gentoo-2-c61af8c14cf204c19e91fa462fc85917ec073c2e.zip | |
Properly avoid automagic dependencies, fixing bug #416675 by Petteri Räty <betelgeuse@gentoo.org>. Add REQUIRED_USE to prevent use flag combinations that do nothing. Remove old.
(Portage version: 2.1.10.62/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/k3b/ChangeLog | 10 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-2.0.2-r3.ebuild (renamed from app-cdr/k3b/k3b-2.0.2-r2.ebuild) | 13 |
2 files changed, 21 insertions, 2 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index c00d16f6c998..767be5c170c1 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -1,6 +1,14 @@ # 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.270 2012/05/19 17:38:23 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.271 2012/05/22 21:28:00 kensington Exp $ + +*k3b-2.0.2-r3 (22 May 2012) + + 22 May 2012; Michael Palimaka <kensington@gentoo.org> +k3b-2.0.2-r3.ebuild, + -k3b-2.0.2-r2.ebuild: + Properly avoid automagic dependencies, fixing bug #416675 by Petteri Räty + <betelgeuse@gentoo.org>. Add REQUIRED_USE to prevent use flag combinations + that do nothing. Remove old. *k3b-2.0.2-r2 (19 May 2012) diff --git a/app-cdr/k3b/k3b-2.0.2-r2.ebuild b/app-cdr/k3b/k3b-2.0.2-r3.ebuild index a6571537d459..d81509f9f856 100644 --- a/app-cdr/k3b/k3b-2.0.2-r2.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-r2.ebuild,v 1.1 2012/05/19 17:38:22 kensington Exp $ +# $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 $ EAPI=4 @@ -66,6 +66,11 @@ PATCHES=( "${FILESDIR}/${P}-libavformat54.patch" ) +REQUIRED_USE=" + lame? ( encode ) + sox? ( encode ) +" + src_configure() { mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF @@ -91,6 +96,12 @@ src_configure() { $(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 kde4-base_src_configure |