x86 stable

6 files changed, 3 insertions, 156 deletions

diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 9298240f6a18..75cb1823ac9c 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,15 +1,11 @@
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 7c65ce7f366fbee86def6c81706adec0 avidemux-0.9-r1.ebuild 2003
 MD5 d3b45f0b1bb824a42d817e2ce5940cf9 ChangeLog 6533
-MD5 8cbf9e9b311aabdba280144ec308aca3 avidemux-2.0.12.ebuild 2050
-MD5 df275a0189f9c36f2c9cbcf90788187e avidemux-2.0.14.ebuild 2045
-MD5 96660865e2ca266daca386f80385aec6 avidemux-2.0.16.ebuild 2580
+MD5 b27f1b69ff66012a499976a554c9d905 avidemux-2.0.16.ebuild 2578
 MD5 4973215472281d2ec01528cc9e62a720 avidemux-2.0.18.ebuild 2369
 MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
 MD5 e2ad26556058864a7ca0eb97a34b5471 files/avidemux-2.0.16-ppc-configure.patch 926
 MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
-MD5 96d22cfce192ab5a04e87096e6c28c17 files/digest-avidemux-2.0.12 68
-MD5 c2b50d20293e7d36d39cd277502b2cc8 files/digest-avidemux-2.0.14 68
 MD5 d3a15e32d4fc018661893e1f28337b1d files/digest-avidemux-2.0.16 68
 MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
 MD5 7f9945862f4c68c59549897fe020eb2c files/digest-avidemux-2.0.18 68
diff --git a/media-video/avidemux/avidemux-2.0.12.ebuild b/media-video/avidemux/avidemux-2.0.12.ebuild
deleted file mode 100644
index 437f6e038999..000000000000
--- a/media-video/avidemux/avidemux-2.0.12.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.12.ebuild,v 1.4 2003/09/10 22:34:15 msterret Exp $
-
-IUSE="debug nls oggvorbis arts truetype alsa"
-filter-flags "-funroll-loops"
-inherit eutils
-
-MY_P=${P}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Great Video editing/encoding tool. New, gtk2 version"
-HOMEPAGE="http://fixounet.free.fr/avidemux/"
-SRC_URI="http://fixounet.free.fr/avidemux/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~x86"
-
-DEPEND="virtual/x11
-	media-sound/mad
-	>=media-libs/a52dec-0.7.4
-	>=media-sound/lame-3.93
-	>=media-video/mjpegtools-1.6
-	>=media-libs/xvid-0.9
-	>=dev-libs/libxml2-2.5.7
-	>=x11-libs/gtk+-2.2.1
-	>=media-libs/divx4linux-20020418-r1
-	nls? ( >=sys-devel/gettext-0.11.2 )
-	oggvorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )
-	arts? ( >=kde-base/arts-1.1.1 )
-	truetype? ( >=media-libs/freetype-2.1.2 )
-	alsa? ( >=media-libs/alsa-lib-0.9.1 )"
-# media-sound/toolame is supported as well
-
-pkg_setup() {
-	ewarn ""
-	ewarn "You MAY notice DivX support is disabled."
-	ewarn "This will be fixed in the next upstream release"
-	ewarn ""
-}
-
-src_compile() {
-	# Fixes a possible automake error due to clock skew
-	touch -r *
-
-	export WANT_AUTOCONF_2_5=1
-	autoconf
-
-	local myconf
-	myconf="--with-gnu-ld --disable-warnings"
-
-	# --enable-profile        creates profiling infos default=no
-	# --enable-pch            enables precompiled header support
-	#                         (currently only KCC) default=no
-	# --enable-final          build size optimized apps
-	#                         (experimental - needs lots of memory)
-	# --disable-closure       don't delay template instantiation
-
-	use debug && myconf="${myconf} --enable-debug=full"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	econf ${myconf} || die "configure failed"
-
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog History README TODO
-}
-
diff --git a/media-video/avidemux/avidemux-2.0.14.ebuild b/media-video/avidemux/avidemux-2.0.14.ebuild
deleted file mode 100644
index 6a8f865b000c..000000000000
--- a/media-video/avidemux/avidemux-2.0.14.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.14.ebuild,v 1.5 2003/10/01 16:59:33 mholzer Exp $
-
-IUSE="debug nls oggvorbis arts truetype alsa"
-filter-flags "-funroll-loops"
-inherit eutils
-
-MY_P=${P}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Great Video editing/encoding tool. New, gtk2 version"
-HOMEPAGE="http://fixounet.free.fr/avidemux/"
-SRC_URI="http://fixounet.free.fr/avidemux/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86"
-
-DEPEND="virtual/x11
-	media-sound/mad
-	>=media-libs/a52dec-0.7.4
-	>=media-sound/lame-3.93
-	>=media-video/mjpegtools-1.6
-	>=media-libs/xvid-0.9
-	>=dev-libs/libxml2-2.5.7
-	>=x11-libs/gtk+-2.2.1
-	>=media-libs/divx4linux-20020418-r1
-	nls? ( >=sys-devel/gettext-0.11.2 )
-	oggvorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )
-	arts? ( >=kde-base/arts-1.1.1 )
-	truetype? ( >=media-libs/freetype-2.1.2 )
-	alsa? ( >=media-libs/alsa-lib-0.9.1 )"
-# media-sound/toolame is supported as well
-
-pkg_setup() {
-	ewarn ""
-	ewarn "You MAY notice DivX support is disabled."
-	ewarn "This will be fixed in the next upstream release"
-	ewarn ""
-}
-
-src_compile() {
-	# Fixes a possible automake error due to clock skew
-	touch -r *
-
-	export WANT_AUTOCONF_2_5=1
-	autoconf
-
-	local myconf
-	myconf="--with-gnu-ld --disable-warnings"
-
-	# --enable-profile        creates profiling infos default=no
-	# --enable-pch            enables precompiled header support
-	#                         (currently only KCC) default=no
-	# --enable-final          build size optimized apps
-	#                         (experimental - needs lots of memory)
-	# --disable-closure       don't delay template instantiation
-
-	use debug && myconf="${myconf} --enable-debug=full"
-	use nls || myconf="${myconf} --disable-nls"
-
-	econf ${myconf} || die "configure failed"
-
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog History README TODO
-}
diff --git a/media-video/avidemux/avidemux-2.0.16.ebuild b/media-video/avidemux/avidemux-2.0.16.ebuild
index 4fc4cc4aec4a..3859d1db04b4 100644
--- a/media-video/avidemux/avidemux-2.0.16.ebuild
+++ b/media-video/avidemux/avidemux-2.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.16.ebuild,v 1.2 2003/10/01 14:27:36 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.16.ebuild,v 1.3 2003/11/02 17:21:40 mholzer Exp $
 
 IUSE="debug nls oggvorbis arts truetype alsa"
 filter-flags "-funroll-loops"
@@ -16,7 +16,7 @@ SRC_URI="http://fixounet.free.fr/avidemux/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 DEPEND="virtual/x11
 	media-sound/mad
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.12 b/media-video/avidemux/files/digest-avidemux-2.0.12
deleted file mode 100644
index 24d109cf85eb..000000000000
--- a/media-video/avidemux/files/digest-avidemux-2.0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 69e35660b95f343743b5daba91e8f25e avidemux-2.0.12.tar.gz 2123217
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.14 b/media-video/avidemux/files/digest-avidemux-2.0.14
deleted file mode 100644
index b997e750be0d..000000000000
--- a/media-video/avidemux/files/digest-avidemux-2.0.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 05870f9cd90b711ecf98331eac29e664 avidemux-2.0.14.tar.gz 2135890