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 | cc36a2b19af443b239411d21d1f3ae27cbbb80c8 (patch) | |
| tree | d3f6fd3e7496654d3bf25fb868a921cf1a3e852e /app-cdr | |
| parent | Marking cups-1.5.2-r4 ~ppc64 for bug 411887 (diff) | |
| download | historical-cc36a2b19af443b239411d21d1f3ae27cbbb80c8.tar.gz historical-cc36a2b19af443b239411d21d1f3ae27cbbb80c8.tar.bz2 historical-cc36a2b19af443b239411d21d1f3ae27cbbb80c8.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.
Package-Manager: portage-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/Manifest | 18 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-2.0.2-r3.ebuild (renamed from app-cdr/k3b/k3b-2.0.2-r2.ebuild) | 13 |
3 files changed, 30 insertions, 11 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/Manifest b/app-cdr/k3b/Manifest index 72cc321d49e6..99b5c34135ac 100644 --- a/app-cdr/k3b/Manifest +++ b/app-cdr/k3b/Manifest @@ -5,17 +5,17 @@ AUX k3b-2.0.2-ffmpeg.patch 3298 RMD160 0e7cff12151cfa33f87f4d4d425921e01fd1a9ba AUX k3b-2.0.2-libavformat54.patch 917 RMD160 5cf3edb1bb46ceee8ff6c47fd8342e044488d40e SHA1 5b35bff3f7670686a32bd71afea2deaca4331631 SHA256 516efa7ad0d9806c603f761769f8d1457fe9fa047a7475e7f11615db89ee1271 DIST k3b-2.0.2.tar.bz2 12833321 RMD160 a0289eb9ccec9607c2bdac3fc7c69102eec5ee40 SHA1 8b30a4d07942e82559b01bc07dea6bcf2defd532 SHA256 af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd EBUILD k3b-2.0.2-r1.ebuild 3412 RMD160 bd84124d0d845017c79a930d30105381e2f20d4d SHA1 1226cf144b964ee0025fd029b445c7e1e450bbd9 SHA256 fdc5088812ef0d71b0ae2de0705318fb907e08c8da80316a6dcaf4149fd95cee -EBUILD k3b-2.0.2-r2.ebuild 3305 RMD160 dda9a2e09a7b806cd53822b299184dd1e9263da9 SHA1 409b344b8a45dc0d3fb602777e7de202f8787b5b SHA256 ea9833c08cb8fd09516c59eaab8fd1f83645066a48e64966a6c98f629d625aa5 -MISC ChangeLog 39236 RMD160 cf84eb5c7b887722b3e631f48becde1d646aa88f SHA1 1e9cf26d1392036fadd712fd7f986d69e0da4cf8 SHA256 1d867e3713fe999fca735cba604eeb8d38d065004519667a1bc3c864a4bd0148 +EBUILD k3b-2.0.2-r3.ebuild 3506 RMD160 1984e953069764b8465e479782897be0eb46e51d SHA1 28ba4b6f918e8f45f760ab3c70a8d91d099a83cd SHA256 003ae19dd7a81dda772881c7087cfd75301203819ebefce0648b4b08bda4c09e +MISC ChangeLog 39553 RMD160 63b0457f42fa3d90d7566a0eb03909078725af88 SHA1 04164be406feda51361c02cbdc59bbd028626ca6 SHA256 94b726627866cc50f3f786d4d59b2ae5d6205ff43b9d4a225ee00c7a410cb366 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJPt9qKAAoJEMbwO6tnXQ0swYsH/jcXJMNbilR7uv7mxWvQxm6O -nO2AaDllu79F5Arb7NHZ/vHR1szbcdawQW2dSjzoit9gkEfBc1WsNbHxw7SGe2i/ -2KIgR70dLRRg4m4Y8BembjDmbfZX6mGVFCl75wn3A6l2PAbo6lVBbWjtqhexd31f -Z9Q9tcISYfiNP36Qf9BrWjG99zkRoiaH1jnd5kG8BIAb8VFSwITGxXET+8lT9o74 -tgPX/xqkjh3XBglQG1BhtMnAInQ/S8Ll2o2gUIquCQaUq9WuaQWf7WoCyvHAULSd -rJa2hrSqG2I7fminzuaQGUzPiTo7h6WoNp+7DnC00XuI4IASpVD22fF9Nh/TTs0= -=mrvR +iQEcBAEBAgAGBQJPvATTAAoJEMbwO6tnXQ0ssA8IAMqUgnPwVrTZWsVAS3Y+a50u +pdoRRMITvwVQlcAeRNQe+s913zeHLiXww52qyCbR7fnay2ZID9OPNNCzuClwdw7m +tQme9AXyqcr2P/tIqdhe3ZzQvH0NWUuVjRztiJEFF029ejCvmVLcCC40JeC63SuK +Ci66RJjv4JyDSYvh8v6hars8dop2FCoDnXhiyEKdRAyB5y7C6pkgwTg6sYr86tXE +7MXOCDyMK12qQx2ZP6ir90qnLv34jdYSl2LFfliURDfYCSApm+GVonAfJUyyVwxJ +LYwMFVuHwvNltuIgOTyrgzjhmh929oKtXPRXwGFBUroeE5CdBoDf5p+hyJovq0s= +=5a3e -----END PGP SIGNATURE----- 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 |