[gentoo-commits] repo/gentoo:master commit in: games-arcade/performous/

[Michael Sterrett]

commit:     00742e7a818d804bf14f461481b5b42e0e515f94
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 15:53:41 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Mon May 16 15:54:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00742e7a

games-arcade/performous: fix building with USE=tools by further commiting to 
use the system-cmake-find-zlib module

Package-Manager: portage-2.2.28

 games-arcade/performous/performous-1.0.ebuild | 4 +++-
 games-arcade/performous/performous-1.1.ebuild | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/games-arcade/performous/performous-1.0.ebuild 
b/games-arcade/performous/performous-1.0.ebuild
index 9fa6cdf..fbdaa56 100644
--- a/games-arcade/performous/performous-1.0.ebuild
+++ b/games-arcade/performous/performous-1.0.ebuild
@@ -66,9 +66,11 @@ src_prepare() {
        sed -i \
                -e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
                -e '/ Z /s/ Z / ZLIB /' \
+               -e 's/Z_FOUND/ZLIB_FOUND/g' \
+               -e 's/Z_LIBRARIES/ZLIB_LIBRARIES/g' \
                -e 's/Jpeg/JPEG/' \
                -e 's/Png/PNG/' \
-               game/CMakeLists.txt || die
+               {game,tools}/CMakeLists.txt || die
 
        strip-linguas -u lang
 }

diff --git a/games-arcade/performous/performous-1.1.ebuild 
b/games-arcade/performous/performous-1.1.ebuild
index 9d54a66..1fcd585 100644
--- a/games-arcade/performous/performous-1.1.ebuild
+++ b/games-arcade/performous/performous-1.1.ebuild
@@ -63,10 +63,12 @@ src_prepare() {
                "${FILESDIR}"/${P}-linguas.patch
        sed -i \
                -e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
-               -e '/ Z /s/ Z / ZLIB /' \
+               -e '/ Z /s/ Z/ ZLIB/g' \
+               -e 's/Z_FOUND/ZLIB_FOUND/g' \
+               -e 's/Z_LIBRARIES/ZLIB_LIBRARIES/g' \
                -e 's/Jpeg/JPEG/' \
                -e 's/Png/PNG/' \
-               game/CMakeLists.txt || die
+               {game,tools}/CMakeLists.txt || die
 
        strip-linguas -u lang
 }