Added to ~ppc-macos. Fixed use invocation wrt macos/ppc-macos.

5 files changed, 19 insertions, 27 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 9e20f62b9519..6b05f8c7c574 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libpng
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.49 2004/09/12 06:48:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.50 2004/09/22 05:29:12 usata Exp $
+
+  22 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> libpng-1.2.5-r7.ebuild,
+  libpng-1.2.5-r8.ebuild, libpng-1.2.7.ebuild:
+  Added to ~ppc-macos. Fixed use invocation wrt macos/ppc-macos.
 
 *libpng-1.2.7 (11 Sep 2004)
 
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 143b26bde86a..a03ec59d5864 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,7 +1,7 @@
-MD5 94a79bdee291c5d78e0d23ea074d9f5a ChangeLog 8759
-MD5 7071ec56a7d9b959c63fab2f608b99ff libpng-1.2.5-r8.ebuild 1824
-MD5 c896d90332c03c40ca9ea4840800bc73 libpng-1.2.7.ebuild 1713
-MD5 598cc2afaaa7d1b41954b0d5c7822eeb libpng-1.2.5-r7.ebuild 2190
+MD5 1c3dd5ba29e11ce7556d606150276d10 ChangeLog 8941
+MD5 55be302ed12a97ee2d73718de404fc8e libpng-1.2.5-r7.ebuild 1858
+MD5 f774b623a05d66a85b602fe66e7dd676 libpng-1.2.5-r8.ebuild 1881
+MD5 58a5c1e1b7c42d518938ad7f199903a6 libpng-1.2.7.ebuild 1745
 MD5 3338fff0166374e14ae138e6a1f4cd21 files/1.2.7-gentoo.diff 464
 MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r7 65
 MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r8 65
diff --git a/media-libs/libpng/libpng-1.2.5-r7.ebuild b/media-libs/libpng/libpng-1.2.5-r7.ebuild
index 6f891db51dbf..5847d458dd2d 100644
--- a/media-libs/libpng/libpng-1.2.5-r7.ebuild
+++ b/media-libs/libpng/libpng-1.2.5-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5-r7.ebuild,v 1.5 2004/09/16 02:06:16 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5-r7.ebuild,v 1.6 2004/09/22 05:29:12 usata Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -22,8 +22,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-gentoo.diff
 
-	use macos && epatch ${FILESDIR}/macos.patch # implements strnlen
-	use ppc-macos && epatch ${FILESDIR}/macos.patch # implements strnlen
+	( use macos || use ppc-macos ) && epatch ${FILESDIR}/macos.patch # implements strnlen
 
 	[ "`gcc-version`" == "3.2" ] && replace-cpu-flags i586 k6 k6-2 k6-3
 	[ "`gcc-version`" == "3.3" ] && replace-cpu-flags i586 k6 k6-2 k6-3
@@ -36,7 +35,7 @@ src_unpack() {
 		-e "s:OBJSDLL = :OBJSDLL = -lz -lm :" \
 		scripts/makefile.linux > Makefile
 
-	if use macos; then
+	if use macos || use ppc-macos ; then
 		einfo "Patching the source for Mac OS X / Darwin compatibility"
 		sed \
 			-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/lib:" \
@@ -45,17 +44,6 @@ src_unpack() {
 			-e "s:prefix=/usr/local:prefix=/usr:" \
 			scripts/makefile.darwin > Makefile
 	fi
-
-	if use ppc-macos; then
-		einfo "Patching the source for Mac OS X / Darwin compatibility"
-		sed \
-			-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/lib:" \
-			-e "s:ZLIBINC=.*:ZLIBINC=/usr/include:" \
-			-e "s:-O3:${CFLAGS}:" \
-			-e "s:prefix=/usr/local:prefix=/usr:" \
-			scripts/makefile.darwin > Makefile
-	fi
-
 }
 
 src_compile() {
diff --git a/media-libs/libpng/libpng-1.2.5-r8.ebuild b/media-libs/libpng/libpng-1.2.5-r8.ebuild
index 723b7b7e5f6a..5ee9cc9753de 100644
--- a/media-libs/libpng/libpng-1.2.5-r8.ebuild
+++ b/media-libs/libpng/libpng-1.2.5-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5-r8.ebuild,v 1.6 2004/08/13 01:34:13 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5-r8.ebuild,v 1.7 2004/09/22 05:29:12 usata Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="1.2"
-KEYWORDS="x86 ppc sparc arm hppa amd64 alpha mips"
+KEYWORDS="x86 ppc sparc arm hppa amd64 alpha mips ~macos ~ppc-macos"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
@@ -21,7 +21,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-gentoo.diff
 	epatch ${FILESDIR}/${P}-security.diff
-	use macos && epatch ${FILESDIR}/macos.patch # implements strnlen
+	( use macos || use ppc-macos ) && epatch ${FILESDIR}/macos.patch # implements strnlen
 
 	[ "`gcc-version`" == "3.2" ] && replace-cpu-flags i586 k6 k6-2 k6-3
 	[ "`gcc-version`" == "3.3" ] && replace-cpu-flags i586 k6 k6-2 k6-3
@@ -34,7 +34,7 @@ src_unpack() {
 		-e "s:OBJSDLL = :OBJSDLL = -lz -lm :" \
 		scripts/makefile.linux > Makefile
 
-	if use macos; then
+	if use macos || use ppc-macos ; then
 		einfo "Patching the source for Mac OS X / Darwin compatibility"
 		sed \
 			-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/lib:" \
diff --git a/media-libs/libpng/libpng-1.2.7.ebuild b/media-libs/libpng/libpng-1.2.7.ebuild
index a046b59d9503..9785a6a80bdf 100644
--- a/media-libs/libpng/libpng-1.2.7.ebuild
+++ b/media-libs/libpng/libpng-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.7.ebuild,v 1.1 2004/09/12 06:48:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.7.ebuild,v 1.2 2004/09/22 05:29:12 usata Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="1.2"
-KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~alpha ~mips"
+KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~alpha ~mips ~macos ~ppc-macos"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
@@ -25,7 +25,7 @@ src_unpack() {
 		replace-cpu-flags i586 k6 k6-2 k6-3
 	fi
 
-	if use macos; then
+	if use macos || use ppc-macos ; then
 		epatch "${FILESDIR}/macos.patch" # implements strnlen
 		sed \
 			-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/lib:" \