gentoo resync : 30.10.2021

4 files changed, 68 insertions, 71 deletions

diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index ef17573e97ab..70fb06cc813d 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,11 +1,11 @@
-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 1706 BLAKE2B a3007cbcf9a01b44e385b9fe30183811a7cb2183ea8560b904271bd1df6ed02c827d4d02ee914691fa2fa9c39ecaf5cc2933318563c9ad0f40614adcf0298076 SHA512 b616bfe18d990f881a703c4c7a545f49d47cbf3bb42f0d4d657fa6a837667a316a48aec0bdf0e1ae803abdf536a66c6c8bbf39f9ec5c6008db7030b67337530a
 AUX supertuxkart-1.2-new-sdl.patch 5394 BLAKE2B 67893f5fb29a954205aeaff2d10029d9f98eacb9b67368a0783bf4a0c84a3d14fb7438e87b8f4925f43757782a48606957aaaea569f98a7b9c3665738fa13bf4 SHA512 e3e70f79168e8de5047d5a7fdb5c96815d8cdf19a010c0110ac90a72fa71abd811577ca80db46f08765b5bb53b77a38ef708d153eb76f7d41f627ebc46deb920
+AUX supertuxkart-1.3-irrlicht-system-libs.patch 1825 BLAKE2B fcc6fb41e44ffdf9f872f92b44ad18c492cb5a5f631be1c7a42078b459673f885c100d4dc0ea4fc2e0b6e418b63f038cc6c8f47519a20894c8549d6a08f7c493 SHA512 8b7c5b59067592a68f54c224eccc25509ee0a6c133a093a6d6b61833d8777f1687484a1481986e06ed9708c17691c1fc1b7b42ad3f17b006fa5b66161e628a4d
 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-1.3-src.tar.xz 627753500 BLAKE2B 3ffc86edf80adb27cd17a6ba796fb14d0660a1c14ff21c7908e5f965609c6f6a6b40270a21690cd1318d1003e07d90b4180c292252b1731d4cd6292fe12e6086 SHA512 42664390c844ebca0be9b2f2aeb3c9197c0c79a7c604707b32e81ef41aec10fa36f5950f06e1540ea6f75f6c7f8a8f7f80aeda48de3d101d991420f5b20530ed
 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
-EBUILD supertuxkart-1.1.ebuild 2201 BLAKE2B 7e0d0ed0ef1655f1849198443115377ac0bf0f8f56e8ece66d8cc9c943151f04d6ac4f261e128fe3f66cf8b2b4c563bf613e1c4495b620fc772b7feec85005e6 SHA512 147821922d9c3eff1201fa487eac637517f11a8f4f2e672844f4a71ff495161b2d1a06126ed4cf6a26791f3bfe1d1d4419ffc3665cbbca1abc2d96775f8316ec
 EBUILD supertuxkart-1.2.ebuild 2181 BLAKE2B f9d04190d5fa0d50c55892aecedb9068d7beb28efbbe5ad18950dd5bc96b1719729a3096a5b05773d3563bccccc82b19f54ba265826cb20f8d680a8c70142562 SHA512 8c59e8458551316b746f3bc36f77b3f6021ec0f98ce482a1f4f625031ce58bef704932692a0e9ef5bb70a8671330c98479229005b441e06f9d5607b2617f5019
+EBUILD supertuxkart-1.3.ebuild 2147 BLAKE2B 09eddab186addc37ae9e3e67d0c59a49dad40f1531d2c77615261af124da1a36656dfb187871a2970e3be77877f2088792d18a9a1be0b91d90a4bdabb1a1bc35 SHA512 d5f64b2c70bd19ec7f8fa1fdf3ff81c3b81fa03d0d89e6c070cce5e954e8924e55c34a8f29054ec047535b4ca5962f5a8b96009e15941aa3b09a59bcd9285a96
 MISC metadata.xml 745 BLAKE2B 6064e59ccfa2826a6cd00a72834b768e2a4de4882e341c4acc9fbb2f5b92e316a97ceee1b836c79c1cebb269add19a0d835048484a4f0d72bf9a7358c3cbae91 SHA512 66ead957f3f61f4796471cc2dd091b35caa601568ef86431658212228671a98ba515026dd576226ce18c25b49d46bc5e4a214a0a4c79533acf08709f72a61b1b
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch
deleted file mode 100644
index ce7ce63fa661..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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/COpenGLExtensionHandler.h
-+++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
-@@ -21,7 +21,7 @@
- 	#endif
- 	#include <GL/gl.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--		#include "glext.h"
-+		#include <GL/glext.h>
- 	#endif
- 	#include "wglext.h"
- 
-@@ -36,7 +36,7 @@
- 	#endif
- 	#include <OpenGL/gl.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--		#include "glext.h"
-+		#include <GL/glext.h>
- 	#endif
- #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-@@ -50,7 +50,7 @@
- 	#include <SDL/SDL_video.h>
- 	#include <SDL/SDL_opengl.h>
-         typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
--	#include "glext.h"
-+	#include <GL/glext.h>
- #else
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- 		#define GL_GLEXT_LEGACY 1
---- 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

-@@ -25,7 +25,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/files/supertuxkart-1.3-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-1.3-irrlicht-system-libs.patch
new file mode 100644
index 000000000000..7ff757432603
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-1.3-irrlicht-system-libs.patch
@@ -0,0 +1,54 @@
+diff -ur a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp	2021-09-28 11:02:26.000000000 +0100
++++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp	2021-10-29 23:30:44.714768031 +0100
+@@ -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

+ 

+diff -ur a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
+--- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h	2021-09-28 11:02:26.000000000 +0100
++++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h	2021-10-29 23:30:44.715768059 +0100
+@@ -30,7 +30,7 @@
+ 	#endif
+ 	#include <GL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ 	#include "wglext.h"
+ 
+@@ -45,7 +45,7 @@
+ 	#endif
+ 	#include <OpenGL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ #endif
+ 
+diff -ur a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
+--- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h	2021-09-28 11:02:26.000000000 +0100
++++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h	2021-10-29 23:30:44.715768059 +0100
+@@ -20,7 +20,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

+@@ -34,7 +34,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/supertuxkart-1.1.ebuild b/games-action/supertuxkart/supertuxkart-1.3.ebuild
index 1b75dbc88d84..59bc12a50831 100644
--- a/games-action/supertuxkart/supertuxkart-1.1.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.3.ebuild
@@ -1,31 +1,34 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 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="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz
+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 nettle recorder wiimote"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="debug 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:=
-	dev-libs/fribidi
 	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=
@@ -48,23 +51,20 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${P}-src"
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-irrlicht-arch-support.patch
-	"${FILESDIR}"/${PN}-0.9.3-irrlicht-system-libs.patch
-	"${FILESDIR}"/${PN}-1.1-fix-buildsystem.patch
+	"${FILESDIR}"/${PN}-1.3-irrlicht-system-libs.patch
 )
 
 src_prepare() {
 	cmake_src_prepare
-
-	# remove bundled libraries, just to be sure
-	rm -r lib/{angelscript,enet,glew,jpeglib,libpng,zlib} || die
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DUSE_SQLITE3=$(usex sqlite)
 		-DUSE_SYSTEM_ANGELSCRIPT=ON
 		-DUSE_SYSTEM_ENET=ON
 		-DUSE_SYSTEM_GLEW=ON
@@ -73,7 +73,6 @@ src_configure() {
 		-DUSE_IPV6=OFF # not supported by system enet
 		-DOpenGL_GL_PREFERENCE=GLVND
 		-DUSE_CRYPTO_OPENSSL=$(usex nettle no yes)
-		-DENABLE_WAYLAND_DEVICE=OFF
 		-DBUILD_RECORDER=$(usex recorder)
 		-DUSE_WIIUSE=$(usex wiimote)
 		-DSTK_INSTALL_BINARY_DIR=bin