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

(Portage version: 2.0.51.19)

3 files changed, 20 insertions, 14 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/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
+}