version bump

Package-Manager: portage-2.0.51.22-r3

14 files changed, 25 insertions, 306 deletions

diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index 43e61f87969e..d76d53e191c3 100644
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-gfx/optipng
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.25 2006/01/28 19:31:48 reb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.26 2006/10/20 15:58:19 taviso Exp $
+
+*optipng-0.5.4 (20 Oct 2006)
+
+  20 Oct 2006; Tavis Ormandy <taviso@gentoo.org>
+  -files/optipng-0.4.5-more-makefile-options.diff,
+  -files/optipng-more-makefile-options.diff, -optipng-0.4.5.ebuild,
+  -optipng-0.4.7.ebuild, -optipng-0.4.8.ebuild, +optipng-0.5.4.ebuild,
+  -optipng-0.5.ebuild:
+  version bump, new version includes manual.
+  remove stale ebuilds.
 
 *optipng-0.5 (28 Jan 2006)
 
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index 48ed27a0f4da..37cc5c576be9 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,25 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 57f8e7a3676e30f4b4b980b0c039ecfe ChangeLog 3196
-MD5 cbb26191f6029021230a63ee5ac9a062 files/digest-optipng-0.4.5 65
-MD5 6bb7aeb92d547a0979d3bc3ee21b9319 files/digest-optipng-0.4.7 65
-MD5 5d355d799e3bb4eb76b567156932b803 files/digest-optipng-0.4.8 65
+MD5 0fd472fecce09cab53d03f4d7945e1f4 optipng-0.4.8-r1.ebuild 934
+MD5 0ae888c5ffe091fb0c00a6c24ddff640 optipng-0.5.4.ebuild 914
+MD5 87e54ab165e01baeb4493d7c0c49ca8b ChangeLog 3561
+MD5 d1fd781dd463a1e5d87df46fad732ec6 metadata.xml 400
 MD5 5d355d799e3bb4eb76b567156932b803 files/digest-optipng-0.4.8-r1 65
-MD5 c2c40dbd91b311b91876a658ca67319f files/digest-optipng-0.5 63
-MD5 95e87b9aa8430dbe8d14268fb922a818 files/optipng-0.4.5-more-makefile-options.diff 2271
-MD5 eab5451d70e601bb80438372adbcc3cd files/optipng-more-makefile-options.diff 1423
+MD5 4b6d069681634e0ccc0afcb487882785 files/digest-optipng-0.5.4 66
 MD5 ee642ac85110cd1a39ac0f53a753289e files/optipng-zlib-security.diff 1455
-MD5 d1fd781dd463a1e5d87df46fad732ec6 metadata.xml 400
-MD5 86d23c83773f704f2e0716a2bc035cdc optipng-0.4.5.ebuild 2587
-MD5 c7fc1e1bf37885691cf1d6733401eb03 optipng-0.4.7.ebuild 922
-MD5 865e94bfc19aedcb3eb7d6c63afb25bf optipng-0.4.8-r1.ebuild 935
-MD5 24e4516150c74ca051b37bc100498e46 optipng-0.4.8.ebuild 931
-MD5 cea4bd276bad34c7a1341c9115294f2f optipng-0.5.ebuild 919
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD28bC3mryvu3JUUURAnrbAJsE0MMpYamUu9JVE5NjmD6ADLGibgCeM3Z4
-vHy0aQ7uo4QrMrc/kI/Zq58=
-=rQCm
------END PGP SIGNATURE-----
diff --git a/media-gfx/optipng/files/digest-optipng-0.4.5 b/media-gfx/optipng/files/digest-optipng-0.4.5
deleted file mode 100644
index bab23dfb0b17..000000000000
--- a/media-gfx/optipng/files/digest-optipng-0.4.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fe3c1b7f605ee3e51c321987c83e2252 optipng-0.4.5.tar.gz 591473
diff --git a/media-gfx/optipng/files/digest-optipng-0.4.7 b/media-gfx/optipng/files/digest-optipng-0.4.7
deleted file mode 100644
index ca9373c6ec1f..000000000000
--- a/media-gfx/optipng/files/digest-optipng-0.4.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 673337f61d53830541ff987f50025b96 optipng-0.4.7.tar.gz 658952
diff --git a/media-gfx/optipng/files/digest-optipng-0.4.8 b/media-gfx/optipng/files/digest-optipng-0.4.8
deleted file mode 100644
index 88f6d9476884..000000000000
--- a/media-gfx/optipng/files/digest-optipng-0.4.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f3648f06a389d7bbb1e6bf309581b6a optipng-0.4.8.tar.gz 666570
diff --git a/media-gfx/optipng/files/digest-optipng-0.5 b/media-gfx/optipng/files/digest-optipng-0.5
deleted file mode 100644
index 5c406f99a86c..000000000000
--- a/media-gfx/optipng/files/digest-optipng-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3964fdf24e6de62fc994850c548dd13f optipng-0.5.tar.gz 746749
diff --git a/media-gfx/optipng/files/digest-optipng-0.5.4 b/media-gfx/optipng/files/digest-optipng-0.5.4
new file mode 100644
index 000000000000..8550fd580ad0
--- /dev/null
+++ b/media-gfx/optipng/files/digest-optipng-0.5.4
@@ -0,0 +1 @@
+MD5 8d989971e674a06b55e17fc5b70c41aa optipng-0.5.4.tar.gz 1094572
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
deleted file mode 100644
index 91f16e1b2b05..000000000000
--- a/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff
+++ /dev/null
@@ -1,68 +0,0 @@
---- 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-03 09:21:38.958025528 +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
-@@ -27,11 +45,14 @@
- 	cp ../lib-cos/zlib/libz.a libz.a
- 
- ../lib-cos/libpng/libpng.a: ../lib-cos/zlib/libz.a
--	cd ../lib-cos/libpng; \
--	${MAKE} -f scripts/makefile.gcc; \
--	cd ../../src
-+ifeq (${usemmx},1)
-+	cd ../lib-cos/libpng; ${MAKE} -f scripts/makefile.gcmmx; cd ../../src
-+else
-+	cd ../lib-cos/libpng; ${MAKE} -f scripts/makefile.gcc; cd ../../src
-+endif
-+
- 
- ../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/files/optipng-more-makefile-options.diff b/media-gfx/optipng/files/optipng-more-makefile-options.diff
deleted file mode 100644
index 872bc634db49..000000000000
--- a/media-gfx/optipng/files/optipng-more-makefile-options.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- scripts/Makefile.gcc.orig	2003-10-31 11:49:17.000000000 +0000
-+++ scripts/Makefile.gcc	2003-10-31 12:17:46.000000000 +0000
-@@ -3,19 +3,26 @@
- 
- all: optipng
- 
--optipng: optipng.o opngio.o opngreduc.o cbitset.o \
--  wildargs.o libpng.a libz.a
--	gcc -s -o optipng optipng.o opngio.o opngreduc.o cbitset.o \
--	  wildargs.o libpng.a libz.a
-+optipng: CFLAGS += -I../lib-cos/zlib -I../lib-cos/libpng
-+optipng: optipng.o opngio.o opngreduc.o cbitset.o libpng.a libz.a
-+	${CC} ${LDFLAGS} -o optipng optipng.o opngio.o opngreduc.o cbitset.o libpng.a libz.a
-+
-+optipng-extpng: CFLAGS += -I../lib-cos/libpng
-+optipng-extpng: optipng.o opngio.o opngreduc.o cbitset.o libz.a
-+	${CC} ${LDFLAGS} -lpng -o optipng optipng.o opngio.o opngreduc.o cbitset.o libz.a
-+
-+optipng-extzlib: CFLAGS += -I../lib-cos/zlib
-+optipng-extzlib: optipng.o opngio.o opngreduc.o cbitset.o libpng.a
-+	${CC} ${LDFLAGS} -lz -o optipng optipng.o opngio.o opngreduc.o cbitset.o libpng.a
-+
-+optipng-allext: optipng.o opngio.o opngreduc.o cbitset.o
-+	${CC} ${LDFLAGS} -lpng -lz -o optipng optipng.o opngio.o opngreduc.o cbitset.o
- 
- .c.o: #png.h opng.h
--	gcc -c -O2 -I../lib-cos/zlib -I../lib-cos/libpng -Wall $*.c
-+	gcc ${CFLAGS} -c $*.c
- 
- cbitset.o: cbitset.c cbitset.h
--	gcc -c -O2 -Wall $*.c
--
--wildargs.o: xtra/wildargs.c
--	gcc -c -O2 xtra/wildargs.c
-+	gcc ${CFLAGS} -c $*.c
- 
- libpng.a: ../lib-cos/libpng/libpng.a
- 	cp ../lib-cos/libpng/libpng.a libpng.a
diff --git a/media-gfx/optipng/optipng-0.4.5.ebuild b/media-gfx/optipng/optipng-0.4.5.ebuild
deleted file mode 100644
index 7261d527214b..000000000000
--- a/media-gfx/optipng/optipng-0.4.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.10 2005/01/13 23:49:08 taviso Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Find the optimal compression settings for your png files"
-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 ~amd64"
-
-IUSE="ext-png ext-zlib mmx"
-
-DEPEND="ext-png? ( media-libs/libpng )
-	ext-zlib? ( sys-libs/zlib )
-	virtual/libc"
-
-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?"
-
-		usemmx=1
-	else
-		usemmx=0
-	fi
-
-	# only defined in bundled zlib
-	if use ext-zlib || use ext-png; then
-		append-flags -DZ_RLE=3
-	fi
-
-	export usemmx 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
-}
-
-pkg_postinst() {
-	if use ext-zlib || use ext-png; then
-		ewarn "the ext-zlib and ext-png USE flags are designed for users"
-		ewarn "that require special modifications to libpng or zlib."
-		ewarn
-		ewarn "the bundled libraries are highly optimised specifically"
-		ewarn "for use with compressing png files, and should be used if"
-		ewarn "possible."
-		ewarn
-		ewarn "if you set these flags in error, please unset them and"
-		ewarn "re-merge ${PN}."
-	fi
-}
diff --git a/media-gfx/optipng/optipng-0.4.7.ebuild b/media-gfx/optipng/optipng-0.4.7.ebuild
deleted file mode 100644
index b9704203cfb3..000000000000
--- a/media-gfx/optipng/optipng-0.4.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.7.ebuild,v 1.4 2005/06/12 17:23:20 kloeri Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Find the optimal compression settings for your png files"
-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="alpha ppc x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	cd ${S}/src
-	sed -i -e 's!-O2!${CFLAGS}!' scripts/gcc.mak
-	emake -f scripts/gcc.mak optipng CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die
-
-	# 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
-}
diff --git a/media-gfx/optipng/optipng-0.4.8-r1.ebuild b/media-gfx/optipng/optipng-0.4.8-r1.ebuild
index fa4af6fb7f88..69856c9f97e6 100644
--- a/media-gfx/optipng/optipng-0.4.8-r1.ebuild
+++ b/media-gfx/optipng/optipng-0.4.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.8-r1.ebuild,v 1.4 2005/10/30 19:00:56 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.8-r1.ebuild,v 1.5 2006/10/20 15:58:19 taviso Exp $
 
 inherit eutils
 
diff --git a/media-gfx/optipng/optipng-0.4.8.ebuild b/media-gfx/optipng/optipng-0.4.8.ebuild
deleted file mode 100644
index a1c72077acb1..000000000000
--- a/media-gfx/optipng/optipng-0.4.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.8.ebuild,v 1.2 2005/07/13 19:27:29 blubb Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Find the optimal compression settings for your png files"
-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="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	cd ${S}/src
-	sed -i -e 's!-O2!${CFLAGS}!' scripts/gcc.mak
-	emake -f scripts/gcc.mak optipng \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-
-	# 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
-}
diff --git a/media-gfx/optipng/optipng-0.5.ebuild b/media-gfx/optipng/optipng-0.5.4.ebuild
index d18fae62d483..83ac57fc7212 100644
--- a/media-gfx/optipng/optipng-0.5.ebuild
+++ b/media-gfx/optipng/optipng-0.5.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.5.ebuild,v 1.1 2006/01/28 19:31:48 reb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.5.4.ebuild,v 1.1 2006/10/20 15:58:19 taviso Exp $
 
 inherit eutils
 
 DESCRIPTION="Find the optimal compression settings for your png files"
-SRC_URI="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/${P}.tar.gz"
-HOMEPAGE="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/"
+SRC_URI="mirror://sourceforge/optipng/${P}.tar.gz"
+HOMEPAGE="http://optipng.sourceforge.net/"
 
 LICENSE="as-is"
 
@@ -28,6 +28,7 @@ src_compile() {
 
 src_install() {
 	dobin ${S}/src/optipng
-	dodoc ${S}/doc/{CAVEAT.txt,DESIGN.txt,FEATURES.txt,HISTORY.txt,LICENSE.txt,TODO.txt,USAGE.txt}
-	dohtml ${S}/doc/index.html
+	dodoc ${S}/doc/{CAVEAT.txt,HISTORY.txt,TODO.txt,USAGE.txt}
+	dohtml ${S}/doc/{design.html,features.html,guide.html,thanks.html}
+	doman ${S}/man/optipng.1
 }