Cleaned up autoconf/automake dependency for libmng to fix #75824.

Package-Manager: portage-2.0.51.19

4 files changed, 28 insertions, 32 deletions

diff --git a/media-libs/libmng/ChangeLog b/media-libs/libmng/ChangeLog
index f6e724bdcde1..ad753604a089 100644
--- a/media-libs/libmng/ChangeLog
+++ b/media-libs/libmng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libmng
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.21 2005/04/03 19:07:54 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.22 2005/04/22 01:43:38 flameeyes Exp $
+
+  22 Apr 2005; Diego Pettenò <flameeyes@gentoo.org> libmng-1.0.8.ebuild,
+  libmng-1.0.8-r1.ebuild:
+  Fixed dependency on autoconf/automake for version 1.0.8 (fixes #75824),
+  cleaned up 1.0.8-r1 to use emake instead of just make.
 
 *libmng-1.0.8-r1 (03 Apr 2005)
 
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index eca27fa32c26..43254bb3b1ff 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 e8728c71b757e04acaa41d1c232d0932 ChangeLog 2893
-MD5 f383100879a3356001fed2867cba2999 libmng-1.0.5.ebuild 940
-MD5 efc128e70a318afaa439006f0f2d77fa libmng-1.0.8-r1.ebuild 1020
-MD5 88e9b3aef9fc330c0ebbb2160f296087 libmng-1.0.4.ebuild 942
 MD5 da41758c27e8f3d63faeeb4bc22e6064 libmng-1.0.3.ebuild 897
-MD5 77917d8a635443c7db0c316010c07345 libmng-1.0.8.ebuild 981
+MD5 88e9b3aef9fc330c0ebbb2160f296087 libmng-1.0.4.ebuild 942
+MD5 f383100879a3356001fed2867cba2999 libmng-1.0.5.ebuild 940
 MD5 bba5cb736760fe9caeea13a9956c9d72 libmng-1.0.7.ebuild 971
-MD5 c68ed79dd86fd7c725656adc2661ed18 files/digest-libmng-1.0.7 64
+MD5 12b65480213bad721830e66101122cfa libmng-1.0.8-r1.ebuild 1046
+MD5 04e348124dfd09ce56bcddb6eb857dcb libmng-1.0.8.ebuild 982
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 d6984060ac6f6121f8f72a5833d4665c ChangeLog 3128
 MD5 4b5d9148a72ba9bca32dc6e27a86378c files/digest-libmng-1.0.3 64
+MD5 e54a953532ee82caa95fc0ea5fe0e498 files/digest-libmng-1.0.4 64
 MD5 f628f6ff3a3af16da957bf57ba7c2fdb files/digest-libmng-1.0.5 64
+MD5 c68ed79dd86fd7c725656adc2661ed18 files/digest-libmng-1.0.7 64
 MD5 f14cb8c3ba7ee37dff6203db2f0a2259 files/digest-libmng-1.0.8 64
-MD5 e54a953532ee82caa95fc0ea5fe0e498 files/digest-libmng-1.0.4 64
 MD5 f14cb8c3ba7ee37dff6203db2f0a2259 files/digest-libmng-1.0.8-r1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCZNbYjUHll2nfF60RAmADAJ4zTmdQc3P1jIYGl3i2JcinekeTigCeO05x
-Wi+kBOKKZm/F8kA8dKglQTM=
-=w6Gc
------END PGP SIGNATURE-----
diff --git a/media-libs/libmng/libmng-1.0.8-r1.ebuild b/media-libs/libmng/libmng-1.0.8-r1.ebuild
index 778459baacc4..6b3dea8bedac 100644
--- a/media-libs/libmng/libmng-1.0.8-r1.ebuild
+++ b/media-libs/libmng/libmng-1.0.8-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-libs/libmng/libmng-1.0.8-r1.ebuild,v 1.1 2005/04/03 19:07:54 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.8-r1.ebuild,v 1.2 2005/04/22 01:43:38 flameeyes Exp $
 
 DESCRIPTION="Multiple Image Networkgraphics lib (animated png's)"
 HOMEPAGE="http://www.libmng.com/"
@@ -17,7 +17,7 @@ RDEPEND=">=media-libs/jpeg-6b
 
 DEPEND="${RDEPEND}
 	sys-devel/autoconf
-	sys-devel/automake"
+	!ppc-macos? ( =sys-devel/automake-1.9* )"
 
 src_unpack() {
 	unpack ${A}
@@ -31,7 +31,7 @@ src_unpack() {
 
 src_compile() {
 	econf --with-lcms || die
-	make || die
+	emake || die
 }
 
 src_install() {
diff --git a/media-libs/libmng/libmng-1.0.8.ebuild b/media-libs/libmng/libmng-1.0.8.ebuild
index 65daac25dac2..8511fe931acf 100644
--- a/media-libs/libmng/libmng-1.0.8.ebuild
+++ b/media-libs/libmng/libmng-1.0.8.ebuild
@@ -1,6 +1,6 @@
-# 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/libmng/libmng-1.0.8.ebuild,v 1.4 2004/10/31 22:40:02 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.8.ebuild,v 1.5 2005/04/22 01:43:38 flameeyes Exp $
 
 DESCRIPTION="Multiple Image Networkgraphics lib (animated png's)"
 HOMEPAGE="http://www.libmng.com/"
@@ -14,28 +14,29 @@ IUSE=""
 RDEPEND=">=media-libs/jpeg-6b
 	>=sys-libs/zlib-1.1.4"
 DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	!ppc-macos? ( =sys-devel/automake-1.9* )
 	>=media-libs/lcms-1.0.8"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	cp libmng_types.h libmng_types.h.orig
 
-	sed 's:\(#include\) "lcms.h":\1 <lcms/lcms.h>:' \
-		libmng_types.h.orig > libmng_types.h
-	bash ${S}/autogen.sh
+	sed -i -e 's:\(#include\) "lcms.h":\1 <lcms/lcms.h>:' \
+		libmng_types.h
+
+	sh autogen.sh
 }
 
 src_compile() {
 	econf || die
-	make || die
+	emake || die
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die
 
-	dodoc Changes README*
-	dodoc doc/doc.readme doc/libmng.txt
+	dodoc Changes README* doc/doc.readme doc/libmng.txt
 	doman doc/man/*
 	dohtml -r doc
-}
\ No newline at end of file
+}