Fixed conversion from IUSE flags to cmake arguments to support USE flags that are disabled by default, as a result it no longer fails to emerge due to -system-ffmpeg.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 21 insertions, 16 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 08bfa20880e1..3dfa6158c398 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.207 2013/03/10 13:58:25 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.208 2013/03/11 12:41:18 tomwij Exp $
+
+  11 Mar 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-2.6.1.ebuild:
+  Fixed conversion from IUSE flags to cmake arguments to support USE flags that
+  are disabled by default, as a result it no longer fails to emerge due to
+  -system-ffmpeg.
 
   10 Mar 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-2.6.1.ebuild,
   metadata.xml:
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 778348dcb872..ee39d25a7ba4 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -8,17 +8,17 @@ DIST avidemux_2.6.0.tar.gz 16145705 SHA256 5ee2d898794141b47bc288e9b0fb770eff831
 DIST avidemux_2.6.1.tar.gz 16537020 SHA256 17ad853a306e6cfed9166ee36b014748ea7b24a62e035b489ed97fbd8d91afc2 SHA512 3a4e1ca21abe014c944549dbb51e1b8588fdd71b147191f01ee47a402ef45a35e8cf5cbf08924f7e1581f961a3ec3eaec570f9c8c3081abffa9752b11008c26f WHIRLPOOL addd80555f423253a46c02a75980e2b70bf03631a378daae86fc66efca4420ae1a2e07b04ba5c00e4e5a7ab7c522344540b3f6c36209233ce1a8d7cde09c1309
 EBUILD avidemux-2.5.6-r2.ebuild 4393 SHA256 95fd317399d57acf75cf0baf73fb487c5143b3dd3af4b0aa1537a9b4c4994776 SHA512 bfc5e96966c46bb52d0f9da586b3c5ccb693561c5008c0d06d7921f649fee0a8fe13eca61947793d272e4e661d42c029e57779e4f7630c7db539fd39610b1c11 WHIRLPOOL 591f6ac35e8e83e0454e3545d9a70d76d27d9de3fee4ecdd6adf3cb4488637eaed8091771c193f3fc893e7094c6c659c5fef25985473171a95e54ac3064b7e16
 EBUILD avidemux-2.6.0.ebuild 5951 SHA256 5267025ecb887f15805b878170dbd81ff7c00e6f0255d954c9a162e2c85471e3 SHA512 c20cacd565d008ef902e0eb107c3449b03881547d0f203595933a37c99b916f1e57a644c3b77b0204b3efbe05025192d69386a2a7e0c210dbf03ebdd5d6b733f WHIRLPOOL ff982e90a4908055588697cbd587cc51a4720a81ec31221417232c708149bba8b1b1e24f11ef7f9159246c8fd93db06083f3927d79ab24a7ad32a5ed93d4bd3d
-EBUILD avidemux-2.6.1.ebuild 6715 SHA256 c078098b9ace625def5b5333a414d06a3986fefbd9f6b328cf9ebaf993b4b647 SHA512 d097d0fc96118d7ce8f6456c6887c8b4958763ee736c293bb2a61f319509a273806a96c7dc2bb2973e3c546aaef1a36dc740eb63907e5a7c74f1754d4b86bc2d WHIRLPOOL 42fb291778c1991615a6f776d3959d46e9a2cabcc7c057a9e153e8837613f05eef543cb0045219b2dd774a49dee174c7190909a1f8d31fdcc2dfcbf10d7feee2
-MISC ChangeLog 38135 SHA256 0b4e754e4e67ba5b4c183b485b6d7bc57ee12cff9eb17534f242ceda61b94ece SHA512 d929b15ff9aa9ee3f9a60cdbf3ae89e7413613883dcc3f83d9780c28813515b21d6ac7013fd9dce98aa7a65a64403705772e3b5569c62b1f5803efc7afba990e WHIRLPOOL 89ca3ea988a6b72d4b85bc56c522dfc71892725636458b9a70e24111c3f57daa1f10f4eac0d6df6e3000f3ae9041413cb2b9473d027a5044aceab2a2057ed5d9
+EBUILD avidemux-2.6.1.ebuild 6721 SHA256 115b3b840502c66a557d2dc00718a60cf45a6e6fff212d3e2e9d0b9af72435e3 SHA512 2174532d1b5313731fa2d09cf20958f186ca38d7cd13c17b3d51165f7506a4e2eef0b25b3a75dfa418d1d3aa3a159eb7ffa275a70c7c7cfa8e30a7a181ec3c03 WHIRLPOOL 5db7417056c4d36e1e62c3593c2c8b1d7dbf692e4c9628429149126a6bfe1e31949419f0f4acc7f8849549746720697b2ae6dc1056408c575586a4398eac7cde
+MISC ChangeLog 38379 SHA256 12ec2ee127629f037ef488aca300238266250b49048e77e33e4813c65ee50956 SHA512 852b1c4d18f488728899a8a898b513e36a55cb725ae5a1dc6d670ba9f864ec5d1cccbeaa36c83b6f4d49fee1f5e0e647de81ee6762df4710952aecf4298cd922 WHIRLPOOL 198e51887e52bfde9308f961ffe80dd53c9359685e610b3b1377576219ecfe3156bb6b4fe6e31f02a94a12c22cd5954059f0f9b573e1b010d92e0ea32bb0b272
 MISC metadata.xml 617 SHA256 cc07206012811ca8352bb16dbd3df6cd73d4f38e804f78261a2e4b89ecd8dc01 SHA512 bedd22470fd3c99eefb882a0fb8f7528c55a3d181c3da08bc1bc44261580074c606c6c9dd1f6854c67e47eef0d3ebf36b3613f2df356a1205d3318e5eed9283a WHIRLPOOL 383957513383cff90961b30e8b060b2068bd9778840047bd321c717938f3bf3a30959af52ee5c29d2ab7a62fe8635794eed644cc8e885469d7cd9ee009bf4ce6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRPJF/AAoJEJWyH81tNOV9cS4H/0+x4QQYjP/Q9p86vr3T4+c2
-SFooAdG//Y0uQFI5LTKqTcWUt7vr6AtIyeVPreWXaaSV7QUxsdbzS/rxr5gmwHcG
-Y8sUOVWZICIvfxFno48xYsEWybd0WMZGu2OFa7giw+UMd7UD+BTxtMdmCBPK2j6H
-zfrB6ZIf6ho+mC/FtnIgN+b0NhurOVGxGuULqsrSHnI7qqTMU0CqkM2G+cAsBPq8
-GQevkQyE02ak8JSrwKxfiyLz3mFdulZegu2uOFA1HVKzbtcsRJXWFaXq2PD7QkDx
-IuCFPCeq8/iNaxukshB/kXQhdydukp0GvXDAgqAXY2sneJXdOO2lu9OnXLUaKzk=
-=F33N
+iQEcBAEBCAAGBQJRPdDoAAoJEJWyH81tNOV934cIAKJfCrvT2hliGOBMoN2ykDTt
+cMcVri9/8Uof5TOguu3RBiWSoBnXqmiw8FPlKnXYkY/UPivbasS9/LlK1/YYSNco
+m6VVsBh//87EGFL3NGuNoFMHIVvQTaUA48lqo1bJnkjGoxuFAmWDlVLtg+uN4lfQ
+wmcZTdd4wUGi9XL4T9aQ3viFLk2RBmGYSG+uXqHWNuCjhluQ3WzgBXj3m97HYGMy
+v1Ohm7gdxanr6IcyRkMzp6zjscmC5DW1syulCozjWZlrwtrc5wIjE8lvkE7MKrsn
+7Pbnv5TR6zTianZqsOef6hGr3eMlBhzdJo5UR0CGSe4wr2YdoMzE+ldMtFVWh8s=
+=Ouqi
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.6.1.ebuild b/media-video/avidemux/avidemux-2.6.1.ebuild
index 42a8fa1d76c3..40c59a0e3d98 100644
--- a/media-video/avidemux/avidemux-2.6.1.ebuild
+++ b/media-video/avidemux/avidemux-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild,v 1.4 2013/03/10 13:58:25 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild,v 1.5 2013/03/11 12:41:18 tomwij Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
 KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts fontconfig gtk jack lame libsamplerate mmx nls qt4 sdl -system-ffmpeg vorbis truetype xvid xv oss x264"
+IUSE="aften a52 alsa amr debug dts fontconfig gtk jack lame libsamplerate mmx oss nls qt4 sdl -system-ffmpeg vorbis truetype xvid x264 xv"
 
 RDEPEND="
 	>=dev-lang/spidermonkey-1.5-r2
@@ -125,13 +125,13 @@ src_configure() {
 	local x mycmakeargs plugin_ui
 
 	mycmakeargs="
-		$(for x in ${IUSE}; do cmake-utils_use $x; done)
+		$(for x in ${IUSE}; do cmake-utils_use ${x/#-/}; done)
+		$(cmake-utils_use amr OPENCORE_AMRWB)
+		$(cmake-utils_use amr OPENCORE_AMRNB)
 		$(cmake-utils_use dts LIBDCA)
-		$(cmake-utils_use truetype FREETYPE2)
 		$(cmake-utils_use nls GETTEXT)
+		$(cmake-utils_use truetype FREETYPE2)
 		$(cmake-utils_use xv XVIDEO)
-		$(cmake-utils_use amr OPENCORE_AMRWB)
-		$(cmake-utils_use amr OPENCORE_AMRNB)
 	"
 	use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"