Heavily clean up ebuild to make it shorter, use the eclass more and lowercase variables; fix up faac, faad and xvideo by instead introducing proper aac and xv USE flags as reported by Nikoli.

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

3 files changed, 77 insertions, 68 deletions

diff --git a/media-libs/avidemux-plugins/ChangeLog b/media-libs/avidemux-plugins/ChangeLog
index 2d3f84899717..d6f10f12be7c 100644
--- a/media-libs/avidemux-plugins/ChangeLog
+++ b/media-libs/avidemux-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/avidemux-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/ChangeLog,v 1.9 2013/07/12 20:49:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/ChangeLog,v 1.10 2013/07/12 22:15:22 tomwij Exp $
+
+  12 Jul 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-plugins-2.6.4-r1.ebuild,
+  avidemux-plugins-2.6.4.ebuild:
+  Heavily clean up ebuild to make it shorter, use the eclass more and lowercase
+  variables; fix up faac, faad and xvideo by instead introducing proper aac and
+  xv USE flags as reported by Nikoli.
 
   12 Jul 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-plugins-2.6.4-r1.ebuild,
   metadata.xml:
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index d6bbb8eeb647..bbab4493875b 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -7,18 +7,18 @@ DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913
 DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9 WHIRLPOOL a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef
 EBUILD avidemux-plugins-2.6.2-r2.ebuild 2819 SHA256 b8c9abaa39d61935b1d160d727faea686336f8733cb24e37be38b0705f06acaf SHA512 6d93ac535f168d241a9fa86627b154d828ea836ab057578edf3d434934106108aad1246ea1676236b2647241ddcb7878771f8b48718a84524b9dcda525cf1647 WHIRLPOOL 0f7af0fac61957dda46bdb61d04f8a727f8fa6bc8a5032b417a8ccf97202db0df75fe0b5c32fc35ae0a3928e610fe6c3c094a479b441737ce7ebed5237d2001f
 EBUILD avidemux-plugins-2.6.3.ebuild 3634 SHA256 e17913ab59b4c8140152826803a2c8f56a8b7421da0dedadd6edc26c96e02631 SHA512 00c841f1a37264ea9b128aa3fa8c58242cafe8d3f7856a70a940ed07d030ba6361d1b107a73bac5290d3ae39e04cd736afecd669d98906c85b1fbbaaa306c89d WHIRLPOOL 128d382992298f16c88fdcbef2c9960387f330d5356e6ceefda6e44b16d836489a31955e20001c4843edd71979164bb7e36ec82ef4aeac32e2ad579bd62e5470
-EBUILD avidemux-plugins-2.6.4-r1.ebuild 4025 SHA256 f0db26e1cd5ef1dad03de2b388542f6189883d7e2765e2db24f48500061971ee SHA512 14fe3aa27fe36c02ee0c07ee56617b41e37dd23edacba7e0b8fba7d0a5384886a49b809ef100408ded93f5a1d4a2384eea35d0a95a3273c438952e05a4f4264b WHIRLPOOL aa12f0c348a56247022017fc3f2ad2a81fa0a2b144c5917d113bed33d5027f84bc63c8f1839f3be8d631a2f077eed6c9809ea3bc8b12709a02c4e16eebc875f0
+EBUILD avidemux-plugins-2.6.4-r1.ebuild 3932 SHA256 027100bac661b681e0b98f0bf384a988a1d723fa95df64a10fa04f474bf37a60 SHA512 4681489fbab43a1f2906e68a86ab658bb22071ff581736de2b0ddf9676518e7d8a87341b09a396ed07ddb651e3deeaa921a2c47f3d3be8a86a22bcdd291c2ab5 WHIRLPOOL df00fdff1b6a42314495cf0a010552f442e8f605d9ce0129bfeaf384c3f76ed6248a3eda6f1e1aa59f0891a2a4af4776ff94fb3c74e87a9af82ad65e6fcde40f
 EBUILD avidemux-plugins-2.6.4.ebuild 3634 SHA256 1e4d21304f8290116f57d4255ad9ca48517561d34880cc8fb4ef9277d33677af SHA512 4ca0796ebe87e72d00fece8f3933d12a73708cd26aba648f3244a9f49736213b54090679e3f12e994ee95cf52223bef721ed492b2931a3e4c13f6c58c37ff6ea WHIRLPOOL 03d11ee54a8dbdce4f0c9cb7e24e7225656faba76aefaceb70a5c432ecab43637ebaf48aa6678bcd1c3ed397014773da5bb674cbda06e0d7aa52d3421471c2d3
-MISC ChangeLog 2834 SHA256 9a4cb1a9c2f90e847056959f8e95ca45c75f4c2e31298b6003da83b816918f03 SHA512 0e510718d588db36c1dfa2ccf83918eec97e023a30f8e630cefe213448c2ef91a1d1525fc24476da0dd0e262d67350e2f2058998b1ad409f2c42832df8c89d03 WHIRLPOOL b4a178b2f78172f615bc7df28a14a8eabbe7e2033505035fcbf097fd6349bd70635d44b9c3b4bd90e39dc474c5f7da88dc0902ee99afe9d3d8c35de2b94d4b20
+MISC ChangeLog 3148 SHA256 cf113673e12d8ee4c07314c2591b30cd698017bc343a5b2cdece7ec101ab7412 SHA512 9e50c2765eab4a98b8f73fd08391fffbd9f1c6bf0c58518d9bd0c7c90d32c05d9a858223e4782fb06047f1ecb8aef490daf87b64caf192d1b4942e7a8d3f3c20 WHIRLPOOL 8b07f54844863f16c8e561726b5b473d4c0c54a1745e958b0154989c96175124e0f01c5099bfc1684c22000e2d811481a5b09a03790307122553b85b5d4604d7
 MISC metadata.xml 1007 SHA256 1a4c911a631fca3bcc61f79eec9ea93c8a66390bfeca32ae4f06ab1f7707bf4a SHA512 1ebcd623ab08176143226f9544005953e2a7a08ca457f378bd083f0eaeef2d2f64f6c5e2d321ba4f67e34720804e03136d6749a2254ab2b92b2145604637adbd WHIRLPOOL 7da1e5d6ab98313b0dd79ec3f9a1e7c7699fbaecbbe8c4a938fcba8b3805337ed5605b71a586794f5b6bc231a0e6be3c182cc40216db2eeaf9c0f87e80e1f991
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR4GsmAAoJEJWyH81tNOV9QTkH/3q5ZF7RS1351nJ0BLjN0nOh
-dQX2SXreDwRkVEo2iNLGHIaeM85zfsPm61EvWCbdA7dMuiJbksOrpJJHbbJnesow
-GEgM1IrA6rWkZj4YQteKD/M4RMXi3P994w3DN/5Txsi/pUty6JzLmlMe6mi8sz7Y
-xi6Sk4/EQsHLboPJmWGUlSIiJdH1UE2ITAKXkxHMeOaFyVupYZt92SlktyrXB2UO
-yohgCfDN1KYwNighd3NGpExG0bJ3tv/H97fbHS3luUq17+L38hE09J0HAnJc7jV6
-SsALx++LrsoquuI5h5862VUhEqIItuEDST2I1EupI+Wvdyh4F6pOqt8Hlg7BrcU=
-=aOmQ
+iQEcBAEBCAAGBQJR4H9EAAoJEJWyH81tNOV939wH/3U8F0VbNQAe6K4kZ9Oj3sTF
+z6rqeYJddl9aNPGPbWA87lzr88fa6K8miuaq9PG9lLDOPfP/OKyWOIFynNwokAkf
+k/RkUj2Grnzi596zdwiFm4ZKE/3sd1iG8oPXqXSl6Lbjvd9xqooFTdNd5puEZtqR
+MWgw+RqHxY3qChj8d5WVm70E63Zt9izyjrsdx9qm3qTq5fhYVHj91pZZfjwlFyWu
+ED972Ju4UIaz6c3LWlEzG6LYmmsTV+28ou4flianL+cqA/WKNxjDrgsVv0BcMyfI
+gsXwMY00wVWOH0MKvf6+IuCRX0v3sJg4vZAKWAeEYUDULnCGd42WpDTAxzHtisc=
+=PG15
 -----END PGP SIGNATURE-----
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild
index ecfedd6b0627..db8923f980d7 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild,v 1.2 2013/07/12 20:49:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild,v 1.3 2013/07/12 22:15:22 tomwij Exp $
 
 EAPI="5"
 
 PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
+
 inherit cmake-utils eutils flag-o-matic l10n toolchain-funcs
 
 SLOT="2.6"
@@ -18,7 +19,7 @@ SRC_URI="mirror://sourceforge/${MY_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 faac faad fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xvid x264 vpx"
+IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vpx"
 
 DEPEND="
 	=media-video/avidemux-${PV}[opengl?,qt4?]
@@ -26,12 +27,14 @@ DEPEND="
 	dev-libs/libxml2
 	media-libs/libpng
 	virtual/libiconv
+	aac? (
+		media-libs/faac
+		media-libs/faad2
+	)
 	aften? ( media-libs/aften )
 	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
 	amr? ( media-libs/opencore-amr )
 	dts? ( media-libs/libdca )
-	faac? ( media-libs/faac )
-	faad? ( media-libs/faad2 )
 	fontconfig? ( media-libs/fontconfig )
 	fribidi? ( dev-libs/fribidi )
 	jack? (
@@ -44,6 +47,11 @@ DEPEND="
 	truetype? ( media-libs/freetype:2 )
 	twolame? ( media-sound/twolame )
 	x264? ( media-libs/x264:= )
+	xv? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXv
+	)
 	xvid? ( media-libs/xvid )
 	vorbis? ( media-libs/libvorbis )
 	vpx? ( media-libs/libvpx )
@@ -52,62 +60,61 @@ RDEPEND="$DEPEND"
 
 S="${WORKDIR}/${MY_P}"
 
-PROCESSES="buildPluginsCommon:avidemux_plugins
+processes="buildPluginsCommon:avidemux_plugins
 	buildPluginsCLI:avidemux_plugins"
 
-use qt4 && PROCESSES+=" buildPluginsQt4:avidemux_plugins"
+use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-optional-pulse.patch
 }
 
 src_configure() {
-	local x mycmakeargs plugin_ui
-
-	mycmakeargs="
-		$(cmake-utils_use alsa ALSA)
-		$(cmake-utils_use aften AFTEN)
-		$(cmake-utils_use amr OPENCORE_AMRWB)
-		$(cmake-utils_use amr OPENCORE_AMRNB)
-		$(cmake-utils_use dts LIBDCA)
-		$(cmake-utils_use faad FAAC)
-		$(cmake-utils_use faad FAAD)
-		$(cmake-utils_use fontconfig FONTCONFIG)
-		$(cmake-utils_use jack JACK)
-		$(cmake-utils_use lame LAME)
-		$(cmake-utils_use oss OSS)
-		$(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
-		$(cmake-utils_use qt4 QT4)
-		$(cmake-utils_use truetype FREETYPE2)
-		$(cmake-utils_use twolame TWOLAME)
-		$(cmake-utils_use x264 X264)
-		$(cmake-utils_use xvid XVID)
-		$(cmake-utils_use xvid XVIDEO)
-		$(cmake-utils_use vorbis VORBIS)
-		$(cmake-utils_use vorbis LIBVORBIS)
-		$(cmake-utils_use vpx VPXDEC)
-	"
-
-	use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
-
-	for PROCESS in ${PROCESSES} ; do
-		SOURCE="${PROCESS%%:*}"
-		DEST="${PROCESS#*:}"
-
-		mkdir "${S}"/${SOURCE} || die "Can't create build folder."
-		cd "${S}"/${SOURCE} || die "Can't enter build folder."
-
-		if [[ "${SOURCE}" == "buildPluginsCommon" ]] ; then
-			plugin_ui="-DPLUGIN_UI=COMMON"
-		elif [[ "${SOURCE}" == "buildPluginsCLI" ]] ; then
-			plugin_ui="-DPLUGIN_UI=CLI"
-		elif [[ "${SOURCE}" == "buildPluginsQt4" ]] ; then
-			plugin_ui="-DPLUGIN_UI=QT4"
+	for process in ${processes} ; do
+		local mycmakeargs="
+			-DAVIDEMUX_SOURCE_DIR='${S}'
+			-DCMAKE_INSTALL_PREFIX='/usr'
+			$(cmake-utils_use aac FAAC)
+			$(cmake-utils_use aac FAAD)
+			$(cmake-utils_use alsa)
+			$(cmake-utils_use aften)
+			$(cmake-utils_use amr OPENCORE_AMRWB)
+			$(cmake-utils_use amr OPENCORE_AMRNB)
+			$(cmake-utils_use dts LIBDCA)
+			$(cmake-utils_use fontconfig)
+			$(cmake-utils_use jack)
+			$(cmake-utils_use lame)
+			$(cmake-utils_use oss)
+			$(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
+			$(cmake-utils_use qt4)
+			$(cmake-utils_use truetype FREETYPE2)
+			$(cmake-utils_use twolame)
+			$(cmake-utils_use x264)
+			$(cmake-utils_use xv XVIDEO)
+			$(cmake-utils_use xvid)
+			$(cmake-utils_use vorbis)
+			$(cmake-utils_use vorbis LIBVORBIS)
+			$(cmake-utils_use vpx VPXDEC)
+		"
+
+		if use debug ; then
+			mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
 		fi
 
-		cmake -DAVIDEMUX_SOURCE_DIR="${S}" \
-			-DCMAKE_INSTALL_PREFIX="/usr" \
-			${mycmakeargs} ${plugin_ui} -G "Unix Makefiles" ../"${DEST}${POSTFIX}/" || die "cmake failed."
+		local build="${process%%:*}"
+
+		if [[ "${build}" == "buildPluginsCommon" ]] ; then
+			mycmakeargs+=" -DPLUGIN_UI=COMMON"
+		elif [[ "${build}" == "buildPluginsCLI" ]] ; then
+			mycmakeargs+=" -DPLUGIN_UI=CLI"
+		elif [[ "${build}" == "buildPluginsQt4" ]] ; then
+			mycmakeargs+=" -DPLUGIN_UI=QT4"
+		fi
+
+		mkdir "${S}"/${build} || die "Can't create build folder."
+		cd "${S}"/${build} || die "Can't enter build folder."
+
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
 	done
 }
 
@@ -120,19 +127,15 @@ src_compile() {
 	# See bug 432322.
 	use x86 && replace-flags -O0 -O1
 
-	for PROCESS in ${PROCESSES} ; do
-		SOURCE="${PROCESS%%:*}"
-
-		cd "${S}/${SOURCE}" || die "Can't enter build folder."
+	for process in ${processes} ; do
+		cd "${S}"/${process%%:*} || die "Can't enter build folder."
 		emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 	done
 }
 
 src_install() {
-	for PROCESS in ${PROCESSES} ; do
-		SOURCE="${PROCESS%%:*}"
-
-		cd "${S}/${SOURCE}" || die "Can't enter build folder."
+	for process in ${processes} ; do
+		cd "${S}"/${process%%:*} || die "Can't enter build folder."
 		emake DESTDIR="${ED}" install
 	done
 }