gentoo resync : 19.11.2017

4 files changed, 57 insertions, 42 deletions

diff --git a/games-arcade/jvgs/Manifest b/games-arcade/jvgs/Manifest
index 7a5db8f2bc38..bc1e63ea16c0 100644
--- a/games-arcade/jvgs/Manifest
+++ b/games-arcade/jvgs/Manifest
@@ -1,6 +1,6 @@
-AUX jvgs-0.5-flags.patch 333 SHA256 2bd3c113b997db45cd2d4ff3c75ad04d33762c4bc12c2eaceedf183bf7884f1e SHA512 9eea5a791f35f5924f734566823b2814be36e70e60b1e96d104fef8a0ecf9ac0c8f2b53a0fc6cab5d4dcd022cb3e4e93d59f057a5bc67f3a94e00b0a7d86bb34 WHIRLPOOL f00dcce8276b62267d74396e22d6c2e06e75f21841ef8d5b11ffe6b5d9e915786b9b7b8dc7c33742cf00173a510fd5a55848274b21ac79a45deec0e193df9f6c
+AUX jvgs-0.5-fix-build-system.patch 1028 SHA256 df6efd0887ead9fc2f5773ffe3c2555846124a222eb4b1df5c9083b7871a5470 SHA512 0f049df4b986d380634837e1e5bc4e21d0fb228a7c61cc6765ebec7cc74f3e37ef71260a2d7a7cc830ac9ea22258702f9cad29d3941bf2dff0f3f6ea56817dc8 WHIRLPOOL 3527f3cad07b0774c74ae57609b7d62e3a81bc11286a8be155646c3c7cf5d0389eff7f0af12d18310b1bffa5fe55e499341a5ec97552c80fa1d993593a73e6c4
 DIST jvgs-0.5-src.tar.gz 25917861 SHA256 b906b96a532303df295312e7b352ab06d1c010ccf201527b2dade4634529efdb SHA512 0a0a8e7a0e7dce6f61bcd328f579212115eb95e3dce8ca223c1d8a3432d9083bf9a313f02f46b799991aa32f10cb9c14e8ecb63a4578b1ffaabc374ba139b28d WHIRLPOOL d56c4eb789bcc53cbc20efb3240c020189f8e785324755e2d6ce668ab673862f5a6fe5b77b4a126a87bd8d0834efac3fc94979897773b273ecfe5c47d932ab1a
-EBUILD jvgs-0.5.ebuild 1070 SHA256 d02a965e1cf58b1466ed08ff25aeed75e78dee4a2ef530e11e1ecbe876f109a8 SHA512 745e4216ca811ade132d1bec63f3fe746beb0a6f1bd6d439b857359c7ebe084a482879c489ecfef79d6009b7238f5abba1324ddadc4f791c2465ec87b8561dd5 WHIRLPOOL 29659b4667ca395e8601be74e0803d490b9277a8cfa83b82624ef17166238daaa8729f56be05e84441922861ab267ce10b1c699a8f4a94ebd08b65c6f5636009
+EBUILD jvgs-0.5-r1.ebuild 806 SHA256 5617bd9018f0e6513f456e3252ac9b72db912743acb355890ed295b2fc08c0d5 SHA512 8ecc3dfc55514602b30deaa694385fc0fe0b75e8e398bf5b7147846d765c331ad74807e93e2335b8d743db81fd29fb58cf5e701562ae10f1396174704bc3689d WHIRLPOOL 1c180562633b28160ae8708c3112e0de50f5f60be97e1a6dc354b4e592a8f2acabb682879c6ac615dbca2811cc8ab41175fe78b3fc959389c9658f7e0700acb7
 MISC ChangeLog 2447 SHA256 d4f807312a3cb023d31d0eebc1c952bac62e0917345c9fb76f54d3219757df3b SHA512 b6f20040fb8e973830d264a487c939a1838e21f84f44fa3aa84afb0d4c1a3777a329df39c2d259c940c98f42d3577942c9f2def1ecc8cde07796859f2cacf092 WHIRLPOOL fd44daed04d8db92c5f08202aa243150a34a15211a50ed8b84894e0912670616efcc2946c645cd9bfee3c2ded1a79d0d60b0411950052080d6be47b095c030bb
 MISC ChangeLog-2015 868 SHA256 f90732281b9031f413deffe6fe66894b49d8443545bcdc953992ca2feed68270 SHA512 e325d15d75a5fb2ce3ba62118a2691dad0841b505f7e79e198d55ff03cf89e0f18f41b28298d17e2c7808a2e22c720362c8fcc370ce30690e7c4e9187306de07 WHIRLPOOL 5e5e5852d454b4c515780b7ba0c3df17731f95966a57fdf01f52164d9264574167aaf57caf691b96bbb254127ec81b8d9c95b3f3cb3657353f439e01bfbfecaf
 MISC metadata.xml 327 SHA256 8f8b4f86f95f2a3e782d9b9323614808cf61ba9ca1012e83352b5d75e33b00a5 SHA512 d37e6f081f28683f1071e57de49287534e6797902e24c681f87477af286a6227eb76abd63bd3091b077270e44061cd0676e49fecf4e74f54d455281fa67946bd WHIRLPOOL 3ace7175d7f8723b3524e530c9867c30a2e05742281559ad3f3a66bb5090bb0f2c3f7d7cabc49e213a6fef3b99a38e28d4dc77f0b2d84f5182a5d35437d88f9d
diff --git a/games-arcade/jvgs/files/jvgs-0.5-fix-build-system.patch b/games-arcade/jvgs/files/jvgs-0.5-fix-build-system.patch
new file mode 100644
index 000000000000..5f5ba191bb7e
--- /dev/null
+++ b/games-arcade/jvgs/files/jvgs-0.5-fix-build-system.patch
@@ -0,0 +1,43 @@
+* Respect user CXXFLAGS
+* Build out-of-source
+
+--- a/src/bind/CMakeLists.txt
++++ b/src/bind/CMakeLists.txt
+@@ -1,16 +1,25 @@
+-ADD_CUSTOM_TARGET(
+-     swig
+-     ${SWIG_EXECUTABLE} -lua -c++ -o ${JVGS_BINARY_DIR}/src/bind/jvgslua.cpp ${JVGS_BINARY_DIR}/src/bind/jvgslua.i
++ADD_CUSTOM_COMMAND(
++    OUTPUT
++        ${CMAKE_CURRENT_BINARY_DIR}/jvgslua.cpp
++    COMMAND
++        ${SWIG_EXECUTABLE} -lua -c++ -o ${CMAKE_CURRENT_BINARY_DIR}/jvgslua.cpp ${CMAKE_CURRENT_SOURCE_DIR}/jvgslua.i
++    VERBATIM
+ )
+ 
+ ADD_LIBRARY(
+     bind STATIC
+-    jvgslua.cpp
++    ${CMAKE_CURRENT_BINARY_DIR}/jvgslua.cpp
+     ScriptManager.cpp
+ )
+ 
+ ADD_DEPENDENCIES( bind swig )
+ 
++TARGET_INCLUDE_DIRECTORIES(
++    bind
++    PRIVATE
++    ${CMAKE_CURRENT_SOURCE_DIR}
++)
++
+ TARGET_LINK_LIBRARIES(
+     bind
+     ${LUA_LIBRARIES}
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-SET( CMAKE_CXX_FLAGS "-DTIXML_USE_STL -ggdb" )
++SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTIXML_USE_STL" )
+ 
+ INCLUDE_DIRECTORIES(
+     ${SDL_INCLUDE_DIR}
diff --git a/games-arcade/jvgs/files/jvgs-0.5-flags.patch b/games-arcade/jvgs/files/jvgs-0.5-flags.patch
deleted file mode 100644
index 04f88b88bc6d..000000000000
--- a/games-arcade/jvgs/files/jvgs-0.5-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Aug  5 19:57:32 UTC 2012
-Subject: build system
-
-respect cxxflags
-
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -1,4 +1,4 @@
--SET( CMAKE_CXX_FLAGS "-DTIXML_USE_STL -ggdb" )
-+SET( CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -DTIXML_USE_STL" )
- 
- INCLUDE_DIRECTORIES(
-     ${SDL_INCLUDE_DIR}
diff --git a/games-arcade/jvgs/jvgs-0.5.ebuild b/games-arcade/jvgs/jvgs-0.5-r1.ebuild
index e621f1b45192..779b57dd7400 100644
--- a/games-arcade/jvgs/jvgs-0.5.ebuild
+++ b/games-arcade/jvgs/jvgs-0.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils eutils games
+EAPI=6
+
+inherit cmake-utils eutils
 
 DESCRIPTION="An open-source platform game with a sketched and minimalistic look"
 HOMEPAGE="http://jvgs.sourceforge.net/"
@@ -11,43 +11,29 @@ SRC_URI="mirror://sourceforge/jvgs/${P}-src.tar.gz"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
-RDEPEND="virtual/opengl
+RDEPEND="
 	dev-lang/lua:0
-	sys-libs/zlib
 	media-libs/libsdl[video]
 	media-libs/sdl-mixer[vorbis]
-	media-libs/freetype:2"
+	media-libs/freetype:2
+	sys-libs/zlib:=
+	virtual/opengl"
 DEPEND="${RDEPEND}
 	dev-lang/swig"
 
 S=${WORKDIR}/${P}-src
-PATCHES=( "${FILESDIR}"/${P}-flags.patch )
-
-src_configure() {
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.5-fix-build-system.patch )
 
 src_install() {
-	exeinto "$(games_get_libdir)"
-	doexe src/${PN}
+	dobin src/${PN}
 
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	doins -r main.lua resources
 
-	games_make_wrapper ${PN} "/$(games_get_libdir)/${PN}" \
-		"${GAMES_DATADIR}/${PN}"
-
 	newicon resources/drawing.svg ${PN}.svg
 	make_desktop_entry ${PN} ${PN}
 
-	dodoc AUTHORS README.markdown
-
-	prepgamesdirs
+	einstalldocs
 }