summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2007-02-02 16:00:06 +0000
committerAlexis Ballier <aballier@gentoo.org>2007-02-02 16:00:06 +0000
commitc02484de456cbf91fa20e4c2a9249b0f6b1e60f8 (patch)
treec4ea54f9c002e37113cf8f7de8c03013aeaa094d /media-video/avidemux
parentNew version. (diff)
downloadgentoo-2-c02484de456cbf91fa20e4c2a9249b0f6b1e60f8.tar.gz
gentoo-2-c02484de456cbf91fa20e4c2a9249b0f6b1e60f8.tar.bz2
gentoo-2-c02484de456cbf91fa20e4c2a9249b0f6b1e60f8.zip
Use eautoreconf rather than the provided script, bug #164973
(Portage version: 2.1.2-r6)
Diffstat (limited to 'media-video/avidemux')
-rw-r--r--media-video/avidemux/ChangeLog6
-rw-r--r--media-video/avidemux/avidemux-2.3.0.ebuild9
-rw-r--r--media-video/avidemux/files/avidemux-2.3.0-amprogas.patch10
3 files changed, 19 insertions, 6 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/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)