New upstream version, removed some old versions.

Package-Manager: portage-2.0.51.22-r1

11 files changed, 29 insertions, 301 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 22f652705aef..f795db7bd72b 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.80 2005/05/18 12:38:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.81 2005/05/25 11:07:43 flameeyes Exp $
+
+*avidemux-2.0.40 (25 May 2005)
+
+  25 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -avidemux-2.0.36.ebuild, -avidemux-2.0.38_rc2.ebuild,
+  -avidemux-2.0.38_rc2-r1.ebuild, -avidemux-2.0.38_rc3-r1.ebuild,
+  +avidemux-2.0.40.ebuild:
+  New upstream version, removed some old versions.
 
 *avidemux-2.0.38-r1 (18 May 2005)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 3dea3e1583fe..7e04e97ea2fe 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,27 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 38ca58ce2a5bf40e80b103669567498e ChangeLog 15248
+MD5 065e3817de842bbdce5f39b2043cc96b ChangeLog 15534
 MD5 ee5806b95c2dcfc5b397bcf7b64fc053 avidemux-2.0.24.ebuild 2486
-MD5 0aed1a48ceb9c6c76092b0799433077a avidemux-2.0.36.ebuild 2539
-MD5 090c20151f2d741a8e17ee2f8db435f9 avidemux-2.0.38_rc2-r1.ebuild 2557
-MD5 f18fa403fee71aa513005f27bbcc4fd7 avidemux-2.0.38_rc2.ebuild 2639
-MD5 3e5d8220ab5d58d761c2c32ee6428827 avidemux-2.0.38_rc3-r1.ebuild 2614
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 MD5 464617688cda55ee904b6c693bd9df48 avidemux-2.0.38-r1.ebuild 2588
 MD5 9517e600b8d22af3a462e4352ad9521f avidemux-2.0.38.ebuild 2585
+MD5 313e3c405ff836cdb75c3f471efff6b5 avidemux-2.0.40.ebuild 2718
 MD5 4b0dc1a0f1e81197582e817410f8d180 files/2.0.38_rc2-fix-faad.patch 759
 MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
-MD5 82846937f7ffde09813d938fe907c5e7 files/digest-avidemux-2.0.36 68
-MD5 fa51202c1d7fc830fcd290028cb4a203 files/digest-avidemux-2.0.38_rc2 72
-MD5 3b83c791427e172d3c509c6516baa4b1 files/digest-avidemux-2.0.38_rc2-r1 142
-MD5 47b9976e12dbb8656a9ec28aaf9316ed files/digest-avidemux-2.0.38_rc3-r1 141
 MD5 cc1b60c4a9838d713cf334342af96a78 files/digest-avidemux-2.0.38 138
 MD5 2e4c3410be3348fc36b780e6bd9f8683 files/digest-avidemux-2.0.38-r1 138
+MD5 0e47e20e917b79428c097e2920683db3 files/digest-avidemux-2.0.40 138
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCizZzj5H05b2HAEkRAqfoAJ4qReRPOQ4QZKGdCwEFcPMIxVn+9QCeP6da
-oPagNyPxw5cWG+Frz1omQGQ=
-=ye5l
+iD8DBQFClFufj5H05b2HAEkRArfOAKCCyS3ILayUgXnBehOaj5mP+o0/TgCfe8k/
++N15/ABCnADJIaC/vN1y8CM=
+=gqoZ
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.0.36.ebuild b/media-video/avidemux/avidemux-2.0.36.ebuild
deleted file mode 100644
index 91153b3836fc..000000000000
--- a/media-video/avidemux/avidemux-2.0.36.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.36.ebuild,v 1.3 2005/04/15 14:45:43 luckyduck Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Great Video editing/encoding tool"
-HOMEPAGE="http://fixounet.free.fr/avidemux/"
-SRC_URI="http://download.berlios.de/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="a52 aac alsa altivec arts debug encode mad mmx nls oggvorbis sdl truetype xvid xv"
-
-RDEPEND="virtual/x11
-	a52? ( >=media-libs/a52dec-0.7.4 )
-	encode? ( >=media-sound/lame-3.93 )
-	>=dev-libs/libxml2-2.6.7
-	>=x11-libs/gtk+-2.4.1
-	aac? ( >=media-libs/faac-1.23.5
-	       >=media-libs/faad2-2.0-r2 )
-	mad? ( media-libs/libmad )
-	xvid? ( >=media-libs/xvid-1.0.0 )
-	x86? ( dev-lang/nasm )
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	oggvorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0.1 )
-	arts? ( >=kde-base/arts-1.2.3 )
-	truetype? ( >=media-libs/freetype-2.1.5 )
-	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
-	sdl? ( media-libs/libsdl )"
-# media-sound/toolame is supported as well
-
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.58
-		>=sys-devel/automake-1.8.3"
-
-filter-flags "-fno-default-inline"
-filter-flags "-funroll-loops"
-filter-flags "-funroll-all-loops"
-filter-flags "-fforce-addr"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	local myconf
-	myconf="--with-gnu-ld --disable-warnings"
-
-	use arts || export ac_cv_path_ART_CONFIG=no
-	use alsa || export ac_cv_header_alsa_asoundlib_h=no
-	use sdl || export ac_cv_path_SDL_CONFIG=no
-	use oggvorbis || export ac_cv_lib_vorbis_vorbis_info_init=no
-	use xvid || export ac_cv_header_xvid_h=no
-	use xv || export ac_cv_header_X11_extensions_XShm_h=no
-	use truetype || export ac_cv_path_FREETYPE_CONFIG=no
-	use encode || export ac_cv_header_lame_lame_h=no
-	use mad || export ac_cv_header_mad_h=no
-	use a52 || export ac_cv_header_a52dec_a52=no
-
-	use debug && myconf="${myconf} --enable-debug=full"
-	use aac || myconf="${myconf} --disable-faac --disable-faad"
-	use mmx || myconf="${myconf} --disable-mmx"
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable altivec) \
-		${myconf} || die "configure failed"
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog History README TODO
-}
-
-pkg_postinst() {
-	if use ppc ; then
-		echo
-		einfo "OSS sound output may not work on ppc"
-		einfo "If your hear only static noise, try"
-		einfo "changing the sound device to ALSA or arts"
-	fi
-}
-
diff --git a/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild b/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild
deleted file mode 100644
index e9da3ca02e81..000000000000
--- a/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild,v 1.6 2005/05/01 21:50:08 flameeyes Exp $
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/}
-PATCHLEVEL="1"
-
-DESCRIPTION="Great Video editing/encoding tool"
-HOMEPAGE="http://fixounet.free.fr/avidemux/"
-SRC_URI="http://download.berlios.de/${PN}/${MY_P}b.tar.gz
-	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="a52 aac alsa altivec arts encode mad mmx nls vorbis sdl truetype xvid xv oss"
-
-RDEPEND="xv? ( virtual/x11 )
-	a52? ( >=media-libs/a52dec-0.7.4 )
-	encode? ( >=media-sound/lame-3.93 )
-	>=dev-libs/libxml2-2.6.7
-	>=x11-libs/gtk+-2.4.1
-	aac? ( >=media-libs/faac-1.23.5
-	       >=media-libs/faad2-2.0-r5 )
-	mad? ( media-libs/libmad )
-	xvid? ( >=media-libs/xvid-1.0.0 )
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	vorbis? ( >=media-libs/libvorbis-1.0.1 )
-	arts? ( >=kde-base/arts-1.2.3 )
-	truetype? ( >=media-libs/freetype-2.1.5 )
-	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
-	sdl? ( media-libs/libsdl )"
-# media-sound/toolame is supported as well
-
-DEPEND="$RDEPEND
-	x86? ( dev-lang/nasm )
-	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.58
-	>=sys-devel/automake-1.8.3"
-
-filter-flags "-fno-default-inline"
-filter-flags "-funroll-loops"
-filter-flags "-funroll-all-loops"
-filter-flags "-fforce-addr"
-
-S=${WORKDIR}/${MY_P}b
-
-src_unpack() {
-	unpack ${A}
-	cd ${S} || die
-
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}/patches/
-
-	cp ${WORKDIR}/${PV}/m4/* ${S}/m4 || die "cp m4 failed"
-
-	make -f Makefile.dist || die "autotools failed."
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable altivec) \
-		$(use_enable mmx) \
-		$(use_enable xv) \
-		$(use_with mad libmad) \
-		$(use_with arts) \
-		$(use_with alsa) \
-		$(use_with oss) \
-		$(use_with vorbis) \
-		$(use_with a52 a52dec) \
-		$(use_with sdl libsdl) \
-		$(use_with truetype freetype2) \
-		$(use_with aac faac) $(use_with aac faad2) \
-		$(use_with xvid) \
-		$(use_with encode lame) \
-		--disable-warnings --disable-dependency-tracking \
-		${myconf} || die "configure failed"
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog History README TODO
-}
-
-pkg_postinst() {
-	if use ppc && use oss; then
-		echo
-		einfo "OSS sound output may not work on ppc"
-		einfo "If your hear only static noise, try"
-		einfo "changing the sound device to ALSA or arts"
-	fi
-}
-
diff --git a/media-video/avidemux/avidemux-2.0.38_rc2.ebuild b/media-video/avidemux/avidemux-2.0.38_rc2.ebuild
deleted file mode 100644
index 1a1e0cb492f4..000000000000
--- a/media-video/avidemux/avidemux-2.0.38_rc2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.38_rc2.ebuild,v 1.5 2005/04/15 14:45:43 luckyduck Exp $
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/}
-DESCRIPTION="Great Video editing/encoding tool"
-HOMEPAGE="http://fixounet.free.fr/avidemux/"
-SRC_URI="http://download.berlios.de/${PN}/${MY_P}b.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="a52 aac alsa altivec arts debug encode mad mmx nls vorbis sdl truetype xvid xv"
-
-RDEPEND="virtual/x11
-	a52? ( >=media-libs/a52dec-0.7.4 )
-	encode? ( >=media-sound/lame-3.93 )
-	>=dev-libs/libxml2-2.6.7
-	>=x11-libs/gtk+-2.4.1
-	aac? ( >=media-libs/faac-1.23.5
-	       >=media-libs/faad2-2.0-r2 )
-	mad? ( media-libs/libmad )
-	xvid? ( >=media-libs/xvid-1.0.0 )
-	x86? ( dev-lang/nasm )
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	vorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0.1 )
-	arts? ( >=kde-base/arts-1.2.3 )
-	truetype? ( >=media-libs/freetype-2.1.5 )
-	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
-	sdl? ( media-libs/libsdl )"
-# media-sound/toolame is supported as well
-
-DEPEND="$RDEPEND
-	>=sys-devel/autoconf-2.58
-	>=sys-devel/automake-1.8.3"
-
-filter-flags "-fno-default-inline"
-filter-flags "-funroll-loops"
-filter-flags "-funroll-all-loops"
-filter-flags "-fforce-addr"
-
-S=${WORKDIR}/${MY_P}b
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}-fix-faad.patch
-	cd ${S} || die
-}
-
-src_compile() {
-	local myconf
-
-	use arts || export ac_cv_path_ART_CONFIG=no
-	use alsa || export ac_cv_header_alsa_asoundlib_h=no
-	use sdl || export ac_cv_path_SDL_CONFIG=no
-	use vorbis || export ac_cv_lib_vorbis_vorbis_info_init=no
-	use xvid || export ac_cv_header_xvid_h=no
-	use xv || export ac_cv_header_X11_extensions_XShm_h=no
-	use truetype || export ac_cv_path_FREETYPE_CONFIG=no
-	use encode || export ac_cv_header_lame_lame_h=no
-	use mad || export ac_cv_header_mad_h=no
-	use a52 || export ac_cv_header_a52dec_a52=no
-
-	use mmx || myconf="${myconf} --disable-mmx"
-	use altivec || myconf="${myconf} --disable-altivec"
-	use debug && myconf="${myconf} --enable-debug=full"
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable aac faac) $(use_enable aac faad) \
-		--disable-warnings \
-		${myconf} || die "configure failed"
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog History README TODO
-}
-
-pkg_postinst() {
-	if use ppc ; then
-		echo
-		einfo "OSS sound output may not work on ppc"
-		einfo "If your hear only static noise, try"
-		einfo "changing the sound device to ALSA or arts"
-	fi
-}
-
diff --git a/media-video/avidemux/avidemux-2.0.38_rc3-r1.ebuild b/media-video/avidemux/avidemux-2.0.40.ebuild
index 25899dbd9315..fc6c64ee8a1d 100644
--- a/media-video/avidemux/avidemux-2.0.38_rc3-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.0.40.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.38_rc3-r1.ebuild,v 1.2 2005/05/12 14:34:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.40.ebuild,v 1.1 2005/05/25 11:07:43 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
 MY_P=${P/_/}
-PATCHLEVEL="3"
+PATCHLEVEL="5"
 
 DESCRIPTION="Great Video editing/encoding tool"
 HOMEPAGE="http://fixounet.free.fr/avidemux/"
@@ -15,7 +15,7 @@ SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="a52 aac alsa altivec arts encode mad mmx nls vorbis sdl truetype xvid xv oss"
+IUSE="a52 aac alsa altivec arts encode mad nls vorbis sdl truetype xvid xv oss"
 
 RDEPEND="xv? ( virtual/x11 )
 	a52? ( >=media-libs/a52dec-0.7.4 )
@@ -50,20 +50,21 @@ src_unpack() {
 	unpack ${A}
 	cd ${S} || die
 
-	# This is no more needed from ffad2-2.0-r6
-	EPATCH_EXCLUDE="00_all_faadfix.patch"
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/${PV}/patches/
+	# 00_all_faadfix.patch: more needed from ffad2-2.0-r6
+	# 02_all_eq2_patch.patch, 02_all_suse.patch
+	# from upstream, applied as .39.
+	EPATCH_EXCLUDE="00_all_faadfix.patch 02_all_eq2_patch.patch 02_all_suse.patch"
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/2.0.38/patches/
 
-	cp ${WORKDIR}/${PV}/m4/* ${S}/m4 || die "cp m4 failed"
+	cp ${WORKDIR}/2.0.38/m4/* ${S}/m4 || die "cp m4 failed"
 
-	make -f Makefile.dist || die "autotools failed."
+	gmake -f Makefile.dist || die "autotools failed."
 }
 
 src_compile() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable altivec) \
-		$(use_enable mmx) \
 		$(use_enable xv) \
 		$(use_with mad libmad) \
 		$(use_with arts) \
@@ -78,7 +79,8 @@ src_compile() {
 		$(use_with encode lame) \
 		--disable-warnings --disable-dependency-tracking \
 		${myconf} || die "configure failed"
-	make || die "make failed"
+
+	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.36 b/media-video/avidemux/files/digest-avidemux-2.0.36
deleted file mode 100644
index dc85bc82cadd..000000000000
--- a/media-video/avidemux/files/digest-avidemux-2.0.36
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea394c5020a11919be92c02a992dc41b avidemux-2.0.36.tar.gz 3272742
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.38_rc2 b/media-video/avidemux/files/digest-avidemux-2.0.38_rc2
deleted file mode 100644
index d4d2cb721ada..000000000000
--- a/media-video/avidemux/files/digest-avidemux-2.0.38_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da2cbb46aa50f934f1fed048d274e5ab avidemux-2.0.38rc2b.tar.gz 3451715
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.38_rc2-r1 b/media-video/avidemux/files/digest-avidemux-2.0.38_rc2-r1
deleted file mode 100644
index cfddaa4c5d50..000000000000
--- a/media-video/avidemux/files/digest-avidemux-2.0.38_rc2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 da2cbb46aa50f934f1fed048d274e5ab avidemux-2.0.38rc2b.tar.gz 3451715
-MD5 ed0fae82b67a9c97616af93295a4541d avidemux-patches-1.tar.bz2 10563
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.38_rc3-r1 b/media-video/avidemux/files/digest-avidemux-2.0.38_rc3-r1
deleted file mode 100644
index 2ddf9ac4897b..000000000000
--- a/media-video/avidemux/files/digest-avidemux-2.0.38_rc3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b73220487b3b577031987fb378de9110 avidemux-2.0.38rc3.tar.gz 3490169
-MD5 2e87b387387156fd63f44c5a31f1105e avidemux-patches-3.tar.bz2 10867
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.40 b/media-video/avidemux/files/digest-avidemux-2.0.40
new file mode 100644
index 000000000000..083f3ba12cb5
--- /dev/null
+++ b/media-video/avidemux/files/digest-avidemux-2.0.40
@@ -0,0 +1,2 @@
+MD5 eed30487a2ae62f927c8a84dbc889e6d avidemux-2.0.40.tar.gz 3755632
+MD5 e225e44c3c69bf4be0b490208ab9861f avidemux-patches-5.tar.bz2 11486