From 0927c5cd827da8d759ea93d37afad7b43f74969b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 3 Jan 2005 21:58:47 +0000 Subject: [PATCH] Version bump #74456 by Ryan Hill. --- media-libs/libpng/ChangeLog | 7 ++- media-libs/libpng/Manifest | 14 +++-- media-libs/libpng/files/digest-libpng-1.2.8 | 1 + media-libs/libpng/libpng-1.2.7-r1.ebuild | 4 +- media-libs/libpng/libpng-1.2.7.ebuild | 4 +- media-libs/libpng/libpng-1.2.8.ebuild | 61 +++++++++++++++++++++ 6 files changed, 79 insertions(+), 12 deletions(-) create mode 100644 media-libs/libpng/files/digest-libpng-1.2.8 create mode 100644 media-libs/libpng/libpng-1.2.8.ebuild diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog index 227899d4252a..9f42415972dd 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.58 2004/12/29 00:52:35 ciaranm Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.59 2005/01/03 21:58:47 vapier Exp $ + + 03 Jan 2005; Mike Frysinger +libpng-1.2.8.ebuild: + Version bump #74456 by Ryan Hill. 29 Dec 2004; Ciaran McCreesh : Change encoding to UTF-8 for GLEP 31 compliance diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest index e0caf083fca6..85836b6bb700 100644 --- a/media-libs/libpng/Manifest +++ b/media-libs/libpng/Manifest @@ -1,9 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 89ee0e03198d2bcd2295f51d4c68cde2 ChangeLog 9949 -MD5 540eed8a696949bf70e500c8c461168f libpng-1.2.7.ebuild 1832 -MD5 70a8894e625b7342ddcfc43c28ae866f libpng-1.2.7-r1.ebuild 1896 +MD5 7eaed8a3df30c09593b3bf763ad9f5f2 ChangeLog 10057 +MD5 c99f79f220032714a162ca69e0dfe911 libpng-1.2.8.ebuild 1642 +MD5 8799b3b063d02da3c9fb322d2b9811d5 libpng-1.2.7-r1.ebuild 1897 +MD5 b86cb2a5d09ddf0b1deff86514b7a1b3 libpng-1.2.7.ebuild 1834 +MD5 37681c3a63bbaa895831b03e9644f77c files/digest-libpng-1.2.8 65 MD5 7443cfcd027ad293e56ec7bed76ee21c files/macos.patch 589 MD5 d1cb64b64c0652863c89a3eb1f7c5f66 files/libpng-1.2.5-security.diff 10114 MD5 b664d38f024a7b21f299727e4aa76d2e files/libpng-1.2.5-gentoo.diff 3470 @@ -14,7 +16,7 @@ MD5 fbf3226ad08934966af8773089b8c945 files/libpng-1.2.7-png_do_strip_filler.diff -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFB2btYroRuSHgZdywRAlGVAJ4lscuXdMOlUDtZsNBwP4gUek3zdgCfX56j -VpMXJg+ZfGcpuM9OJtXXBzk= -=FbCt +iD8DBQFB2cAproRuSHgZdywRAuh9AJ9tdNTRhubaqpiOZI21Ce4hRgKQawCeKzAW +JKCx1WAogN0NuUUZnpxzyDo= +=fyL/ -----END PGP SIGNATURE----- diff --git a/media-libs/libpng/files/digest-libpng-1.2.8 b/media-libs/libpng/files/digest-libpng-1.2.8 new file mode 100644 index 000000000000..39a9478b3be0 --- /dev/null +++ b/media-libs/libpng/files/digest-libpng-1.2.8 @@ -0,0 +1 @@ +MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970 diff --git a/media-libs/libpng/libpng-1.2.7-r1.ebuild b/media-libs/libpng/libpng-1.2.7-r1.ebuild index 692ca49e27c2..f768296bf076 100644 --- a/media-libs/libpng/libpng-1.2.7-r1.ebuild +++ b/media-libs/libpng/libpng-1.2.7-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 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-r1.ebuild,v 1.1 2004/11/20 03:58:17 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.7-r1.ebuild,v 1.2 2005/01/03 21:58:47 vapier Exp $ inherit flag-o-matic eutils gcc diff --git a/media-libs/libpng/libpng-1.2.7.ebuild b/media-libs/libpng/libpng-1.2.7.ebuild index f344758f9895..6004c738f682 100644 --- a/media-libs/libpng/libpng-1.2.7.ebuild +++ b/media-libs/libpng/libpng-1.2.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 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.9 2004/11/13 03:54:21 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.7.ebuild,v 1.10 2005/01/03 21:58:47 vapier Exp $ inherit flag-o-matic eutils gcc diff --git a/media-libs/libpng/libpng-1.2.8.ebuild b/media-libs/libpng/libpng-1.2.8.ebuild new file mode 100644 index 000000000000..c626d1836046 --- /dev/null +++ b/media-libs/libpng/libpng-1.2.8.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.8.ebuild,v 1.1 2005/01/03 21:58:47 vapier Exp $ + +inherit flag-o-matic eutils toolchain-funcs + +DESCRIPTION="Portable Network Graphics library" +HOMEPAGE="http://www.libpng.org/" +SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2" + +LICENSE="as-is" +SLOT="1.2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh ~sparc ~x86" +IUSE="" + +DEPEND="sys-libs/zlib" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/1.2.7-gentoo.diff + + [[ $(gcc-version) == "3.3" || $(gcc-version) == "3.2" ]] \ + && replace-cpu-flags k6 k6-2 k6-3 i586 + + local makefilein="scripts/makefile.linux" + if use ppc-macos ; then + epatch "${FILESDIR}"/macos.patch # implements strnlen + makefilein="scripts/makefile.darwin" + fi + sed \ + -e "/^ZLIBLIB=/s:=.*:=/usr/$(get_libdir):" \ + -e '/^ZLIBINC=/s:=.*:=/usr/include:' \ + -e "s:-O3:${CFLAGS}:" \ + -e '/^prefix=/s:/local::' \ + -e '/^MANPATH=/s:/man:/share/man:' \ + -e "/^LIBPATH=/s:/lib:/$(get_libdir):" \ + -e '/^OBJSDLL =/s:=:= -lz -lm :' \ + -e 's:mkdir:mkdir -p:' \ + ${makefilein} > Makefile +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die + 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/$(get_libdir)/libpng.so.3.1.2.1 ]] ; then + rm -f "${ROOT}"/usr/$(get_libdir)/libpng.so.3.1.2.1 + fi +} -- 2.26.2