Use eautoreconf rather than the provided script, bug #164973

Package-Manager: portage-2.1.2-r6

4 files changed, 34 insertions, 17 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 8b55639f8ca9..7d04a1d00a79 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.107 2007/02/02 07:35:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.108 2007/02/02 16:00:06 aballier Exp $
+
+  02 Feb 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/avidemux-2.3.0-amprogas.patch, avidemux-2.3.0.ebuild:
+  Use eautoreconf rather than the provided script, bug #164973
 
   02 Feb 2007; Alexis Ballier <aballier@gentoo.org>
   +files/avidemux-2.3.0-po.makefile.patch, avidemux-2.3.0.ebuild:
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 8a32d323a5a3..a3453cc629c0 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -5,6 +5,10 @@ AUX avidemux-2.0.42-as-needed.patch 2089 RMD160 6e738883de2d13e0e25ab92b02233552
 MD5 2827b9dff4e9519e37be7898ef7e84f7 files/avidemux-2.0.42-as-needed.patch 2089
 RMD160 6e738883de2d13e0e25ab92b0223355279e6aae2 files/avidemux-2.0.42-as-needed.patch 2089
 SHA256 c7d7b5c7d4d69543f09a9f9bceae867da4811cf3c917d8d9e13ee54f90b3284f files/avidemux-2.0.42-as-needed.patch 2089
+AUX avidemux-2.3.0-amprogas.patch 284 RMD160 8c7c44296339f7f4fbae3d629d3e38cf63432756 SHA1 53127b1d07f7d8ceb04d7b92150f499234c4f06d SHA256 b93520061994ba223dede420a597fd3ba999021006893b3100e16649d41957d5
+MD5 5e03fe5ad0e79f4a000cfbafdf28e1a6 files/avidemux-2.3.0-amprogas.patch 284
+RMD160 8c7c44296339f7f4fbae3d629d3e38cf63432756 files/avidemux-2.3.0-amprogas.patch 284
+SHA256 b93520061994ba223dede420a597fd3ba999021006893b3100e16649d41957d5 files/avidemux-2.3.0-amprogas.patch 284
 AUX avidemux-2.3.0-configure.patch 5816 RMD160 8fc9492fa808725e7c10e412a9fc0cc465240113 SHA1 c54df33c712e93b6ec48fb19ab8e17f48baaa5c7 SHA256 f1b880316b4dfbe784f32f7135bc6b5529ce64e283d5a330c02d588bf973f74b
 MD5 267f172131678e6ed36717f634fd1c63 files/avidemux-2.3.0-configure.patch 5816
 RMD160 8fc9492fa808725e7c10e412a9fc0cc465240113 files/avidemux-2.3.0-configure.patch 5816
@@ -38,14 +42,14 @@ EBUILD avidemux-2.1_pre1.ebuild 3173 RMD160 c344c73302b5b14b9a01b1186059f2eeb5af
 MD5 18fe28a4bc669584f38bc88bfb06cb88 avidemux-2.1_pre1.ebuild 3173
 RMD160 c344c73302b5b14b9a01b1186059f2eeb5af9e38 avidemux-2.1_pre1.ebuild 3173
 SHA256 33c4babb491a2e64ddf5989f949890fff35d24614684cc4a8c67e2cd08328bca avidemux-2.1_pre1.ebuild 3173
-EBUILD avidemux-2.3.0.ebuild 3508 RMD160 324d21d8a03eccea877619ca7ab88ffc30e9d99f SHA1 b9421c2fa61b18b3080114751275e8368381bc88 SHA256 9e5501ed2ede65a09c7e59e09c94e4cf60ba4facb651ffeec22f8ed024ee7ffd
-MD5 844346276a1dbaf6e459c5418d864d07 avidemux-2.3.0.ebuild 3508
-RMD160 324d21d8a03eccea877619ca7ab88ffc30e9d99f avidemux-2.3.0.ebuild 3508
-SHA256 9e5501ed2ede65a09c7e59e09c94e4cf60ba4facb651ffeec22f8ed024ee7ffd avidemux-2.3.0.ebuild 3508
-MISC ChangeLog 19631 RMD160 7d45cbda893411f2ea8a8f3948c2facd822d1368 SHA1 49dcec8bd63237c26d804fb47ca1c4c3c918cf9f SHA256 a0bad11eb0d19c524cb35def339d45f16286ba6d233338ffd696cc8356fba119
-MD5 110fca7026b301d9b9ff95cf678f527e ChangeLog 19631
-RMD160 7d45cbda893411f2ea8a8f3948c2facd822d1368 ChangeLog 19631
-SHA256 a0bad11eb0d19c524cb35def339d45f16286ba6d233338ffd696cc8356fba119 ChangeLog 19631
+EBUILD avidemux-2.3.0.ebuild 3471 RMD160 39fdcd2331f469a43e526aaeca8343fb994f1fbb SHA1 1ee97ef150716034faa88a8caa9931b6c3be7231 SHA256 921224426b7b27e31b7ada27203b2f91bec2dd83bee87f5cdea8d111107034d9
+MD5 bba3feeb439fd5dd1d433a1711c1480c avidemux-2.3.0.ebuild 3471
+RMD160 39fdcd2331f469a43e526aaeca8343fb994f1fbb avidemux-2.3.0.ebuild 3471
+SHA256 921224426b7b27e31b7ada27203b2f91bec2dd83bee87f5cdea8d111107034d9 avidemux-2.3.0.ebuild 3471
+MISC ChangeLog 19810 RMD160 bea7fe9ffabb81c881b99eabdcf0dab68a41f786 SHA1 2e5d8ee6baff14da695ff8b132d98f8d341d2283 SHA256 a57d680cd28ebcbf2cb55224f8921883c8d979a2395ab1f210b27da8e163f38b
+MD5 b0a31fef55ad0ad838408f693c33209f ChangeLog 19810
+RMD160 bea7fe9ffabb81c881b99eabdcf0dab68a41f786 ChangeLog 19810
+SHA256 a57d680cd28ebcbf2cb55224f8921883c8d979a2395ab1f210b27da8e163f38b ChangeLog 19810
 MISC metadata.xml 318 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 SHA1 b9cd3e9f43bdd337eb81270e723569d1b4865e1a SHA256 4379b50013e723e18c04e42b0750112cb17af07b82a7b0e3b7aa32bd502124ba
 MD5 d5c5ccb29604d60b3222d8d620b9a55e metadata.xml 318
 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 metadata.xml 318
@@ -62,7 +66,7 @@ SHA256 9e7c104e7929ebe25b34ce8c772b4c888865242eb143abddc5f4cd77e0357e4d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFwunavFcC4BYPU0oRAjt7AJ4jUxTVFq4P2IiUBsHIbgEF/p5IAgCgjuHH
-mcYs0e7Kac4sJ2vAqceGK2k=
-=0KQ7
+iD8DBQFFw2AOvFcC4BYPU0oRAiEhAJ43BALqXluHVca1U/kScY3t5vTVIACfYdUd
+E4s4Lcairlqqur1SBvfTpUs=
+=7FBG
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.3.0.ebuild b/media-video/avidemux/avidemux-2.3.0.ebuild
index 8b46410cfad8..e97b0a2cdb79 100644
--- a/media-video/avidemux/avidemux-2.3.0.ebuild
+++ b/media-video/avidemux/avidemux-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.3.0.ebuild,v 1.3 2007/02/02 07:35:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.3.0.ebuild,v 1.4 2007/02/02 16:00:06 aballier Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -50,9 +50,7 @@ DEPEND="$RDEPEND
 			x11-libs/libXt
 			x11-proto/xextproto
 		) virtual/x11 )
-	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.58
-	>=sys-devel/automake-1.8.3"
+	dev-util/pkgconfig"
 
 pkg_setup() {
 	filter-flags "-fno-default-inline"
@@ -81,9 +79,10 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-dts.patch"
 	epatch "${FILESDIR}/${P}-configure.patch"
 	epatch "${FILESDIR}/${P}-po.makefile.patch"
+	epatch "${FILESDIR}/${P}-amprogas.patch"
 	#sed -i -e 's/x264=no,-lm/x264=no,-lm -lX11/' configure.in.in || die "sed failed."
 
-	gmake -f Makefile.dist || die "autotools failed."
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
diff --git a/media-video/avidemux/files/avidemux-2.3.0-amprogas.patch b/media-video/avidemux/files/avidemux-2.3.0-amprogas.patch
new file mode 100644
index 000000000000..3bb508a0bf21
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.3.0-amprogas.patch
@@ -0,0 +1,10 @@
+--- configure.in.old	2007-02-02 15:47:59.000000000 +0100
++++ configure.in	2007-02-02 15:48:40.000000000 +0100
+@@ -54,6 +54,7 @@
+ AC_PROG_RANLIB
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
++AM_PROG_AS
+ dnl without this order in this file, automake will be confused!
+ dnl
+ AM_CONFIG_HEADER(config.h)