removed use macos

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 6b417d0402668d7269637110422c7f1c9bbc5523..ded325c5a3a08c9947361c2cc23e78f7a939b5d0 100644 (file)
--- 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.54 2004/09/23 12:55:28 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.55 2004/11/06 21:05:45 mr_bones_ Exp $
+
+  06 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> libpng-1.2.5-r8.ebuild,
+  libpng-1.2.7.ebuild:
+  removed use macos
 
   23 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> libpng-1.2.7.ebuild:
   Stable on sparc

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 0aaf0919f7d9520065e6020c8944645580e7c00a..3d429433e0589faac241d00c475ed1e8ebabc800 100644 (file)
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,6 +1,6 @@
-MD5 d493b8003d48a648aeec86ea8dafff26 ChangeLog 9384
-MD5 d8aabd6d662e8c974118e40db9cbed25 libpng-1.2.5-r8.ebuild 1896
-MD5 b0fcb7ac73ec47e7c7fab134b9d8d6a3 libpng-1.2.7.ebuild 1847
+MD5 8713a8bdb9535f4b1d0f442cf7350078 ChangeLog 9508
+MD5 602563e0a8ad2ef1f5345717fa660cae libpng-1.2.5-r8.ebuild 1870
+MD5 16b7845d5054c2a48c518f0eee37af52 libpng-1.2.7.ebuild 1837
 MD5 7443cfcd027ad293e56ec7bed76ee21c files/macos.patch 589
 MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r8 65
 MD5 d1cb64b64c0652863c89a3eb1f7c5f66 files/libpng-1.2.5-security.diff 10114

diff --git a/media-libs/libpng/libpng-1.2.5-r8.ebuild b/media-libs/libpng/libpng-1.2.5-r8.ebuild
index 3aaf660730dd859fd340840982447cf61884a6f9..f536500c9f4e05d905e51a7de764bd8ccd003469 100644 (file)
--- 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.11 2004/10/23 07:56:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5-r8.ebuild,v 1.12 2004/11/06 21:05:45 mr_bones_ Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -21,7 +21,7 @@ src_unpack() {
 
        epatch ${FILESDIR}/${P}-gentoo.diff
        epatch ${FILESDIR}/${P}-security.diff
-       if use macos || use ppc-macos ; then
+       if use ppc-macos ; then
                epatch ${FILESDIR}/macos.patch # implements strnlen
        fi
 
@@ -36,7 +36,7 @@ src_unpack() {
                -e "s:OBJSDLL = :OBJSDLL = -lz -lm :" \
                scripts/makefile.linux > Makefile
 
-       if use macos || use ppc-macos ; then
+       if 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 a77d7a9a920900dda535090b5c2173497602c2ed..ff5caec76c96104c6a10bc7376da4bb9009958dd 100644 (file)
--- 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.7 2004/10/15 03:36:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.7.ebuild,v 1.8 2004/11/06 21:05:45 mr_bones_ Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -25,7 +25,7 @@ src_unpack() {
                replace-cpu-flags k6 k6-2 k6-3 i586
        fi
 
-       if use macos || use ppc-macos ; then
+       if use ppc-macos ; then
                epatch "${FILESDIR}/macos.patch" # implements strnlen
                sed \
                        -e "s:ZLIBLIB=.*:ZLIBLIB=/usr/$(get_libdir):" \