fix aclocal warnings

Package-Manager: portage-2.0.51.20-r5

3 files changed, 34 insertions, 27 deletions

diff --git a/media-libs/gdk-pixbuf/Manifest b/media-libs/gdk-pixbuf/Manifest
index 5ceb27b4902e..47832630f7c6 100644
--- a/media-libs/gdk-pixbuf/Manifest
+++ b/media-libs/gdk-pixbuf/Manifest
@@ -1,13 +1,14 @@
+MD5 c8b5e670856dfc60c58cf653f8c5372e ChangeLog 5943
 MD5 3826b463f06d731336873a516b683bd4 gdk-pixbuf-0.22.0-r2.ebuild 1502
 MD5 18aa044e5155ebc7a6cd0e32c86c5de1 gdk-pixbuf-0.22.0.ebuild 1306
-MD5 ff94323b5fdaea6e9eb36f572aab72c2 gdk-pixbuf-0.22.0-r4.ebuild 1768
-MD5 9dcfbabc6910dbdf835de445608d844d gdk-pixbuf-0.22.0-r3.ebuild 1678
-MD5 c8b5e670856dfc60c58cf653f8c5372e ChangeLog 5943
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 d1fb93f1ae994875158a7e0c108c36f8 files/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch 1157
-MD5 5f59d5772b1482d885a180dbc581cf84 files/gdk-pixbuf-0.22.0-bmp_secure.patch 557
+MD5 9dcfbabc6910dbdf835de445608d844d gdk-pixbuf-0.22.0-r3.ebuild 1678
+MD5 598879cf073da6fe3495b1ae5feca191 gdk-pixbuf-0.22.0-r4.ebuild 1706
+MD5 7cb705de10c34e6b633af2ff2912e908 files/digest-gdk-pixbuf-0.22.0 70
 MD5 7cb705de10c34e6b633af2ff2912e908 files/digest-gdk-pixbuf-0.22.0-r2 70
 MD5 7cb705de10c34e6b633af2ff2912e908 files/digest-gdk-pixbuf-0.22.0-r3 70
-MD5 7cb705de10c34e6b633af2ff2912e908 files/digest-gdk-pixbuf-0.22.0-r4 70
+MD5 5f59d5772b1482d885a180dbc581cf84 files/gdk-pixbuf-0.22.0-bmp_secure.patch 557
 MD5 6311cee2e3fa5106adf17758b5dab6c6 files/gdk-pixbuf-0.22.0-loaders.patch 2307
-MD5 7cb705de10c34e6b633af2ff2912e908 files/digest-gdk-pixbuf-0.22.0 70
+MD5 7cb705de10c34e6b633af2ff2912e908 files/digest-gdk-pixbuf-0.22.0-r4 70
+MD5 d1fb93f1ae994875158a7e0c108c36f8 files/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch 1157
+MD5 3edfa9fe9382fd8206d6238ec121a5af files/gdk-pixbuf-0.22.0-m4.patch 276
diff --git a/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-m4.patch b/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-m4.patch
new file mode 100644
index 000000000000..032976db931e
--- /dev/null
+++ b/media-libs/gdk-pixbuf/files/gdk-pixbuf-0.22.0-m4.patch
@@ -0,0 +1,9 @@
+Fix aclocal warning:
+/usr/share/aclocal/gdk-pixbuf.m4:12: warning: underquoted definition of AM_PATH_GDK_PIXBUF
+--- gdk-pixbuf-0.22.0/gdk-pixbuf.m4
++++ gdk-pixbuf-0.22.0/gdk-pixbuf.m4
+@@ -11,3 +11,3 @@
+ dnl
+-AC_DEFUN(AM_PATH_GDK_PIXBUF,
++AC_DEFUN([AM_PATH_GDK_PIXBUF],
+ [dnl 
diff --git a/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r4.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r4.ebuild
index 735a316a0bf6..3d036b87486d 100644
--- a/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r4.ebuild
+++ b/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r4.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r4.ebuild,v 1.1 2005/03/30 09:51:37 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r4.ebuild,v 1.2 2005/04/29 01:13:48 vapier Exp $
 
-inherit virtualx libtool gnome.org gnuconfig eutils
+inherit virtualx libtool gnome.org eutils
 
 DESCRIPTION="GNOME Image Library"
 HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc mmx"
 
 RDEPEND="media-libs/jpeg
@@ -25,30 +25,27 @@ DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )"
 
 src_unpack() {
-
 	unpack ${A}
-
-	cd ${S}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-m4.patch
 	# security fix (#64230)
-	epatch ${FILESDIR}/${P}-bmp_secure.patch
-	epatch ${FILESDIR}/${P}-loaders.patch
+	epatch "${FILESDIR}"/${P}-bmp_secure.patch
+	epatch "${FILESDIR}"/${P}-loaders.patch
 	# reject corrupt bmps (#64230)
-	epatch ${FILESDIR}/${P}-bmp_reject_corrupt.patch
-
-}
+	epatch "${FILESDIR}"/${P}-bmp_reject_corrupt.patch
 
-src_compile() {
-	#allow to build on mipslinux systems
-	gnuconfig_update
-
-	local myconf
 	#update libtool, else we get the "relink bug"
 	elibtoolize
+}
 
-	use doc && myconf="--enable-gtk-doc" \
-		|| myconf="--disable-gtk-doc"
+src_compile() {
+	local myconf=""
 	use mmx || myconf="${myconf} --disable-mmx"
-	econf --sysconfdir=/etc/X11/gdk-pixbuf ${myconf}  || die
+	econf \
+		--sysconfdir=/etc/X11/gdk-pixbuf \
+		$(use_enable doc gtk-doc) \
+		${myconf} \
+		|| die
 
 	#build needs to be able to
 	#connect to an X display.
@@ -64,5 +61,5 @@ src_install() {
 	chmod a+rx ${D}/usr/$(get_libdir)/gdk-pixbuf/loaders
 	chmod a+r ${D}/usr/$(get_libdir)/gdk-pixbuf/loaders/*
 
-	dodoc AUTHORS COPYING* ChangeLog INSTALL README NEWS TODO
+	dodoc AUTHORS ChangeLog INSTALL README NEWS TODO
 }