Fix for the libpng-pc symlink overwrite, this should fix yet another 1.0 +1.2 cooperation issue

4 files changed, 73 insertions, 3 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index f80ce053733f..48f564dac32f 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libpng
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.30 2003/04/24 22:57:29 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.31 2003/05/18 17:36:25 spider Exp $
+
+  18 maj 2003; <spider@gentoo.org>libpng-1.0.15-r1.ebuild :
+  update to make libpng not overwrite libpng.pc, which broke fbdesk
 
   24 Apr 2003; Martin Schlemmer <azarah@gentoo.org> libpng-1.2.5-r4.ebuild :
   Fix it to default CC to "gcc" if not set, else build borks.
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 1c5260f7d99d..9179bcf9cdef 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,9 +1,10 @@
 MD5 a45f21ebf391a5a3f6c386e8e23cc977 libpng-1.2.5-r2.ebuild 1337
-MD5 5f5be8b784190fe141f2c01ead3b437a libpng-1.0.15-r1.ebuild 1848
+MD5 3650f1b25d251aa1d5c82b38ad613464 libpng-1.0.15-r1.ebuild 1850
+MD5 6a3bed1aa12f3bd2aeefa28e2408bba6 libpng-1.0.15.ebuild 1795
 MD5 accdfcb4d9d26ee0e2b8305a24aabece libpng-1.2.5-r4.ebuild 1393
 MD5 a7754d81ebea49d786056a1ae35b7e0d libpng-1.0.12-r2.ebuild 955
 MD5 0d1b30cb9b2d78d43321d6c51f3ac922 libpng-1.2.5-r3.ebuild 1337
-MD5 845eef6a4fdeeeaa54c709d23349d4b4 ChangeLog 5550
+MD5 391ca2f648d50834bd8e3e13108f5405 ChangeLog 5679
 MD5 9be0a40434a7fed964059730ccd09027 files/libpng-update-libs.sh 857
 MD5 eee5672e220f4356c2649991b913d82d files/libpng-1.0.12-gentoo.diff 2732
 MD5 43ce91760c00b690a06ebfa09ef68938 files/digest-libpng-1.0.12-r2 66
diff --git a/media-libs/libpng/files/digest-libpng-1.0.15-r1 b/media-libs/libpng/files/digest-libpng-1.0.15-r1
new file mode 100644
index 000000000000..431976f6d0ef
--- /dev/null
+++ b/media-libs/libpng/files/digest-libpng-1.0.15-r1
@@ -0,0 +1 @@
+MD5 69569534bd0d6a9443189ba56cd89ef3 libpng-1.0.15.tar.bz2 374743
diff --git a/media-libs/libpng/libpng-1.0.15-r1.ebuild b/media-libs/libpng/libpng-1.0.15-r1.ebuild
new file mode 100644
index 000000000000..5b816dab9c7c
--- /dev/null
+++ b/media-libs/libpng/libpng-1.0.15-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2003 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.1 2003/05/18 17:36:25 spider 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/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"
+
+}