Version bump to 2.6.2 where I revised the way it builds using separated core libraries, should work properly. Removed old versions that had a broken intermediate build system. Removed some unused things, fixed a QA warning and more...

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

5 files changed, 45 insertions, 298 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 3dfa6158c398..315a30fa0f9a 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,15 @@
 # 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.208 2013/03/11 12:41:18 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.209 2013/03/16 11:22:50 tomwij Exp $
+
+*avidemux-2.6.2 (16 Mar 2013)
+
+  16 Mar 2013; Tom Wijsman <TomWij@gentoo.org> +avidemux-2.6.2.ebuild,
+  -avidemux-2.6.0.ebuild, -avidemux-2.6.1.ebuild, metadata.xml:
+  Version bump to 2.6.2 where I revised the way it builds using separated core
+  libraries, should work properly. Removed old versions that had a broken
+  intermediate build system. Removed some unused things, fixed a QA warning and
+  more...
 
   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
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index ee39d25a7ba4..33a126536cb2 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -4,21 +4,19 @@ Hash: SHA256
 AUX avidemux-2.5.4-build-plugins-fix.patch 497 SHA256 a470bfa50d86082f4e9ad31c5be630efe9a237f8dd504058278968770635ecef SHA512 f6023e1252463abeee7495c4fb034077ccd21f731c32b0cbb57cadb4880fd68d46a81220fb6553d1bf5af3eae4874adfb13ac17b06c5344144c04bffcf6791ee WHIRLPOOL 86d36e2e9f80623f314352639868d25d19899625424c7a09192a6639877a9acf666c5e9a04b690f5e7b784ba70a580a76988d5a2fd605df375b7bbf096310489
 AUX avidemux-2.5.6-ffmpeg-symbol-visibility.patch 869 SHA256 0ed5a1296fbe20f001657ed63dcbf758cf88aafb75a451c37513b825864956c0 SHA512 57db2ffaad2b4ffc46fac8f46810b1cf028013045392d1633f6e25fc65be6401fd0b5fc0991d09403d6dac39b8aacdf06f966aae70d97a53653ddc1aaa95a9bf WHIRLPOOL 093eec35dd59cb4165527bde0d2335e1ec8a88d1f8ef5cb4e51e88f6ba25204cdf645123b55204f1a8c15a3d066c5eb95f4c4ee24a6af22693a9f8e4b9378c2f
 DIST avidemux_2.5.6.tar.gz 14914123 SHA256 d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b SHA512 8a9dcfc61a396fc4f9f0a213269bcb574de0baa442d3165cfab0fe8e86309e7b0dd2ffe3e2d7ff8a8e6e3fd15da28699e8000367d92da0782fec6d5a38c1d77c WHIRLPOOL fecca87889b19a321a9fe13e734ca11a883c88152e5d59926ecd423b178bb26ef611ee00d8b2897f8a4a36a5c159d6c9f32733bc98fccced08532b8f060bd6ac
-DIST avidemux_2.6.0.tar.gz 16145705 SHA256 5ee2d898794141b47bc288e9b0fb770eff831125a586e7e7046f0e2506ea4580 SHA512 a2d6d440eb0168bd40b51f7ae5980621e5dbddc9c1a3dbd56a4158f7f4e6c3d951caf2fe091fa37a0bb3d4b40ec385fec904611b415cb37fe9df0c66906bcb9d WHIRLPOOL 09746c3217320ea26cb020eb0efdc7f0c376b2af49a293db26a2c44d2c2f01d4bdbabbccc4366980d61a9d80d87b3bf36d62df8c2629aee4b400e4bebf6374da
-DIST avidemux_2.6.1.tar.gz 16537020 SHA256 17ad853a306e6cfed9166ee36b014748ea7b24a62e035b489ed97fbd8d91afc2 SHA512 3a4e1ca21abe014c944549dbb51e1b8588fdd71b147191f01ee47a402ef45a35e8cf5cbf08924f7e1581f961a3ec3eaec570f9c8c3081abffa9752b11008c26f WHIRLPOOL addd80555f423253a46c02a75980e2b70bf03631a378daae86fc66efca4420ae1a2e07b04ba5c00e4e5a7ab7c522344540b3f6c36209233ce1a8d7cde09c1309
+DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3 WHIRLPOOL 0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7
 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 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
+EBUILD avidemux-2.6.2.ebuild 4811 SHA256 496441c370cfa14c5e6ad4d56e10d3eb124f741e3b8b0cc11ac8d7492d3f6c6d SHA512 0811e2efc3cd3c8d2081d249a8fdf261f6ce7f03d63a99bb5e794d05c380a14d26154c04e4436df9234d98867e16cf96f39d37855c5e69a25ce89121ad1bd204 WHIRLPOOL b1a1f658f281fdf4d664641c1450b663d14d8b5987fe1c45c6edcc7c556a41aec50b7dd6b10214ee1533c3899e39586af6175edef305571b401c05b70c62a3ae
+MISC ChangeLog 38789 SHA256 4d3c029f5725e4fdb830fb1a9e795792b797dc68530eac3ecd41ab233d6a4321 SHA512 34f450c33de20773258ea5e95fd5a195e7a2d687b9028c4f6014e3afe16956e68be4c8126df8d0c2f532a1ecb5538afbe60534a37eada87eb28b1ebf9d9b3d96 WHIRLPOOL 96a4ae392e87067e48a49793693a09ee6d16410fc307cbf61f933e9c2702806f10544262e29efca45ea82c9b2738e97f259ee2deaaff514dc6b59cb9265c56ed
+MISC metadata.xml 540 SHA256 f1410337c0d9a5ac6defbaa4a30c00711a2698bbd7f741db3153e9d055f3166b SHA512 964848c238bf50ce85bf58d794bb6c7b44b7607f7ecac873622f1cad830f30a7f727f7a103a8e05b2547a2961ca6e1a4db0471d151c3502b124fc583758ca49f WHIRLPOOL a3b194c507357fdf4fc7380d020f1f0306f37e19c5de35b9398a3d468208aab52fa7f41e484bce0728a4592cd3c11ce069a75cacfaf1f760215298b424322e53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRPdDoAAoJEJWyH81tNOV934cIAKJfCrvT2hliGOBMoN2ykDTt
-cMcVri9/8Uof5TOguu3RBiWSoBnXqmiw8FPlKnXYkY/UPivbasS9/LlK1/YYSNco
-m6VVsBh//87EGFL3NGuNoFMHIVvQTaUA48lqo1bJnkjGoxuFAmWDlVLtg+uN4lfQ
-wmcZTdd4wUGi9XL4T9aQ3viFLk2RBmGYSG+uXqHWNuCjhluQ3WzgBXj3m97HYGMy
-v1Ohm7gdxanr6IcyRkMzp6zjscmC5DW1syulCozjWZlrwtrc5wIjE8lvkE7MKrsn
-7Pbnv5TR6zTianZqsOef6hGr3eMlBhzdJo5UR0CGSe4wr2YdoMzE+ldMtFVWh8s=
-=Ouqi
+iQEcBAEBCAAGBQJRRFX6AAoJEJWyH81tNOV9q8EIALn2hIMVmhhjNHvGDJa+BoUu
+WizZvdfNoZkIyOQ2pHHTARY2cZnCOp6Q0CcIltNQaOVhILrVavCqHeoGDUpudrlk
+mFv3BWzbNU6sgtqshHsLl22tQjwWItPFsRiFtJ2WvmEVX0zLosiW6+wci9/K0o/P
+XEHzXtstO5YRbz8QKlgDeJNPSbb6mwQ4shkhwv6kWSSxst25Fu8cH6tqUIrqJQbX
+0gdNUKiego2mT7liflxA0DsE3XH7QOqmVyK7qJKmBfgCD79Yv5hSCrnoCduEWTDd
+c/n1MlMNC0ogT3BPN7lemiCUgFpR7Aoz4qZDRdSUorfW/JcErj7XZ1eEEI4+eXg=
+=ccZ7
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.6.0.ebuild b/media-video/avidemux/avidemux-2.6.0.ebuild
deleted file mode 100644
index 70b94adfb275..000000000000
--- a/media-video/avidemux/avidemux-2.6.0.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# 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.0.ebuild,v 1.2 2013/03/02 22:06:56 hwoarang Exp $
-
-EAPI=4
-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
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff
-LICENSE="GPL-2 MIT GPL-1 public-domain PSF-2"
-SLOT="2.6"
-KEYWORDS="~amd64 ~x86"
-IUSE="aften a52 alsa amr debug dts fontconfig gtk jack
-	lame libsamplerate mmx nls qt4 sdl vorbis truetype xvid xv oss x264"
-
-RDEPEND="
-	virtual/libiconv
-	dev-libs/libxml2
-	media-libs/libpng
-	>=dev-lang/spidermonkey-1.5-r2
-	gtk? ( >=x11-libs/gtk+-2.6.0:2 )
-	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
-	x264? ( media-libs/x264 )
-	xvid? ( media-libs/xvid )
-	aften? ( media-libs/aften )
-	amr? ( media-libs/opencore-amr )
-	lame? ( media-sound/lame )
-	dts? ( media-libs/libdca )
-	vorbis? ( media-libs/libvorbis )
-	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
-	jack? (
-		media-sound/jack-audio-connection-kit
-		libsamplerate? ( media-libs/libsamplerate )
-	)
-	truetype? ( >=media-libs/freetype-2.1.5 )
-	fontconfig? ( media-libs/fontconfig )
-	sdl? ( media-libs/libsdl )
-	xv? ( x11-libs/libXv )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-"
-DEPEND="
-	$RDEPEND
-	oss? ( virtual/os-headers )
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-S=${WORKDIR}/${MY_P}
-BUILD_S=${WORKDIR}/${P}_build
-
-avidemux_build_process() {
-	local BUILDDIR="${1}"
-	local SOURCEDIR="${2}"
-	local mycmakeargs="${3}"
-	EXTRA="${mycmakeargs}"
-	BUILDER="Unix Makefiles"
-	FAKEROOT_DIR="${S}"/gentoo-install
-	SOURCEDIR="${2}"
-	mkdir ${BUILDDIR} && cd "${BUILDDIR}"
-	einfo "Configuring: ${BUILDDIR}"
-	cmake -DFAKEROOT="${FAKEROOT_DIR}" -DAVIDEMUX_SOURCE_DIR="${S}" \
-		-DCMAKE_INSTALL_PREFIX="/usr" \
-		${EXTRA} -G "${BUILDER}" ../"${SOURCEDIR}/"
-	# for some reason, core needs -j1. That's what they do in their
-	# script as well
-	if [[ ${BUILDDIR} == "buildCore" ]]; then
-		extra_opts="-j1"
-	else
-		unset extra_opts
-	fi
-	einfo "Building: ${BUILDDIR}"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${extra_opts}
-
-	einfo "Fake install: ${BUILDDIR}"
-	# pretend that you installed it somewhere
-	emake DESTDIR="${FAKEROOT_DIR}" ${extra_opts} install
-
-	cd ..
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# TODO: convert to l10n.eclass usage
-	local lingua= po_files= qt_ts_files= avidemux_ts_files=
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} ${AVIDEMUX_LANGS}; then
-			if [[ -e ${S}/po/${lingua}.po ]]; then
-				po_files+=" \${po_subdir}/${lingua}.po"
-			fi
-			if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
-				qt_ts_files+=" \${ts_subdir}/qt_${lingua}.ts"
-			fi
-			if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
-				avidemux_ts_files+=" \${ts_subdir}/${PN}_${lingua}.ts"
-			fi
-		fi
-	done
-
-	sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \
-		"${S}/cmake/Po.cmake" || die "sed failed"
-	sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \
-	    -e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
-		"${S}/cmake/Ts.cmake" || die "sed failed"
-
-	# Fix icon name -> avidemux-2.6.png
-	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die
-	# the desktop file is broken. It uses avidemux2 instead of avidemux3
-	# so it will actually launch avidemux-2.5 if it is installed
-	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die
-	# Now rename to not collide with 2.5
-	mv ${PN}2.desktop ${PN}-2.6.desktop
-	# fix major issues in desktop files wrt bugs #291453, #316599, #430500
-	# duplicate desktop file
-	cp ${PN}-2.6.desktop ${PN}-2.6-gtk.desktop || die
-	# the desktop file is broken. It uses avidemux2 instead of avidemux3
-	# so it will actually launch avidemux-2.5 if it is installed
-	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.desktop || die
-}
-
-src_configure() {
-	true;
-}
-
-src_compile() {
-	# add lax vector typing for PowerPC
-	if use ppc || use ppc64; then
-		append-cflags -flax-vector-conversions
-	fi
-	# bug 432322
-	use x86 && replace-flags -O0 -O1
-
-	local x mycmakeargs
-	# default args
-	use debug \
-		&& POSTFIX="_debug" \
-		&& mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
-
-	mycmakeargs="
-		$(for x in ${IUSE}; do cmake-utils_use $x; done)
-		$(cmake-utils_use dts LIBDCA)
-		$(cmake-utils_use truetype FREETYPE2)
-		$(cmake-utils_use nls GETTEXT)
-		$(cmake-utils_use xv XVIDEO)
-		$(cmake-utils_use amr OPENCORE_AMRWB)
-		$(cmake-utils_use amr OPENCORE_AMRNB)
-	"
-
-	# Lets try to do all the s**t that bootStrap.bash is
-	# trying to do
-	use qt4 && with_qt4=1
-	use gtk && with_gtk=1
-
-	avidemux_build_process buildCore avidemux_core${POSTFIX} "${mycmakeargs}"
-	avidemux_build_process buildCli avidemux/cli${POSTFIX} "${mycmakeargs}"
-	mycmakeargs+="-DPLUGIN_UI=COMMON "
-	avidemux_build_process buildPluginsCommon avidemux_plugins${POSTFIX} "${mycmakeargs}"
-	mycmakeargs+="-DPLUGIN_UI=CLI "
-	avidemux_build_process buildPluginsCLI avidemux_plugins${POSTFIX} "${mycmakeargs}"
-
-	if use qt4; then
-		avidemux_build_process buildQt4 avidemux/qt4${POSTFIX} "${mycmakeargs}"
-		mycmakeargs+="-DPLUGIN_UI=QT4 "
-		avidemux_build_process buildPluginsQt4 avidemux_plugins${POSTFIX} "${mycmakeargs}"
-	fi
-	if use gtk; then
-		avidemux_build_process buildGtk avidemux/gtk${POSTFIX} "${mycmakeargs}"
-		mycmakeargs+="-DPLUGIN_UI=GTK "
-		avidemux_build_process buildPluginsGtk avidemux_plugins${POSTFIX} "${mycmakeargs}"
-	fi
-}
-
-src_install() {
-	# everything is installed(?) in ${S}/gentoo-install.
-	# Move it to ${D}.
-	insinto /
-	doins -r "${S}"/gentoo-install/*
-	# Mark executables with +x
-	find "${ED}"/usr/bin -exec chmod a+x {} \;
-
-	newicon ${PN}_icon.png ${PN}-2.6.png
-	use gtk && domenu ${PN}-2.6-gtk.desktop
-	use qt4 && domenu ${PN}-2.6.desktop
-	dodoc AUTHORS README
-}
diff --git a/media-video/avidemux/avidemux-2.6.1.ebuild b/media-video/avidemux/avidemux-2.6.2.ebuild
index 40c59a0e3d98..2dd906742255 100644
--- a/media-video/avidemux/avidemux-2.6.1.ebuild
+++ b/media-video/avidemux/avidemux-2.6.2.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.5 2013/03/11 12:41:18 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.2.ebuild,v 1.1 2013/03/16 11:22:50 tomwij Exp $
 
 EAPI="5"
 
@@ -10,90 +10,36 @@ inherit cmake-utils eutils flag-o-matic l10n toolchain-funcs
 SLOT="2.6"
 MY_P="${PN}_${PV}"
 
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks."
 HOMEPAGE="http://fixounet.free.fr/${PN}"
 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 oss nls qt4 sdl -system-ffmpeg vorbis truetype xvid x264 xv"
-
-RDEPEND="
-	>=dev-lang/spidermonkey-1.5-r2
-	dev-libs/libxml2
-	media-libs/libpng
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	virtual/libiconv
-	aften? ( media-libs/aften )
-	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
-	amr? ( media-libs/opencore-amr )
-	dts? ( media-libs/libdca )
-	fontconfig? ( media-libs/fontconfig )
+IUSE="aften a52 alsa amr debug dts fontconfig gtk jack lame libsamplerate mmx oss nls qt4 sdl vorbis truetype xvid x264 xv"
+
+# TODO: Figure out which dependencies can be moved out of avidemux-core into here.
+RDEPEND="=media-libs/avidemux-core-${PV}[aften?,a52?,alsa?,amr?,dts?,fontconfig?,jack?,lame?,libsamplerate?,mmx?,oss?,nls?,sdl?,vorbis?,truetype?,xvid?,x264?,xv?]
 	gtk? ( >=x11-libs/gtk+-2.6.0:2 )
-	jack? (
-		media-sound/jack-audio-connection-kit
-		libsamplerate? ( media-libs/libsamplerate )
-	)
-	lame? ( media-sound/lame )
-	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
-	sdl? ( media-libs/libsdl )
-	system-ffmpeg? ( >=media-video/ffmpeg-1.0[aac,cpudetection,mp3,theora] )
-	truetype? ( >=media-libs/freetype-2.1.5 )
-	x264? ( media-libs/x264 )
-	xv? ( x11-libs/libXv )
-	xvid? ( media-libs/xvid )
-	vorbis? ( media-libs/libvorbis )
-"
-DEPEND="
-	$RDEPEND
-	oss? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
+	qt4? ( >=dev-qt/qtgui-4.8.3:4 )"
+DEPEND="$RDEPEND"
 
 S="${WORKDIR}/${MY_P}"
-BUILD_S="${WORKDIR}/${P}_build"
 
-PROCESSES="buildCore:avidemux_core${POSTFIX}
-		buildCli:avidemux/cli${POSTFIX}
-		buildPluginsCommon:avidemux_plugins${POSTFIX}
-		buildPluginsCLI:avidemux_plugins${POSTFIX}"
+PROCESSES="buildCli:avidemux/cli
+	buildPluginsCommon:avidemux_plugins
+	buildPluginsCLI:avidemux_plugins"
 
-use qt4 && PROCESSES+=" buildQt4:avidemux/qt4${POSTFIX}
-		buildPluginsQt4:avidemux_plugins${POSTFIX}"
+use qt4 && PROCESSES+=" buildQt4:avidemux/qt4
+	buildPluginsQt4:avidemux_plugins"
 
-use gtk && PROCESSES+=" buildGtk:avidemux/gtk${POSTFIX}
-		buildPluginsGtk:avidemux_plugins${POSTFIX}"
+use gtk && PROCESSES+=" buildGtk:avidemux/gtk
+	buildPluginsGtk:avidemux_plugins"
 
 src_prepare() {
 	base_src_prepare
 
-	# TODO: convert to l10n.eclass usage
-	local lingua= po_files= qt_ts_files= avidemux_ts_files=
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} ${AVIDEMUX_LANGS}; then
-			if [[ -e ${S}/po/${lingua}.po ]]; then
-				po_files+=" \${po_subdir}/${lingua}.po"
-			fi
-			if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
-				qt_ts_files+=" \${ts_subdir}/qt_${lingua}.ts"
-			fi
-			if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
-				avidemux_ts_files+=" \${ts_subdir}/${PN}_${lingua}.ts"
-			fi
-		fi
-	done
-
-	sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \
-		"${S}/cmake/Po.cmake" || die "po_files sed failed"
-
-	sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \
-	    -e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
-		"${S}/cmake/Ts.cmake" || die "ts_files sed failed"
-
 	# Fix icon name -> avidemux-2.6.png
 	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed."
 
@@ -112,13 +58,9 @@ src_prepare() {
 	# so it will actually launch avidemux-2.5 if it is installed.
 	sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.desktop || die "Desktop file fix failed."
 
-	if use system-ffmpeg ; then
-		rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "Failed to remove ffmpeg."
-
-		sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "Failed to remove ffmpeg."
-		sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "Failed to remove ffmpeg."
-		sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "Failed to remove ffmpeg."
-	fi
+	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
+	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}-2.6.desktop
+	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}-2.6-gtk.desktop
 }
 
 src_configure() {
@@ -139,9 +81,8 @@ src_configure() {
 		SOURCE="${PROCESS%%:*}"
 		DEST="${PROCESS#*:}"
 
-		cd "${S}" || die "Can't enter source folder."
-		mkdir "${SOURCE}" || die "Can't create build folder."
-		cd "${SOURCE}" || die "Can't enter build folder."
+		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"
@@ -155,7 +96,7 @@ src_configure() {
 
 		cmake -DAVIDEMUX_SOURCE_DIR="${S}" \
 			-DCMAKE_INSTALL_PREFIX="/usr" \
-			${mycmakeargs} ${plugin_ui} -G "Unix Makefiles" ../"${DEST}/"
+			${mycmakeargs} ${plugin_ui} -G "Unix Makefiles" ../"${DEST}${POSTFIX}/" || die "cmake failed."
 	done
 }
 
@@ -172,13 +113,7 @@ src_compile() {
 		SOURCE="${PROCESS%%:*}"
 
 		cd "${S}/${SOURCE}" || die "Can't enter build folder."
-
-		if [[ "${SOURCE}" == "buildCore" ]] ; then
-			# TODO: Report this upstream, seems to be within ffmpeg code.
-			emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-		else
-			emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-		fi
+		emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 	done
 }
 
@@ -187,10 +122,8 @@ src_install() {
 		SOURCE="${PROCESS%%:*}"
 
 		cd "${S}/${SOURCE}" || die "Can't enter build folder."
-
-		if [[ "${SOURCE}" == "buildCore" ]] ; then
-			# TODO: Report this upstream, seems to be within ffmpeg code.
-			emake DESTDIR="${ED}" -j1 install
+		if [[ "${SOURCE}" == "buildPluginsCLI" || "${SOURCE}" == "buildPluginsQt4" || "${SOURCE}" == "buildPluginsGtk" ]] ; then
+			emake DESTDIR="${ED}" preinstall
 		else
 			emake DESTDIR="${ED}" install
 		fi
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 8002939d58ff..f4aa850387b7 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -9,7 +9,6 @@
   <use>
     <flag name="aften">Enable A/52 (AC-3) audio encoder support</flag>
     <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg></flag>
-    <flag name="system-ffmpeg">Use the ffmpeg provided by the system.</flag>
     <flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg></flag>
   </use>
 </pkgmetadata>