gentoo resync : 07.07.2018

3 files changed, 39 insertions, 13 deletions

diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 2879aa424dd4..520ddb9e7622 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -3,6 +3,7 @@ AUX supertux-0.4.0-icon.patch 546 BLAKE2B c5e26bdb22cee7ffd8a3d9a9f87e0c2a486c4e
 AUX supertux-0.4.0-license.patch 599 BLAKE2B a89b596876956f260de582d7f31e1b8ded03471e5fbefd0cf9214dd95a54c889b295707becfbf9f98d32269e414acf498713cae47ae882604e8683eac926086a SHA512 d3609c7d0053d8f2bdaf4f91449ba71d8c2a2509bb6718393e06add5ff9b59a3dc78f70fcdb7ace4f73eab9325ab5ef64cf9399c0e65a9b31f5fc4bfeb6bb751
 AUX supertux-0.5.0-obstack.patch 958 BLAKE2B 41da812369a4a64040e7759a4c56a7b3fb42898f50fc58ef03d76a9c27cc904db9909223eee98f9f5a7f12b5c0fde295701633eab308fe495333df3989071de7 SHA512 aecba33369bb255c9fef8e0ed873d7c457ddd85340f2788bd3f517b1a126e943e0ec1085239f1fea7eb242d0344efaa5ddeaa14865cc61a6863dab44b854f9ed
 AUX supertux-0.5.0-tinygettext.patch 920 BLAKE2B 9558c2df82a03e1893ae10c0f283f257fda90493947e4fbaec24a6e4d540e0dcf28505be92be3224b4cb5f6ca978abc09adac0b86503132203e9ce0cacf2b1c2 SHA512 eaf1c0ca534cb6d0cd216bd69283856bdad46830210edb6b00d4d382b2a2045eede8e96fa7b1832e8e2246144452b59a82966621441362c56c8bd3ace758097e
+AUX supertux-0.5.1-ninja.patch 1045 BLAKE2B 2f59d8fdf05e1994ae9690cdce001ea6235f8c06e7438eba41b54264e631188210591adce6d212f08a497c31cca9f08542b4dff1cac4568b0fdb4410eaaecdb6 SHA512 8b877ab382913d74db9890bf19867efc0c6ff4a5901a679ffbfbe72142341e61c804e1f4def1bd1157f3f144b50f2eca143420b08940eeaaed93a9b8fc1c8d5d
 DIST SuperTux-v0.5.1-Source.tar.gz 90564367 BLAKE2B ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123 SHA512 1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
-EBUILD supertux-0.5.1.ebuild 1515 BLAKE2B 6dbd48b48d79051958491581892260f1e9e206d1793535dd2438402b20bdfeba2124b443e65025077a45b3df587072a4952a6062a9cb342974966fd6ad783537 SHA512 81a58cbf509ebf357b1193073cf1aeacd330373a02b01d41ced54bb57a87c88687d07d7ffcf851364050403267c40f3f9e02d048d01e6cd8297df080a8d52bb3
+EBUILD supertux-0.5.1.ebuild 1502 BLAKE2B fdda1513fc69f1c990243b3375e6e5f11dc46bef8434331a6b28aa0b3e78db1c2af81765a1b71d69b953721b68e24d64de1cc4a074773421e2312d09894851f7 SHA512 af5b234a5893f3162a88e006758f3d3ffc8631a3dd18d422a9ca598fbc00ff933fe62ed51ddbcfefecbfca9d10e74a609b06575d14398f842f5477e551292c01
 MISC metadata.xml 389 BLAKE2B 960cbba61ef7e12c35b66f36620ba2570e159517b06a520b0c233496c0910b2949f4f87b789f3c948621b6beb2ba0a4d5e8bdb277516213cbbc115d31af58698 SHA512 e61b89a6c0da8bf74f2b126e185fbf4be02b7ac7bc80082bd4c6e80384ab00db73a196af1ed9448a31435dbb62768b7eee8c8e64a40c51a6257bffe8170deb65
diff --git a/games-arcade/supertux/files/supertux-0.5.1-ninja.patch b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
new file mode 100644
index 000000000000..d5181177fdcd
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
@@ -0,0 +1,30 @@
+Allow building with ninja instead of CMake, see also:
+
+  https://bugs.gentoo.org/649458
+  https://cmake.org/pipermail/cmake/2015-April/060234.html
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -332,7 +332,10 @@
+   -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+   -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+   -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX}
+-  -DINSTALL_INC_DIR=include)
++  -DINSTALL_INC_DIR=include
++  BUILD_BYPRODUCTS
++  squirrel/lib/libsquirrel_static.a
++  squirrel/lib/libsqstdlib_static.a)
+ 
+ IF(WIN32)
+ 	ADD_LIBRARY(squirrel_lib SHARED IMPORTED)
+@@ -370,7 +373,9 @@
+   -DHAVE_SDL=ON
+   -DCMAKE_INSTALL_PREFIX=${TINYGETTEXT_PREFIX}
+   -DSDL2_INCLUDE_DIRS=${SDL2_INCLUDE_DIRS}
+-  -DLIB_SUFFIX=${LIB_SUFFIX})
++  -DLIB_SUFFIX=${LIB_SUFFIX}
++  BUILD_BYPRODUCTS
++  tinygettext/lib${LIB_SUFFIX}/libtinygettext.a)
+ 
+ ADD_LIBRARY(tinygettext_lib STATIC IMPORTED)
+ SET_TARGET_PROPERTIES(tinygettext_lib PROPERTIES IMPORTED_LOCATION "${TINYGETTEXT_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}tinygettext${CMAKE_STATIC_LIBRARY_SUFFIX}")
diff --git a/games-arcade/supertux/supertux-0.5.1.ebuild b/games-arcade/supertux/supertux-0.5.1.ebuild
index af91e8b026d3..c1773f3228cd 100644
--- a/games-arcade/supertux/supertux-0.5.1.ebuild
+++ b/games-arcade/supertux/supertux-0.5.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 inherit cmake-utils flag-o-matic
 
 MY_P="SuperTux-v${PV}-Source"
@@ -32,35 +34,28 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.0-{desktop,license,icon}.patch
 	"${FILESDIR}"/${PN}-0.5.0-{obstack,tinygettext}.patch
+	"${FILESDIR}"/${PN}-0.5.1-ninja.patch
 )
 
 src_prepare() {
 	cmake-utils_src_prepare
 
 	# This is not a developer release so switch the logo to the non-dev one.
-	sed 's@logo_dev@logo@' \
+	sed -e 's@logo_dev@logo@' \
 		-i data/images/objects/logo/logo.sprite || die
 }
 
 src_configure() {
 	append-cxxflags -std=c++11
+
 	local mycmakeargs=(
 		-DWERROR=OFF
 		-DINSTALL_SUBDIR_BIN=bin
 		-DINSTALL_SUBDIR_DOC=share/doc/${PF}
 		-DINSTALL_SUBDIR_SHARE=share/${PN}2
 		-DENABLE_SQDBG="$(usex debug)"
-		-DUSE_DEBUG="$(usex debug)"
 		-DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is still required.
+		-DUSE_SYSTEM_PHYSFS=ON
 	)
-
 	cmake-utils_src_configure
 }
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}