gentoo resync : 02.09.2020

5 files changed, 168 insertions, 4 deletions

diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index 08dd643ac195..c47021daeaa6 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,7 +1,10 @@
 AUX supertuxkart-0.9.3-irrlicht-system-libs.patch 1576 BLAKE2B b252cc0036f41e9bcf02e1bf049f82de7cd94aba981cc7e161aac52306890fc490d2d4b213fcec60f9098573b3cc059a26aa2efe524030034e4a29c15bf36b88 SHA512 55d353d492aafec3ddb801b28bbe4058bc0b348980f631057850915849013ec191658c55dbc41b48402219a13ec5db811d89401d5cfbb27e7bf5c68f2478d5b6
 AUX supertuxkart-1.1-fix-buildsystem.patch 761 BLAKE2B 6a3ca6329851b3ad22b4b7617d7d6b7668ac50a7aebaf8a2cb41f5e8036af03f669dab6cd803de2e7315196aa2c6f8698bf3d65280fb90446e7b64d22d7eabd1 SHA512 b15729cc2aea6286ecc55927a26c5e667c1ac51e8ea505622373fe8b6c51ae3a9dc8d57334d3a9ab1bd968c6107bc5a315963731a3b3ad9d89a8839981abfc11
 AUX supertuxkart-1.1-irrlicht-arch-support.patch 1520 BLAKE2B 14c6fc7615e44c5007eb5828ac7e157f69a41343d6f5affb1c6b5af5afdca4c123bd1fe238c90495c097a5eafed976f557212f1e8d89c787069473cf63218fc0 SHA512 7cdb9582248937a9a48aeb1d66cee565fe1bb3255d58ec5dcfd735ee807fa51d7fc0ba661b74156ca12b036af3aefe7cabdf386e71fef98617d24268da2d0c0e
+AUX supertuxkart-1.2-irrlicht-system-libs.patch 1794 BLAKE2B 046d9416ab44830ae50c6fde7a01395f978480c91becf423a3d8c749e21f2ff02a33582a62dec1916fdb88f72c33634d3926b50c8c4304446b2238139b172bdd SHA512 4acd958bd67e39885a49dd87de08e26e6c45e94e5a4e46a6569e02ece16ee72054a9c5bd5e253e313bed5e831b32c055b6d13be4cd03f1d83baf1b401f301cb4
+DIST SuperTuxKart-1.2-src.tar.xz 614569164 BLAKE2B 5bdaa8dcac12ab6c399e6f0fc3121906070f4cd5c58dba6ccf04229d92b9b21d87a43662f39fc29ac1528ce429aebea87934fa8a180a0933385704f5a43cd6f7 SHA512 bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835
 DIST supertuxkart-1.1-src.tar.xz 616739152 BLAKE2B a4dd9ec0a8ee158306dc902d3de363b68e7a317800df1b36339843521019df91c0713b74bdef8dc06b40bee57285237408a17b539c7bd7298cd3ef3deaf99fda SHA512 81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804
 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
-EBUILD supertuxkart-1.1.ebuild 2269 BLAKE2B e0eece8e3c66f153183c5c7c4dbe87fb794b9441b8b5f15052f8fd1bd9a894c0797a4dc0743d78d867889331957f798d57e78638a38e9663f6254fb3603126a3 SHA512 55869bbeeddb2e9dee3b14b5dc02f77a852a6eff70bad737c75279452a7d6834e3a582d517dcce58544d49af022dac46f7fbf1d2423e0f9ceea010e59754ffdb
-MISC metadata.xml 648 BLAKE2B d59c4184d4dbc02f0b6d9edae30553187e4a91c81385ab360e93231ffaf4c49c647720f1839ebefd92a938bc1efbb5f8ee0fa1434cae56087ab73f0f7cca8697 SHA512 5191f653e432c5b01a6aef1f1fbae8d92daa66dd94eb391d7b132a510452b19532f2b620afe131e9b1b5bdbb4a2cb597bf9cd2c236deb5b4de74a3154f279df4
+EBUILD supertuxkart-1.1.ebuild 2261 BLAKE2B 92da19bb602e4e86d7efbd49180968d060ec7f1441bf0edabd04842904cdf9c5ee75def32db6278f9e70cf7b6abd63b1d6297c37aa68e688243dc85c37701973 SHA512 6b6d48a2344093b278739b3620f6ee1064233cd19cdea51c6bc94a7084c5d0a6f577b6fd57d75e1e3bb7052947f8b4a2ca997a14ac3f6b188656d7d0bc3072c4
+EBUILD supertuxkart-1.2.ebuild 2200 BLAKE2B 07c8a9c06f7c841a88a0ab9e292f9ebeda184b16872ff28e9afbd183ef4700f8fac5c5807993fbfc1cf2d310732354c4d842e1ac2b57e9fe8efd7412a7606a38 SHA512 e4b4c4269856fa539db4bb2989f16fd8bd153432102da83fefae2249091010c129aad6973a3ae9dc238ab8d79fc86077038851a56fbbae85d60c53f9c5b585b2
+MISC metadata.xml 744 BLAKE2B 9a5503c3ced6ea22f92a36d6b8bb59dc9a36c58c6aae2d0e5894ee660c411cfaf99d9fefa27cae93d8d9523d1b537a1bc74a6377e143a50965f3b2a6223e02ab SHA512 9db288ffb3c471712925fe0a7d2f1a09b4618397533cd1f0ca2e70f3008ab7ed1ee72d9533f99ee68464c16cb024d7ec468fe9107bbecd05091f9ca6f5325608
diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
new file mode 100644
index 000000000000..2a23e51323dc
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch
@@ -0,0 +1,69 @@
+https://salsa.debian.org/games-team/supertuxkart/-/raw/master/debian/patches/irrlicht/use-system-libs.diff
+----
+Subject: [PATCH] debian/use-system-libs
+
+Path to build irrlicht using the system libraries for png,zlib and
+jpeg as well as the glext family of header files.
+
+Signed-off-by: Christoph Egger <debian@christoph-egger.org
+
+--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
++++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+@@ -35,7 +35,7 @@
+ #include <GL/gl.h>
+ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
+ #define GLX_GLXEXT_PROTOTYPES
+-#include "glxext.h"
++#include <GL/glxext.h>
+ #endif
+ #endif
+ 
+--- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
++++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
+@@ -24,7 +24,7 @@
+ 	#define NO_SDL_GLEXT
+ 	#include <SDL_video.h>
+ 	#include <SDL_opengl.h>
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #elif defined(_IRR_WINDOWS_API_)
+ 	// include windows headers for HWND
+ 	#define WIN32_LEAN_AND_MEAN
+@@ -34,7 +34,7 @@
+ 	#endif
+ 	#include <GL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ 	#include "wglext.h"
+ 
+@@ -49,7 +49,7 @@
+ 	#endif
+ 	#include <OpenGL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ #endif
+ 
+--- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
++++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
+@@ -12,7 +12,7 @@
+ 	#define WIN32_LEAN_AND_MEAN
+ 	#include <windows.h>
+ 	#include <GL/gl.h>
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 	#define GL_GLEXT_LEGACY 1
+@@ -26,7 +26,7 @@
+ 	#include <GL/gl.h>
+ #endif
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #endif
+ #endif
+ 
diff --git a/games-action/supertuxkart/metadata.xml b/games-action/supertuxkart/metadata.xml
index ced8e3e6ee96..bb2a9028c685 100644
--- a/games-action/supertuxkart/metadata.xml
+++ b/games-action/supertuxkart/metadata.xml
@@ -6,12 +6,13 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="fribidi">Support for right-to-left languages</flag>
 		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>
 		<flag name="recorder">Enable recording with <pkg>media-libs/libopenglrecorder</pkg></flag>
+		<flag name="sqlite">Record IP bans, statistics in server mode with <pkg>dev-db/sqlite</pkg></flag>
 		<flag name="wiimote">Support for wiimote input devices</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">supertuxkart/stk-code</remote-id>
 		<remote-id type="sourceforge">supertuxkart</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-action/supertuxkart/supertuxkart-1.1.ebuild b/games-action/supertuxkart/supertuxkart-1.1.ebuild
index 77e990201cd2..329de4139a25 100644
--- a/games-action/supertuxkart/supertuxkart-1.1.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug fribidi libressl nettle recorder wiimote"
+IUSE="debug libressl nettle recorder wiimote"
 
 # don't unbundle irrlicht and bullet
 # both are modified and system versions will break the game
diff --git a/games-action/supertuxkart/supertuxkart-1.2.ebuild b/games-action/supertuxkart/supertuxkart-1.2.ebuild
new file mode 100644
index 000000000000..5e9aa59fdef6
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-1.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+MY_P="SuperTuxKart-${PV}-src"
+DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
+HOMEPAGE="https://supertuxkart.net/"
+SRC_URI="https://github.com/${PN}/stk-code/releases/download/${PV}/${MY_P}.tar.xz
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug libressl nettle recorder sqlite wiimote"
+
+# don't unbundle irrlicht and bullet
+# both are modified and system versions will break the game
+# https://sourceforge.net/p/irrlicht/feature-requests/138/
+
+RDEPEND="
+	dev-cpp/libmcpp
+	sqlite? ( dev-db/sqlite:3 )
+	dev-libs/angelscript:=
+	media-libs/freetype:2
+	media-libs/glew:0=
+	media-libs/harfbuzz:=
+	media-libs/libpng:0=
+	media-libs/libsdl2
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/libintl
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+	nettle? ( dev-libs/nettle:= )
+	!nettle? (
+		libressl? ( dev-libs/libressl:= )
+		!libressl? ( >=dev-libs/openssl-1.0.1d:0= )
+	)
+	recorder? ( media-libs/libopenglrecorder )
+	wiimote? ( net-wireless/bluez )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-irrlicht-arch-support.patch
+	"${FILESDIR}"/${PN}-1.2-irrlicht-system-libs.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SQLITE3=$(usex sqlite)
+		-DUSE_SYSTEM_ANGELSCRIPT=ON
+		-DUSE_SYSTEM_ENET=ON
+		-DUSE_SYSTEM_GLEW=ON
+		-DUSE_SYSTEM_SQUISH=OFF
+		-DUSE_SYSTEM_WIIUSE=OFF
+		-DUSE_IPV6=OFF # not supported by system enet
+		-DOpenGL_GL_PREFERENCE=GLVND
+		-DUSE_CRYPTO_OPENSSL=$(usex nettle no yes)
+		-DBUILD_RECORDER=$(usex recorder)
+		-DUSE_WIIUSE=$(usex wiimote)
+		-DSTK_INSTALL_BINARY_DIR=bin
+		-DSTK_INSTALL_DATA_DIR=share/${PN}
+		-DBUILD_SHARED_LIBS=OFF # build bundled libsquish as static library
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc CHANGELOG.md
+
+	doicon -s 64 "${DISTDIR}"/${PN}.png
+}