3 files changed, 6 insertions, 48 deletions
diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index b2dfcf170a6d..5d4820f2df98 100644
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/optipng
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.56 2010/04/13 18:26:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.57 2010/04/29 15:41:18 ssuominen Exp $
+
+  29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> optipng-0.6.3.ebuild:
+  amd64 stable wrt #306359
 
   13 Apr 2010; Raúl Porcel <armin76@gentoo.org> optipng-0.6.3.ebuild:
   alpha stable wrt #306359
diff --git a/media-gfx/optipng/optipng-0.6.2-r1.ebuild b/media-gfx/optipng/optipng-0.6.2-r1.ebuild
deleted file mode 100644
index 84f513258e2e..000000000000
--- a/media-gfx/optipng/optipng-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.6.2-r1.ebuild,v 1.4 2009/03/06 16:27:44 armin76 Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Compress PNG files without affecting image quality"
-HOMEPAGE="http://optipng.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${P}.1.diff"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${DISTDIR}"/${P}.1.diff
-	sed -i \
-		-e '/^C/s: -O2.*: $(GENTOO_CFLAGS) -Wall:' \
-		-e '/^LD/s: -s$: $(GENTOO_LDFLAGS):' \
-		src/scripts/gcc.mak \
-		lib/libpng/scripts/makefile.gcc \
-		lib/pngxtern/scripts/gcc.mak \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake \
-		-C src \
-		-f scripts/gcc.mak \
-		CC="$(tc-getCC)" \
-		GENTOO_CFLAGS="${CFLAGS}" \
-		GENTOO_LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dobin src/optipng || die "dobin failed"
-	dodoc README.txt doc/*.txt
-	dohtml doc/*.html
-	doman man/optipng.1
-}
diff --git a/media-gfx/optipng/optipng-0.6.3.ebuild b/media-gfx/optipng/optipng-0.6.3.ebuild
index 4ea8e818b33f..67097c0ecbe9 100644
--- a/media-gfx/optipng/optipng-0.6.3.ebuild
+++ b/media-gfx/optipng/optipng-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.6.3.ebuild,v 1.6 2010/04/13 18:26:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.6.3.ebuild,v 1.7 2010/04/29 15:41:18 ssuominen Exp $
 
 EAPI=2
 inherit toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="media-libs/libpng"