bump

5 files changed, 161 insertions, 4 deletions

diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index 08b91fb03257..79a791b1c9fa 100644
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/optipng
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.6 2004/04/27 21:47:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.7 2004/06/02 22:54:30 taviso Exp $
+
+*optipng-0.4.5 (02 Jun 2004)
+
+  02 Jun 2004; Tavis Ormandy <taviso@gentoo.org> optipng-0.4.5.ebuild:
+  bump
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> optipng-0.4.3.ebuild:
   Add inherit eutils
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index ae2d3c51ca7b..34a8546df78b 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,8 +1,10 @@
-MD5 d1fd781dd463a1e5d87df46fad732ec6 metadata.xml 400
+MD5 b3baa13bb3accb81ba7461967a9d2e75 optipng-0.4.3-r1.ebuild 1783
 MD5 6394bac8d59dd1981322344337db62ef optipng-0.4.3.ebuild 1782
+MD5 b3baa13bb3accb81ba7461967a9d2e75 optipng-0.4.5.ebuild 1783
 MD5 36aa6c8889c3cad7a3ee568db28657d3 ChangeLog 1023
-MD5 b3baa13bb3accb81ba7461967a9d2e75 optipng-0.4.3-r1.ebuild 1783
+MD5 d1fd781dd463a1e5d87df46fad732ec6 metadata.xml 400
+MD5 776935461c2653df2b47f23f7b7c60d7 files/digest-optipng-0.4.3-r1 65
 MD5 776935461c2653df2b47f23f7b7c60d7 files/digest-optipng-0.4.3 65
+MD5 cbb26191f6029021230a63ee5ac9a062 files/digest-optipng-0.4.5 65
 MD5 eab5451d70e601bb80438372adbcc3cd files/optipng-more-makefile-options.diff 1423
-MD5 776935461c2653df2b47f23f7b7c60d7 files/digest-optipng-0.4.3-r1 65
 MD5 ae0b66a3fd8e8cff827c907900a5d63c files/optipng-0.4.3-r1-more-makefile-options.diff 1552
diff --git a/media-gfx/optipng/files/digest-optipng-0.4.5 b/media-gfx/optipng/files/digest-optipng-0.4.5
new file mode 100644
index 000000000000..bab23dfb0b17
--- /dev/null
+++ b/media-gfx/optipng/files/digest-optipng-0.4.5
@@ -0,0 +1 @@
+MD5 fe3c1b7f605ee3e51c321987c83e2252 optipng-0.4.5.tar.gz 591473
diff --git a/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff b/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff
new file mode 100644
index 000000000000..4506ea2673b5
--- /dev/null
+++ b/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff
@@ -0,0 +1,62 @@
+--- optipng-0.4.5.orig/src/scripts/Makefile.gcc	2004-05-31 10:38:00.000000000 +0100
++++ optipng-0.4.5/src/scripts/Makefile.gcc	2004-06-02 23:49:49.134972424 +0100
+@@ -3,22 +3,40 @@
+ 
+ all: optipng
+ 
++optipng: CFLAGS += -I../lib-cos/zlib -I../lib-cos/libpng
+ optipng: optipng.o opngio.o opngreduc.o cbitset.o osys.o \
+   wildargs.o libpng.a libz.a
+-	gcc -s -o optipng optipng.o opngio.o opngreduc.o cbitset.o osys.o \
+-	  wildargs.o libpng.a libz.a
++	${CC} ${LDFLAGS} -o optipng optipng.o opngio.o \
++	opngreduc.o cbitset.o osys.o wildargs.o libpng.a libz.a
++
++optipng-extpng: CFLAGS += -I../lib-cos/zlib
++optipng-extpng: optipng.o opngio.o opngreduc.o cbitset.o osys.o \
++  wildargs.o libz.a
++	${CC} ${LDFLAGS} -lpng -o optipng optipng.o opngio.o \
++	opngreduc.o cbitset.o osys.o wildargs.o libz.a
++
++optipng-extzlib: CFLAGS += -I../lib-cos/libpng
++optipng-extzlib: optipng.o opngio.o opngreduc.o cbitset.o osys.o \
++  wildargs.o libpng.a
++	${CC} ${LDFLAGS} -lz -o optipng optipng.o opngio.o \
++	opngreduc.o cbitset.o osys.o wildargs.o libpng.a
++
++optipng-allext: optipng.o opngio.o opngreduc.o cbitset.o osys.o \
++  wildargs.o
++	${CC} ${LDFLAGS} -lpng -lz -o optipng optipng.o opngio.o \
++	opngreduc.o cbitset.o osys.o wildargs.o
+ 
+ .c.o: #png.h opng.h
+-	gcc -c -O2 -I../lib-cos/zlib -I../lib-cos/libpng -Wall $*.c
++	${CC} ${CFLAGS} -c -Wall $*.c
+ 
+ cbitset.o: cbitset.c cbitset.h
+-	gcc -c -O2 -Wall $*.c
++	${CC} ${CFLAGS} -c -Wall $*.c
+ 
+ osys.o: osys.c osys.h
+-	gcc -c -O2 -Wall $*.c
++	${CC} ${CFLAGS} -c -Wall $*.c
+ 
+ wildargs.o: xtra/wildargs.c
+-	gcc -c -O2 xtra/wildargs.c
++	${CC} ${CFLAGS} -c xtra/wildargs.c
+ 
+ libpng.a: ../lib-cos/libpng/libpng.a
+ 	cp ../lib-cos/libpng/libpng.a libpng.a
+@@ -28,10 +46,10 @@
+ 
+ ../lib-cos/libpng/libpng.a: ../lib-cos/zlib/libz.a
+ 	cd ../lib-cos/libpng; \
+-	${MAKE} -f scripts/makefile.gcc; \
++	${MAKE} -f scripts/${pngmake}; \
+ 	cd ../../src
+ 
+ ../lib-cos/zlib/libz.a:
+ 	cd ../lib-cos/zlib; \
+-	${MAKE} CC="gcc" CFLAGS="-O3 -DNO_GZCOMPRESS -DNO_GZIO" libz.a; \
++	${MAKE} CC="${CC}" CFLAGS="${CFLAGS} -DNO_GZCOMPRESS -DNO_GZIO" libz.a; \
+ 	cd ../../src
diff --git a/media-gfx/optipng/optipng-0.4.5.ebuild b/media-gfx/optipng/optipng-0.4.5.ebuild
new file mode 100644
index 000000000000..a74e1a4d4a62
--- /dev/null
+++ b/media-gfx/optipng/optipng-0.4.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.5.ebuild,v 1.1 2004/06/02 22:54:30 taviso Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="PNG optimizing utility"
+SRC_URI="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/${P}.tar.gz"
+HOMEPAGE="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/"
+
+LICENSE="as-is"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha"
+
+IUSE="ext-png ext-zlib mmx"
+
+DEPEND="ext-png? ( media-libs/libpng )
+	ext-zlib? ( sys-libs/zlib )
+	virtual/glibc"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+
+	# optionally use the system binaries, rather than the bundled
+	# patched versions (some archs/configurations require patches 
+	# not included here)
+	cd ${S}/src; epatch ${FILESDIR}/${PF}-more-makefile-options.diff
+}
+
+src_compile() {
+	cd ${S}/src
+
+	append-ldflags -lm
+
+	# use libpng's mmx makefile if requested
+	if use mmx; then
+
+		# do amd64/ia64 support mmx?
+		use x86 || ewarn "mmx flag set, but not on x86?"
+
+		pngmake=makefile.gcmmx
+	else
+		pngmake=makefile.gcc
+	fi
+
+	# only defined in bundled zlib?
+	if use ext-zlib || use ext-png; then
+		append-flags -DZ_RLE=3
+	fi
+
+	export pngmake LDFLAGS
+
+	# some logic to decide which version to build...
+	if ! use ext-png; then
+		if ! use ext-zlib; then
+			# use the included patched zlib/libpng
+			einfo "Building ${PN} with bundled libraries..."
+			emake -f scripts/Makefile.gcc optipng
+		else
+			# use the system zlib.
+			einfo "Building ${PN} with bundled libpng..."
+			emake -f scripts/Makefile.gcc optipng-extzlib
+		fi
+	else
+		if use ext-zlib; then
+			# use the system zlib and libpng.
+			einfo "Building ${PN} without bundled libraries..."
+			emake -f scripts/Makefile.gcc optipng-allext
+		else
+			# use the system libpng.
+			einfo "Building ${PN} with bundled zlib..."
+			emake -f scripts/Makefile.gcc optipng-extpng
+		fi
+	fi
+
+	# some feedback everything went ok...
+	echo; ls -l optipng; size optipng
+}
+
+src_install() {
+	dobin ${S}/src/optipng
+	dodoc ${S}/doc/{CAVEAT,DESIGN,FEATURES,HISTORY,LICENSE,README,TODO,USAGE}
+	dohtml ${S}/doc/index.html
+}