gentoo resync : 14.12.2020

4 files changed, 87 insertions, 0 deletions

diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index 27f0457b8638..de08bc0947ad 100644
--- a/games-sports/Manifest.gz
+++ b/games-sports/Manifest.gz
diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest
index cd2ca32bee24..bdb11cf179f2 100644
--- a/games-sports/xmoto/Manifest
+++ b/games-sports/xmoto/Manifest
@@ -1,4 +1,6 @@
+AUX xmoto-0.6.1_cmake_lua_version.patch 565 BLAKE2B 7d8a41465eea47a6b9016236b00df91b853b0862edb9df5375b59f66d9db90ce6a30a98e677d15a51cdd4ec5ca34c63b9542ca0587f1a591eede2881881dbcee SHA512 53ff371f8c74643290b479b20798a64d07ba568379489191c000116bbccee0fa714a08b2423ced1817b7bebdf7f586405fade15e92f1a28bf03ac4888fc88c72
 AUX xmoto-0.6.1_lua_deprecated.patch 2581 BLAKE2B c643744ba7a9ed53dcad90f2c30445ef0aa8a465bea02ec75c19596c3b8d6fbc8b53fb71c23d6bed11f49e9cf23ecd3749438c80e38570043e52e3fcfe348abb SHA512 e4f6ad1c791e27b9c4ceeaf9a282111a06cc8aaef6e33f6649dd8d78bf2fa6751f76ddee32ed0d3e0f1c5c738acedd898068a280cdd0dd9151c4a3e1358c0901
 DIST xmoto-0.6.1.tar.gz 41623870 BLAKE2B a26b89266b05513f2a48a2516ffdd39f05d584e70aa1fb18d463c754acd438cef0b0f1664cc577ebb89012f86dc37e2d52cd9d1310217941f16c9a4085dc3894 SHA512 809e5f149e5679adc2f82313afe654dbd027c0c10292c90e6c1982bdd3f7d0f1305e30b974bba94a92e18aeeff5faa6f0d24be225d4755ae73ad03274adaf60b
 EBUILD xmoto-0.6.1-r1.ebuild 1607 BLAKE2B d5b198ab87ea9f0663c9c559c92f4ee33be0abb5d2d0ece2ae546c72b676dcb1e9b7ff948f73a56d47d87a137d5dc265cfa477435ff554703bc7650b44b8384b SHA512 835acdab73411a481d08765028b0cfea3375d8762f8155095529c37acc4a86169f09be07551f5a43678f4298da69727efbcdf8abf9c46319799a2e05b202c225
+EBUILD xmoto-0.6.1-r100.ebuild 1765 BLAKE2B af4eb69f73766e5be23737b6532d809be9d6c94053def74f23bdd37077177f40fe21a8e34db6bc28e3c393cec02933117f8ad2e9d266ceeec673e88aa5e4ec83 SHA512 1ec325e15e65149d2096745130d73095eebc27edb353c40a67604d0b402a762aa2537322ac3d45bfae0f3e40034aad4423c554e2a7f32e7d46f9f78fbc15acea
 MISC metadata.xml 447 BLAKE2B 39dc46e26dbcacafbdaaee5a45f19d3d8fcae0c24a3336938beb549bdc4c4ab8a8b4027f8b28fc62c2cf29c70b63ae9b39acb0241c0179a2adef346edac07695 SHA512 150597c0a53e42f1996ffbad3bf0d773a1a8a7028abc9ac5fedf1e2a5e076bc160d33dca327b05737678a388d6df0ddd200a30fa3e7d81238fd8749444e8c895
diff --git a/games-sports/xmoto/files/xmoto-0.6.1_cmake_lua_version.patch b/games-sports/xmoto/files/xmoto-0.6.1_cmake_lua_version.patch
new file mode 100644
index 000000000000..53a29161a141
--- /dev/null
+++ b/games-sports/xmoto/files/xmoto-0.6.1_cmake_lua_version.patch
@@ -0,0 +1,13 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -40,8 +40,8 @@
+ endif()
+ find_package(PNG REQUIRED)
+ 
+-find_package(Lua)
+-set(USE_SYSTEM_Lua $<AND:$<BOOL:${PREFER_SYSTEM_Lua}>,$<BOOL:${LUA51_FOUND}>,$<NOT:$<BOOL:${WIN32}>>>)
++find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
++set(USE_SYSTEM_Lua $<AND:$<BOOL:${PREFER_SYSTEM_Lua}>,$<BOOL:${LUA_FOUND}>,$<NOT:$<BOOL:${WIN32}>>>)
+ if (NOT LUA_VERSION_STRING VERSION_LESS 5.2 AND LUA_VERSION_STRING VERSION_LESS 5.3)
+     add_definitions("-DLUA_COMPAT_ALL")
+ elseif (LUA_VERSION_STRING VERSION_GREATER_EQUAL "5.3")
diff --git a/games-sports/xmoto/xmoto-0.6.1-r100.ebuild b/games-sports/xmoto/xmoto-0.6.1-r100.ebuild
new file mode 100644
index 000000000000..aa6635754fc4
--- /dev/null
+++ b/games-sports/xmoto/xmoto-0.6.1-r100.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit cmake lua-single
+
+DESCRIPTION="A challenging 2D motocross platform game, where physics play an important role"
+HOMEPAGE="https://xmoto.tuxfamily.org"
+SRC_URI="https://github.com/xmoto/xmoto/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="double-precision +nls"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="app-arch/bzip2
+	dev-db/sqlite:3
+	dev-games/ode[double-precision=]
+	${LUA_DEPS}
+	dev-libs/libxdg-basedir
+	dev-libs/libxml2
+	media-fonts/dejavu
+	media-libs/libpng:0=
+	media-libs/libsdl[joystick,opengl]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	virtual/glu
+	virtual/opengl
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/${P}_lua_deprecated.patch"
+	"${FILESDIR}/${PN}-0.6.1_cmake_lua_version.patch"
+)
+
+src_prepare() {
+	sed -e "/^Icon/s/.xpm//" -i extra/xmoto.desktop || die
+	sed -e "/add_subdirectory.*\(bzip2\|libccd\|lua\|ode\|xdgbasedir\)/d" -i src/CMakeLists.txt || die
+	rm -rf vendor/{bzip2,lua,ode,xdgbasedir} || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GETTEXT=$(usex nls)
+		-DOpenGL_GL_PREFERENCE=GLVND
+		-DLUA_VERSION=$(lua_get_version)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm -f "${ED}/usr/share/xmoto"/Textures/Fonts/DejaVuSans{Mono,}.ttf || die
+	dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSans.ttf
+	dosym ../../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSansMono.ttf
+}