summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-07-13 11:16:00 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-07-13 11:16:00 +0000
commitcc642ffde873886944197f5ba662ccf14b92b3dc (patch)
tree8dcf6ac94fd48b6e3585dce6fb13e4cf9acbf4a9 /media-video
parentQA: Don't assign default to S; Default src_compile is fine because we have no... (diff)
downloadgentoo-2-cc642ffde873886944197f5ba662ccf14b92b3dc.tar.gz
gentoo-2-cc642ffde873886944197f5ba662ccf14b92b3dc.tar.bz2
gentoo-2-cc642ffde873886944197f5ba662ccf14b92b3dc.zip
Backport lib64 fixes in avifile-0.7.43.20050224-r1.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/avifile/ChangeLog6
-rw-r--r--media-video/avifile/avifile-0.7.43.20050224-r1.ebuild17
-rw-r--r--media-video/avifile/avifile-0.7.43.20050224-r2.ebuild6
3 files changed, 15 insertions, 14 deletions
diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index dad467cd9891..89b503484e96 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/avifile
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.105 2005/06/28 22:13:30 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.106 2005/07/13 11:16:00 flameeyes Exp $
+
+ 13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+ avifile-0.7.43.20050224-r1.ebuild, avifile-0.7.43.20050224-r2.ebuild:
+ Backport lib64 fixes in avifile-0.7.43.20050224-r1.
*avifile-0.7.43.20050224-r2 (28 Jun 2005)
diff --git a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild
index 0d63acfe505f..7e7d7f5ba7f9 100644
--- a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild
+++ b/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.7 2005/06/19 15:59:58 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.8 2005/07/13 11:16:00 flameeyes Exp $
inherit eutils flag-o-matic
@@ -82,15 +82,12 @@ src_unpack() {
# Run autotools...
cd ${S}
- [[ -f configure.ac && -f configure.in ]] && rm configure.in
-
- export WANT_AUTOMAKE=1.6
- export WANT_AUTOCONF=2.5
- libtoolize --force --copy || die "libtoolize failed"
- aclocal -I ${S}/m4 || die "aclocal failed"
- autoheader || die "autoheader failed"
- automake --gnu --add-missing --include-deps --force-missing --copy || die "automake failed"
- autoconf || die "autoconf failed"
+ [[ -f configure.ac ]] && rm -f configure.in
+ # acinclude have a broken SDL test that clobber '/usr/lib64' to '4'
+ rm -f acinclude.m4
+
+ # Reconfigure autotools
+ ACLOCAL_FLAGS="-I m4" ./autogen.sh --copy --force || die "autogen.sh failed"
# fixes mad FPM detection
epatch ${FILESDIR}/${PN}-mad.patch
diff --git a/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
index 48178a4ef39f..2e8e4dd2623c 100644
--- a/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
+++ b/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild,v 1.1 2005/06/28 22:13:30 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r2.ebuild,v 1.2 2005/07/13 11:16:00 flameeyes Exp $
inherit eutils flag-o-matic
@@ -82,9 +82,9 @@ src_unpack() {
# Run autotools...
cd ${S}
- [[ -f configure.ac && -f configure.in ]] && rm -f configure.in
+ [[ -f configure.ac ]] && rm -f configure.in
# acinclude have a broken SDL test that clobber '/usr/lib64' to '4'
- [[ -f acinclude.m4 ]] && rm -f acinclude.m4
+ rm -f acinclude.m4
# Reconfigure autotools
ACLOCAL_FLAGS="-I m4" ./autogen.sh --copy --force || die "autogen.sh failed"