5 files changed, 17 insertions, 162 deletions
diff --git a/media-gfx/pngcrush/ChangeLog b/media-gfx/pngcrush/ChangeLog
index 5b8dfacfeca0..48b81d360564 100644
--- a/media-gfx/pngcrush/ChangeLog
+++ b/media-gfx/pngcrush/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/pngcrush
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.44 2009/05/30 18:50:07 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.45 2009/06/01 12:31:50 maekke Exp $
+
+  01 Jun 2009; Markus Meier <maekke@gentoo.org> -pngcrush-1.6.10.ebuild,
+  -files/pngcrush-1.6.10-makefile_and_missing_definitions.patch,
+  -pngcrush-1.6.14.ebuild:
+  old
 
   30 May 2009; nixnut <nixnut@gentoo.org> pngcrush-1.6.15.ebuild:
   ppc stable #268865
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index 317a3f297403..7031f13b992c 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,10 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Makefile 266 RMD160 e0de84c3254288cc52266e6f05656758f5102c62 SHA1 af142ea41bb37f5b4d82a9d38f9a613df57a6a2e SHA256 29a1424722da4229c2a224cf73504e6bb712ec74f092500bce78fd9e8513af45
-AUX pngcrush-1.6.10-makefile_and_missing_definitions.patch 2446 RMD160 18978c36dc64b8b90f1e23d597ac6f589bdac394 SHA1 f5055658b2ddb900fa4e1211728b30b52ccf7303 SHA256 a48005421df2e2c389357ec11fdb7aa6580c96cfa736701654dd87270b20720f
-DIST pngcrush-1.6.10-nolib.tar.bz2 42633 RMD160 92466d6bde526e77f826b4ec7589f132c525ea39 SHA1 4b3d6450d776e53408960fba9de7661b3e3e99cc SHA256 05dd4de676ec516a9d4c2c8cfd5a201e30e292916779a42db230c62e5ae32892
-DIST pngcrush-1.6.14-nolib.tar.bz2 42526 RMD160 45561badab7a1d45c362c67d2df206df0320d87f SHA1 bda58f7e62a0e5013e13192a90ec2b905156bce4 SHA256 a8fd5a195240d5eb0b8fe941d1838a399bcc8af2ca91aa5d73f11d86302ea171
 DIST pngcrush-1.6.15-nolib.tar.bz2 42608 RMD160 4f25e825ad1eda86ea0a8baf36b4783ae317a5fc SHA1 c3d20e1fdac37d3208ee5cf04173144f14377006 SHA256 3d27f7c3b7f37d29b2c449d0228154b1807a215a558fccec0c12ce7bbf9819e1
-EBUILD pngcrush-1.6.10.ebuild 793 RMD160 4357dded345fbcf6ad720fa4717c7b18bdfa38d1 SHA1 34fdc2b5ea92f50a8ce966481e3c3bece37b89ab SHA256 14e3d799949f6c064549adfaa9d0f433b8838468e048738cbb1389f1dfa68964
-EBUILD pngcrush-1.6.14.ebuild 778 RMD160 61943a99ee99eff5ef354770c9e68676cf146dae SHA1 609ba71dcabfed5b918fd369a91f0de193a6da0b SHA256 a24c375409b57daae754c34bf865a415a87dc6f5be7a0786865b9c9d770efeba
 EBUILD pngcrush-1.6.15.ebuild 775 RMD160 da32af9a5afa69f4fecaaf29ba6dc6074c65d6c3 SHA1 32f69384fb65c01808a5847906ddb0aa2ff16226 SHA256 88fb567c54c85fc033d32ae4cac1ab5c617f0e4f57cca88db67560271ed9407a
-MISC ChangeLog 5506 RMD160 9bb045182a6fad6a09b221059d5efb5a4f0ebfe9 SHA1 bf02562f152f358a63de6894f733c84b7ef7c7ea SHA256 f0d7ccba7fa8e5c47a1a1a536855f87b66d112540951859a77cc5eced164d4ff
+MISC ChangeLog 5678 RMD160 462399778eed33cbc2039d856d9695d11005cc95 SHA1 e95a92c7cc2819264f05296b24cde4e0e70f2060 SHA256 6fdb324362ca297a6d054254f0b6b669a03ee64a32198b16480b55daebd975f3
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkojyowACgkQkKaRLQcq0GIw8ACeN6ZDk1Tu4OwjcbhIGJmV/1kb
+A4IAoKkwnnHceTmGA6y9wNAnUWFhceIH
+=smZH
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/pngcrush/files/pngcrush-1.6.10-makefile_and_missing_definitions.patch b/media-gfx/pngcrush/files/pngcrush-1.6.10-makefile_and_missing_definitions.patch
deleted file mode 100644
index 27f4177d7525..000000000000
--- a/media-gfx/pngcrush/files/pngcrush-1.6.10-makefile_and_missing_definitions.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -ruN pngcrush-1.6.10-nolib.orig/Makefile  pngcrush-1.6.10-nolib/Makefile
---- pngcrush-1.6.10-nolib.orig/Makefile	1970-01-01 02:00:00.000000000 +0200
-+++ pngcrush-1.6.10-nolib/Makefile	2008-07-30 23:01:16.000000000 +0300
-@@ -0,0 +1,69 @@
-+# Sample makefile for pngcrush using gcc and GNU make.
-+# Glenn Randers-Pehrson
-+# Last modified:  19 February 2005
-+# Kapil Hari Paranjape
-+# Last modified:  12 June 2008
-+#
-+# Invoke this makefile from a shell prompt in the usual way; for example:
-+#
-+#	make -f Makefile
-+#
-+# This makefile builds a dynamically linked executable.
-+
-+# macros --------------------------------------------------------------------
-+
-+GAS_VERSION := $(shell as --version | sed -n -e's/GNU assembler (.*) //p')
-+
-+PNGINC = /usr/include
-+
-+CC ?= gcc
-+RM = rm -f
-+
-+CFLAGS += -I. -Wall
-+
-+O = .o
-+E =
-+
-+# additional defines
-+DEFINES = -DPNG_USE_PNGGCCRD -DPNG_iCCP_SUPPORTED \
-+	-DPNG_iTXt_SUPPORTED -DPNG_USE_GLOBAL_ARRAYS \
-+	-DGAS_VERSION="\"${GAS_VERSION}\"" \
-+
-+PNGCRUSH  = pngcrush
-+
-+LIBS = -lpng -lz
-+
-+OBJS  = pngcrush$(O)
-+
-+EXES = $(PNGCRUSH)$(E)
-+
-+
-+# implicit make rules -------------------------------------------------------
-+
-+.c$(O): png.h cexcept.h $(ZHDR)
-+	$(CC) -c $(CFLAGS) $(DEFINES) $<
-+
-+
-+# dependencies --------------------------------------------------------------
-+
-+all:  $(EXES)
-+
-+png.h:
-+	ln -s $(PNGINC)/png.h png.h
-+
-+pngcrush$(O): pngcrush.c cexcept.h
-+	$(CC) -c $(CFLAGS) $(DEFINES) $<
-+
-+$(PNGCRUSH)$(E): $(OBJS)
-+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-+
-+# maintenance ---------------------------------------------------------------
-+
-+clean:
-+	$(RM) $(EXES) $(OBJS) png.h
-+
-+install:
-+	mkdir -p $(DESTDIR)/usr/bin/
-+	cp $(PNGCRUSH)$(E) $(DESTDIR)/usr/bin/
-+	chmod 0755 $(DESTDIR)/usr/bin/$(PNGCRUSH)$(E)
-+
-
-diff -ruN pngcrush-1.6.10-nolib.orig/pngcrush.c  pngcrush-1.6.10-nolib/pngcrush.c
---- pngcrush-1.6.10-nolib.orig/pngcrush.c	2008-10-15 01:00:58.000000000 +0400
-+++ pngcrush-1.6.10-nolib/pngcrush.c	2008-10-15 01:02:30.000000000 +0400
-@@ -2821,7 +2821,7 @@
- #if !defined(PNG_cHRM_SUPPORTED) || !defined(PNG_hIST_SUPPORTED) || \
-     !defined(PNG_iCCP_SUPPORTED) || !defined(PNG_sCAL_SUPPORTED) || \
-     !defined(PNG_pCAL_SUPPORTED) || !defined(PNG_sPLT_SUPPORTED) || \
--    !defined(PNG_tIME_SUPPORTED)
-+    !defined(PNG_sTER_SUPPORTED) || !defined(PNG_tIME_SUPPORTED)
-                         png_byte chunk_name[5];
-                         chunk_name[4] = '\0';
- #endif
-
diff --git a/media-gfx/pngcrush/pngcrush-1.6.10.ebuild b/media-gfx/pngcrush/pngcrush-1.6.10.ebuild
deleted file mode 100644
index eff6f022c2aa..000000000000
--- a/media-gfx/pngcrush/pngcrush-1.6.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.6.10.ebuild,v 1.4 2008/11/30 21:32:05 dertobi123 Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Portable Network Graphics (PNG) optimizing utility"
-HOMEPAGE="http://pmt.sourceforge.net/pngcrush"
-SRC_URI="mirror://sourceforge/pmt/${P}-nolib.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=media-libs/libpng-1.2.31"
-
-S=${WORKDIR}/${P}-nolib
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile_and_missing_definitions.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake || die "emake failed."
-}
-
-src_install() {
-	dobin ${PN} || die "dobin failed."
-	dodoc *.txt
-}
diff --git a/media-gfx/pngcrush/pngcrush-1.6.14.ebuild b/media-gfx/pngcrush/pngcrush-1.6.14.ebuild
deleted file mode 100644
index 3bafcb410300..000000000000
--- a/media-gfx/pngcrush/pngcrush-1.6.14.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.6.14.ebuild,v 1.1 2009/03/14 11:27:22 maekke Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Portable Network Graphics (PNG) optimizing utility"
-HOMEPAGE="http://pmt.sourceforge.net/pngcrush"
-SRC_URI="mirror://sourceforge/pmt/${P}-nolib.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libpng-1.2.31"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}-nolib"
-
-src_unpack() {
-	unpack ${A}
-	cp "${FILESDIR}"/Makefile "${S}" || die
-}
-
-src_compile() {
-	tc-export CC
-	emake || die "emake failed."
-}
-
-src_install() {
-	dobin ${PN} || die "dobin failed."
-	dodoc *.txt
-}