version bump

5 files changed, 92 insertions, 4 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 53ef479818c9..9e20f62b9519 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,12 @@
 # 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.48 2004/08/13 01:34:13 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.49 2004/09/12 06:48:59 mr_bones_ Exp $
+
+*libpng-1.2.7 (11 Sep 2004)
+
+  11 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/1.2.7-gentoo.diff, +libpng-1.2.7.ebuild:
+  version bump
 
   12 Aug 2004; Joshua Kinard <kumba@gentoo.org> libpng-1.2.5-r8.ebuild:
   Bumped 1.2.5-r8 to mips stable to fix Bug #59424.
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index f850884bb7af..d90caf7397b5 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,8 +1,10 @@
 MD5 717ebb7381d4ddc31102f6e6877689da ChangeLog 8605
-MD5 7071ec56a7d9b959c63fab2f608b99ff libpng-1.2.5-r8.ebuild 1824
 MD5 d1beee5aaa5daf6100554a7afee08ed9 libpng-1.2.5-r7.ebuild 1813
-MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r8 65
+MD5 7071ec56a7d9b959c63fab2f608b99ff libpng-1.2.5-r8.ebuild 1824
+MD5 14557d24fa99221d14841d85c560abb1 libpng-1.2.7.ebuild 1746
 MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r7 65
+MD5 7443cfcd027ad293e56ec7bed76ee21c files/macos.patch 589
+MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r8 65
 MD5 d1cb64b64c0652863c89a3eb1f7c5f66 files/libpng-1.2.5-security.diff 10114
+MD5 cf98652d430c500b40470ffbcc2636e1 files/digest-libpng-1.2.7 65
 MD5 b664d38f024a7b21f299727e4aa76d2e files/libpng-1.2.5-gentoo.diff 3470
-MD5 7443cfcd027ad293e56ec7bed76ee21c files/macos.patch 589
diff --git a/media-libs/libpng/files/1.2.7-gentoo.diff b/media-libs/libpng/files/1.2.7-gentoo.diff
new file mode 100644
index 000000000000..230a93a67a49
--- /dev/null
+++ b/media-libs/libpng/files/1.2.7-gentoo.diff
@@ -0,0 +1,13 @@
+--- pngconf.h.orig	2004-09-11 23:35:25.000000000 -0700
++++ pngconf.h	2004-09-11 23:35:52.000000000 -0700
+@@ -260,8 +260,8 @@
+      /* If you encounter a compiler error here, see the explanation
+       * near the end of INSTALL.
+       */
+-         __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__ */
+ 
diff --git a/media-libs/libpng/files/digest-libpng-1.2.7 b/media-libs/libpng/files/digest-libpng-1.2.7
new file mode 100644
index 000000000000..c0b13966cdce
--- /dev/null
+++ b/media-libs/libpng/files/digest-libpng-1.2.7
@@ -0,0 +1 @@
+MD5 21030102f99f81c37276403e5956d198 libpng-1.2.7.tar.bz2 379504
diff --git a/media-libs/libpng/libpng-1.2.7.ebuild b/media-libs/libpng/libpng-1.2.7.ebuild
new file mode 100644
index 000000000000..a046b59d9503
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.7.ebuild
@@ -0,0 +1,66 @@
+# 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.2.7.ebuild,v 1.1 2004/09/12 06:48:59 mr_bones_ 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 ~arm ~hppa ~amd64 ~alpha ~mips"
+IUSE=""
+
+DEPEND="sys-libs/zlib"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PV}-gentoo.diff"
+
+	if [ "$(gcc-version)" == "3.3" -o "$(gcc-version)" == "3.2" ] ; then
+		replace-cpu-flags i586 k6 k6-2 k6-3
+	fi
+
+	if use macos; then
+		epatch "${FILESDIR}/macos.patch" # implements strnlen
+		sed \
+			-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/lib:" \
+			-e "s:ZLIBINC=.*:ZLIBINC=/usr/include:" \
+			-e "s:-O3:${CFLAGS}:" \
+			-e "s:prefix=/usr/local:prefix=/usr:" \
+			scripts/makefile.darwin > Makefile
+	else
+		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
+	fi
+}
+
+src_compile() {
+	emake \
+		CC="$(gcc-getCC)" \
+		CXX="$(gcc-getCXX)" \
+		|| die "emake failed"
+}
+
+src_install() {
+	dodir /usr/{include,lib} /usr/share/man
+	einstall MANPATH="${D}/usr/share/man" || die
+	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
+	if [ -f "${ROOT}/usr/lib/libpng.so.3.1.2.1" ] ; then
+		rm "${ROOT}/usr/lib/libpng.so.3.1.2.1"
+	fi
+}