Add small patch from netbsd #49263 by Anders Rune Jensen. Re-add the

  flag-o-matic stuff for k6 cpus and gcc-3.2/3.3

20 files changed, 43 insertions, 484 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index f90ff5f80358..19f349d7b31b 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-libs/libpng
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.38 2004/05/12 08:26:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.39 2004/05/14 00:55:39 vapier Exp $
+
+*libpng-1.2.5-r6 (13 May 2004)
+
+  13 May 2004; Mike Frysinger <vapier@gentoo.org>
+  -files/libpng-1.0.12-gentoo.diff, files/libpng-1.2.5-gentoo.diff,
+  -files/libpng-update-bins.sh, -files/libpng-update-libs.sh,
+  -libpng-1.0.12-r2.ebuild, -libpng-1.0.15-r1.ebuild, libpng-1.0.15-r2.ebuild,
+  -libpng-1.0.15.ebuild, -libpng-1.2.5-r2.ebuild, -libpng-1.2.5-r3.ebuild,
+  -libpng-1.2.5-r4.ebuild, -libpng-1.2.5-r5.ebuild, +libpng-1.2.5-r6.ebuild:
+  Add small patch from netbsd #49263 by Anders Rune Jensen. Re-add the
+  flag-o-matic stuff for k6 cpus and gcc-3.2/3.3
 
 *libpng-1.2.5-r5 (11 May 2004)
 *libpng-1.0.15-r2 (11 May 2004)
diff --git a/media-libs/libpng/files/digest-libpng-1.0.12-r2 b/media-libs/libpng/files/digest-libpng-1.0.12-r2
deleted file mode 100644
index bce57ca614dc..000000000000
--- a/media-libs/libpng/files/digest-libpng-1.0.12-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0878f194188dd543e99650e190220b6 libpng-1.0.12.tar.bz2 356932
diff --git a/media-libs/libpng/files/digest-libpng-1.0.15 b/media-libs/libpng/files/digest-libpng-1.0.15
deleted file mode 100644
index 431976f6d0ef..000000000000
--- a/media-libs/libpng/files/digest-libpng-1.0.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 69569534bd0d6a9443189ba56cd89ef3 libpng-1.0.15.tar.bz2 374743
diff --git a/media-libs/libpng/files/digest-libpng-1.0.15-r1 b/media-libs/libpng/files/digest-libpng-1.0.15-r1
deleted file mode 100644
index 431976f6d0ef..000000000000
--- a/media-libs/libpng/files/digest-libpng-1.0.15-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 69569534bd0d6a9443189ba56cd89ef3 libpng-1.0.15.tar.bz2 374743
diff --git a/media-libs/libpng/files/digest-libpng-1.2.5-r3 b/media-libs/libpng/files/digest-libpng-1.2.5-r3
deleted file mode 100644
index 794c1d47d26f..000000000000
--- a/media-libs/libpng/files/digest-libpng-1.2.5-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fc28af730f12ace49b14568de4ad934 libpng-1.2.5.tar.bz2 378030
diff --git a/media-libs/libpng/files/digest-libpng-1.2.5-r4 b/media-libs/libpng/files/digest-libpng-1.2.5-r4
deleted file mode 100644
index 794c1d47d26f..000000000000
--- a/media-libs/libpng/files/digest-libpng-1.2.5-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fc28af730f12ace49b14568de4ad934 libpng-1.2.5.tar.bz2 378030
diff --git a/media-libs/libpng/files/digest-libpng-1.2.5-r5 b/media-libs/libpng/files/digest-libpng-1.2.5-r5
deleted file mode 100644
index 794c1d47d26f..000000000000
--- a/media-libs/libpng/files/digest-libpng-1.2.5-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fc28af730f12ace49b14568de4ad934 libpng-1.2.5.tar.bz2 378030
diff --git a/media-libs/libpng/files/digest-libpng-1.2.5-r2 b/media-libs/libpng/files/digest-libpng-1.2.5-r6
index 794c1d47d26f..794c1d47d26f 100644
--- a/media-libs/libpng/files/digest-libpng-1.2.5-r2
+++ b/media-libs/libpng/files/digest-libpng-1.2.5-r6
diff --git a/media-libs/libpng/files/libpng-1.0.12-gentoo.diff b/media-libs/libpng/files/libpng-1.0.12-gentoo.diff
deleted file mode 100644
index 34e8f65df2ee..000000000000
--- a/media-libs/libpng/files/libpng-1.0.12-gentoo.diff
+++ /dev/null
@@ -1,72 +0,0 @@
---- libpng-1.0.12.orig/pngconf.h
-+++ libpng-1.0.12/pngconf.h
-@@ -243,8 +243,13 @@
- #      undef _BSD_SOURCE
- #    endif
- #    ifdef _SETJMP_H
--      __png.h__ already includes setjmp.h;
--      __dont__ include it again.;
-+/* Explanation added by debian maintainer Philippe Troin <phil@fifi.org>.
-+   There are two versions of setjmp, depending wether or not we compile for
-+   BSD. They are incompatible and can cause crashes. The PNG people force
-+   here a unique behavior for setjmp. It fou get the error below,
-+   then include <png.h> before <setjmp.h>.
-+*/
-+#error png.h already includes setjmp.h with some additional fixup.
- #    endif
- #  endif /* __linux__ */
- 
---- libpng-1.0.12.orig/pngget.c
-+++ libpng-1.0.12/pngget.c
-@@ -566,9 +566,9 @@
-          channels++;
-       pixel_depth = *bit_depth * channels;
-       rowbytes_per_pixel = (pixel_depth + 7) >> 3;
--      if ((*width > PNG_MAX_UINT/rowbytes_per_pixel))
-+      if ((*width > (PNG_MAX_UINT/rowbytes_per_pixel) - 64))
-       {
--         png_warning(png_ptr,
-+         png_error(png_ptr,
-             "Width too large for libpng to process image data.");
-       }
-       return (1);
---- libpng-1.0.12.orig/pngpread.c
-+++ libpng-1.0.12/pngpread.c
-@@ -736,6 +736,13 @@
-       }
-       if (!(png_ptr->zstream.avail_out))
-       {
-+         if ((
-+#if defined(PNG_READ_INTERLACING_SUPPORTED)
-+             png_ptr->interlaced && png_ptr->pass > 6) ||
-+             (!png_ptr->interlaced &&
-+#endif
-+             png_ptr->row_number == png_ptr->num_rows-1))
-+           png_error(png_ptr, "Too much data in IDAT chunks");
-          png_push_process_row(png_ptr);
-          png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
-          png_ptr->zstream.next_out = png_ptr->row_buf;
---- libpng-1.0.12.orig/pngrtran.c
-+++ libpng-1.0.12/pngrtran.c
-@@ -1924,8 +1924,8 @@
-          /* This changes the data from RRGGBB to RRGGBBXX */
-          if (flags & PNG_FLAG_FILLER_AFTER)
-          {
--            png_bytep sp = row + (png_size_t)row_width * 3;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 6;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 1; i < row_width; i++)
-             {
-                *(--dp) = hi_filler;
-@@ -1946,8 +1946,8 @@
-          /* This changes the data from RRGGBB to XXRRGGBB */
-          else
-          {
--            png_bytep sp = row + (png_size_t)row_width * 3;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 6;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 0; i < row_width; i++)
-             {
-                *(--dp) = *(--sp);
diff --git a/media-libs/libpng/files/libpng-1.2.5-gentoo.diff b/media-libs/libpng/files/libpng-1.2.5-gentoo.diff
index 4fee583ccd04..3229b89a21d6 100644
--- a/media-libs/libpng/files/libpng-1.2.5-gentoo.diff
+++ b/media-libs/libpng/files/libpng-1.2.5-gentoo.diff
@@ -1,3 +1,16 @@
+--- libpng-1.2.5.orig/pngconf.h	2002-10-03 13:32:27.000000000 +0200
++++ libpng-1.2.5/pngconf.h	2004-04-28 13:40:03.617656368 +0200
+@@ -252,8 +252,8 @@
+ #      undef _BSD_SOURCE
+ #    endif
+ #    ifdef _SETJMP_H
+-      __png.h__ already includes setjmp.h;
+-      __dont__ include it again.;
++#warning      __png.h__ already includes setjmp.h;
++#warning      __dont__ include it again.;
+ #    endif
+ #  endif /* __linux__ */
+ 
 --- libpng3-1.2.5.orig/pngrtran.c
 +++ libpng3-1.2.5/pngrtran.c
 @@ -1930,7 +1930,7 @@
diff --git a/media-libs/libpng/files/libpng-update-bins.sh b/media-libs/libpng/files/libpng-update-bins.sh
deleted file mode 100644
index 05a91a28fdeb..000000000000
--- a/media-libs/libpng/files/libpng-update-bins.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-if [ ! -f /usr/sbin/qpkg ]; then
-	if [ ! -f /usr/bin/qpkg ]; then
-		echo "qpkg not found, will emerge gentoolkit"
-		emerge gentoolkit
-	fi
-fi
-if [ -f /usr/sbin/qpkg ]; then
-	QPKG=/usr/sbin/qpkg
-fi
-if [ -f /usr/bin/qpkg ]; then
-	QPKG=/usr/bin/qpkg
-fi
-
-rm -f /tmp/pngstuff.*
-echo "scanning /usr do not be alarmed of error messages"
-find /usr -type f -perm +u+x | while read FOO; do
-	ldd "${FOO}" | grep libpng.so.2  && ${QPKG} -nc -f ${FOO} >>/tmp/pngstuff.bins
-done
-
-
-cat /tmp/pngstuff.bins |sort | uniq | sed 's:\(.*/.*\)-[0-9]\+.*:\1:g' >/tmp/pngstuff.bins.rebuild
-echo "You will now need to rebuild the following packages"
-echo "-----------"
-cat /tmp/pngstuff.bins.rebuild
-echo "-----------"
-# cat /tmp/pngstuff.bins.rebuild | while read PACK; do emerge ${PACK}; done
-echo "done, deleting tempfiles"
-rm -f /tmp/pngstuff.*
-
diff --git a/media-libs/libpng/files/libpng-update-libs.sh b/media-libs/libpng/files/libpng-update-libs.sh
deleted file mode 100644
index 52f0b8e80fb0..000000000000
--- a/media-libs/libpng/files/libpng-update-libs.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-if [ ! -f /usr/sbin/qpkg ]; then
-	if [ ! -f /usr/bin/qpkg ]; then
-		echo "qpkg not found, will emerge gentoolkit"
-		emerge gentoolkit
-	fi
-fi
-if [ -f /usr/sbin/qpkg ]; then
-	QPKG=/usr/sbin/qpkg
-fi
-if [ -f /usr/bin/qpkg ]; then
-	QPKG=/usr/bin/qpkg
-fi
-
-rm -f /tmp/pngstuff.*
-echo "Scanning libraries. do not be alarmed of error messages"
-
-find /usr/lib -type f -perm +u+x | while read LIB; do
-	ldd "${LIB}" | grep "libpng.so.2"  && ${QPKG} -nc -f "${LIB}" >>/tmp/pngstuff.libs
-done
-cat /tmp/pngstuff.libs |sort | uniq |  sed 's:\(.*/.*\)-[0-9]\+.*:\1:g' >/tmp/pngstuff.libs.rebuild
-echo "You will now need to rebuild the following packages"
-echo "------------"
-cat /tmp/pngstuff.libs.rebuild
-echo "------------"
-# cat /tmp/pngstuff.libs.rebuild | while read PACK; do emerge ${PACK}; done
-echo "--- Done with libraries ---"
-
-
-rm -f /tmp/pngstuff.*
-
diff --git a/media-libs/libpng/libpng-1.0.12-r2.ebuild b/media-libs/libpng/libpng-1.0.12-r2.ebuild
deleted file mode 100644
index 745c7dbcb296..000000000000
--- a/media-libs/libpng/libpng-1.0.12-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.0.12-r2.ebuild,v 1.4 2004/03/19 07:56:04 mr_bones_ Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Portable Network Graphics library"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.libpng.org/"
-
-SLOT="1.0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND=">=sys-libs/zlib-1.1.3-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-gentoo.diff
-
-	sed -e "s:ZLIBLIB=../zlib:ZLIBLIB=/usr/lib:" \
-		-e "s:ZLIBINC=../zlib:ZLIBINC=/usr/include:" \
-		-e "s:prefix=/usr:prefix=${D}/usr:" \
-		-e "s:-O3:${CFLAGS}:" \
-		scripts/makefile.linux > Makefile
-}
-
-src_compile() {
-	make || die
-}
-
-src_install() {
-	dodir /usr/{include,lib}
-	make install prefix=${D}/usr || die
-	doman *.[35]
-	dodoc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
-}
diff --git a/media-libs/libpng/libpng-1.0.15-r1.ebuild b/media-libs/libpng/libpng-1.0.15-r1.ebuild
deleted file mode 100644
index f8449f3bdb53..000000000000
--- a/media-libs/libpng/libpng-1.0.15-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.0.15-r1.ebuild,v 1.4 2004/03/19 07:56:04 mr_bones_ Exp $
-
-inherit flag-o-matic eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Portable Networks Graphics library."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.libpng.org/"
-SLOT="1.0"
-LICENSE="as-is"
-KEYWORDS="x86 ~ppc ~sparc amd64"
-
-DEPEND=">=sys-libs/zlib-1.1.3-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-gentoo.diff
-
-	replace-flags "-march=k6-3" "-march=i586"
-	replace-flags "-march=k6-2" "-march=i586"
-	replace-flags "-march=k6" "-march=i586"
-
-	sed -e "s:ZLIBLIB=../zlib:ZLIBLIB=/usr/lib:" \
-		-e "s:ZLIBINC=../zlib:ZLIBINC=/usr/include:" \
-		-e "s:prefix=/usr:prefix=${D}/usr:" \
-		-e "s:-O3:${CFLAGS}:" \
-		scripts/makefile.linux > Makefile
-}
-
-src_compile() {
-	make || die
-}
-
-src_install() {
-	dodir /usr/{include,lib}
-	make install prefix=${D}/usr || die
-
-	newman libpngpf.3 libpngpf-10.3
-	newman libpng.3 libpng-10.3
-	newman png.5 png-10.5
-
-	# remove stuffs so that libpng-1.2 is the system default
-	rm ${D}/usr/lib/pkgconfig/libpng.pc
-	rm ${D}/usr/bin/libpng-config
-	rm ${D}/usr/lib/libpng.{a,so}
-	rm ${D}/usr/include/{png.h,pngconf.h,libpng}
-	rm -rf ${D}/usr/man
-
-	dodoc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
-}
-
-pkg_postinst() {
-	einfo "Please note:"
-	einfo "previous versions of libpng-1.0 series were incorrectly overwriting png.h symlink"
-	einfo "and libpng.pc from libpng-1.2.x installation."
-	einfo "This might cause removal of png.h by autoclean after you updated libpng-1.0 to 1.0.15"
-	einfo ""
-	einfo "If you experience problems compiling other packages with error message complaining"
-	einfo "about missing png.h, please remerge libpng-1.2.5 manually"
-
-}
diff --git a/media-libs/libpng/libpng-1.0.15-r2.ebuild b/media-libs/libpng/libpng-1.0.15-r2.ebuild
index 482b7d4170d1..eebca2aa1d43 100644
--- a/media-libs/libpng/libpng-1.0.15-r2.ebuild
+++ b/media-libs/libpng/libpng-1.0.15-r2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.0.15-r2.ebuild,v 1.1 2004/05/11 19:55:36 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.0.15-r2.ebuild,v 1.2 2004/05/14 00:55:39 vapier Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils gcc
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Portable Networks Graphics library."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
-SLOT="1.0"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
 LICENSE="as-is"
-KEYWORDS="x86 ~ppc ~sparc amd64"
+SLOT="1.0"
+KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
 
 DEPEND=">=sys-libs/zlib-1.1.3-r2"
 
@@ -20,11 +21,11 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-gentoo.diff
 
-	replace-flags "-march=k6-3" "-march=i586"
-	replace-flags "-march=k6-2" "-march=i586"
-	replace-flags "-march=k6" "-march=i586"
+	[ "`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
 
-	sed -e "s:ZLIBLIB=../zlib:ZLIBLIB=/usr/lib:" \
+	sed \
+		-e "s:ZLIBLIB=../zlib:ZLIBLIB=/usr/lib:" \
 		-e "s:ZLIBINC=../zlib:ZLIBINC=/usr/include:" \
 		-e "s:prefix=/usr:prefix=${D}/usr:" \
 		-e "s:-O3:${CFLAGS}:" \
@@ -50,7 +51,7 @@ src_install() {
 	rm ${D}/usr/include/{png.h,pngconf.h,libpng}
 	rm -rf ${D}/usr/man
 
-	dodoc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
+	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
 }
 
 pkg_postinst() {
@@ -61,5 +62,4 @@ pkg_postinst() {
 	einfo ""
 	einfo "If you experience problems compiling other packages with error message complaining"
 	einfo "about missing png.h, please remerge libpng-1.2.5 manually"
-
 }
diff --git a/media-libs/libpng/libpng-1.0.15.ebuild b/media-libs/libpng/libpng-1.0.15.ebuild
deleted file mode 100644
index 3f40bee2cea7..000000000000
--- a/media-libs/libpng/libpng-1.0.15.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.0.15.ebuild,v 1.6 2004/03/19 07:56:04 mr_bones_ Exp $
-
-inherit flag-o-matic eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Portable Networks Graphics library."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.libpng.org/"
-SLOT="1.0"
-LICENSE="as-is"
-KEYWORDS="x86 ~ppc ~sparc"
-
-DEPEND=">=sys-libs/zlib-1.1.3-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-gentoo.diff
-
-	replace-flags "-march=k6-3" "-march=i586"
-	replace-flags "-march=k6-2" "-march=i586"
-	replace-flags "-march=k6" "-march=i586"
-
-	sed -e "s:ZLIBLIB=../zlib:ZLIBLIB=/usr/lib:" \
-		-e "s:ZLIBINC=../zlib:ZLIBINC=/usr/include:" \
-		-e "s:prefix=/usr:prefix=${D}/usr:" \
-		-e "s:-O3:${CFLAGS}:" \
-		scripts/makefile.linux > Makefile
-}
-
-src_compile() {
-	make || die
-}
-
-src_install() {
-	dodir /usr/{include,lib}
-	make install prefix=${D}/usr || die
-
-	newman libpngpf.3 libpngpf-10.3
-	newman libpng.3 libpng-10.3
-	newman png.5 png-10.5
-
-	# remove stuffs so that libpng-1.2 is the system default
-	rm ${D}/usr/bin/libpng-config
-	rm ${D}/usr/lib/libpng.{a,so}
-	rm ${D}/usr/include/{png.h,pngconf.h,libpng}
-	rm -rf ${D}/usr/man
-
-	dodoc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
-}
-
-pkg_postinst() {
-	einfo "Please note:"
-	einfo "previous versions of libpng-1.0 series were incorrectly overwriting png.h symlink"
-	einfo "from libpng-1.2.x installation."
-	einfo "This might cause removal of png.h by autoclean after you updated libpng-1.0 to 1.0.15"
-	einfo ""
-	einfo "If you experience problems compiling other packages with error message complaining"
-	einfo "about missing png.h, please remerge libpng-1.2.5 manually"
-}
diff --git a/media-libs/libpng/libpng-1.2.5-r2.ebuild b/media-libs/libpng/libpng-1.2.5-r2.ebuild
deleted file mode 100644
index a42b8d2dbefd..000000000000
--- a/media-libs/libpng/libpng-1.2.5-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5-r2.ebuild,v 1.5 2004/03/19 07:56:04 mr_bones_ Exp $
-
-inherit flag-o-matic eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Portable Network Graphics library"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.libpng.org/"
-
-SLOT="1.2"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="sys-libs/zlib"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-gentoo.diff
-
-	replace-flags "-march=k6-3" "-march=i586"
-	replace-flags "-march=k6-2" "-march=i586"
-	replace-flags "-march=k6" "-march=i586"
-
-	sed -e "s:ZLIBLIB=.*:ZLIBLIB=/usr/lib:" \
-		-e "s:ZLIBINC=.*:ZLIBINC=/usr/include:" \
-		-e "s:-O3:${CFLAGS}:" \
-		-e "s:prefix=/usr/local:prefix=/usr:" \
-		-e "s:OBJSDLL = :OBJSDLL = -lz -lm :" \
-			scripts/makefile.linux > Makefile
-
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /usr/{include,lib}
-	dodir /usr/share/man
-	make \
-		DESTDIR=${D} \
-		MANPATH=/usr/share/man \
-		install || die
-
-	doman *.[35]
-	dodoc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
-}
-
-pkg_postinst() {
-	# the libpng authors really screwed around between 1.2.1 and 1.2.3
-	[ -f /usr/lib/libpng.so.3.1.2.1 ] && rm /usr/lib/libpng.so.3.1.2.1
-}
diff --git a/media-libs/libpng/libpng-1.2.5-r3.ebuild b/media-libs/libpng/libpng-1.2.5-r3.ebuild
deleted file mode 100644
index 50f5c9652659..000000000000
--- a/media-libs/libpng/libpng-1.2.5-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5-r3.ebuild,v 1.3 2004/03/19 07:56:04 mr_bones_ Exp $
-
-inherit flag-o-matic eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Portable Network Graphics library"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.libpng.org/"
-
-SLOT="1.2"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="sys-libs/zlib"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-gentoo.diff
-
-	replace-flags "-march=k6-3" "-march=i586"
-	replace-flags "-march=k6-2" "-march=i586"
-	replace-flags "-march=k6" "-march=i586"
-
-	sed -e "s:ZLIBLIB=.*:ZLIBLIB=/usr/lib:" \
-		-e "s:ZLIBINC=.*:ZLIBINC=/usr/include:" \
-		-e "s:-O3:${CFLAGS}:" \
-		-e "s:prefix=/usr/local:prefix=/usr:" \
-		-e "s:OBJSDLL = :OBJSDLL = -lz -lm :" \
-			scripts/makefile.linux > Makefile
-
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /usr/{include,lib}
-	dodir /usr/share/man
-	make \
-		DESTDIR=${D} \
-		MANPATH=/usr/share/man \
-		install || die
-
-	doman *.[35]
-	dodoc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
-}
-
-pkg_postinst() {
-	# the libpng authors really screwed around between 1.2.1 and 1.2.3
-	[ -f /usr/lib/libpng.so.3.1.2.1 ] && rm /usr/lib/libpng.so.3.1.2.1
-}
diff --git a/media-libs/libpng/libpng-1.2.5-r5.ebuild b/media-libs/libpng/libpng-1.2.5-r5.ebuild
deleted file mode 100644
index 456df5c4dd07..000000000000
--- a/media-libs/libpng/libpng-1.2.5-r5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5-r5.ebuild,v 1.1 2004/05/11 19:55:36 solar Exp $
-
-inherit flag-o-matic eutils gcc
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="1.2"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
-IUSE=""
-
-DEPEND="sys-libs/zlib"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-gentoo.diff
-
-	sed \
-		-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/lib:" \
-		-e "s:ZLIBINC=.*:ZLIBINC=/usr/include:" \
-		-e "s:-O3:${CFLAGS}:" \
-		-e "s:prefix=/usr/local:prefix=/usr:" \
-		-e "s:OBJSDLL = :OBJSDLL = -lz -lm :" \
-		scripts/makefile.linux > Makefile
-}
-
-src_compile() {
-	emake CC="$(gcc-getCC)" CXX="$(gcc-getCXX)" || die "Make failed"
-}
-
-src_install() {
-	dodir /usr/{include,lib}
-	dodir /usr/share/man
-	einstall MANPATH=${D}/usr/share/man|| die "Failed to install"
-
-	doman libpng.3 libpngpf.3 png.5
-	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
-}
-
-pkg_postinst() {
-	# the libpng authors really screwed around between 1.2.1 and 1.2.3
-	[ -f ${ROOT}/usr/lib/libpng.so.3.1.2.1 ] && rm ${ROOT}/usr/lib/libpng.so.3.1.2.1
-}
diff --git a/media-libs/libpng/libpng-1.2.5-r4.ebuild b/media-libs/libpng/libpng-1.2.5-r6.ebuild
index c71a5009b8f3..4dee258fbefd 100644
--- a/media-libs/libpng/libpng-1.2.5-r4.ebuild
+++ b/media-libs/libpng/libpng-1.2.5-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5-r4.ebuild,v 1.14 2004/04/28 22:36:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.5-r6.ebuild,v 1.1 2004/05/14 00:55:39 vapier Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -21,6 +21,9 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-gentoo.diff
 
+	[ "`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
+
 	sed \
 		-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/lib:" \
 		-e "s:ZLIBINC=.*:ZLIBINC=/usr/include:" \
@@ -37,7 +40,7 @@ src_compile() {
 src_install() {
 	dodir /usr/{include,lib}
 	dodir /usr/share/man
-	einstall MANPATH=${D}/usr/share/man|| die "Failed to install"
+	einstall MANPATH=${D}/usr/share/man || die "Failed to install"
 
 	doman libpng.3 libpngpf.3 png.5
 	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO