fix aclocal warnings

Package-Manager: portage-2.0.51.20-r5

4 files changed, 34 insertions, 41 deletions

diff --git a/media-libs/libfame/Manifest b/media-libs/libfame/Manifest
index 34639009ccd9..9c77c724029c 100644
--- a/media-libs/libfame/Manifest
+++ b/media-libs/libfame/Manifest
@@ -1,25 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a3448605a548cc3385b88768dd9fc4b8 libfame-0.9.0-r1.ebuild 1075
-MD5 2120445221c8a91f1b31eca9501cd737 libfame-0.9.0.ebuild 1022
-MD5 9e501b7e4b89f84f344b8094941e7b09 libfame-0.8.10.ebuild 798
 MD5 fd8ddfeba933ea80684913805e08888c ChangeLog 2822
+MD5 9e501b7e4b89f84f344b8094941e7b09 libfame-0.8.10.ebuild 798
+MD5 2120445221c8a91f1b31eca9501cd737 libfame-0.9.0.ebuild 1022
+MD5 a3448605a548cc3385b88768dd9fc4b8 libfame-0.9.0-r1.ebuild 1075
+MD5 00020efe0315ee1cc85dec7802edc32e libfame-0.9.1.ebuild 1137
+MD5 305ca5d7dd6c362974d8eb8fd97b406d libfame-0.9.1-r1.ebuild 1306
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 7d2f186002fb669f3b718e4197a7dea7 libfame-0.9.1-r1.ebuild 1400
-MD5 7cd527b68124bb20b260a4d9b5d17f7d libfame-0.9.1.ebuild 1269
 MD5 c3a2bb99aa1812617fb10c1738955aad files/digest-libfame-0.8.10 66
+MD5 0631609809520953d425ea1b77009300 files/digest-libfame-0.9.0 65
+MD5 0631609809520953d425ea1b77009300 files/digest-libfame-0.9.0-r1 65
+MD5 ee02d656f68ae66ef4fe16890e05e3ac files/digest-libfame-0.9.1 65
 MD5 1833e1c064e17bf9a9d0588a72aa9be6 files/libfame-0.9.1-gcc34.patch 629
-MD5 792f81a3c9fe0a8f9d215eb02ed8659a files/libfame-0.9.1-pic.patch 19202
 MD5 a51e496784f3b72b161e5b53f191f1f5 files/libfame-0.9.1-mmx_configure.patch 873
-MD5 0631609809520953d425ea1b77009300 files/digest-libfame-0.9.0-r1 65
 MD5 ee02d656f68ae66ef4fe16890e05e3ac files/digest-libfame-0.9.1-r1 65
-MD5 0631609809520953d425ea1b77009300 files/digest-libfame-0.9.0 65
-MD5 ee02d656f68ae66ef4fe16890e05e3ac files/digest-libfame-0.9.1 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCbQ9C06ebR+OMO78RAnPJAJ9UWJ44DduigwGKTVurqlElN1Wc9ACeJpSC
-K6MYLYAqOFlz2LyyMYgasvk=
-=ZhbH
------END PGP SIGNATURE-----
+MD5 792f81a3c9fe0a8f9d215eb02ed8659a files/libfame-0.9.1-pic.patch 19202
+MD5 578c866bfd1a2180b97f3a5c8ab12fcb files/libfame-0.9.1-m4.patch 248
diff --git a/media-libs/libfame/files/libfame-0.9.1-m4.patch b/media-libs/libfame/files/libfame-0.9.1-m4.patch
new file mode 100644
index 000000000000..fd263e02cc3f
--- /dev/null
+++ b/media-libs/libfame/files/libfame-0.9.1-m4.patch
@@ -0,0 +1,9 @@
+Fix aclocal warnings:
+/usr/share/aclocal/libfame.m4:6: warning: underquoted definition of AM_PATH_LIBFAME
+--- libfame-0.9.1/libfame.m4
++++ libfame-0.9.1/libfame.m4
+@@ -5,3 +5,3 @@
+ dnl
+-AC_DEFUN(AM_PATH_LIBFAME,
++AC_DEFUN([AM_PATH_LIBFAME],
+ [dnl 
diff --git a/media-libs/libfame/libfame-0.9.1-r1.ebuild b/media-libs/libfame/libfame-0.9.1-r1.ebuild
index d332b5b852a2..7d6e492e6e84 100644
--- a/media-libs/libfame/libfame-0.9.1-r1.ebuild
+++ b/media-libs/libfame/libfame-0.9.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r1.ebuild,v 1.1 2005/04/25 15:39:27 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1-r1.ebuild,v 1.2 2005/04/29 00:28:46 vapier Exp $
 
-inherit flag-o-matic gnuconfig gcc eutils
+inherit flag-o-matic gcc eutils
 
 DESCRIPTION="MPEG-1 and MPEG-4 video encoding library"
 HOMEPAGE="http://fame.sourceforge.net/"
@@ -13,29 +13,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="mmx sse"
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-m4.patch
 
-	cd ${S}
 	# Do not add -march=i586, bug #41770.
 	sed -i -e 's:-march=i[345]86 ::g' configure
 
 	#closing bug #45736
 	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
 	then
-		epatch ${FILESDIR}/${P}-mmx_configure.patch
-		epatch ${FILESDIR}/${P}-gcc34.patch
+		epatch "${FILESDIR}"/${P}-mmx_configure.patch
+		epatch "${FILESDIR}"/${P}-gcc34.patch
 	fi
 
 	# yet another pic patch, thanks to the 'pic gods' ;-)
 	# see #90318
-	epatch ${FILESDIR}/${P}-pic.patch
-
-	# This is needed for alpha and probably other newer arches (amd64)
-	# (13 Jan 2004 agriffis)
-	gnuconfig_update
+	epatch "${FILESDIR}"/${P}-pic.patch
 }
 
 src_compile() {
diff --git a/media-libs/libfame/libfame-0.9.1.ebuild b/media-libs/libfame/libfame-0.9.1.ebuild
index 87d590bcbfd3..74abb29a2d54 100644
--- a/media-libs/libfame/libfame-0.9.1.ebuild
+++ b/media-libs/libfame/libfame-0.9.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1.ebuild,v 1.5 2005/01/04 10:01:36 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.1.ebuild,v 1.6 2005/04/29 00:28:46 vapier Exp $
 
-inherit flag-o-matic gnuconfig gcc eutils
+inherit flag-o-matic gcc eutils
 
 DESCRIPTION="MPEG-1 and MPEG-4 video encoding library"
 HOMEPAGE="http://fame.sourceforge.net/"
@@ -13,29 +13,25 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 mips ~ppc ppc64 ~sparc ~x86"
 IUSE="mmx sse"
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-m4.patch
 
-	cd ${S}
 	# Do not add -march=i586, bug #41770.
 	sed -i -e 's:-march=i[345]86 ::g' configure
 
 	#closing bug #45736
 	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
 	then
-		epatch ${FILESDIR}/${P}-mmx_configure.patch
-		epatch ${FILESDIR}/${P}-gcc34.patch
+		epatch "${FILESDIR}"/${P}-mmx_configure.patch
+		epatch "${FILESDIR}"/${P}-gcc34.patch
 	fi
-
-	# This is needed for alpha and probably other newer arches (amd64)
-	# (13 Jan 2004 agriffis)
-	gnuconfig_update
 }
 
 src_compile() {
-#	filter-flags -fprefetch-loop-arrays
 	econf $(use_enable mmx) $(use_enable sse) || die
 	emake || die
 }