old

3 files changed, 13 insertions, 71 deletions

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 105702fffbdd..e0caf083fca6 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,12 +1,20 @@
-MD5 602563e0a8ad2ef1f5345717fa660cae libpng-1.2.5-r8.ebuild 1870
+-----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 fbf3226ad08934966af8773089b8c945 files/libpng-1.2.7-png_do_strip_filler.diff 3033
-MD5 3338fff0166374e14ae138e6a1f4cd21 files/1.2.7-gentoo.diff 464
+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
-MD5 82c75412d0c6a4a86704a7a4545ee502 files/digest-libpng-1.2.5-r8 65
-MD5 7443cfcd027ad293e56ec7bed76ee21c files/macos.patch 589
+MD5 3338fff0166374e14ae138e6a1f4cd21 files/1.2.7-gentoo.diff 464
 MD5 cf98652d430c500b40470ffbcc2636e1 files/digest-libpng-1.2.7 65
 MD5 cf98652d430c500b40470ffbcc2636e1 files/digest-libpng-1.2.7-r1 65
+MD5 fbf3226ad08934966af8773089b8c945 files/libpng-1.2.7-png_do_strip_filler.diff 3033
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB2btYroRuSHgZdywRAlGVAJ4lscuXdMOlUDtZsNBwP4gUek3zdgCfX56j
+VpMXJg+ZfGcpuM9OJtXXBzk=
+=FbCt
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/files/digest-libpng-1.2.5-r8 b/media-libs/libpng/files/digest-libpng-1.2.5-r8
deleted file mode 100644
index 794c1d47d26f..000000000000
--- a/media-libs/libpng/files/digest-libpng-1.2.5-r8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fc28af730f12ace49b14568de4ad934 libpng-1.2.5.tar.bz2 378030
diff --git a/media-libs/libpng/libpng-1.2.5-r8.ebuild b/media-libs/libpng/libpng-1.2.5-r8.ebuild
deleted file mode 100644
index f536500c9f4e..000000000000
--- a/media-libs/libpng/libpng-1.2.5-r8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.5-r8.ebuild,v 1.12 2004/11/06 21:05:45 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 mips alpha arm hppa amd64 ia64 ppc64 s390 ppc-macos"
-IUSE=""
-
-DEPEND="sys-libs/zlib"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/${P}-security.diff
-	if use ppc-macos ; then
-		epatch ${FILESDIR}/macos.patch # implements strnlen
-	fi
-
-	[ "`gcc-version`" == "3.2" ] && replace-cpu-flags k6 k6-2 k6-3 i586
-	[ "`gcc-version`" == "3.3" ] && replace-cpu-flags k6 k6-2 k6-3 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
-
-	if use ppc-macos ; then
-		einfo "Patching the source for Mac OS X / Darwin compatibility"
-		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
-	fi
-}
-
-src_compile() {
-	emake CC="$(gcc-getCC)" CXX="$(gcc-getCXX)" || die "Make failed"
-}
-
-src_install() {
-	dodir /usr/{include,lib} /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
-}