From: Samuli Suominen <ssuominen@gentoo.org>
Date: Mon, 10 Oct 2011 21:07:42 +0000 (+0000)
Subject: old
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0699c5a53275fa57d8c30921830df3c60cdd1fd6;p=gentoo.git

old

Package-Manager: portage-2.2.0_alpha64/cvs/Linux x86_64
---

diff --git a/media-gfx/pngcrush/ChangeLog b/media-gfx/pngcrush/ChangeLog
index 68073b268347..b0c49e7a6826 100644
--- a/media-gfx/pngcrush/ChangeLog
+++ b/media-gfx/pngcrush/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/pngcrush
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.67 2011/10/09 01:49:02 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.68 2011/10/10 21:07:42 ssuominen Exp $
+
+  10 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -pngcrush-1.7.17-r1.ebuild:
+  old
 
   09 Oct 2011; Matt Turner <mattst88@gentoo.org> metadata.xml:
   Drop maintainership.
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index 0e5cc537c17f..215f80a144cc 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,26 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pngcrush-1.7.17-unbundle-zlib.diff 807 RMD160 d4674038dc7fa1434ad3250db810c21140a940bd SHA1 4212fb356ea8c690e61f3db28b6dc87cf25fb8dc SHA256 844007cc1ca8ae205af5828df579e0739bfd9536167342432d479dc58ef11f3b
+AUX pngcrush-1.7.17-unbundle-zlib.diff 701 RMD160 92cb67d70e50dd51669bdc2fb58dcf7732fbd0ad SHA1 5ba52877fc02458f3d02f1b0f67f66eb1bdf841f SHA256 901a206500fa0e6452f08c5947dee7dadb0fb773e9a24fd460453957a625bcf5
 DIST pngcrush-1.7.17.tar.xz 347036 RMD160 ea2e1ce5f2f44be2901ec8de478ba3542460472b SHA1 e820a36c66cd5377c6459b438b88bde6bf80c9d5 SHA256 37454dd6382417fc8fdc5223aa80fa7dc064b63307481f3fa6eca2ea713c4397
-EBUILD pngcrush-1.7.17-r1.ebuild 810 RMD160 4fbfe303cf4ce07605e5a497974f384de0f25856 SHA1 07780970e565d56cf9a7f4473b70519c5354faff SHA256 29cd39228193a888224a1b537cf5e17218e1b2bd36e8bae26f7fd86ac3512c60
-EBUILD pngcrush-1.7.17-r2.ebuild 875 RMD160 13ec659baeb87c14b2a48cae7b2905665326bd25 SHA1 2f37f33524aee276cd96e18117e3e94fe946b76c SHA256 1416c74ae4d154018cb6b5a25751e839b96ba5a4e0eb82176ac1b52a41162c4f
-MISC ChangeLog 8673 RMD160 fcd4b95402418a513608f0acee171265dc8a6d0a SHA1 29c1d6b399187f6102be95216dab5d79fed512f5 SHA256 d23cdca0a21785fe9fc714da9822962209c249b1638d2d686e1dc2fc195ab387
+EBUILD pngcrush-1.7.17-r2.ebuild 879 RMD160 ca5505713c848e1ea5f9163c9c72198b94c93e4f SHA1 11250017bc8ebac65f07561ade7e01e9a1e155aa SHA256 8e8c7a4df8f9ac4c36b6c2fdf994177405a19aa3d908f8d043468e74271b550e
+MISC ChangeLog 8765 RMD160 bbd7640aab3331f1fbe64555176ad2d45082041f SHA1 8c8f00a659604151a1ddeb6430d72a2d1fc2968e SHA256 71fafa2fd2b5db7f2c21a89186f430103a3fe6a3da16e48d31cb6c5080ea75b1
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOkP2NAAoJEA/daC2XTKcqxuYQALd72HoVZQnZaL4lxcpx/0QG
-iJptpmAvq+O+PwRWDqP2iWWXtZfgRGU84uEFJLFYp9fSldX1vIv0XYL+JcJTGoyF
-61EFtFhVARzV/puOK4zBRxac308XUy/Ou8uxFTyGQuZQ4E+/jdfjz4mFKLRAt6+2
-CiGuHBBkF7eJgNxpgXEHnB166nMNf9YJkzaE7MSeR2XgbIa8BUVIO5hh2qpjUKZe
-HtM+Wv76ivk04GJSbhy2DusECbRQGogX6EKFElKOYlDnRivus4ZIseOZc/wfdDHV
-/JawPO7xG46Ne28+t0rV258IDa6gkqe7ekFCc18mbKVZSYT8uFJPbAN/nFiBYWjO
-iNpD35j2HbHinB5iNml8hJDDYUyEY7WD2tzGSLZwb8tccQHHDlBSvZEB3k/rNwmU
-1MbSwYx1TV/NVo3Jc5eufnadQ7GSmLL9n1uP+2ynEt7p+43RqYj+ZzbGask16kRP
-n1Nme/M29G2tSBsQZTwDtSQZLoHuC+dVFhb+7OCN2TIDkGHjI1FHQdiVVxLMIp88
-miRUJuyoS2aJ4MvZ5owuoU/yR+JpgIu/QFuI7+CkyvpyiqV3M2F0kEsKwGpqyqAP
-cFTysu3eFoZBmeSe6V7G7JziE9lIV5hIZWsNoiKKya7bKbbPG8D+fvQnF19C2k70
-LCFuNhsRu5swmu6vQOel
-=lTCR
+iQEcBAEBAgAGBQJOk16xAAoJEEdUh39IaPFN9EYH/3sEEbGYyMjFAVAxSwdq09LK
+JkP61A4dJkiSS+xowINLRV/6Obg2qALbQKMqGXRsvvvaYn9Ln/z5d+yoGPHHAWSy
+L9uBYs1NKOosa9HB+2epQmx8iFeQmslqRnAUQesVbyhXr4sX6GfacyZ6r3fc3M5R
+QAsQ7JBnFWBD1qF2sGuOnEnO1Ul2aRqDxnJMjuyE5e+E+z2DHkeMe3dw38BWi1j4
+sVE1kDhMDTMob381SUdU2Hb6DFbrDvJVoYvf42nFHbRiY7TI3xqAa0gF1aEkJo4v
+p39r6iOmRwOZb1jD9lEPHZWX7bk8zT6FLztc09jaNB0iBo2vMqA3GFuWE8W2rMo=
+=f5gI
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/pngcrush/files/pngcrush-1.7.17-unbundle-zlib.diff b/media-gfx/pngcrush/files/pngcrush-1.7.17-unbundle-zlib.diff
index bde167c92ab9..efdd87f1e31f 100644
--- a/media-gfx/pngcrush/files/pngcrush-1.7.17-unbundle-zlib.diff
+++ b/media-gfx/pngcrush/files/pngcrush-1.7.17-unbundle-zlib.diff
@@ -1,5 +1,5 @@
---- pngcrush-1.7.17/Makefile	2010-02-26 05:16:56.000000000 +0100
-+++ pngcrush-1.7.17-1/Makefile	2011-10-08 22:09:24.514781541 +0200
+--- Makefile
++++ Makefile
 @@ -30,15 +30,15 @@
  
  PNGCRUSH  = pngcrush
diff --git a/media-gfx/pngcrush/pngcrush-1.7.17-r1.ebuild b/media-gfx/pngcrush/pngcrush-1.7.17-r1.ebuild
deleted file mode 100644
index 0973db801355..000000000000
--- a/media-gfx/pngcrush/pngcrush-1.7.17-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.7.17-r1.ebuild,v 1.2 2011/10/08 19:29:34 ssuominen Exp $
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="Portable Network Graphics (PNG) optimizing utility"
-HOMEPAGE="http://pmt.sourceforge.net/pngcrush/"
-SRC_URI="mirror://sourceforge/pmt/${P}.tar.xz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-# media-libs/libpng
-# sys-libs/zlib
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} -Wall -Wshadow" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dohtml ChangeLog.html
-}
diff --git a/media-gfx/pngcrush/pngcrush-1.7.17-r2.ebuild b/media-gfx/pngcrush/pngcrush-1.7.17-r2.ebuild
index 19e4f9f4f7a9..72008d080975 100644
--- a/media-gfx/pngcrush/pngcrush-1.7.17-r2.ebuild
+++ b/media-gfx/pngcrush/pngcrush-1.7.17-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.7.17-r2.ebuild,v 1.1 2011/10/08 20:18:49 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.7.17-r2.ebuild,v 1.2 2011/10/10 21:07:42 ssuominen Exp $
 
 EAPI=4
 inherit toolchain-funcs eutils
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-unbundle-zlib.diff"
+	epatch "${FILESDIR}"/${P}-unbundle-zlib.diff
 }
 
 src_compile() {