Strip makefile down and version bump.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 55 insertions, 75 deletions

diff --git a/media-gfx/pngcrush/ChangeLog b/media-gfx/pngcrush/ChangeLog
index 4c2f57916fb8..5f06774d651c 100644
--- a/media-gfx/pngcrush/ChangeLog
+++ b/media-gfx/pngcrush/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/pngcrush
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.40 2009/03/14 11:27:22 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.41 2009/04/02 23:22:40 vapier Exp $
+
+*pngcrush-1.6.15 (02 Apr 2009)
+
+  02 Apr 2009; Mike Frysinger <vapier@gentoo.org> files/Makefile,
+  +pngcrush-1.6.15.ebuild:
+  Strip makefile down and version bump.
 
 *pngcrush-1.6.14 (14 Mar 2009)
 
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index e9522a2c1527..4a36df86dbbf 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX Makefile 1461 RMD160 15d84c28dd4d0de15e285b61e72b314610d17264 SHA1 e8337d658e561f3de0beb58787e5ffc7fea3734b SHA256 0369c8d7e42dd2b795e3391e5b7eeb3901105a813ca062d1e43784e70328c0ac
+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
-MISC ChangeLog 5041 RMD160 e9ca0cc33c6fbaf9f0bdbefbabe3146cb9705cd9 SHA1 4873b3729e84c252b75c58ff4d0abf8e394c0a9c SHA256 cb9d7b69d0becc676bfb09ce9b134508eda800097d1ace28b5b4da84189937ac
+EBUILD pngcrush-1.6.15.ebuild 778 RMD160 aa5ea213f0c083327dc21b264e244031b50025f2 SHA1 8f3cefa745d59bf827eef59d5ab484ca815f5317 SHA256 f74f23f4a8d74eb493e14d46ef6e8fc0527222058868137ec580d41800412286
+MISC ChangeLog 5207 RMD160 f7d92053460ed63c1a7b205f1cbce075eb4f69dd SHA1 c41312f0a3124b45d657aa294b15418df882dd23 SHA256 0bde1eb0bdfadd73398f0f1dac2041a366f2f29777aae5b32a38eb221176ca29
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkm7lPEACgkQkKaRLQcq0GL0MQCffS0yg2wbJE8KzmR3rK8jWYWW
-AAoAn1VAbL6VBJNLzqHkxeFafuybxpji
-=uU1h
+iEYEARECAAYFAknVSMYACgkQn/5bYzqsSmFb2QCeIJjWN0ecRULAyO35UueahRwr
+EpMAoMbBiBK5dI8t5hwIVUidt1Fmfr+D
+=ldkZ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/pngcrush/files/Makefile b/media-gfx/pngcrush/files/Makefile
index 22e7752ddefa..24e215b46b8f 100644
--- a/media-gfx/pngcrush/files/Makefile
+++ b/media-gfx/pngcrush/files/Makefile
@@ -1,69 +1,7 @@
-# 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
-
+GAS_VERSION = $(shell as --version | sed -n -e's/GNU assembler (.*) //p')
 CFLAGS += -I. -Wall
-
-O = .o
-E =
-
-# additional defines
-DEFINES = -DPNG_USE_PNGGCCRD -DPNG_iCCP_SUPPORTED \
+CPPFLAGS += -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)
-
+	-DGAS_VERSION="\"${GAS_VERSION}\""
+LDLIBS += -lpng -lz
+all: pngcrush
diff --git a/media-gfx/pngcrush/pngcrush-1.6.15.ebuild b/media-gfx/pngcrush/pngcrush-1.6.15.ebuild
new file mode 100644
index 000000000000..c3b7f655042a
--- /dev/null
+++ b/media-gfx/pngcrush/pngcrush-1.6.15.ebuild
@@ -0,0 +1,34 @@
+# 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.15.ebuild,v 1.1 2009/04/02 23:22:40 vapier 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
+}