revision bump to 1.25 and added warning to 1.0.15 to avoid autoclean related issue

4 files changed, 76 insertions, 4 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index c74ff2a502fe..edae4c485574 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libpng
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.21 2003/01/17 15:05:02 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.22 2003/01/20 00:11:11 george Exp $
+
+  19 Jan 2003; George Shapovalov <george@gentoo.org> libpng-1.2.5-r3.ebuild, libpng-1.0.15.ebuild :
+  update to libpng-1.0.15 may cause autocleaning of png.h if user did not remerge libpng-1.2.5 after
+  emerging 1.0.12. Revision bumped libpng-1.2.5-r3.ebuild to force remerge.
+  Also added warning to libpng-1.0.15.ebuild about this issue.
 
   17 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> libpng-1.2.5-r2.ebuild :
   Changed sed "/" to ":".
diff --git a/media-libs/libpng/files/digest-libpng-1.2.5-r3 b/media-libs/libpng/files/digest-libpng-1.2.5-r3
new file mode 100644
index 000000000000..794c1d47d26f
--- /dev/null
+++ b/media-libs/libpng/files/digest-libpng-1.2.5-r3
@@ -0,0 +1 @@
+MD5 3fc28af730f12ace49b14568de4ad934 libpng-1.2.5.tar.bz2 378030
diff --git a/media-libs/libpng/libpng-1.0.15.ebuild b/media-libs/libpng/libpng-1.0.15.ebuild
index 07c510c3fe85..6821240782bc 100644
--- a/media-libs/libpng/libpng-1.0.15.ebuild
+++ b/media-libs/libpng/libpng-1.0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.3 2003/01/16 17:06:58 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.0.15.ebuild,v 1.4 2003/01/20 00:11:11 george Exp $
 
 inherit flag-o-matic eutils
 
@@ -38,7 +38,7 @@ src_compile() {
 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
@@ -48,6 +48,16 @@ src_install() {
 	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-r3.ebuild b/media-libs/libpng/libpng-1.2.5-r3.ebuild
new file mode 100644
index 000000000000..a2214c097fa2
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.5-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2002 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.1 2003/01/20 00:11:11 george 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
+}