clean up ebuild and fix m4 warnings

Package-Manager: portage-2.0.51.20-r5

4 files changed, 29 insertions, 27 deletions

diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index c1173e4aa72b..535eb2df71a6 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -1,13 +1,14 @@
-MD5 efb6ddebe1e5eaf05f97ca9fc264c826 audiofile-0.2.6.ebuild 783
-MD5 26a14217f140b0ebac44409a290c13b1 audiofile-0.2.5.ebuild 835
 MD5 7b711ca281da1cc501e2761fc55c9084 ChangeLog 4318
 MD5 42c777ae654196e02a69556045798633 audiofile-0.2.3-r1.ebuild 781
-MD5 345e996ea53f36810537eee841472301 audiofile-0.2.6-r1.ebuild 949
-MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
 MD5 faf526e53972f56a50f0e5180591b393 audiofile-0.2.4.ebuild 835
+MD5 26a14217f140b0ebac44409a290c13b1 audiofile-0.2.5.ebuild 835
+MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
+MD5 efb6ddebe1e5eaf05f97ca9fc264c826 audiofile-0.2.6.ebuild 783
+MD5 8ad8e4534917cd82569fae21ba5205b8 audiofile-0.2.6-r1.ebuild 884
 MD5 970090dcbe2b745a5b3940fdae30e6be files/digest-audiofile-0.2.3-r1 67
-MD5 614e3fa2ecce47cc2b638aee1d145dba files/digest-audiofile-0.2.6 67
-MD5 6be24f4f613faf959f406fcbe756324e files/sfconvert-eradicator.patch 4345
 MD5 229f6edb9a272909dd6c3f847c52c89f files/digest-audiofile-0.2.4 67
-MD5 614e3fa2ecce47cc2b638aee1d145dba files/digest-audiofile-0.2.6-r1 67
 MD5 bd21c46ede9b8210a6706ceda2b44659 files/digest-audiofile-0.2.5 67
+MD5 614e3fa2ecce47cc2b638aee1d145dba files/digest-audiofile-0.2.6 67
+MD5 614e3fa2ecce47cc2b638aee1d145dba files/digest-audiofile-0.2.6-r1 67
+MD5 6be24f4f613faf959f406fcbe756324e files/sfconvert-eradicator.patch 4345
+MD5 9d76ce996f4c8a8efa8854b6836bcc93 files/audiofile-0.2.6-m4.patch 273
diff --git a/media-libs/audiofile/audiofile-0.2.6-r1.ebuild b/media-libs/audiofile/audiofile-0.2.6-r1.ebuild
index b9c3b108ef3b..7448645710c9 100644
--- a/media-libs/audiofile/audiofile-0.2.6-r1.ebuild
+++ b/media-libs/audiofile/audiofile-0.2.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.2.6-r1.ebuild,v 1.14 2004/11/04 22:06:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.2.6-r1.ebuild,v 1.15 2005/04/28 23:59:33 vapier Exp $
 
-inherit libtool gnuconfig eutils
+inherit libtool eutils
 
 DESCRIPTION="An elegant API for accessing audio files"
 HOMEPAGE="http://www.68k.org/~michael/audiofile/"
@@ -13,18 +13,14 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-
-	cd ${S}/sfcommands
-	epatch ${FILESDIR}/sfconvert-eradicator.patch
-
-	cd ${S}
-	# Allows configure to detect mipslinux systems
-	gnuconfig_update
-
+	cd "${S}"/sfcommands
+	epatch "${FILESDIR}"/sfconvert-eradicator.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-m4.patch
 	elibtoolize
 }
 
@@ -34,7 +30,6 @@ src_compile() {
 }
 
 src_install() {
-#	einstall || die
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog README TODO NEWS NOTES
 }
diff --git a/media-libs/audiofile/files/audiofile-0.2.6-m4.patch b/media-libs/audiofile/files/audiofile-0.2.6-m4.patch
new file mode 100644
index 000000000000..5aca7b14a5c1
--- /dev/null
+++ b/media-libs/audiofile/files/audiofile-0.2.6-m4.patch
@@ -0,0 +1,9 @@
+Get rid of aclocal warning:
+/usr/share/aclocal/audiofile.m4:12: warning: underquoted definition of AM_PATH_AUDIOFILE
+--- audiofile-0.2.6/audiofile.m4
++++ audiofile-0.2.6/audiofile.m4
+@@ -11,3 +11,3 @@
+ dnl
+-AC_DEFUN(AM_PATH_AUDIOFILE,
++AC_DEFUN([AM_PATH_AUDIOFILE],
+ [dnl 
diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest
index a2c59be6f85e..09041d94e989 100644
--- a/media-libs/imlib/Manifest
+++ b/media-libs/imlib/Manifest
@@ -1,10 +1,7 @@
-MD5 c3d91305f3a060258a5fb19cf5590bde imlib-1.9.14-r2.ebuild 1104
 MD5 6a30b3156f6c2a23e34a34be607cd1d8 ChangeLog 4742
-MD5 9f8b6f38fc490ef1ae094ffe26fd9645 imlib-1.9.14-r3.ebuild 1171
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 13ebbdff38b389c23e8cac50e2c913a6 imlib-1.9.14-r1.ebuild 1029
-MD5 249b41b845e39ccae3a4022bead066e9 files/digest-imlib-1.9.14-r1 65
-MD5 b273d36aa60adbfaacaf6062234e4c1f files/imlib-1.9.14-sec2.patch 13040
-MD5 249b41b845e39ccae3a4022bead066e9 files/digest-imlib-1.9.14-r2 65
+MD5 deaeaf36b590abd7cb1c80ccc403ef5a imlib-1.9.14-r3.ebuild 1184
+MD5 8e77a50e166c6610a16692c5e35adfe9 files/imlib-1.9.14-m4.patch 436
 MD5 785e01e32ee3640d632ac61e28d14aa4 files/imlib-1.9.14-bound.patch 11764
 MD5 249b41b845e39ccae3a4022bead066e9 files/digest-imlib-1.9.14-r3 65
+MD5 b273d36aa60adbfaacaf6062234e4c1f files/imlib-1.9.14-sec2.patch 13040