gentoo resync : 31.12.2018

7 files changed, 109 insertions, 3 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index cad89f9dd5a9..345893889b15 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index 520ddb9e7622..be40991e3180 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -4,6 +4,11 @@ AUX supertux-0.4.0-license.patch 599 BLAKE2B a89b596876956f260de582d7f31e1b8ded0
 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
+AUX supertux-0.6.0-icon.patch 531 BLAKE2B ffe235acd0ebaac3ecb2588d195496ac2ea34a906874e01fead00df73b6b9e694aa92d335bf3e69c42e4f773c3bfdd8c7a191d8610e400381e102a82a10357d2 SHA512 c1ec17a90100fb12d52561e028366264e6588e08fa1af1ace0438ebc4c2ea8b783c8720d47a9bf43e907ea8fcc3c6a91c510a221ac9c488234205a18ec567b6e
+AUX supertux-0.6.0-license.patch 696 BLAKE2B 76ba58368ce9c02ce66f2a51f54e6c95ede9058130dc54e9560ad060f69806623ea6496a3cb89d823cfbae8d84ce00e4da19eb38e60519f48726a083a3633b76 SHA512 8b4baf774be6625ff253614bb68436ddc26149722af7acea0a4f0772d496c6b30013a22fd3777b11275bd901128caf11b968a37b6a7b99ab344bac78309a6e8e
+AUX supertux-0.6.0-obstack.patch 1063 BLAKE2B ab251d7514f38a8a641e680df6c69bea88b8cfb360fc93b7e91a5274ca20e0ef4210429f8ab0694cd5c3e9eee89c6ee955b54a20dd04b11cb385bccc5bb6be6c SHA512 32da8175888fca98b76640739aa531fbfcc132dbce0a89e76be49bca29bc5878266c702e5f4c7499ddd0473804b344c62d03f39f6b14941f0e669e20d2c2241d
 DIST SuperTux-v0.5.1-Source.tar.gz 90564367 BLAKE2B ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123 SHA512 1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
-EBUILD supertux-0.5.1.ebuild 1502 BLAKE2B fdda1513fc69f1c990243b3375e6e5f11dc46bef8434331a6b28aa0b3e78db1c2af81765a1b71d69b953721b68e24d64de1cc4a074773421e2312d09894851f7 SHA512 af5b234a5893f3162a88e006758f3d3ffc8631a3dd18d422a9ca598fbc00ff933fe62ed51ddbcfefecbfca9d10e74a609b06575d14398f842f5477e551292c01
+DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59 SHA512 7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b
+EBUILD supertux-0.5.1.ebuild 1505 BLAKE2B 0de13bef427186ee354f5a370a7c0a1728a113cb4e060b11802774198196cfe6b21cc78450b52564cb0569b50839cf74742dec9545aeaee0bf5d0cda237263a6 SHA512 bb0f1b0db5463abf529ae7e073e95976ddd8d8c605ab11e0e8e8dee45763117920aa54448838ed0c09f1024cf14685277a1e633e95892f3df20c75c05bbca21b
+EBUILD supertux-0.6.0.ebuild 1456 BLAKE2B 575447891a0be20bf30420e03d5cfb3dc56b689510bd2bea904214b9ee4be65e75961e3adebc18fe84bbeed1064418a08f55e48dd300db78c274092daf44f18e SHA512 3c98a6973fae94edc48165c69612f1341b420bc0458387bd6ec7cbfaf8efdc083efdcd2fe9d0d73d3df33c2f09131652ed6d880b9cb5ec88e1826747bcc3d271
 MISC metadata.xml 389 BLAKE2B 960cbba61ef7e12c35b66f36620ba2570e159517b06a520b0c233496c0910b2949f4f87b789f3c948621b6beb2ba0a4d5e8bdb277516213cbbc115d31af58698 SHA512 e61b89a6c0da8bf74f2b126e185fbf4be02b7ac7bc80082bd4c6e80384ab00db73a196af1ed9448a31435dbb62768b7eee8c8e64a40c51a6257bffe8170deb65
diff --git a/games-arcade/supertux/files/supertux-0.6.0-icon.patch b/games-arcade/supertux/files/supertux-0.6.0-icon.patch
new file mode 100644
index 000000000000..aac503c8cc9c
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.0-icon.patch
@@ -0,0 +1,11 @@
+--- SuperTux-v0.6.0-Source/CMakeLists.txt
++++ SuperTux-v0.6.0-Source/CMakeLists.txt
+@@ -846,7 +846,7 @@
+     install(FILES ${DLLS} DESTINATION ${INSTALL_SUBDIR_BIN})
+   endif()
+ 
+-  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.ico DESTINATION ".")
++  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION ".")
+ 
+   option(PACKAGE_VCREDIST "Package the VCREDIST libraries with the program" OFF)
+ 
diff --git a/games-arcade/supertux/files/supertux-0.6.0-license.patch b/games-arcade/supertux/files/supertux-0.6.0-license.patch
new file mode 100644
index 000000000000..600a3fd0c962
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.0-license.patch
@@ -0,0 +1,11 @@
+--- SuperTux-v0.6.0-Source/CMakeLists.txt
++++ SuperTux-v0.6.0-Source/CMakeLists.txt
+@@ -895,7 +895,7 @@
+   install(FILES ${SQUIRREL_LIB_PATH} ${SQSTDLIB_LIB_PATH} ${PHYSFS_LIB_PATH} DESTINATION ${INSTALL_SUBDIR_BIN})
+ endif()
+ 
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
+ 
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.stxt DESTINATION ${INSTALL_SUBDIR_SHARE})
+ 
diff --git a/games-arcade/supertux/files/supertux-0.6.0-obstack.patch b/games-arcade/supertux/files/supertux-0.6.0-obstack.patch
new file mode 100644
index 000000000000..a46ca3afd12d
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.6.0-obstack.patch
@@ -0,0 +1,19 @@
+--- SuperTux-v0.6.0-Source/CMakeLists.txt
++++ SuperTux-v0.6.0-Source/CMakeLists.txt
+@@ -470,7 +470,6 @@
+ include_directories(${CMAKE_BINARY_DIR}/)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
+ include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
+-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
+ include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
+ include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL_SavePNG/)
+ 
+@@ -481,7 +480,7 @@
+ 
+ ## Build list of sources for supertux binary
+ 
+-file(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)
++file(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/findlocale/findlocale.c)
+ 
+ file(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp src/video/null/*.cpp)
+ file(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_BINARY_DIR}/tmp/*.rc")
diff --git a/games-arcade/supertux/supertux-0.5.1.ebuild b/games-arcade/supertux/supertux-0.5.1.ebuild
index c1773f3228cd..f61607c368e3 100644
--- a/games-arcade/supertux/supertux-0.5.1.ebuild
+++ b/games-arcade/supertux/supertux-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND="dev-games/physfs
+RDEPEND=">=dev-games/physfs-3.0
 	dev-libs/boost:=
 	media-libs/glew:=
 	virtual/opengl
diff --git a/games-arcade/supertux/supertux-0.6.0.ebuild b/games-arcade/supertux/supertux-0.6.0.ebuild
new file mode 100644
index 000000000000..c12492e71e3c
--- /dev/null
+++ b/games-arcade/supertux/supertux-0.6.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+inherit cmake-utils flag-o-matic
+
+MY_P="SuperTux-v${PV}-Source"
+
+DESCRIPTION="A game similar to Super Mario Bros."
+HOMEPAGE="https://supertux.org/"
+SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-games/physfs-3.0
+	dev-libs/boost:=
+	media-libs/glew:=
+	virtual/opengl
+	media-libs/libvorbis
+	media-libs/openal
+	>=media-libs/libsdl2-2.0.1[joystick,video]
+	>=media-libs/sdl2-image-2.0.0[png,jpeg]
+	>=net-misc/curl-7.21.7"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
+	"${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# This is not a developer release so switch the logo to the non-dev one.
+	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)"
+		-DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is still required.
+		-DUSE_SYSTEM_PHYSFS=ON
+	)
+	cmake-utils_src_configure
+}