Cleanup

(Portage version: 2.1.4)

5 files changed, 27 insertions, 90 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/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
 }