Fix building with libpng14 wrt #308875 by Locke Shinseiko.

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

diff --git a/games-sports/xmoto/ChangeLog b/games-sports/xmoto/ChangeLog
index 9b33716969ac8fe58ee18d6e0ad3f42ec4e260de..21750d48841d5e9a5c4b76dd0563c97086225260 100644 (file)
--- a/games-sports/xmoto/ChangeLog
+++ b/games-sports/xmoto/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-sports/xmoto
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/ChangeLog,v 1.44 2010/01/07 00:48:52 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/ChangeLog,v 1.45 2010/03/10 20:22:33 ssuominen Exp $
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> xmoto-0.5.2.ebuild:
+  Fix building with libpng14 wrt #308875 by Locke Shinseiko.
 
   07 Jan 2010; Joseph Jezak <josejx@gentoo.org> xmoto-0.5.2.ebuild:
   Marked ppc stable for bug #288801.

diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest
index 5b87d238844fca2a3a24ef1baca84f52655d6886..289518223b940f5256280ffa54b940ed30ebec1c 100644 (file)
--- a/games-sports/xmoto/Manifest
+++ b/games-sports/xmoto/Manifest
@@ -1,6 +1,6 @@
 AUX xmoto-0.5.2-64bit.patch 954 RMD160 1cac31931069d9ef855d8af731df17d6b1864edd SHA1 170cb0d1bb204893ae58fd4509585ddb0abce20e SHA256 1c6c5a0a31037b27ea9ed5f3f8e8b3aaae22bd699cca460a20737e63792988a8
 DIST inksmoto-0.6.0.tar.gz 2493402 RMD160 6cf76101e70e764aa74e8eeff90abe266d36f855 SHA1 8f318a0b1ac01054b879fd5510e2f27784896416 SHA256 d85b81b2b299c3a18c7f81ef69f44786218c409e8d90a6dd7661e1b15eba8b77
 DIST xmoto-0.5.2-src.tar.gz 38170502 RMD160 a8323336814261b0c2bb0acf13d5e65ac92e921d SHA1 aa819872f06beb114025c490cea8e229cd85135d SHA256 a8c91378ed439b640157267981b423dceea3584a439d25eea8aa28181458058f
-EBUILD xmoto-0.5.2.ebuild 2501 RMD160 6ca3f43c451c38469910c7e939fc5b897e483778 SHA1 6ad6cd437708edec64ba24a8a264ce1889b431d6 SHA256 155125f7d57a9cd2c2b1362c3c5d4a8547fd9602f97a803c937e35e08b84297e
-MISC ChangeLog 6193 RMD160 573210dbbb7a8f1b80e857de29b4e3ed5f7e844c SHA1 bf3124489e0763e57fc85b3d46bf20cd5c4af3c5 SHA256 25da5b9b994bb4b9e1a580c2be134778f8dbcc4169b0babbb43951e86d542d7c
+EBUILD xmoto-0.5.2.ebuild 2597 RMD160 1d09dd967e69bdfc2724f3c2ac8a3568b5a42040 SHA1 1f6069d1b94eeca9d4f2809e439cca92dd8cf58f SHA256 69a5383ad26c250045a5b9c7f83663b2f402d0277cbd550b4b554144f1629a7a
+MISC ChangeLog 6332 RMD160 44a07cc04ad22712a6ae023ae26ae26958cf6bae SHA1 02e1a6519b30056b10851b6c216951873e75cea3 SHA256 102a7b0eef19435698abb03c1cf1000962b5cb46e0f0e50cf08683906b70d0f5
 MISC metadata.xml 341 RMD160 2d838068ec16928a24200dec167b73ddf036f985 SHA1 9557b148a79d61f5c8cfac1b38cfba9b9aa66b95 SHA256 5159c45c1d84dcf5beefe53af26077b900294563ee9ddfc9bb4879f3dd6f9a1d

diff --git a/games-sports/xmoto/xmoto-0.5.2.ebuild b/games-sports/xmoto/xmoto-0.5.2.ebuild
index 1a651b3eada396dbde6399e4af06f158264717c6..cb501aaea295831847162f6b79d3fa55a7e22ab2 100644 (file)
--- a/games-sports/xmoto/xmoto-0.5.2.ebuild
+++ b/games-sports/xmoto/xmoto-0.5.2.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/games-sports/xmoto/xmoto-0.5.2.ebuild,v 1.7 2010/01/07 00:48:52 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/xmoto-0.5.2.ebuild,v 1.8 2010/03/10 20:22:33 ssuominen Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games
@@ -21,7 +21,7 @@ RDEPEND="
        dev-db/sqlite:3
        dev-games/ode
        dev-lang/lua[deprecated]
-       media-libs/jpeg
+       media-libs/jpeg:0
        media-libs/libpng
        media-libs/libsdl[joystick]
        media-libs/sdl-mixer[vorbis]
@@ -43,8 +43,10 @@ src_prepare() {
        use editor && rm -vf "${WORKDIR}"/extensions/{bezmisc,inkex}.py
        sed -i \
                -e '/^gettextsrcdir/s:=.*:= @localedir@/gettext/po:' \
-               po/Makefile.in.in \
-               || die "sed failed"
+               po/Makefile.in.in || die
+       sed -i \
+               -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
+               src/image/tim_png.cpp || die
        epatch "${FILESDIR}"/${P}-64bit.patch
 }