Cleanup

Package-Manager: portage-2.1.4

6 files changed, 40 insertions, 96 deletions

diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index 351be69d5719..7138469d9918 100644
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/optipng
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.33 2007/12/25 16:00:46 phreak Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.34 2008/01/31 18:07:45 nyhm Exp $
+
+  31 Jan 2008; Tristan Heaven <nyhm@gentoo.org>
+  -files/optipng-zlib-security.diff, metadata.xml, -optipng-0.4.8-r1.ebuild,
+  optipng-0.5.5.ebuild:
+  Cleanup
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing taviso from metadata.xml as per #202471. Assigning to
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index 0e958df1f01e..29d9726b712f 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,9 +1,16 @@
-AUX optipng-zlib-security.diff 1455 RMD160 247b006009d8abb32f54c2d9b581714ee96d258c SHA1 57567d6cdc4e9f6077fca6be5f2fc35b5b66217e SHA256 439c11e536acda6c410d059a27c2fe9b8dd72a5d181e6807dbf79567c2182bd8
-DIST optipng-0.4.8.tar.gz 666570 RMD160 0484daacbdba1b7e7c424d3af24f34b9a7e3177f SHA1 e1b7c00d276828bb9324011d1a19c7916307fdff SHA256 afeaf18ba5af6bf750c1fe66598fec57b81ed7c85bfc243f003ac8e53270aa41
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST optipng-0.5.4.tar.gz 1094572 RMD160 04afd1ef56eb34dc5bba652d9e2bc48a0dc56d61 SHA1 c9d2d2d9b75b8feae71c424224e50f2e3b449050 SHA256 3074f7ebac74683c12b805d58f836400cbec51355fad13f47d46775792ad35ab
 DIST optipng-0.5.5.tar.gz 1109905 RMD160 39e4b0587e4bcc7cb705e329dde35b1f9426b1d0 SHA1 670da3b01da903fa04886e4b6e625648570b3d9c SHA256 79b5c9c728221168e905bc091ef9c64a392278967ccfbbdcff3614ef4f43938f
-EBUILD optipng-0.4.8-r1.ebuild 924 RMD160 3de92b8695f5ecaa97f290eb74e9b396b54ec112 SHA1 336324257b91bcb36021d98aa37400440f23259d SHA256 4dafaacae189e9cd0cb1ec03c093ad0023f32927ad65f202fb6f93a9d4986049
 EBUILD optipng-0.5.4.ebuild 900 RMD160 0b22949cacb06cdde4e903846056207b8176e173 SHA1 abbed2fa15d113fa1ef513aa8b90bf146a29ec3a SHA256 1d3229a4eeda391b3cd78cc9467ecb379ee6a873c8ff66b399e640789af127fd
-EBUILD optipng-0.5.5.ebuild 903 RMD160 047bd193ede61add3b2fc29933b02e36f969a75d SHA1 d578f422b8e3d997b81841fde6709c008f325691 SHA256 ed27c1576bb2f77e4479e2e420e78dd7f140be2457d2682b4b6e43779a646419
-MISC ChangeLog 4376 RMD160 24aca90dfbf828c520dce5f69af4a1740f4ca463 SHA1 d22e71a9d1aeb587554d83abfe51f3c07ba4f0d3 SHA256 9eab79ffff3a96d62726d1ad24889d6f8002111f5d3781e7d5cefb5ba2ce0052
-MISC metadata.xml 401 RMD160 e473f2168cf4e12719dec0327c2bbbdf180ee4c6 SHA1 be76e925a653b2d036d04ce8f2a22f695f344bbf SHA256 01b65f39b017690d097e062156f72380535ae873cff62e94b8e462c06356bc39
+EBUILD optipng-0.5.5.ebuild 865 RMD160 5cbe12cb05fa70540d572db64ebcdffba3fb4c5c SHA1 125a687e9c34b9c794ade83217f851f9332f97d1 SHA256 151fc3704f483bfbea573e8f80ef2187302842ecfa60f284a83c3af61adb502d
+MISC ChangeLog 4534 RMD160 a86b8b4576f197c8334bfe6b1dbbff2924417db9 SHA1 cfdaf968b183c377bf560bb7423cdf8e4fcb3cea SHA256 fbd1ab0480fc3c02eb0c549400c914cc5a455c32ecd247da457bbc37c6799d2f
+MISC metadata.xml 253 RMD160 33155d552badd3133f93e25bfcd82b62d296deb9 SHA1 b30245f00aae656e7a024b2ab4b8ad8e5549250f SHA256 2ddc2634b7e897546998869bcf0803bfbf4940cb75da9e45a2a8f421b4dabfd3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHog53dz7hIScOURERAsc7AKC0XgQQU7Wg3mCiGVtXlumZAkEctQCfTSBs
+gJSIuUahgTnIOenkN2Io/FI=
+=CpVj
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/optipng/files/optipng-zlib-security.diff b/media-gfx/optipng/files/optipng-zlib-security.diff
deleted file mode 100644
index 157ae8927af0..000000000000
--- a/media-gfx/optipng/files/optipng-zlib-security.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru optipng-0.4.8.orig/lib/zlib/inftrees.c optipng-0.4.8/lib/zlib/inftrees.c
---- optipng-0.4.8.orig/lib/zlib/inftrees.c	2004-09-15 15:30:06.000000000 +0100
-+++ optipng-0.4.8/lib/zlib/inftrees.c	2005-10-07 17:13:03.069420200 +0100
-@@ -134,7 +134,7 @@
-         left -= count[len];
-         if (left < 0) return -1;        /* over-subscribed */
-     }
--    if (left > 0 && (type == CODES || (codes - count[0] != 1)))
-+    if (left > 0 && (type == CODES || max != 1))
-         return -1;                      /* incomplete set */
- 
-     /* generate offsets into symbol table for each length for sorting */
-diff -ru optipng-0.4.8.orig/lib/zlib/inftrees.h optipng-0.4.8/lib/zlib/inftrees.h
---- optipng-0.4.8.orig/lib/zlib/inftrees.h	2003-08-10 23:15:50.000000000 +0100
-+++ optipng-0.4.8/lib/zlib/inftrees.h	2005-10-07 17:13:49.953292768 +0100
-@@ -36,12 +36,12 @@
-  */
- 
- /* Maximum size of dynamic tree.  The maximum found in a long but non-
--   exhaustive search was 1004 code structures (850 for length/literals
--   and 154 for distances, the latter actually the result of an
-+   exhaustive search was 1444 code structures (852 for length/literals
-+   and 592 for distances, the latter actually the result of an
-    exhaustive search).  The true maximum is not known, but the value
-    below is more than safe. */
--#define ENOUGH 1440
--#define MAXD 154
-+#define ENOUGH 2048
-+#define MAXD 592
- 
- /* Type of code to build for inftable() */
- typedef enum {
diff --git a/media-gfx/optipng/metadata.xml b/media-gfx/optipng/metadata.xml
index 8d08a5438c91..dc05e68c4faa 100644
--- a/media-gfx/optipng/metadata.xml
+++ b/media-gfx/optipng/metadata.xml
@@ -3,10 +3,7 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>nyhm@gentoo.org</email>
+		<name>Tristan Heaven</name>
 	</maintainer>
-	<longdescription lang="en">
-		OptiPNG is a PNG optimizer that recompresses the image files to a
-		smaller size, without losing any information.
-	</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/optipng/optipng-0.4.8-r1.ebuild b/media-gfx/optipng/optipng-0.4.8-r1.ebuild
deleted file mode 100644
index b2c947631014..000000000000
--- a/media-gfx/optipng/optipng-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 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.6 2007/05/21 19:59:35 grobian 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/"
-
-LICENSE="as-is"
-
-SLOT="0"
-KEYWORDS="alpha ~amd64 ppc x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e 's!-O2!${CFLAGS}!' scripts/gcc.mak
-	epatch ${FILESDIR}/optipng-zlib-security.diff
-}
-
-src_compile() {
-	emake -C ${S}/src -f ${S}/src/scripts/gcc.mak optipng \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	dobin ${S}/src/optipng
-	dodoc ${S}/doc/{CAVEAT,DESIGN,FEATURES,HISTORY,LICENSE,TODO,USAGE}
-	dohtml ${S}/doc/index.html
-}
diff --git a/media-gfx/optipng/optipng-0.5.5.ebuild b/media-gfx/optipng/optipng-0.5.5.ebuild
index 09216d33221e..8b5fd4fa6b52 100644
--- a/media-gfx/optipng/optipng-0.5.5.ebuild
+++ b/media-gfx/optipng/optipng-0.5.5.ebuild
@@ -1,34 +1,35 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.5.5.ebuild,v 1.1 2007/07/10 23:47:40 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.5.5.ebuild,v 1.2 2008/01/31 18:07:45 nyhm Exp $
 
-inherit eutils
-
-DESCRIPTION="Find the optimal compression settings for your png files"
-SRC_URI="mirror://sourceforge/optipng/${P}.tar.gz"
+DESCRIPTION="Compress PNG files without affecting image quality"
 HOMEPAGE="http://optipng.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="as-is"
-
+LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
-	sed -i -e 's!-O2!${CFLAGS}!' ${S}/src/scripts/gcc.mak
+	cd "${S}"
+	sed -i \
+		-e "s:-O2:${CFLAGS}:" \
+		-e "s:-s:${LDFLAGS}:" \
+		src/scripts/gcc.mak \
+		lib/libpng/scripts/makefile.gcc \
+		lib/pngxtern/scripts/gcc.mak \
+		|| die "sed failed"
 }
 
 src_compile() {
-	emake -C ${S}/src -f ${S}/src/scripts/gcc.mak optipng \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+	emake -C src -f scripts/gcc.mak || die "emake failed"
 }
 
 src_install() {
-	dobin ${S}/src/optipng
-	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
+	dobin src/optipng || die "dobin failed"
+	dodoc README.txt doc/*.txt
+	dohtml doc/*.html
+	doman man/optipng.1
 }