Added cleanups for avidemux as in bug #89097.

Package-Manager: portage-2.0.51.19

4 files changed, 124 insertions, 28 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index e2276fc22d1a..a55bd87e1e24 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,13 @@
 # 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.69 2005/04/15 14:45:43 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.70 2005/04/18 15:44:31 flameeyes Exp $
+
+*avidemux-2.0.38_rc2-r1 (18 Apr 2005)
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +avidemux-2.0.38_rc2-r1.ebuild:
+  Added a new revision to avidemux with configure patches which makes
+  deprecated the configure cache tricks. Fixes #89097.
 
   15 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
   avidemux-2.0.34_rc1-r1.ebuild, avidemux-2.0.34_rc2.ebuild,
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 3235aab29778..bf4690f2ff60 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,38 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b60a31026d6ccc354aa3d4a46fb7060b avidemux-2.0.34_rc1.ebuild 2420
-MD5 f18fa403fee71aa513005f27bbcc4fd7 avidemux-2.0.38_rc2.ebuild 2639
+MD5 05470a17014072ce6ca6c7b14aa94c17 ChangeLog 12642
 MD5 ee5806b95c2dcfc5b397bcf7b64fc053 avidemux-2.0.24.ebuild 2486
-MD5 162de3edb58b8605348d0c594368017c avidemux-2.0.38_rc1.ebuild 2666
 MD5 50470b95a03dd765d8fe70deb1389eb4 avidemux-2.0.34_rc1-r1.ebuild 3057
+MD5 b60a31026d6ccc354aa3d4a46fb7060b avidemux-2.0.34_rc1.ebuild 2420
 MD5 6692bb928c62d0906e5bc9c32c613bf0 avidemux-2.0.34_rc2.ebuild 2567
-MD5 f900ff8236d4fa518c43a184c580b0c2 ChangeLog 12390
-MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 MD5 0aed1a48ceb9c6c76092b0799433077a avidemux-2.0.36.ebuild 2539
-MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
-MD5 7b49ecad9a48d74f4e99127f434ce29b files/avidemux-2.0.34-test1_faac.patch 631
+MD5 162de3edb58b8605348d0c594368017c avidemux-2.0.38_rc1.ebuild 2666
+MD5 f18fa403fee71aa513005f27bbcc4fd7 avidemux-2.0.38_rc2.ebuild 2639
+MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
+MD5 ec55caf8b7cb97e215cc40f3c9d99ac1 avidemux-2.0.38_rc2-r1.ebuild 2532
+MD5 71caa2da3a9489e6d3e10b3816c753c6 files/2.0.38_rc1_mpegidentify.patch 1077
 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 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
+MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
 MD5 04305efde8b8b115e0a0c8e1885cf194 files/avidemux-2.0.30_amd64_cpuutil.patch 1539
-MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
-MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
-MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1-r1 74
 MD5 277683ec9bcbe17a0b7fea610eba9cfb files/avidemux-2.0.30_fixes.patch 1713
-MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
-MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672
+MD5 634a8594c2fead1220505d3071037788 files/avidemux-2.0.32_mpeg_ps_fix.patch 519
+MD5 7b49ecad9a48d74f4e99127f434ce29b files/avidemux-2.0.34-test1_faac.patch 631
+MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
 MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1 74
+MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1-r1 74
 MD5 f9121be7bae99c7b33f4140c70799dce files/digest-avidemux-2.0.34_rc2 71
+MD5 82846937f7ffde09813d938fe907c5e7 files/digest-avidemux-2.0.36 68
 MD5 b33a610486defc84ec634b6161943b21 files/digest-avidemux-2.0.38_rc1 71
 MD5 fa51202c1d7fc830fcd290028cb4a203 files/digest-avidemux-2.0.38_rc2 72
-MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
-MD5 634a8594c2fead1220505d3071037788 files/avidemux-2.0.32_mpeg_ps_fix.patch 519
-MD5 71caa2da3a9489e6d3e10b3816c753c6 files/2.0.38_rc1_mpegidentify.patch 1077
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCX9Oq06ebR+OMO78RAqcnAJ40coX6ZUw3/WN4/AFP2/p9sg1CpgCfW7bh
-rROeQtfDJR2dOoe1JrJk6co=
-=EjNu
------END PGP SIGNATURE-----
+MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
+MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
+MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
+MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672
+MD5 4240b00a52d4c48f4c37fa919a62c75f files/digest-avidemux-2.0.38_rc2-r1 153
diff --git a/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild b/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild
new file mode 100644
index 000000000000..a24fd6051325
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.0.38_rc2-r1.ebuild
@@ -0,0 +1,95 @@
+# 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.1 2005/04/18 15:44:32 flameeyes 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
+	http://dev.gentoo.org/~flameeyes/distfiles/${PF}-patches.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-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/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
+	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}/${PVR}/patches/
+
+	cp ${WORKDIR}/${PVR}/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/files/digest-avidemux-2.0.38_rc2-r1 b/media-video/avidemux/files/digest-avidemux-2.0.38_rc2-r1
new file mode 100644
index 000000000000..f4a99ab3330c
--- /dev/null
+++ b/media-video/avidemux/files/digest-avidemux-2.0.38_rc2-r1
@@ -0,0 +1,2 @@
+MD5 da2cbb46aa50f934f1fed048d274e5ab avidemux-2.0.38rc2b.tar.gz 3451715
+MD5 1bd3fe046e4e278005f6db6215244d4a avidemux-2.0.38_rc2-r1-patches.tar.bz2 9612