Split out aa c and lame configure flags, to fix bug 236229. Remove old ~arch versions.

(Portage version: 2.2_rc9/cvs/Linux 2.6.26.5 i686)

5 files changed, 29 insertions, 260 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index d29d50ff1d9b..6894f93a0d29 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.134 2008/08/10 22:39:52 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.135 2008/09/24 19:54:04 yngwin Exp $
+
+  24 Sep 2008; Ben de Groot <yngwin@gentoo.org> -avidemux-2.4.ebuild,
+  avidemux-2.4.1.ebuild, -avidemux-2.4.2.ebuild, avidemux-2.4.3.ebuild:
+  Split out aac and lame configure flags, to fix bug 236229. Remove old
+  ~arch versions.
 
 *avidemux-2.4.3 (10 Aug 2008)
 
@@ -367,7 +372,7 @@
 
   29 Okt 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.32.ebuild:
   Version bump.
-  
+
   19 Okt 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.30.ebuild:
   Added amd64-patch, closes bug #68052.
 
@@ -375,7 +380,7 @@
 
   17 Okt 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.30.ebuild:
   Version bump.
-  
+
   23 Sep 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.26.ebuild,
   avidemux-2.0.28.ebuild:
   Added faad2 dependency, closes bug #59556
@@ -393,7 +398,7 @@
   24 Aug 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.28.ebuild:
   Version bump, closes bug #60254.Introducing xvid-1.0 as a dependency.
   Thanks to Ken Garland for his submission.
-  
+
   23 Jul 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.26.ebuild:
   Cleaned up filter-flags, closes bug #58112.
 
@@ -417,10 +422,10 @@
 
   26 Jun 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.24.ebuild:
   Marked stable for ppc and testing for ~amd64.
-  
+
   23 Jun 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.24.ebuild:
   Marked stable for x86.
-  
+
   09 Jun 2004; Aron Griffis <agriffis@gentoo.org> avidemux-0.9-r1.ebuild,
   avidemux-2.0.18.ebuild, avidemux-2.0.20.ebuild, avidemux-2.0.22.ebuild,
   avidemux-2.0.24.ebuild:
@@ -430,7 +435,7 @@
 
   08 May 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.24.ebuild:
   Version bump.
-  
+
   03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
   avidemux-0.9-r1.ebuild, avidemux-2.0.18.ebuild, avidemux-2.0.20.ebuild,
   avidemux-2.0.22.ebuild:
@@ -440,7 +445,7 @@
   bumped to stable
 
 *avidemux-2.0.22 (28 Feb 2004)
-  
+
   28 Feb 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.22.ebuild:
   Version bumped.
 
@@ -456,7 +461,7 @@
 
   01 May 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.20.ebuild:
   Removed divx4linux dep as it's not used anyway. Closes bug #45176
-  
+
   21 Dec 2003; Martin Holzer <mholzer@gentoo.org> avidemux-2.0.20.ebuild:
   Version bumped. Closes 36224.
 
@@ -472,7 +477,7 @@
 
   01 May 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.18.ebuild:
   Removed divx4linux dep as it's not used anyway. Closes bug #45176
-  
+
   01 Nov 2003; Markus Nigbur <pyrania@gentoo.org> avidemux-2.0.18.ebuild:
   Version bump.
 
@@ -506,9 +511,9 @@
   <marc.hildebrand@t-online.de> in #24545.
 
   19 Jul 2003; Nick Hadaway <raker@gentoo.org> avidemux-2.0.10-r1.ebuild:
-  Readjusted for a mad metapackage Changed to econf.  Added debug and 
-  nls USE variables.  Author suggests marking 2.0.10 as stable.  Also 
-  added alsa, arts, oggvorbis, and truetype USE variables albeit with no 
+  Readjusted for a mad metapackage Changed to econf.  Added debug and
+  nls USE variables.  Author suggests marking 2.0.10 as stable.  Also
+  added alsa, arts, oggvorbis, and truetype USE variables albeit with no
   configure opts.
 
 *avidemux-2.0.10-r1 (17 Jul 2003)
@@ -587,9 +592,9 @@
 *avidemux-0.9-pre30 (20 Jan 2003)
 
   20 Jan 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_pre30.ebuild
-  files/digest-avidemux-0.9_pre30 files/ASM_vidDeintAsm.cpp.diff.gz 
-  files/gui_filter.diff.gz ChangeLog : 
-  Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted in 
+  files/digest-avidemux-0.9_pre30 files/ASM_vidDeintAsm.cpp.diff.gz
+  files/gui_filter.diff.gz ChangeLog :
+  Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted in
   #14174.
 
 *avidemux-0.9-pre28 (09 Jan 2003)
@@ -638,9 +643,9 @@
   This version won't compile without ffmpeg installed:
   Grab ffmpeg from cvs (or /usr/portage/distfiles) and install it this way:
   ./configure --prefix=/usr --enable-shared && make && make install
-  
+
   Then try to emerge avidemux again.
-  
+
   New features/bugfixes:
   see http://fixounet.free.fr/avidemux/ for details
 
diff --git a/media-video/avidemux/avidemux-2.4.1.ebuild b/media-video/avidemux/avidemux-2.4.1.ebuild
index 27eb491ea7b7..4a0c664d3a3a 100644
--- a/media-video/avidemux/avidemux-2.4.1.ebuild
+++ b/media-video/avidemux/avidemux-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.1.ebuild,v 1.11 2008/07/27 14:22:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.1.ebuild,v 1.12 2008/09/24 19:54:04 yngwin Exp $
 
 EAPI="1"
 
@@ -96,7 +96,8 @@ src_compile() {
 	use jack || mycmakeargs="${mycmakeargs} -DNO_Jack=1"
 	use aften || mycmakeargs="${mycmakeargs} -DNO_Aften=1"
 	use libsamplerate || mycmakeargs="${mycmakeargs} -DNO_libsamplerate=1"
-	use encode || mycmakeargs="${mycmakeargs} -DNO_Lame=1 -DNO_FAAC=1"
+	use encode && use aac || mycmakeargs="${mycmakeargs} -DNO_FAAC=1"
+	use encode && use lame || mycmakeargs="${mycmakeargs} -DNO_Lame=1"
 	use xvid || mycmakeargs="${mycmakeargs} -DNO_Xvid=1"
 	use amrnb || mycmakeargs="${mycmakeargs} -DNO_AMRNB=1"
 	use dts || mycmakeargs="${mycmakeargs} -DNO_libdca=1"
diff --git a/media-video/avidemux/avidemux-2.4.2.ebuild b/media-video/avidemux/avidemux-2.4.2.ebuild
deleted file mode 100644
index 5addbce3ee45..000000000000
--- a/media-video/avidemux/avidemux-2.4.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.2.ebuild,v 1.3 2008/07/26 21:34:46 carlo Exp $
-
-EAPI="1"
-
-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"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="aac aften alsa amrnb arts dts encode esd jack lame libsamplerate
-truetype vorbis x264 xv xvid gtk qt4"
-
-RDEPEND="dev-libs/libxml2
-	media-libs/libpng
-	media-libs/libsdl
-	>=dev-libs/glib-2
-	aac? ( media-libs/faad2 )
-	aften? ( media-libs/aften )
-	alsa? ( media-libs/alsa-lib )
-	amrnb? ( media-libs/amrnb )
-	arts? ( kde-base/arts )
-	dts? ( media-libs/libdca )
-	encode? (
-		aac? ( media-libs/faac )
-		lame? ( media-sound/lame )
-		)
-	esd? ( media-sound/esound )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	truetype? ( media-libs/freetype
-		media-libs/fontconfig )
-	vorbis? ( media-libs/libvorbis )
-	x264? ( media-libs/x264 )
-	xv? ( x11-libs/libXv )
-	xvid? ( media-libs/xvid )
-	gtk? ( >=x11-libs/gtk+-2
-		x11-libs/libX11 )
-	qt4? ( || ( x11-libs/qt-gui:4
-			=x11-libs/qt-4.3* )
-		x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig
-	>=dev-util/cmake-2.4.4"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if hasq distcc ${FEATURES}; then
-		eerror "Avidemux does not compile with distcc. Please retry with"
-		eerror "FEATURES='-distcc' emerge avidemux"
-		die "distcc not supported for this package"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# TODO. Needs to be reported upstream.
-	epatch "${FILESDIR}"/${PN}-2.4-libdca.patch
-	epatch "${FILESDIR}"/${PN}-2.4-i18n.patch
-	# post-release patch from upstream
-	epatch "${FILESDIR}"/${P}-x264-2pass-fix.patch
-}
-
-src_compile() {
-	# Commented out options cause compilation errors, some
-	# might need -Wl,--as-needed in LDFLAGS and all USE
-	# flags disabled for reproducing. -drac
-	# TODO. Needs to be fixed, or reported upstream.
-
-	local mycmakeargs
-
-	# ConfigureChecks.cmake
-	use alsa || mycmakeargs="${mycmakeargs} -DNO_ALSA=1"
-	#use oss || mycmakeargs="${mycmakeargs} -DNO_OSS=1"
-	#use nls || mycmakeargs="${mycmakeargs} -DNO_NLS=1"
-	#use sdl || mycmakeargs="${mycmakeargs} -DNO_SDL=1"
-
-	# ConfigureChecks.cmake -> ADM_CHECK_HL -> cmake/adm_checkHeaderLib.cmake
-	use truetype || mycmakeargs="${mycmakeargs} -DNO_FontConfig=1"
-	use xv || mycmakeargs="${mycmakeargs} -DNO_Xvideo=1"
-	use esd || mycmakeargs="${mycmakeargs} -DNO_Esd=1"
-	use jack || mycmakeargs="${mycmakeargs} -DNO_Jack=1"
-	use aften || mycmakeargs="${mycmakeargs} -DNO_Aften=1"
-	use libsamplerate || mycmakeargs="${mycmakeargs} -DNO_libsamplerate=1"
-	use encode || mycmakeargs="${mycmakeargs} -DNO_Lame=1 -DNO_FAAC=1"
-	use xvid || mycmakeargs="${mycmakeargs} -DNO_Xvid=1"
-	use amrnb || mycmakeargs="${mycmakeargs} -DNO_AMRNB=1"
-	use dts || mycmakeargs="${mycmakeargs} -DNO_libdca=1"
-	use x264 || mycmakeargs="${mycmakeargs} -DNO_x264=1"
-	use aac || mycmakeargs="${mycmakeargs} -DNO_FAAD=1 -DNO_NeAAC=1"
-	use vorbis || mycmakeargs="${mycmakeargs} -DNO_Vorbis=1"
-	#use png || mycmakeargs="${mycmakeargs} -DNO_libPNG=1"
-
-	# ConfigureChecks.cmake -> cmake/FindArts.cmake
-	use arts || mycmakeargs="${mycmakeargs} -DNO_ARTS=1"
-
-	# CMakeLists.txt
-	use truetype || mycmakeargs="${mycmakeargs} -DNO_FREETYPE=1"
-	use gtk || mycmakeargs="${mycmakeargs} -DNO_GTK=1"
-	use qt4 || mycmakeargs="${mycmakeargs} -DNO_QT4=1"
-
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS History
-	doicon avidemux_icon.png
-
-	use gtk && make_desktop_entry avidemux2_gtk "Avidemux GTK" \
-		avidemux_icon "AudioVideo;GTK"
-	use qt4 && make_desktop_entry avidemux2_qt4 "Avidemux Qt" \
-		avidemux_icon "AudioVideo;Qt"
-}
diff --git a/media-video/avidemux/avidemux-2.4.3.ebuild b/media-video/avidemux/avidemux-2.4.3.ebuild
index 55f710584964..0a21dfabf99f 100644
--- a/media-video/avidemux/avidemux-2.4.3.ebuild
+++ b/media-video/avidemux/avidemux-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.3.ebuild,v 1.1 2008/08/10 22:39:52 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.3.ebuild,v 1.2 2008/09/24 19:54:04 yngwin Exp $
 
 EAPI="1"
 
@@ -90,7 +90,8 @@ src_compile() {
 	use jack || mycmakeargs="${mycmakeargs} -DNO_Jack=1"
 	use aften || mycmakeargs="${mycmakeargs} -DNO_Aften=1"
 	use libsamplerate || mycmakeargs="${mycmakeargs} -DNO_libsamplerate=1"
-	use encode || mycmakeargs="${mycmakeargs} -DNO_Lame=1 -DNO_FAAC=1"
+	use encode && use aac || mycmakeargs="${mycmakeargs} -DNO_FAAC=1"
+	use encode && use lame || mycmakeargs="${mycmakeargs} -DNO_Lame=1"
 	use xvid || mycmakeargs="${mycmakeargs} -DNO_Xvid=1"
 	use amrnb || mycmakeargs="${mycmakeargs} -DNO_AMRNB=1"
 	use dts || mycmakeargs="${mycmakeargs} -DNO_libdca=1"
diff --git a/media-video/avidemux/avidemux-2.4.ebuild b/media-video/avidemux/avidemux-2.4.ebuild
deleted file mode 100644
index 0cda7336d95b..000000000000
--- a/media-video/avidemux/avidemux-2.4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.ebuild,v 1.7 2008/07/26 21:34:46 carlo Exp $
-
-EAPI="1"
-
-inherit cmake-utils eutils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="aac aften alsa amrnb arts dts encode esd jack libsamplerate
-x264 xv xvid vorbis truetype gtk qt4"
-
-RDEPEND="dev-libs/libxml2
-	media-libs/libpng
-	media-libs/libsdl
-	>=dev-libs/glib-2
-	alsa? ( media-libs/alsa-lib )
-	xv? ( x11-libs/libXv )
-	esd? ( media-sound/esound )
-	jack? ( media-sound/jack-audio-connection-kit )
-	aften? ( media-libs/aften )
-	libsamplerate? ( media-libs/libsamplerate )
-	xvid? ( media-libs/xvid )
-	amrnb? ( media-libs/amrnb )
-	dts? ( media-libs/libdca )
-	x264? ( media-libs/x264 )
-	aac? ( media-libs/faad2 )
-	vorbis? ( media-libs/libvorbis )
-	arts? ( kde-base/arts )
-	truetype? ( media-libs/freetype
-		media-libs/fontconfig )
-	gtk? ( >=x11-libs/gtk+-2
-		x11-libs/libX11 )
-	qt4? ( || ( x11-libs/qt-gui:4
-		=x11-libs/qt-4.3* )
-		x11-libs/libX11 )
-	encode? (
-		aac? ( media-libs/faac )
-		media-sound/lame )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig
-	>=dev-util/cmake-2.4.4"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# TODO. Needs to be reported upstream.
-	epatch "${FILESDIR}"/${P}-libdca.patch
-	epatch "${FILESDIR}"/${P}-i18n.patch
-}
-
-src_compile() {
-	# Commented out options cause compilation errors, some
-	# might need -Wl,--as-needed in LDFLAGS and all USE
-	# flags disabled for reproducing. -drac
-	# TODO. Needs to be fixed, or reported upstream.
-
-	local mycmakeargs
-
-	# ConfigureChecks.cmake
-	use alsa || mycmakeargs="${mycmakeargs} -DNO_ALSA=1"
-	#use oss || mycmakeargs="${mycmakeargs} -DNO_OSS=1"
-	#use nls || mycmakeargs="${mycmakeargs} -DNO_NLS=1"
-	#use sdl || mycmakeargs="${mycmakeargs} -DNO_SDL=1"
-
-	# ConfigureChecks.cmake -> ADM_CHECK_HL -> cmake/adm_checkHeaderLib.cmake
-	use truetype || mycmakeargs="${mycmakeargs} -DNO_FontConfig=1"
-	use xv || mycmakeargs="${mycmakeargs} -DNO_Xvideo=1"
-	use esd || mycmakeargs="${mycmakeargs} -DNO_Esd=1"
-	use jack || mycmakeargs="${mycmakeargs} -DNO_Jack=1"
-	use aften || mycmakeargs="${mycmakeargs} -DNO_Aften=1"
-	use libsamplerate || mycmakeargs="${mycmakeargs} -DNO_libsamplerate=1"
-	use encode || mycmakeargs="${mycmakeargs} -DNO_Lame=1 -DNO_FAAC=1"
-	use xvid || mycmakeargs="${mycmakeargs} -DNO_Xvid=1"
-	use amrnb || mycmakeargs="${mycmakeargs} -DNO_AMRNB=1"
-	use dts || mycmakeargs="${mycmakeargs} -DNO_libdca=1"
-	use x264 || mycmakeargs="${mycmakeargs} -DNO_x264=1"
-	use aac || mycmakeargs="${mycmakeargs} -DNO_FAAD=1 -DNO_NeAAC=1"
-	use vorbis || mycmakeargs="${mycmakeargs} -DNO_Vorbis=1"
-	#use png || mycmakeargs="${mycmakeargs} -DNO_libPNG=1"
-
-	# ConfigureChecks.cmake -> cmake/FindArts.cmake
-	use arts || mycmakeargs="${mycmakeargs} -DNO_ARTS=1"
-
-	# CMakeLists.txt
-	use truetype || mycmakeargs="${mycmakeargs} -DNO_FREETYPE=1"
-	use gtk || mycmakeargs="${mycmakeargs} -DNO_GTK=1"
-	use qt4 || mycmakeargs="${mycmakeargs} -DNO_QT4=1"
-
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS
-
-	doicon avidemux_icon.png
-
-	use gtk && make_desktop_entry avidemux2_gtk "Avidemux GTK" \
-		avidemux_icon "AudioVideo;GTK;"
-	use qt4 && make_desktop_entry avidemux2_qt4 "Avidemux Qt" \
-		avidemux_icon "AudioVideo;Qt;"
-}