gentoo Easter resync : 12.04.2020

5 files changed, 19 insertions, 69 deletions

diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index e7647f9000a2..27562c043259 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,8 +1,7 @@
-AUX supertuxkart-0.9.3-irrlicht-arch-support.patch 1514 BLAKE2B b7daa129e94ddb96a774ce8cbc47d88475ced879efb9ff38029bd36268083c5838d2c03051f8147e3e8068b588bf0325c7c204f1b3b91ec1d58936cdee6cb119 SHA512 e6560b05c37ca95f8c04ac20f109f55a0a2bf00dd10fbe1975daae5f41c0ed2e1612df12fcdf3c4b6d70ecdfbb67f3d5b4a11ec137051592f5fc67114721c03c
 AUX supertuxkart-0.9.3-irrlicht-system-libs.patch 1576 BLAKE2B b252cc0036f41e9bcf02e1bf049f82de7cd94aba981cc7e161aac52306890fc490d2d4b213fcec60f9098573b3cc059a26aa2efe524030034e4a29c15bf36b88 SHA512 55d353d492aafec3ddb801b28bbe4058bc0b348980f631057850915849013ec191658c55dbc41b48402219a13ec5db811d89401d5cfbb27e7bf5c68f2478d5b6
-AUX supertuxkart-1.0-fix-buildsystem.patch 806 BLAKE2B a7e81d17b75225f1db4cbaf51a9ca4634b1d39d0460ce3f481f6b63c8e88778f76993469ca40bca5051e85dba428580938eee6b47ea0505d1c6bcbb7768449fd SHA512 1951e3e83984e3da7be0f23eea4ccea7a57472c1f12e9d7552c94ccefb07b41ce0616040aacdc41ed2448ffb60445aad0e3918a18f9df639fc3c6960a8cd315e
-AUX supertuxkart-1.0-system-squish.patch 1667 BLAKE2B 87d61b4118ab09cb7d455cdb7c9311e67049d3edbf9a0e067bf700baeac16a91aac8ea58a4e76e42f2c6c96df353ef4485292cd93fe00bcbe0624cabfb878d44 SHA512 6c43d3bed3400dfcc8ceeecc9cc2d2ed53f7a8e363bd17935e6ce38f8a7b98b75be26664c53ddfbbe0d680e0c9ea4f3f8a5a7047c18c7c83f4386f7f5383b6fc
-DIST supertuxkart-1.0-src.tar.xz 597012504 BLAKE2B ed1b851bad8696b4593c54f215b115528afc29bde237f67627e2918c4a9fab09eddc204d0c879fa85c6b10b5544dba5fa5fc1b437cb83e6d884ac717e3369c28 SHA512 182754610abd09545630fa1f7fda858ba1731bbacb078bc71597e143f9cb2a1cfcedd3038720760d0471a89b79cc3bb1eb292d38fcd53be05aad7cb17c474ca9
+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
+DIST supertuxkart-1.1-src.tar.xz 616739152 BLAKE2B a4dd9ec0a8ee158306dc902d3de363b68e7a317800df1b36339843521019df91c0713b74bdef8dc06b40bee57285237408a17b539c7bd7298cd3ef3deaf99fda SHA512 81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804
 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
-EBUILD supertuxkart-1.0.ebuild 2324 BLAKE2B de0737dcd264f3b02a74251cf708b2ab802100c7b7e54291ac3f08bbccea0ff7739b2d6ec8d80ebacc2f531fa2eeca3cad3353ff2ec9f66c3fc87cbbdbc1484e SHA512 e44ad7eaa6db13705042aec24f9f7cc31b9fffc8fcaef9e6b758ebfaa913d9e1fb3d3ab685627d6531ab394a94049243ef4553d58c522b2ebc572a25621cb606
+EBUILD supertuxkart-1.1.ebuild 2246 BLAKE2B 53b9b07a6a1e7d95a9315330cf740b7d34eba70cdea8c9c0e039662f2be6c9f7b63aeb36af318baffbdac088f5171faac1e523eca57b3dc85436351d7be6b4f4 SHA512 02163204a18f2172bac856922fef03fd4aac80625f2421dda527997a65e27c68327e8c6b8897fa100ed65e14c40bdacc3344ff749572da29c3b51c0c2e3168be
 MISC metadata.xml 648 BLAKE2B d59c4184d4dbc02f0b6d9edae30553187e4a91c81385ab360e93231ffaf4c49c647720f1839ebefd92a938bc1efbb5f8ee0fa1434cae56087ab73f0f7cca8697 SHA512 5191f653e432c5b01a6aef1f1fbae8d92daa66dd94eb391d7b132a510452b19532f2b620afe131e9b1b5bdbb4a2cb597bf9cd2c236deb5b4de74a3154f279df4
diff --git a/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch b/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch
deleted file mode 100644
index 8158c4bb9e5e..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e1601b1ae07e3c1ac05cffe05b82e0c60998bc72 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Mon, 13 May 2019 22:51:21 +0100
-Subject: [PATCH] CMake: Add option to use system Squish library
-
-The system version was preferred before but it wasn't possible to
-explicitly disable it, making its use automagic, which is bad for
-packaging.
-
-Closes: https://github.com/supertuxkart/stk-code/pull/3916
----
- CMakeLists.txt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8a7f03264..40e7790fe 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,6 +31,8 @@ CMAKE_DEPENDENT_OPTION(BUILD_RECORDER "Build opengl recorder" ON
-     "NOT SERVER_ONLY;NOT APPLE" OFF)
- CMAKE_DEPENDENT_OPTION(USE_FRIBIDI "Support for right-to-left languages" ON
-     "NOT SERVER_ONLY" OFF)
-+CMAKE_DEPENDENT_OPTION(USE_SYSTEM_SQUISH "Use system Squish library instead of the built-in version, when available." ON
-+    "NOT SERVER_ONLY" OFF)
- CMAKE_DEPENDENT_OPTION(USE_WIIUSE "Support for wiimote input devices" ON
-     "NOT SERVER_ONLY;NOT MINGW;NOT CYGWIN" OFF)
- 
-@@ -247,8 +249,10 @@ if(NOT SERVER_ONLY)
- endif()
- 
- if(NOT SERVER_ONLY)
--    find_library(SQUISH_LIBRARY NAMES squish libsquish)
--    find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS)
-+    if(USE_SYSTEM_SQUISH)
-+        find_library(SQUISH_LIBRARY NAMES squish libsquish)
-+        find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS)
-+    endif()
-     if (NOT SQUISH_LIBRARY OR NOT SQUISH_INCLUDEDIR)
-         add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libsquish")
-         include_directories("${PROJECT_SOURCE_DIR}/lib/libsquish")
--- 
-2.20.1
-
diff --git a/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch b/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch
index 23e8280a18f4..394a1963199d 100644
--- a/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch
+++ b/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch
@@ -2,13 +2,13 @@ diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
 index 92a881c81..1371fdf11 100644
 --- a/lib/irrlicht/CMakeLists.txt
 +++ b/lib/irrlicht/CMakeLists.txt
-@@ -96,15 +96,6 @@ endif()
+@@ -94,15 +94,6 @@
  if(WIN32)
      add_definitions(-D_IRR_STATIC_LIB_)
      add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
 -else()
--    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing")
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing")
+-    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fstrict-aliasing")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3 -fstrict-aliasing")
 -    if(CMAKE_COMPILER_IS_GNUCC)
 -        set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
 -    endif()
@@ -16,5 +16,5 @@ index 92a881c81..1371fdf11 100644
 -        set(CMAKE_CXX_FLAGS   "${CMAKE_CXX_FLAGS} -fexpensive-optimizations")
 -    endif()
  endif()
- 
+
  if(USE_GLES2)
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch b/games-action/supertuxkart/files/supertuxkart-1.1-irrlicht-arch-support.patch
index 66191861a963..ad9638ff3dcf 100644
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch
+++ b/games-action/supertuxkart/files/supertuxkart-1.1-irrlicht-arch-support.patch
@@ -32,8 +32,8 @@ Signed-off-by: Christoph Egger <debian@christoph-egger.org>
 + #endif

  #endif

  #define _IRR_POSIX_API_

-@@ -460,11 +464,7 @@
- 	#undef _IRR_WCHAR_FILESYSTEM

+@@ -465,11 +465,7 @@
+     #undef _IRR_WCHAR_FILESYSTEM

  #endif

  

 -#if defined(__sparc__) || defined(__sun__)

@@ -42,6 +42,6 @@ Signed-off-by: Christoph Egger <debian@christoph-egger.org>
 -

 -#if defined(_IRR_SOLARIS_PLATFORM_)

 +#if defined(_IRR_SOLARIS_PLATFORM_) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__)

- 	#undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_

+     #undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_

  #endif

  

diff --git a/games-action/supertuxkart/supertuxkart-1.0.ebuild b/games-action/supertuxkart/supertuxkart-1.1.ebuild
index 9d7ff7ec2272..5701c73bab72 100644
--- a/games-action/supertuxkart/supertuxkart-1.0.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake desktop xdg-utils
+inherit cmake desktop xdg
 
 DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
 HOMEPAGE="https://supertuxkart.net/"
@@ -21,6 +21,7 @@ IUSE="debug fribidi libressl nettle recorder wiimote"
 
 RDEPEND="
 	dev-libs/angelscript:=
+	dev-libs/fribidi
 	media-libs/freetype:2
 	media-libs/glew:0=
 	media-libs/libpng:0=
@@ -35,7 +36,6 @@ RDEPEND="
 	virtual/opengl
 	x11-libs/libX11
 	x11-libs/libXxf86vm
-	fribidi? ( dev-libs/fribidi )
 	nettle? ( dev-libs/nettle:= )
 	!nettle? (
 		libressl? ( dev-libs/libressl:= )
@@ -48,11 +48,12 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+S="${WORKDIR}/${P}-src"
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.3-irrlicht-arch-support.patch
+	"${FILESDIR}"/${PN}-1.1-irrlicht-arch-support.patch
 	"${FILESDIR}"/${PN}-0.9.3-irrlicht-system-libs.patch
-	"${FILESDIR}"/${PN}-1.0-fix-buildsystem.patch
-	"${FILESDIR}"/${PN}-1.0-system-squish.patch
+	"${FILESDIR}"/${PN}-1.1-fix-buildsystem.patch
 )
 
 src_prepare() {
@@ -69,9 +70,10 @@ src_configure() {
 		-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)
 		-DENABLE_WAYLAND_DEVICE=OFF
-		-DUSE_FRIBIDI=$(usex fribidi)
 		-DBUILD_RECORDER=$(usex recorder)
 		-DUSE_WIIUSE=$(usex wiimote)
 		-DSTK_INSTALL_BINARY_DIR=bin
@@ -87,11 +89,3 @@ src_install() {
 
 	doicon -s 64 "${DISTDIR}"/${PN}.png
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}