Fix libpng14 detection wrt #308887 by Locke Shinseiko.

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

diff --git a/games-puzzle/shaaft/ChangeLog b/games-puzzle/shaaft/ChangeLog
index 921601cb56e897a72d834e337df8914757738c20..11837dbcf3976c6fa1a1ea5448c7fc4b0f037902 100644 (file)
--- a/games-puzzle/shaaft/ChangeLog
+++ b/games-puzzle/shaaft/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/shaaft
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/ChangeLog,v 1.10 2009/02/17 18:27:29 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/ChangeLog,v 1.11 2010/03/10 21:34:58 ssuominen Exp $
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> shaaft-0.5.0.ebuild:
+  Fix libpng14 detection wrt #308887 by Locke Shinseiko.
 
   17 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> shaaft-0.5.0.ebuild:
   EAPI=2; skip installing build utility Packer

diff --git a/games-puzzle/shaaft/Manifest b/games-puzzle/shaaft/Manifest
index 452dadbec53a98f1ae0dfc4c860f7afaf3966e72..fd345c652b7e3083f1a289e7fc4de5a61d99481a 100644 (file)
--- a/games-puzzle/shaaft/Manifest
+++ b/games-puzzle/shaaft/Manifest
@@ -2,6 +2,6 @@ AUX shaaft-0.5.0-gcc34.patch 544 RMD160 d54ef48c0557ce2dc0774f2897b7796989e97b53
 AUX shaaft-0.5.0-gcc41.patch 277 RMD160 666f376a8313f0df536f326f94552e3c6a15d307 SHA1 ac240b39a9f718cfe0038404782eea7fec62c373 SHA256 15c5a0b6a48e44c2b42dbb7a37ea348f12fc4ebcb4b9866594f39283ccbf9dd1
 AUX shaaft-0.5.0-gcc43.patch 428 RMD160 1445bde8b9c4c2e3592bea9688b4cb923c960d66 SHA1 559bf65d1a5b5a1d3af16c2b2f84b2e9443807b1 SHA256 923bbf44762997fa9cef7b42c93bac31da05ae622eb8f3f12abad4f11d7a7549
 DIST Shaaft-0.5.0.tar.bz2 512996 RMD160 88441778220be57923aa6ca50de0d08a365ee9fc SHA1 d9e5d70e13e406ec98dee551ec77544010c786ab SHA256 db8040c4fee36da9ec9653fd6c04ffb21112c4c9c2297ee66f08b94efa61dc80
-EBUILD shaaft-0.5.0.ebuild 1031 RMD160 e2b9bc68ed3f1035bc26ec576ad00ed15ec98133 SHA1 569f9341869506332dd3d760a3c5f8e60120b9a4 SHA256 35fb97907fbd05fa51f8770684f56f2794d9d5c449360e820646e5a5fab3e439
-MISC ChangeLog 1322 RMD160 f39940044bf440d3ea39e063545b2a9b886ba4a3 SHA1 3789dea2a1deeb3375028c52026f6243489700ea SHA256 85eb57df9919d9f1427362e65b82c164aa932cb7c17e8c8164cfe426da4cb34e
+EBUILD shaaft-0.5.0.ebuild 1111 RMD160 4ff2d2de05620acd61616de58909dcb29f957a3e SHA1 e1e93e4c2c765f9641839bf81aa4a5a4bd185670 SHA256 e27d92c3ecc239c23a0e8e6a40b616a846ab3dd3ea7bffa14e5105e41455b680
+MISC ChangeLog 1455 RMD160 0454dde17a88d3f6e6f6e97fc92504f519c8a286 SHA1 b5d7eadccfc9614079697802debd18dd4411d608 SHA256 4b779e710e23dc6610f75cd9e7d514e0984b9346d7a4d3e3cca397413334cecc
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-puzzle/shaaft/shaaft-0.5.0.ebuild b/games-puzzle/shaaft/shaaft-0.5.0.ebuild
index c168a50e44526ecde47047295f8aeff1e1d7222b..7433b2dd5509ead3fcc1175586d001677e65cfc5 100644 (file)
--- a/games-puzzle/shaaft/shaaft-0.5.0.ebuild
+++ b/games-puzzle/shaaft/shaaft-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/shaaft-0.5.0.ebuild,v 1.12 2009/02/17 18:27:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/shaaft/shaaft-0.5.0.ebuild,v 1.13 2010/03/10 21:34:58 ssuominen Exp $
 
 EAPI=2
-inherit eutils games
+inherit autotools eutils games
 
 DESCRIPTION="A falling block game similar to Blockout"
 HOMEPAGE="http://criticalmass.sourceforge.net/shaaft.php"
@@ -29,10 +29,16 @@ src_prepare() {
                game/main.cpp \
                || die "sed main.cpp failed"
 
+       sed -i \
+               -e 's:png12:png:g' \
+               configure.in || die
+
        epatch \
                "${FILESDIR}"/${P}-gcc34.patch \
                "${FILESDIR}"/${P}-gcc41.patch \
                "${FILESDIR}"/${P}-gcc43.patch
+
+       eautoreconf
 }
 
 src_install() {