amd64 stable wrt #306359

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 8 insertions, 53 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/Manifest b/media-gfx/optipng/Manifest
index d14d9bf44bd9..527c4241c06c 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,9 +1,6 @@
-DIST optipng-0.6.2.1.diff 1984 RMD160 e144a8894806e7753da76e5142bb1b90304590fe SHA1 d4456bc5d10e0ec1cf9a260da17f63e31a40dc48 SHA256 b39e748b24ea51ac55aa2b5fae1a3f31e9ede5321941ec3da2904351fe625b69
-DIST optipng-0.6.2.tar.gz 1052509 RMD160 cd9ecfbd1c8901d14cb93fbc9f07403071cea37e SHA1 374b3537a262590ba2822f2b10d9241247b4da95 SHA256 84312506ea0c683a4e7675b3c8278067222762520016cc61e53c2b0e679120ca
 DIST optipng-0.6.3.tar.gz 1060571 RMD160 3ef55878defee86a57b8b0b268da1a7e9eca0d14 SHA1 eba6e3c940588b1d02abfabc407e5c759a3fdd8a SHA256 d11630955e2e72f07dd0aa1270f9d20caaef41796fdbfbbc1caad5b931fdf721
 DIST optipng-0.6.4.tar.gz 1483806 RMD160 6b5248c3c6b744315e70e86b49d998fe66759879 SHA1 ebb8d623c7f79c5c6942803bb96789103780bce9 SHA256 3000892b1d240351f057fbc8012485c3a1e75b991fa8d54e048273fa0fa87647
-EBUILD optipng-0.6.2-r1.ebuild 1103 RMD160 6e94cc9634ab7b9a4195eef05035b8c689c5ef26 SHA1 f936917a80d7f954753e3d777f4dc5ee1c9974db SHA256 0459ce2988d0e4c8d69c962ec3bc9dd1b58be5d49d365dfaacb8be78c5a132d4
-EBUILD optipng-0.6.3.ebuild 1195 RMD160 c107f56c94dfb4d99de53b86130245dc0b303eb9 SHA1 ac0acdbd0e85f04a2681c091290e63e98cb56b69 SHA256 5bbf546bd6c9320819782c9bb0db18bf9ebdf1d9adcb6d1b42b8f50524489ffc
+EBUILD optipng-0.6.3.ebuild 1196 RMD160 9b0ff8b3155199bf24e73d8f2149614558bc93fc SHA1 2dd24d8c25b89c3b78827ed9825b8c48baff60b8 SHA256 2e3b69be983b5b551fc970ee07ba87cd754cfe924e1811833bee55107e379aa6
 EBUILD optipng-0.6.4.ebuild 1240 RMD160 2319d7ae5b8b7dc956829a2e8663b4171a2f84d6 SHA1 1d289c6c2da08bd69c5db9107e09cc4ac90ab1db SHA256 329befc81fa893eeb280bc264da5a998ee5a09079aad6cd6819b625ad4b0c6b9
-MISC ChangeLog 7205 RMD160 52d72455b16b080e5fb9bde765c99bb62a0ca5d0 SHA1 72186bbf271d4c4e487415e5eb54a59042345823 SHA256 7b3ee69769295293d20cc69b2fa9aece3208d5bb350987b62dce429b3a1a65dc
+MISC ChangeLog 7311 RMD160 e9c064cbd91e6dda093d3b8ff2bf9f7ad929c6c7 SHA1 6592cafc811a4859e9c4e3f9a876cea6a38f33c1 SHA256 5cfd87b7a4d8bf5ccd133a7ad546f9257a21dbc2c046e08c3887a824b4d3d77b
 MISC metadata.xml 253 RMD160 33155d552badd3133f93e25bfcd82b62d296deb9 SHA1 b30245f00aae656e7a024b2ab4b8ad8e5549250f SHA256 2ddc2634b7e897546998869bcf0803bfbf4940cb75da9e45a2a8f421b4dabfd3
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"