bump ebuild revisions to force user updates for GLSA process. No change in the .ebuild so no need to call for arch maintiners. By request of koon@g.o

6 files changed, 129 insertions, 2 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 00a22a198a13..5fc550d79403 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,13 @@
 # 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.36 2004/05/09 06:32:23 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.37 2004/05/11 19:55:36 solar Exp $
+
+*libpng-1.0.15-r2 (11 May 2004)
+
+  11 May 2004; <solar@gentoo.org> libpng-1.0.15-r2.ebuild,
+  libpng-1.2.5-r5.ebuild:
+  bump ebuild revisions to force user updates for GLSA process. No change in the
+  .ebuild so no need to call for arch maintiners. By request of koon@g.o
 
   09 May 2004; <solar@gentoo.org> files/libpng-1.0.15-gentoo.diff,
   files/libpng-1.2.5-gentoo.diff:
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index e0f0c5c6aa6d..6ea66573708f 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,10 +1,12 @@
-MD5 369f6fe9ea3ee2de1f8f5f337cda4f85 ChangeLog 6741
+MD5 db4f288424dae6ec55de7b325f3922e2 ChangeLog 7014
 MD5 715d8c5f921a8315141902b4ae0e4f2d libpng-1.0.12-r2.ebuild 958
 MD5 a7e44158011831ead567a1478a9cdd09 libpng-1.0.15-r1.ebuild 1858
 MD5 dd70c9bd9d3707ce120546479724d61b libpng-1.0.15.ebuild 1797
 MD5 9d278512fe1660d14db5cbdea5e1f8d2 libpng-1.2.5-r2.ebuild 1340
 MD5 a9610e1bdfe6644ac07e41277b41ad76 libpng-1.2.5-r3.ebuild 1340
 MD5 08786c08e2bf51b01e5bd0b19061546a libpng-1.2.5-r4.ebuild 1313
+MD5 0d75ab431c18bcd235b7307180aaf417 libpng-1.2.5-r5.ebuild 1311
+MD5 1a94b50ae4043f38738c9dea21c9ce80 libpng-1.0.15-r2.ebuild 1854
 MD5 43ce91760c00b690a06ebfa09ef68938 files/digest-libpng-1.0.12-r2 66
 MD5 0f74a3acf75488cf44f857e870379d0d files/digest-libpng-1.0.15 66
 MD5 0f74a3acf75488cf44f857e870379d0d files/digest-libpng-1.0.15-r1 66
@@ -16,3 +18,5 @@ MD5 41148c3ecb7b1ff7b2e1e57f4663db1a files/libpng-1.0.15-gentoo.diff 2413
 MD5 b178287f568a5b244249546276d44d9a files/libpng-1.2.5-gentoo.diff 2145
 MD5 f7540df1d3b40b59b17a3caf1216079f files/libpng-update-bins.sh 836
 MD5 9be0a40434a7fed964059730ccd09027 files/libpng-update-libs.sh 857
+MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r5 65
+MD5 0f74a3acf75488cf44f857e870379d0d files/digest-libpng-1.0.15-r2 66
diff --git a/media-libs/libpng/files/digest-libpng-1.0.15-r2 b/media-libs/libpng/files/digest-libpng-1.0.15-r2
new file mode 100644
index 000000000000..431976f6d0ef
--- /dev/null
+++ b/media-libs/libpng/files/digest-libpng-1.0.15-r2
@@ -0,0 +1 @@
+MD5 69569534bd0d6a9443189ba56cd89ef3 libpng-1.0.15.tar.bz2 374743
diff --git a/media-libs/libpng/files/digest-libpng-1.2.5-r5 b/media-libs/libpng/files/digest-libpng-1.2.5-r5
new file mode 100644
index 000000000000..794c1d47d26f
--- /dev/null
+++ b/media-libs/libpng/files/digest-libpng-1.2.5-r5
@@ -0,0 +1 @@
+MD5 3fc28af730f12ace49b14568de4ad934 libpng-1.2.5.tar.bz2 378030
diff --git a/media-libs/libpng/libpng-1.0.15-r2.ebuild b/media-libs/libpng/libpng-1.0.15-r2.ebuild
new file mode 100644
index 000000000000..482b7d4170d1
--- /dev/null
+++ b/media-libs/libpng/libpng-1.0.15-r2.ebuild
@@ -0,0 +1,65 @@
+# 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 $
+
+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.2.5-r5.ebuild b/media-libs/libpng/libpng-1.2.5-r5.ebuild
new file mode 100644
index 000000000000..456df5c4dd07
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.5-r5.ebuild
@@ -0,0 +1,49 @@
+# 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
+}