Cleaned up ebuild to make it shorter, use the eclass more and lowercase variables.

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

3 files changed, 25 insertions, 22 deletions

diff --git a/media-libs/avidemux-core/ChangeLog b/media-libs/avidemux-core/ChangeLog
index 7fec38a1e3db..ad8973091bea 100644
--- a/media-libs/avidemux-core/ChangeLog
+++ b/media-libs/avidemux-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/avidemux-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.8 2013/07/07 13:09:29 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.9 2013/07/12 22:58:35 tomwij Exp $
+
+  12 Jul 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-core-2.6.4.ebuild:
+  Cleaned up ebuild to make it shorter, use the eclass more and lowercase
+  variables.
 
   07 Jul 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-core-2.6.2-r1.ebuild:
   Add sub slot operator for media-libs/x264 dependency.
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 1c22fc03c6c9..05782ea51455 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -6,17 +6,17 @@ 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-core-2.6.2-r1.ebuild 3838 SHA256 42b11e4b741fc63679098f4be83bfa620e795bd454bc02f41b380174109f2229 SHA512 08cfa1c71fa00dd9a7c70bd8e1e8642d15a1ef1540eb1c0a1e08980ae67a9b8502604540e7ba0c18fb028dfd737b339a979d43e6194556dc46d12f032fc0feb3 WHIRLPOOL c7b1e0f95468d31ea501e06655c58fde6d8f64c46e8aeec108b5ec8a98a0946ec12fe3cf59688f7cff625adabd44b3a12ad26fcebd5998f80625459b7338b1a1
 EBUILD avidemux-core-2.6.3.ebuild 3242 SHA256 2051e97fd1d184afb9c305d0f68d9e886a5735e7254993a80f27bf0e89a7a0d3 SHA512 0f08660b696c2bc5faccd76d910d8bfff16b1dc1eaa492813c5915dbbbcdbd5a33b43285826c9c35d5c2016d67c8cca6e0f933b65f1122ab82b9499987bd5f4a WHIRLPOOL a61d9ba9ba28beb2d4087c573d2ccfefb78fcfd17906699fcb7d950b1a77dd205d18a9b83180f85accb1671bd3a3b6cfd27dd2188dd1c70df3d6b6c5062a1e82
-EBUILD avidemux-core-2.6.4.ebuild 3242 SHA256 1aeaa612e2d86ea21ccd3e8270806e6e880f219cc76b7aa9c16eb2517ba24124 SHA512 ee3bc4832cbdcac663b6ddbfb5c8db0959c6c8fd92e537c569ba4e851421dc4b606226a7512afb18eeb1f3240afd4ea2e10b482b72f54289259dfd828ad582a4 WHIRLPOOL d8c830e6d6ff8ffdccc59c225e3e31684cdf10cef11c7f39489fb677591957b16c1a86d911729d396aa3155b9a1a339c78d07ba95a9f02cdf4d0574b5cb48a69
-MISC ChangeLog 1481 SHA256 2213b56c3fc0b59bf20eed45f6c65ff04db1ed87ae5fa4faa42924680160ac28 SHA512 544ca2463982f5a3d9bf80a924ffe792d055bb59c5508c1bcdb287cae91726d903278b183af74abd6f65ca0842efbd9786f1adcde744baa93476c90a62466a7d WHIRLPOOL 0b0f5fa20ca7dc6730dd8e1f17e1953a65c054dc56b14657d799767ab324770f0ed7f6f3ebca15321a83695a1c94934dd499f475e21d8b4a7fe3ecc158909cf2
+EBUILD avidemux-core-2.6.4.ebuild 3214 SHA256 8675a3d7184ff01efafdd86a658f869abe8c0b6a79f658a842dd5f1be13de847 SHA512 9476260e34fab24c143107560fe1848f2c1e79175df9875e43e28376e19b248fa6ba1403c98c0de1f098940d88ac27a897487574f38e3cde86e10d2b9fc5f516 WHIRLPOOL 21fa4489f94ba4fc4b9027ca932b8ce04c169bb45f588a8a96af9634bdd57e4d6183858e2ea8a23028f80321af8e886c38526e055e4561e2d4113152fe487c6c
+MISC ChangeLog 1644 SHA256 b7d932bca7bde14dd04ef05d22574c0f5f9980bbdc3818fb9b8c83cca9fba1a2 SHA512 664a8ca34d5ead65dd8782cbb8eec84e9d72dd1245af50f0eebb011638cdfca4c1f0d63075e2e40687064386f06e9cfe318fb6e3d304770bd6fab26c9ff44db6 WHIRLPOOL fa9772d699d696c9dc15a88a76527c373ea7b00b7d9bdca15059cc29d353c64f7e365fd1d615f10f6958bdb79c9e3580be7a3425277580b68621740e2d0cfa9e
 MISC metadata.xml 533 SHA256 e699a1cc65faf166948081bae861e86850ca561fcbb5e3ea392b51bd91e472a7 SHA512 87b8f1b0ceb54f05ce4e50652709e2b4634763e954f6978fad3e3155ac1a04c0ce42b42bdd5e7045fe1a5dbde116411c08a6f9a56a5b9401bca20f661c061abb WHIRLPOOL 8c210345b5f4d2f8dd6d8d4b0e5b7192f3a9a7bbc1dd7f8f040ee73f0eaf5ac6aff9a41f1e644d5e63913a8bcb5e0486ff949a76d6e24b4902c3ddc0dcf0ad89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR2WfQAAoJEJWyH81tNOV9T68H/iag3/XpM1itAKEo7U/aZW2X
-P7YUrAmkMfEDYqpBx0h6jqRL8rP6ALff7d8lVVRKyBtsUcyMoWkPvIaG+5csyjDS
-/y0SL86Bf8CgoSLZEIS9Asg2uvwwbcpcA8VRQRKybjXvImzeyCRl5EAOemjvwnLV
-I+JOX57v3OyDA+0JurGREl/dv3q++YDP+IQZM9s4Ra+xngKn5CXsitVUG8kRFtd6
-tth/wXsHJh2slfyt0wUakHrwra8VIXXY9xzvdPlmp3v6vW7+8ymSa9mU/MoO9g5C
-tgTB6dANxo4XwPfh5UzQ1FRymKrBE4SPur+xFMxTN3oN7Gwb5mjj0Bw9wVcsng0=
-=4N+F
+iQEcBAEBCAAGBQJR4IldAAoJEJWyH81tNOV9zJUIAIu+yij1t+nB9nKGXKzqN4D1
++T/c8qIqk+WZTksQ8lhivEgVmyuMfCJiodYbdOs5kQyu1gJU/cZ3BrGwDwkUhg5C
+f1vZ3Uj+K+t8fBk/EttvaAvX9yEcZDVxDEbJxT9vXu7QTgSAnpJspGuBd0xLeeV1
+XkuLOIIULTsZ7rouGN6Mxc4cE9JNX8BfXBFIbky7S1vzUaXdcjxGWg9RgC3bm0Z8
+RtLqT0h7HiOIsvuWLIu3DJOd2863O0vMXcmz60RsgPcnmEQFRGf3V1/D5q7pgRHu
+itm23R6S7IQwvAImYi8cmtkmimiY3OfIPPOu7Xfo8f1vb0aGgvEMDmnRkMeNmNM=
+=UKWP
 -----END PGP SIGNATURE-----
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild
index bc3f9fadfabb..20645e0f837a 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.4.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-libs/avidemux-core/avidemux-core-2.6.4.ebuild,v 1.1 2013/05/16 07:00:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild,v 1.2 2013/07/12 22:58:35 tomwij Exp $
 
 EAPI="5"
 
@@ -54,26 +54,25 @@ src_prepare() {
 		# Avoid existing avidemux installations from making the build process fail, bug #461496.
 		sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake || die "Failed to avoid existing avidemux installation from making the build fail."
 	fi
-
 }
 
 src_configure() {
-	local x mycmakeargs
-
-	mycmakeargs="
+	local mycmakeargs="
+		-DAVIDEMUX_SOURCE_DIR='${S}'
+		-DCMAKE_INSTALL_PREFIX='/usr'
 		$(cmake-utils_use nls GETTEXT)
 		$(cmake-utils_use sdl SDL)
 		$(cmake-utils_use vdpau VDPAU)
 		$(cmake-utils_use xv XVIDEO)
 	"
-	use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
-
-	mkdir "${S}"/buildCore || die "Can't create build folder."
-	cd "${S}"/buildCore || die "Can't enter build folder."
+	if use debug ; then
+		mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
+	fi
 
-	cmake -DAVIDEMUX_SOURCE_DIR="${S}" \
-		-DCMAKE_INSTALL_PREFIX="/usr" \
-		${mycmakeargs} -G "Unix Makefiles" ../"avidemux_core${POSTFIX}/" || die "cmake failed."
+	local build="${S}"/buildCore
+	mkdir ${build} || die "Can't create build folder."
+	cd ${build} || die "Can't enter build folder."
+	CMAKE_USE_DIR="${S}"/avidemux_core BUILD_DIR=${build} cmake-utils_src_configure
 }
 
 src_compile() {