remove 1.0

5 files changed, 5 insertions, 131 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 0a4b79a9a1a5..b036d2734792 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,9 @@
 # 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.46 2004/08/06 10:47:33 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.47 2004/08/06 12:19:07 foser Exp $
+
+  06 Aug 2004; foser <foser@gentoo.org> libpng-1.0* :
+  Remove all traces of libpng-1.0* (#59424)
 
   06 Aug 2004; Bryan Østergaard,,, <kloeri@gentoo.org> libpng-1.2.5-r8.ebuild:
   Stable on alpha, bug #59424.
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 2347fa9d6a68..806beaeaedcf 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,11 +1,8 @@
 MD5 97babe3e87df1ba7f9f3833b6559d1c1 libpng-1.2.5-r8.ebuild 1820
-MD5 c3f6e4decd490e5d6e65ab197228ec66 libpng-1.0.15-r2.ebuild 1845
-MD5 b6c7afbdaa8f020f20bb0a8870fe6f44 ChangeLog 8382
+MD5 415675418a5e599a11ec3a49ff316f96 ChangeLog 8480
 MD5 d1beee5aaa5daf6100554a7afee08ed9 libpng-1.2.5-r7.ebuild 1813
-MD5 0f74a3acf75488cf44f857e870379d0d files/digest-libpng-1.0.15-r2 66
 MD5 7443cfcd027ad293e56ec7bed76ee21c files/macos.patch 589
 MD5 d1cb64b64c0652863c89a3eb1f7c5f66 files/libpng-1.2.5-security.diff 10114
 MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r7 65
 MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r8 65
-MD5 41148c3ecb7b1ff7b2e1e57f4663db1a files/libpng-1.0.15-gentoo.diff 2413
 MD5 b664d38f024a7b21f299727e4aa76d2e files/libpng-1.2.5-gentoo.diff 3470
diff --git a/media-libs/libpng/files/digest-libpng-1.0.15-r2 b/media-libs/libpng/files/digest-libpng-1.0.15-r2
deleted file mode 100644
index 431976f6d0ef..000000000000
--- a/media-libs/libpng/files/digest-libpng-1.0.15-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 69569534bd0d6a9443189ba56cd89ef3 libpng-1.0.15.tar.bz2 374743
diff --git a/media-libs/libpng/files/libpng-1.0.15-gentoo.diff b/media-libs/libpng/files/libpng-1.0.15-gentoo.diff
deleted file mode 100644
index 5a375bfeabc3..000000000000
--- a/media-libs/libpng/files/libpng-1.0.15-gentoo.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -urN libpng-1.0.15-old/pngconf.h libpng-1.0.15/pngconf.h
---- libpng-1.0.15-old/pngconf.h	2002-10-03 04:13:12.000000000 -0700
-+++ libpng-1.0.15/pngconf.h	2003-01-16 08:57:40.000000000 -0800
-@@ -254,8 +254,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__ */
- 
-diff -urN libpng-1.0.15-old/pngrtran.c libpng-1.0.15/pngrtran.c
---- libpng-1.0.15-old/pngrtran.c	2002-10-03 04:13:15.000000000 -0700
-+++ libpng-1.0.15/pngrtran.c	2003-01-16 08:57:40.000000000 -0800
-@@ -1965,8 +1965,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;
-@@ -1987,8 +1987,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);
---- libpng-1.0.15-old/pngerror.c       2002-10-03 05:32:27.000000000 -0600
-+++ libpng-1.0.15/pngerror.c     2004-04-29 09:26:18.000000000 -0600
-@@ -135,10 +135,12 @@
-       buffer[iout] = 0;
-    else
-    {
-+      png_size_t len = strnlen(error_message, 63);
-+
-       buffer[iout++] = ':';
-       buffer[iout++] = ' ';
--      png_memcpy(buffer+iout, error_message, 64);
--      buffer[iout+63] = 0;
-+      png_memcpy(buffer+iout, error_message, len);
-+      buffer[iout+len] = 0;
-    }
- }
diff --git a/media-libs/libpng/libpng-1.0.15-r2.ebuild b/media-libs/libpng/libpng-1.0.15-r2.ebuild
deleted file mode 100644
index b8806733b1da..000000000000
--- a/media-libs/libpng/libpng-1.0.15-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.0.15-r2.ebuild,v 1.3 2004/06/24 23:13:27 agriffis 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.0"
-KEYWORDS="x86 ppc sparc amd64"
-IUSE=""
-
-DEPEND=">=sys-libs/zlib-1.1.3-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	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=../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 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"
-}