puzzlemoppet: fix gentoo bug #607578

6 files changed, 39 insertions, 60 deletions

diff --git a/games-puzzle/puzzlemoppet/Manifest b/games-puzzle/puzzlemoppet/Manifest
index d31ea51..af90ed1 100644
--- a/games-puzzle/puzzlemoppet/Manifest
+++ b/games-puzzle/puzzlemoppet/Manifest
@@ -1,23 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST PuzzleMoppetFull.tar.gz 12947670 SHA256 1901c988e42890ad53db1d19cd544e503a15f538e2deb2d1ce2b6e1072fdd859 SHA512 33e63e9a30cdc262f00442dce59a77f44082c0b4e19542cabc8afda03a0d63392a0506dc114deabd7db2eda18217c12926c789a2185aaee2c2d6d88c72ef8d4d WHIRLPOOL b2d610696e864acfb5e34637295a70df5fd53460c71dc9bc2555852e0ddff0c6391a335810fa82bc3f53299769cb6ed220be69b3f666874c5514868021c1bf14
 DIST PuzzleMoppetSource.tar.gz 7220665 SHA256 4f6545320c7ee1091ec94c8aba2a63f6996553399557d5937a7e47453a2a942d SHA512 84f309c278b7f18ad1bfe380cd98d2f669c11f436e5c388dc32801c0dec1a1b756c0980810f0e8564356db612e595202515f5e9c785ad103e647efe81e46b705 WHIRLPOOL cddfa2700f010c765b0c5c1a39a9c3a96902532533f2ea38cdf53fc5a078cc57a31abd6e4e87befe32b384589085d097b95fe0a3eea8257ab75d9e6c2e27ebe0
-DIST stb_vorbis.c 187079 SHA256 2906b89aa4bb13806a0b6997fa3c01630f522d58cd4dce75ba025002758d0a45 SHA512 3641d62fe3253f6e1eb73184b09c6512c4a3da3b8b5a88f043c261a126df50479a6c727425d29d6e1a26da71ba14821703deed4159b4521f3f73dd7444dd06df WHIRLPOOL 0ec466b5e316f8cf164163ef55c36194765ea8c6bbb7e0306cdf06c5a91208227bfe2331201c13e4673069e22a7c403793369069fcc75ec3c1563e4d690dfb85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQlghhAAoJECZQPTSbOzNLygsP/3uB28DQGsjhsxQu2axDz6aE
-mYUbw+azJ3gPiSdWcG+t2vun/cQBfFvXllrb/Q1TbcTAz+ZkBzJIIaK1TRVsIciU
-EBfC41wuCD5P5r7g8d6GAVGW68FyMBzmjO6AqJEt/1lNDnUVZqSGtV8cvuDL8yzu
-yaJbz7zrLl29byFlReUFN0yKAJ+tvB6N6/VhZ7YaHVn+KYBZDWA4UZTq9kM2UUKk
-IXJcD5GKoV5lQZ/gTdz8WBND2/VZ4tFZgIH5T+oYTKl4E3B8QQpRDdvkZiv29ALD
-+THHDWSBxXpzR8u21llk80JhS9ypYgTq4ptM9hq440SAi6krkXXXN6F0aksba+bt
-YbQVQAlNlxnxh/0cWtOdhse68Jgh9ToCbQNIJOxvPBteRV8h0LTRAVPUCusTlKQy
-baq47iivrDYq3QKu9XG8vhEEpvXbHS9cv45t2x7nmSlRpAIkZ+HBUdn/ryzh6CQZ
-dVlfk551xLTtJHd5GKtYDYtAd+pYwjAu+bCYH7NIo0jUyDt63BNNb651UB5JMuYX
-1+tAFoxvG9U4+NT6aU35/l2qaOThNYUVrJLXblUt4bl94w4ah3VT1+1wSL4YU6kR
-NjbbTuKkMVEWv0Zu8JJHFkLdCpZ2YhXPBPbRjPXp4F43ctv2DXspu2dzeULqXGR8
-uRL/obNpCb4Iy69gG73C
-=ZEH3
------END PGP SIGNATURE-----
+DIST puzzlemoppet.stb_vorbis.c 181709 SHA256 8457ee27a5f9adb442951eb168cf2b2b9d1ff9175891323139d7266d5f9db72b SHA512 2dd01e448e46d990a758e0ca3554e9e0b5084a1808a283251a41925031f64745d55d5d44ead981daf175894e114a4b590c1902bfae51f07894cca59466786cf0 WHIRLPOOL 23cc008a881c1c58d1dc470a6ac75a014266cb3181b0399f8361d4cd71a6495b5edfeb3eb68c743dd834fa8a308e359e0e9f8f7d93151baff8dd7aa49f7ded0e
diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch
index 86015d8..99152ba 100644
--- a/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch
+++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-64bit.patch
@@ -1,5 +1,5 @@
---- PuzzleMoppetSource/Litha Engine/source/Engine.cppO	2011-09-17 15:06:28.000000000 +0200
-+++ PuzzleMoppetSource/Litha Engine/source/Engine.cpp	2012-07-14 10:07:32.120033849 +0200
+--- a/source/Engine.cpp	2011-09-17 15:06:28.000000000 +0200
++++ b/source/Engine.cpp	2012-07-14 10:07:32.120033849 +0200
 @@ -781,10 +781,11 @@
  	// this engine. Obviously this event cannot be stored or transmitted over a network
  	// in case the pointer gets invalidated.
diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch
index 42932b2..cd3f4e9 100644
--- a/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch
+++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-cmake.patch
@@ -1,5 +1,5 @@
---- PuzzleMoppetSource/Litha Engine/projects/Puzzle/CMakeLists.txtO	2011-09-17 15:06:24.000000000 +0200
-+++ PuzzleMoppetSource/Litha Engine/projects/Puzzle/CMakeLists.txt	2012-07-14 09:52:14.060028541 +0200
+--- a/projects/Puzzle/CMakeLists.txt	2011-09-17 15:06:24.000000000 +0200
++++ b/projects/Puzzle/CMakeLists.txt	2012-07-14 09:52:14.060028541 +0200
 @@ -26,18 +26,8 @@
  
  
diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch
index 43c9a75..4c1978f 100644
--- a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch
+++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrhack.patch
@@ -1,6 +1,5 @@
-diff -Naur PuzzleMoppetSource-p1/Litha Engine/projects/Puzzle/Events.cpp PuzzleMoppetSource-p2/Litha Engine/projects/Puzzle/Events.cpp
---- PuzzleMoppetSource-p1/Litha Engine/projects/Puzzle/Events.cpp	2012-06-30 13:19:23.000000000 +0200
-+++ PuzzleMoppetSource-p2/Litha Engine/projects/Puzzle/Events.cpp	2012-07-13 15:21:09.048032909 +0200
+--- a/projects/Puzzle/Events.cpp	2012-06-30 13:19:23.000000000 +0200
++++ b/projects/Puzzle/Events.cpp	2012-07-13 15:21:09.048032909 +0200
 @@ -355,11 +355,11 @@
  			
  			// Emit entire one second's worth of particles all at once.
@@ -16,9 +15,8 @@ diff -Naur PuzzleMoppetSource-p1/Litha Engine/projects/Puzzle/Events.cpp PuzzleM
  			
  			
  			scene::IParticleAffector *affector = ps->createFadeOutParticleAffector();
-diff -Naur PuzzleMoppetSource-p1/Litha Engine/source/PostProcessingChain.cpp PuzzleMoppetSource-p2/Litha Engine/source/PostProcessingChain.cpp
---- PuzzleMoppetSource-p1/Litha Engine/source/PostProcessingChain.cpp	2011-09-17 15:06:28.000000000 +0200
-+++ PuzzleMoppetSource-p2/Litha Engine/source/PostProcessingChain.cpp	2012-07-13 15:16:01.148032909 +0200
+--- a/source/PostProcessingChain.cpp	2011-09-17 15:06:28.000000000 +0200
++++ b/source/PostProcessingChain.cpp	2012-07-13 15:16:01.148032909 +0200
 @@ -62,12 +62,12 @@
  	
  	// Create RTT
diff --git a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch
index f525092..48d26f5 100644
--- a/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch
+++ b/games-puzzle/puzzlemoppet/files/puzzlemoppet-irrpatch.patch
@@ -1,6 +1,5 @@
-diff -Naur PuzzleMoppetSource-o/Litha Engine/CMakeLists.txt PuzzleMoppetSource/Litha Engine/CMakeLists.txt
---- PuzzleMoppetSource-o/Litha Engine/CMakeLists.txt	2012-07-13 18:19:24.600053643 +0200
-+++ PuzzleMoppetSource/Litha Engine/CMakeLists.txt	2012-07-13 18:34:48.960062962 +0200
+--- a/CMakeLists.txt	2017-01-29 21:07:57.191535103 +0700
++++ b/CMakeLists.txt	2017-01-29 21:08:48.953560110 +0700
 @@ -57,11 +57,19 @@
  # (things required by both litha engine and individual projects)
  # (actually some of these probably aren't required by both...)
diff --git a/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild b/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild
index c35946a..f6229b4 100644
--- a/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild
+++ b/games-puzzle/puzzlemoppet/puzzlemoppet-1.0.ebuild
@@ -1,52 +1,54 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: games-puzzle/puzzlemoppet-1.0.ebuild frostwork Exp $
 
-EAPI="3"
+EAPI="6"
 
 MY_PN="PuzzleMoppet"
 
-inherit games cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="a serenely peaceful yet devilishly challenging 3D puzzle game"
-HOMEPAGE="http://http://garnetgames.com/${PN}"
-SRC_URI="http://garnetgames.com/${MY_PN}Full.tar.gz
-		http://garnetgames.com/${MY_PN}Source.tar.gz
-		http://nothings.org/stb_vorbis/stb_vorbis.c"
+HOMEPAGE="http://garnetgames.com/puzzlemoppet"
+SRC_URI="
+	http://garnetgames.com/${MY_PN}Full.tar.gz
+	http://garnetgames.com/${MY_PN}Source.tar.gz
+	https://raw.githubusercontent.com/nothings/stb/e2caccb811d70af0dc359be5522e6b0d3b503e46/stb_vorbis.c -> ${PN}.stb_vorbis.c
+"
 
 LICENSE="WTFPL"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-games/ode
-		dev-games/irrlicht"
+RDEPEND="
+	dev-games/ode
+	dev-games/irrlicht
+"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/"${MY_PN}Source/Litha Engine"
 DAT="${WORKDIR}"/"${MY_PN}FullVersion"
 
-src_prepare(){
-	cp "${DISTDIR}"/stb_vorbis.c "${S}"/source/SoundSystems/OpenALSoundSystem
-	epatch "${FILESDIR}"/${PN}-irrpatch.patch
-	epatch "${FILESDIR}"/${PN}-irrhack.patch
-	epatch "${FILESDIR}"/${PN}-cmake.patch
-	epatch "${FILESDIR}"/${PN}-64bit.patch
-	for i in `find projects/Puzzle -name *.cpp`; do sed -i "$i" -e "s:../projects:"${GAMES_DATADIR}"/"${PN}"/projects:g"; done
-	for i in `find projects/ConfigApp -name *.cpp`; do sed -i "$i" -e "s:../projects:"${GAMES_DATADIR}"/"${PN}"/projects:g"; done
+src_prepare() {
+	cp "${DISTDIR}"/${PN}.stb_vorbis.c "${S}"/source/SoundSystems/OpenALSoundSystem/stb_vorbis.c
+	eapply "${FILESDIR}"/${PN}-irrpatch.patch
+	eapply "${FILESDIR}"/${PN}-irrhack.patch
+	eapply "${FILESDIR}"/${PN}-cmake.patch
+	eapply "${FILESDIR}"/${PN}-64bit.patch
+	for i in `find projects/Puzzle -name *.cpp`; do sed -i "$i" -e "s:../projects:/usr/share/${PN}/projects:g"; done
+	for i in `find projects/ConfigApp -name *.cpp`; do sed -i "$i" -e "s:../projects:/usr/share/${PN}/projects:g"; done
 	sed -i -e "s:config:"${PN}-config":g" -i projects/ConfigApp/CMakeLists.txt
+	default
 }
 
 src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r "${DAT}/projects"
 
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r "${DAT}"/projects
+	dobin "bin/${PN}"
+	dobin "bin/${PN}-config"
 
-	dogamesbin bin/${PN} || die "dogamesbin failed"
-	dogamesbin bin/${PN}-config || die "dogamesbin failed"
+	newicon "${DAT}/icons/main.png" "${PN}.png"
 
-	newicon "${DAT}"/icons/main.png ${PN}.png
-
-	make_desktop_entry ${PN} ${MY_PN} ${PN}
-	prepgamesdirs
+	make_desktop_entry "${PN}" "${MY_PN}" "${PN}"
 }