Remove old, except stable. Cleanup wrt amr. Specify x264 dep to fix bug 286801. Re-adding ~ppc keyword.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

6 files changed, 26 insertions, 192 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index ef3bf83132ce..16dcba7eccbf 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.153 2009/09/27 10:27:02 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.154 2009/09/30 14:40:11 yngwin Exp $
+
+*avidemux-2.5.1-r2 (30 Sep 2009)
+
+  30 Sep 2009; Ben de Groot <yngwin@gentoo.org> avidemux-2.4.4-r2.ebuild,
+  -avidemux-2.5.0.ebuild, -avidemux-2.5.1-r1.ebuild,
+  +avidemux-2.5.1-r2.ebuild, metadata.xml:
+  Remove old, except stable. Cleanup wrt amr. Specify x264 dep to fix bug
+  286801. Re-adding ~ppc keyword.
 
   27 Sep 2009; Dominik Kapusta <ayoy@gentoo.org> avidemux-2.5.0.ebuild,
   avidemux-2.5.1-r1.ebuild:
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 507bc0fbf263..f4a8051a707a 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX avidemux-2.4-cmake264.patch 820 RMD160 e02c32891a257dd6e14e2b6aa464232cea222429 SHA1 387804ad24a816a24a036b57692cee9ff13e728f SHA256 693958df6c16d467e3c4a0b9dc56861c2c1bf8eed051de5cd7422b274d5d68af
 AUX avidemux-2.4-i18n.patch 1676 RMD160 5cc06702f8a4d96a12630d4f543035baa5ccac0f SHA1 32557519caeed3b236f48b40d5ee8953b2d03197 SHA256 ab978ed96a2689af2e01ad8b9a08ed9bd4b2f8e4c6721d9598964f1fd8a5e6d2
 AUX avidemux-2.4-libdca.patch 949 RMD160 53ec97b26441f2617566dbb949496be72ecbc07c SHA1 91ff55452ed9bdaabd76fa41add4c405bf6b8405 SHA256 95f49dbe69a4621ef8f33795898623156222e16d0774a6c454e2e303c6290c3e
@@ -8,20 +5,10 @@ AUX avidemux-2.4-ts-cmake.patch 517 RMD160 10796376d71b67ed7881db397679ea1888b86
 AUX avidemux-2.4.3-x264.patch 1484 RMD160 ed487bb8f6a65fca9180790156411d84ee18fe8c SHA1 06fb7f651ff8b3c866785c8a9e65ced1ec395d03 SHA256 b7e6a3374aed67734602b5ef25c994267d8bd2324c46993554853336c6a47553
 AUX avidemux-2.4.4-gcc-4.4.patch 3946 RMD160 1be6fb90f05befb0399ef38ccb6358d082f27b0a SHA1 63de9ce7999af1b9f94c01b14ccd049c2b27f32a SHA256 d8e2392b4eb4a0e5573fe5bac10a9ac57ae0f16207e613543d8e61d7527914af
 AUX lavcodec-mpegvideo_mmx-asm-fix.patch 2443 RMD160 3b1b315ef1e5083f95807ce5419196c832a66aad SHA1 0bd5ca05d373f7fd63cafb03d5514cfc86d8504c SHA256 c6cfcf06da8a254e542077a7ac728be220d41fc0ad3c4b7001ac63de5f36bc6c
-DIST avidemux-2.5.0-patches-1.tar.bz2 6371 RMD160 8abb2f7645f7e3992a802c8f8abbce5982f4933b SHA1 78961a826384ab3e6959f5ef3a1c5bb74337c683 SHA256 7bff6f272ede8d8581fcfe46deaafc20ab064e904e255351bcac9c5aef07297b
 DIST avidemux-2.5.1-patches-1.tar.bz2 3700 RMD160 6150cef25c8411c76816f800bc1d688e2771bebe SHA1 bdc6aab3f19c1ef71f3e04c23435f22452651fd9 SHA256 bcd472ea7c5f96c8bf8f48c2c93d53804912e94c77120dc8739e2c0ab122d69c
 DIST avidemux_2.4.4.tar.gz 6894690 RMD160 8bb2705b3e2d5379d833ec4fa06a01b897c06e04 SHA1 c50a00caf13a8ea1053e5994edeb59354192e18e SHA256 45aafd6e54047edcfe9c985f4c9523c0efd71f7d21dad5e584aceb92c63e2956
-DIST avidemux_2.5.0.tar.gz 12806613 RMD160 e2a385af627d41bede2231e62893dbb957e75fc3 SHA1 9697f1a54006e362a361aa609d3bdc1065676fb2 SHA256 9c92a8de1bfa82bd8f01dff27a953434c8042646babe1b0949620de86d449a7a
 DIST avidemux_2.5.1.tar.gz 13020725 RMD160 fc12d01cf4b98ddcf635c20b32f8890cc70ab23a SHA1 50fe78548e0ebf0611d23aa4755f332056520392 SHA256 2f5546b8a95da23f5c43202d9c7b465dd7a0012d689d483ad7eb44bae8ca5c92
-EBUILD avidemux-2.4.4-r2.ebuild 3569 RMD160 40c9ed0aa804e8522114a0dbeae1450e0ea4f4fa SHA1 1cd5f5fd615684a9eed5c01be7ee8ec4b3ba8b0e SHA256 0c64685f4e800fea3fc2052bab688d62bfbf662175a5cb0b750c59784190d2df
-EBUILD avidemux-2.5.0.ebuild 5167 RMD160 dc98e7eea39060922328a5c03e89b7d7e802d245 SHA1 40e0c2e9e0e1b5fb1e44a5c0d86dcbce885e2dfd SHA256 f405ed9871ec920ced5478170523013d8fdb73dca55601d654f40ed7a22fb74e
-EBUILD avidemux-2.5.1-r1.ebuild 5010 RMD160 6745e309e39c5e0f92a642aa9749170160b05f63 SHA1 5ff9b1228d4f8a07b8713872d9a351dc778f661e SHA256 410b2af676ae5491da8c52b4f6598729416344bacb4a161a07f3aef94204f469
-MISC ChangeLog 27074 RMD160 8dd23533674fd770d425089edbe705265daec519 SHA1 c3a79a3365c5d298e380bcbf2379001b58d28213 SHA256 7c95a033a0b9185a1a32bed17adc9e2a2f4a65ced4ed563140d2791f162125d8
-MISC metadata.xml 513 RMD160 293398788053d9f00b94feb27be8de763622e269 SHA1 c3b1796f8eac9f0b90a2df29345f9d3bda238ff5 SHA256 bf77fa934a03278dc96c1d0b8a1db3a8b8a98b97271f7d309adc6f4eb3de1264
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq/PgEACgkQ+CZEqwt+F6b0sQCfavlxJr2dUrsvNtfzBqr9dbCX
-H1AAoKK8X3nKUZ9oXCwdcRTPmQpUmiaa
-=PZqY
------END PGP SIGNATURE-----
+EBUILD avidemux-2.4.4-r2.ebuild 3583 RMD160 033e90179de8fea9f239bb800e408bf0586f0688 SHA1 6b68ecd13a899a65caf7e0879f608da2fb9d271c SHA256 81badef9b02bbf740b0be67617547e13db8fad7dc7f72b82a877681921e75884
+EBUILD avidemux-2.5.1-r2.ebuild 4955 RMD160 bf3971eec4b58d10c6d5241af9f8725d78c9f101 SHA1 66279aae61f9a66503f628c5358a1776e03e33e0 SHA256 4a1a5ddcef86f2e9e0d9141b8172ad31246a499415fb903ac07faf38c22ca374
+MISC ChangeLog 27389 RMD160 6f25e8817d30bb5d1022faed8529883b38b1c0aa SHA1 5d460ad8d1d115eda16b63f036e068868539acf9 SHA256 b124ba71513c90ce18b7c2979ee7f81ad508c665286dad0140ebf5552fcfd482
+MISC metadata.xml 590 RMD160 018bf8622286335430012a39ce6810cce1968d03 SHA1 82400c105393d875cd8e5ec93947eb1430c3142c SHA256 9b3978e836b23532658749ccd39bcf469463f5af540cf8211479307678c262b6
diff --git a/media-video/avidemux/avidemux-2.4.4-r2.ebuild b/media-video/avidemux/avidemux-2.4.4-r2.ebuild
index 8ca6dc164895..a65277e29fb7 100644
--- a/media-video/avidemux/avidemux-2.4.4-r2.ebuild
+++ b/media-video/avidemux/avidemux-2.4.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.4-r2.ebuild,v 1.5 2009/06/28 12:18:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.4-r2.ebuild,v 1.6 2009/09/30 14:40:11 yngwin Exp $
 
 EAPI="2"
 
@@ -36,7 +36,7 @@ RDEPEND="dev-libs/libxml2
 	truetype? ( media-libs/freetype
 		media-libs/fontconfig )
 	vorbis? ( media-libs/libvorbis )
-	x264? ( media-libs/x264 )
+	x264? ( <media-libs/x264-0.0.20090908 )
 	xv? ( x11-libs/libXv )
 	xvid? ( media-libs/xvid )
 	gtk? ( x11-libs/gtk+:2 )
diff --git a/media-video/avidemux/avidemux-2.5.0.ebuild b/media-video/avidemux/avidemux-2.5.0.ebuild
deleted file mode 100644
index 9ac99e387435..000000000000
--- a/media-video/avidemux/avidemux-2.5.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.0.ebuild,v 1.2 2009/09/27 10:27:02 ayoy Exp $
-
-EAPI="2"
-
-inherit cmake-utils eutils flag-o-matic
-
-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}/${MY_P}.tar.gz
-	mirror://gentoo/${P}-patches-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+aac +aften +alsa amrnb +dts esd jack libsamplerate +mp3 nls oss
-	pulseaudio +sdl +truetype +vorbis +x264 +xv +xvid gtk +qt4"
-
-RDEPEND="dev-libs/libxml2
-	aac? ( media-libs/faac
-		media-libs/faad2 )
-	aften? ( media-libs/aften )
-	alsa? ( media-libs/alsa-lib )
-	amrnb? ( media-libs/amrnb )
-	dts? ( media-libs/libdca )
-	mp3? ( media-sound/lame )
-	esd? ( media-sound/esound )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	oss? ( media-libs/alsa-oss )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	truetype? ( media-libs/freetype:2
-		media-libs/fontconfig )
-	vorbis? ( media-libs/libvorbis )
-	x264? ( media-libs/x264 )
-	xv? ( x11-libs/libXv )
-	xvid? ( media-libs/xvid )
-	gtk? ( x11-libs/gtk+:2 )
-	qt4? ( >=x11-libs/qt-gui-4.5.1:4 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-util/pkgconfig
-	>=dev-util/cmake-2.6.4"
-
-S=${WORKDIR}/${MY_P}
-
-AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
-for L in ${AVIDEMUX_LANGS}; do
-	IUSE="${IUSE} linguas_${L}"
-done
-
-PATCHES=( "${WORKDIR}/patches/${PV}-i18n.patch"
-	"${WORKDIR}/patches/${PV}-gcc4.4.patch"
-	"${WORKDIR}/patches/${PV}-multilib.patch"
-	"${WORKDIR}/patches/${PV}-ts-parallel-build.patch"
-	"${WORKDIR}/patches/${PV}-coreImage-parallel-build.patch"
-	# adds plugins as a build target and adjusts include paths
-	"${WORKDIR}/patches/${PV}-build-plugins.patch"
-	# creates a lib dir in a build dir to allow correct plugins linking
-	"${WORKDIR}/patches/${PV}-fake-inst-dir.patch"
-	"${WORKDIR}/patches/${PV}-xv.patch" )
-
-src_prepare() {
-	base_src_prepare
-
-	local po_files=
-	local qt_ts_files=
-	local avidemux_ts_files=
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} ${AVIDEMUX_LANGS}; then
-			if [[ -e ${S}/po/${lingua}.po ]]; then
-				po_files="${po_files} \${po_subdir}/${lingua}.po"
-			fi
-			if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
-				qt_ts_files="${qt_ts_files} \${ts_subdir}/qt_${lingua}.ts"
-			fi
-			if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
-				avidemux_ts_files="${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"
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DAVIDEMUX_INSTALL_PREFIX='${S}_build'
-		-DAVIDEMUX_CORECONFIG_DIR='${S}_build/config'"
-
-	# CMakeLists.txt
-	use gtk || mycmakeargs="${mycmakeargs} -DGTK=0"
-	use qt4 || mycmakeargs="${mycmakeargs} -DQT4=0"
-
-	# cmake/admCheckMiscLibs.cmake
-	use nls || mycmakeargs="${mycmakeargs} -DGETTEXT=0"
-	use sdl || mycmakeargs="${mycmakeargs} -DSDL=0"
-	use xv || mycmakeargs="${mycmakeargs} -DXVIDEO=0"
-
-	# cmake/admCheckAudioDeviceLibs.cmake
-	use alsa || mycmakeargs="${mycmakeargs} -DALSA=0"
-	use esd || mycmakeargs="${mycmakeargs} -DESD=0"
-	use jack || mycmakeargs="${mycmakeargs} -DJACK=0"
-	use oss || mycmakeargs="${mycmakeargs} -DOSS=0"
-	use pulseaudio || mycmakeargs="${mycmakeargs} -DPULSEAUDIOSIMPLE=0"
-
-	# cmake/admCheckAudioEncoderLibs.cmake
-	use aften || mycmakeargs="${mycmakeargs} -DAFTEN=0"
-	use mp3 || mycmakeargs="${mycmakeargs} -DLAME=0"
-	use aac || mycmakeargs="${mycmakeargs} -DFAAC=0"
-	use vorbis || mycmakeargs="${mycmakeargs} -DVORBIS=0"
-
-	# plugins/ADM_audioDecoders
-	use aac || mycmakeargs="${mycmakeargs} -DFAAD=0"
-	use amrnb || mycmakeargs="${mycmakeargs} -DAMRNB=0"
-	use dts || mycmakeargs="${mycmakeargs} -DLIBDCA=0"
-
-	# plugins/ADM_videoFilters
-	use truetype || mycmakeargs="${mycmakeargs} -DFREETYPE2=0 -DFONTCONFIG=0"
-
-	# plugins/ADM_videoEncoder
-	use xvid || mycmakeargs="${mycmakeargs} -DXVID=0"
-	use x264 || mycmakeargs="${mycmakeargs} -DX264=0"
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# first build the application
-	cmake-utils_src_compile
-	# and then go on with plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins" || die "building plugins failed"
-}
-
-src_install() {
-	# install the application
-	cmake-utils_src_install
-	# install plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins" DESTDIR="${D}" install \
-		|| die "installing plugins failed"
-
-	dodoc AUTHORS || die "dodoc failed"
-	newicon avidemux_icon.png avidemux.png || die "installing icon failed"
-
-	if use qt4; then
-		sed -i "s/\(${PN}2_\)gtk/\1qt4/" ${PN}2.desktop || die "sed failed"
-		domenu ${PN}2.desktop || die "installing desktop file failed"
-	fi
-
-	if use gtk; then
-		domenu ${PN}2-gtk.desktop || die "installing desktop file failed"
-	fi
-}
diff --git a/media-video/avidemux/avidemux-2.5.1-r1.ebuild b/media-video/avidemux/avidemux-2.5.1-r2.ebuild
index 1c1ef523e3b4..aea18a75f662 100644
--- a/media-video/avidemux/avidemux-2.5.1-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.5.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.1-r1.ebuild,v 1.2 2009/09/27 10:27:02 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.1-r2.ebuild,v 1.1 2009/09/30 14:40:11 yngwin Exp $
 
 EAPI="2"
 
@@ -15,8 +15,8 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+aac +aften +alsa +dts esd jack libsamplerate +mp3 nls opencore-amr oss
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+aac +aften +alsa amr +dts esd jack libsamplerate +mp3 nls oss
 	pulseaudio +sdl +truetype +vorbis +x264 +xv +xvid gtk +qt4"
 
 RDEPEND="dev-libs/libxml2
@@ -24,7 +24,7 @@ RDEPEND="dev-libs/libxml2
 		media-libs/faad2 )
 	aften? ( media-libs/aften )
 	alsa? ( media-libs/alsa-lib )
-	opencore-amr? ( media-libs/opencore-amr )
+	amr? ( media-libs/opencore-amr )
 	dts? ( media-libs/libdca )
 	mp3? ( media-sound/lame )
 	esd? ( media-sound/esound )
@@ -36,7 +36,7 @@ RDEPEND="dev-libs/libxml2
 	truetype? ( media-libs/freetype:2
 		media-libs/fontconfig )
 	vorbis? ( media-libs/libvorbis )
-	x264? ( media-libs/x264 )
+	x264? ( <media-libs/x264-0.0.20090908 )
 	xv? ( x11-libs/libXv )
 	xvid? ( media-libs/xvid )
 	gtk? ( x11-libs/gtk+:2 )
@@ -119,8 +119,7 @@ src_configure() {
 	use dts || mycmakeargs="${mycmakeargs} -DLIBDCA=0"
 
 	# opencore
-	use opencore-amr || mycmakeargs="${mycmakeargs} -DOPENCORE_AMRNB=0
-	                                                -DOPENCORE_AMRWB=0"
+	use amr || mycmakeargs="${mycmakeargs} -DOPENCORE_AMRNB=0 -DOPENCORE_AMRWB=0"
 
 	# plugins/ADM_videoFilters
 	use truetype || mycmakeargs="${mycmakeargs} -DFREETYPE2=0 -DFONTCONFIG=0"
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 65f1856d6d60..544e57189f34 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -7,8 +7,10 @@
     <name>Ben de Groot</name>
   </maintainer>
   <use>
-    <flag name="aften">Enable A/52 (AC-3) audio encoder support</flag>
-    <flag name="amrnb">Enable Narrow Band Adaptive Multi-Rate Audio support</flag>
-    <flag name="opencore-amr">Enable Band Adaptive Multi-Rate format support</flag>
+    <flag name='aften'>Enable A/52 (AC-3) audio encoder support</flag>
+    <flag name='amr'>Enable Adaptive Multi-Rate format support through
+      <pkg>media-libs/opencore-amr</pkg></flag>
+	<flag name='amrnb'>Enables Adaptive Multi-Rate Audio support (Narrow Band)
+      through <pkg>media-libs/amrnb</pkg></flag>
   </use>
 </pkgmetadata>