gentoo resync : 18.05.2019

10 files changed, 96 insertions, 297 deletions

diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index 1d60ea1b47e2..c730a36ef95e 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,11 +1,8 @@
-AUX supertuxkart-0.9.3-fix-buildsystem.patch 3634 BLAKE2B a6862dab8f1153b0c54880a6fc3151ab4c0cd1083aa170f6dac749c1eda18386045a8fd41ce4ac489a62891c0ad5528db720b2e8bbdc6a1295cbe4902e7850b0 SHA512 c7725e7bf8736782bdd66b3ce0680e5fcdf1a02b469f47f6123f362d985926b9c2d1e2f5555dc5f9b32cc1585397c1ac6e31f7b5ef36cd974e80d20cefc1d59e
-AUX supertuxkart-0.9.3-intrin.patch 1709 BLAKE2B 936cc845bd05c5e340f90d2bdfcb27c0853309133bf1dbbc5a068eb02d0f67e24b3a93339229f9016af5708fa6ece0626c9593d46d052b9f9d68fa77b27d8d32 SHA512 f9a2f1e5b393d67327478a4d24c492a3d7818d2e88e244877f554421bd506aebfe2c4174aad404be77067d76d408feb734ee5d27d787dd10ad148892e51b326c
 AUX supertuxkart-0.9.3-irrlicht-arch-support.patch 1514 BLAKE2B b7daa129e94ddb96a774ce8cbc47d88475ced879efb9ff38029bd36268083c5838d2c03051f8147e3e8068b588bf0325c7c204f1b3b91ec1d58936cdee6cb119 SHA512 e6560b05c37ca95f8c04ac20f109f55a0a2bf00dd10fbe1975daae5f41c0ed2e1612df12fcdf3c4b6d70ecdfbb67f3d5b4a11ec137051592f5fc67114721c03c
-AUX supertuxkart-0.9.3-irrlicht-bundled-libs.patch 1069 BLAKE2B e176361b4bb0df5c6f5a7b1bec24816c2f368470d4cb277830b02abf05d55e31bc7259620f667d704e94d7748e0cf24e53fb4c7fbea6eceae011fd2e6e0be420 SHA512 64d9e8891db76123351f55ceba034a65fd3894d80341c496ff5762678548e18d5aef8d2e71dfb01eef7591dac16685940d5083058aca40aa1d1b9d0550228d9c
 AUX supertuxkart-0.9.3-irrlicht-system-libs.patch 1576 BLAKE2B b252cc0036f41e9bcf02e1bf049f82de7cd94aba981cc7e161aac52306890fc490d2d4b213fcec60f9098573b3cc059a26aa2efe524030034e4a29c15bf36b88 SHA512 55d353d492aafec3ddb801b28bbe4058bc0b348980f631057850915849013ec191658c55dbc41b48402219a13ec5db811d89401d5cfbb27e7bf5c68f2478d5b6
-AUX supertuxkart-0.9.3-unbundle-enet.patch 1591 BLAKE2B 96bd9b9235f5eabfd02939cc76aee1f01e415554e91310f133ff8441fa8243825db66912cafde4c6ce4146a07f2870a5b11e03460a2dee9bf69c8565591239a3 SHA512 fcbae8df0424be0693dbfd71b349a3d81fd046dba2cccf720630ec94b8a575e41eefafe5e602d44e64b3613344e2b473655c2ce004dc32d45fc3e5f9e4965a22
-AUX supertuxkart-0.9.3-unbundle-libs.patch 364 BLAKE2B e83f06bcb976c01a53f80941e94c616af06509cb8c329861c2c6b206f67fadf17b7ca8bbb324b43cad5593090fae58fec5d10332013e4522ed27d1e9ee5d47fe SHA512 0ba80dd7d5b18eba882c38b7522e06d29c11acc6b34500ba29391494e085c72f1c45533c27033d37b44ef7b954339ea313632d3ced718b20294e12a47a1e78f5
-DIST supertuxkart-0.9.3-src.tar.xz 544517772 BLAKE2B 84ab64371a59bf302905181ad98dd12542a9ffda18b9081ecfa6fcbb61d89c6b1f76f3598184459bbb40a42a1c968767837e76bbd0c9b2ade6b4c18831bc61fb SHA512 29eb1d8fb8e336453e590273089af09eac9a563f82c0bc797d43d5e21d5c9d1274a84ea7ee46487b3d127c47e55e3d233ad7e0e8c502c15dbafc1cc0f5c861c9
+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
 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
-EBUILD supertuxkart-0.9.3.ebuild 2149 BLAKE2B 8215fb5543727060c28e622e3a254158cdbed3d78cad8182af041d7a414f7f15a762eef52874b784c2940bc5d6f7555d5b565cd6a7d8f2ebfec8a9e1bcb5ffa7 SHA512 eb926cbb2e49f4b3750bf3404e56fbea6d2371bff84e72c846007e21ecb605acbf8b9c60fff5b079b8b44cb4ce71764fea48e4e0b80e24929d9487662a5f243b
-MISC metadata.xml 573 BLAKE2B 6a6ec70954841483c605afdf11e8b6d8e2b1b4eec660597010df8672e6726bf512aa59acd767df7ab53aeb4975a4a3f1650fb745950f078d9abe64a4753cd6d9 SHA512 c321e0f7c53b06f71d61b02185abd4f8901c21b9e59e1bf53a9a1d6f9569483307fdd1666a9a12c603971b16a47dc4780d39f8419f1396239e75cb10b289a3a9
+EBUILD supertuxkart-1.0.ebuild 2348 BLAKE2B cc7704ec2da00b634cdba90899703b4d9feeeb47de3b1bd3b75a87fbf2adffd97ef09a666fadd8e1a9a9d591e50ab4cd5832ee02f13b9f0ad75949b21bf90b03 SHA512 7a4d49b01656d764ac9bc3fc7fe790272c2527a0954923ce582812d04f6b0326d99496dbf6b5f18c1dcf603f0d99b1a7e25a25ae9df7e358f70699c63ad9bba2
+MISC metadata.xml 648 BLAKE2B d59c4184d4dbc02f0b6d9edae30553187e4a91c81385ab360e93231ffaf4c49c647720f1839ebefd92a938bc1efbb5f8ee0fa1434cae56087ab73f0f7cca8697 SHA512 5191f653e432c5b01a6aef1f1fbae8d92daa66dd94eb391d7b132a510452b19532f2b620afe131e9b1b5bdbb4a2cb597bf9cd2c236deb5b4de74a3154f279df4
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch
deleted file mode 100644
index def5c80340ba..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-* Unbundle remaining libraries: GLEW, zlib, png, jpeg
-* Add -DAS_DEPRECATED for Angelscript
-* Remove definition of debug macros
-* Build bundled Irrlicht with user flags
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -110,43 +110,11 @@
- include_directories(${ENET_INCLUDE_DIR})
- 
- # Build glew library
- if(NOT USE_GLES2 AND NOT SERVER_ONLY)
-+    find_package(GLEW REQUIRED)
-+    include_directories(${GLEW_INCLUDE_DIRS})
-     add_definitions(-DGLEW_NO_GLU)
--    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
--    include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
- endif()
-
--if(MSVC OR APPLE)
--    if (NOT APPLE)
--    # Build zlib library
--    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/zlib")
--    include_directories("${PROJECT_SOURCE_DIR}/lib/zlib")
--
--    set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/zlib" "${PROJECT_BINARY_DIR}/lib/zlib/")
--    set(ZLIB_LIBRARY zlibstatic)
--    endif()
--
--    # Build png library
--    set(SKIP_INSTALL_ALL TRUE)
--    set(PNG_STATIC TRUE CACHE BOOL "Build static lib")
--    set(PNG_TESTS FALSE CACHE BOOL "Build libpng tests")
--    set(PNG_SHARED FALSE CACHE BOOL "Build shared lib")
--    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
--    include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
--
--    set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
--    set(PNG_LIBRARY png_static)
--endif()
--
--# Add jpeg library
--if (APPLE)
--    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
--    include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
--    set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
--    set(JPEG_LIBRARY jpeglib)
--else()
--    find_package(JPEG REQUIRED)
--    include_directories(${JPEG_INCLUDE_DIR})
--endif()
- 
- if (BUILD_RECORDER)
-@@ -206,6 +174,7 @@
-     find_package(Angelscript)
-     if(ANGELSCRIPT_FOUND)
-         include_directories(${Angelscript_INCLUDE_DIRS})
-+        add_definitions(-DAS_DEPRECATED)
-     else()
-         message(FATAL_ERROR "Angelscript not found. "
-             "Either install angelscript or use built-in version using "
-@@ -307,14 +276,6 @@
-     # VS will automatically add NDEBUG for release mode, but only _DEBUG in debug mode.
-     # Since STK uses DEBUG, this is added for debug compilation only:
-     set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG)
--else()
--    # All non VS generators used create only a single compile mode, so
--    # compile flags can be simplye be added
--    if(CMAKE_BUILD_TYPE MATCHES Debug)
--        add_definitions(-DDEBUG)
--    else()
--        add_definitions(-DNDEBUG)
--    endif()
- endif()
- 
- # TODO: remove this switch
-@@ -426,7 +395,7 @@
- if(NOT SERVER_ONLY)
-     if(NOT USE_GLES2)
--        target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} glew graphics_utils)
-+        target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARIES} graphics_utils)
-     else()
-         target_link_libraries(supertuxkart GLESv2)
-     endif()
- endif()
---- a/lib/irrlicht/CMakeLists.txt
-+++ b/lib/irrlicht/CMakeLists.txt
-@@ -68,15 +68,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")
--    if(CMAKE_COMPILER_IS_GNUCC)
--        set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
--    endif()
--    if(CMAKE_COMPILER_IS_GNUCXX)
--        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-intrin.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch
deleted file mode 100644
index 75830b8ba8f2..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 813b08bc73e4e93714b972ee56c64b4771735e01 Mon Sep 17 00:00:00 2001
-From: Benau <Benau@users.noreply.github.com>
-Date: Sun, 14 Jan 2018 10:19:37 +0800
-Subject: [PATCH] Fix #3091
-
----
- lib/graphics_utils/mipmap/cpusimd.h | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/lib/graphics_utils/mipmap/cpusimd.h b/lib/graphics_utils/mipmap/cpusimd.h
-index 1dc2c730b2..5e2cf30e5f 100644
---- a/lib/graphics_utils/mipmap/cpusimd.h
-+++ b/lib/graphics_utils/mipmap/cpusimd.h
-@@ -38,11 +38,11 @@
-  #include <mmintrin.h>
-  #define CPU_MMX_SUPPORT (1)
- #endif
--#if __SSE__ || _M_X64 || _M_IX86_FP >= 1  || CPU_ENABLE_SSE
-+#if __SSE__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 1 ) ) || CPU_ENABLE_SSE
-  #include <xmmintrin.h>
-  #define CPU_SSE_SUPPORT (1)
- #endif
--#if __SSE2__ || _M_X64 || _M_IX86_FP >= 2  || CPU_ENABLE_SSE2
-+#if __SSE2__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 2 ) ) || CPU_ENABLE_SSE2
-  #include <emmintrin.h>
-  #define CPU_SSE2_SUPPORT (1)
- #endif
-@@ -95,23 +95,23 @@
-  #define CPU_POPCNT_SUPPORT (1)
- #endif
- #if __LZCNT__ || CPU_ENABLE_LZCNT
-- #include <lzcntintrin.h>
-+ #include <x86intrin.h>
-  #define CPU_LZCNT_SUPPORT (1)
- #endif
- #if __F16C__ || CPU_ENABLE_F16C
-- #include <f16cintrin.h>
-+ #include <x86intrin.h>
-  #define CPU_F16C_SUPPORT (1)
- #endif
- #if __BMI__ || CPU_ENABLE_BMI
-- #include <bmiintrin.h>
-+ #include <x86intrin.h>
-  #define CPU_BMI_SUPPORT (1)
- #endif
- #if __BMI2__ || CPU_ENABLE_BMI2
-- #include <bmi2intrin.h>
-+ #include <x86intrin.h>
-  #define CPU_BMI2_SUPPORT (1)
- #endif
- #if __TBM__ || CPU_ENABLE_TBM
-- #include <tbmintrin.h>
-+ #include <x86intrin.h>
-  #define CPU_TBM_SUPPORT (1)
- #endif
- 
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-bundled-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-bundled-libs.patch
deleted file mode 100644
index 194f278b958d..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-bundled-libs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Remove embedded libraries in Irrlicht source (flagged by lintian)
- Since removing the subdirectories containing libjpeg/libpng/zlib/bzip2/lzma
- would make this patch way too large, this patch should be applied on top of
-	rm -rf lib/jpeglib/
-	rm -rf lib/zlib/
-	rm -rf lib/libpng/
- in debian/rules (e.g. in the clean target).
-Forwarded: no
-Author: Vincent Cheng <vcheng@debian.org>
-Last-Update: 2016-07-07
-
---- a/lib/irrlicht/CMakeLists.txt
-+++ b/lib/irrlicht/CMakeLists.txt
-@@ -2,9 +2,6 @@
- find_package(PNG REQUIRED)
- find_package(JPEG REQUIRED)
- 
--include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
--                    "${JPEG_INCLUDE_DIR}"
--                    "${PNG_INCLUDE_DIRS}"
--                    "${ZLIB_INCLUDE_DIR}")
-+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)
- 
- if(MSVC OR APPLE)
-@@ -576,7 +573,7 @@
- endif()
- 
- add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES})
-
--target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
-+target_link_libraries(stkirrlicht png jpeg z)
- 
- if(NOT SERVER_ONLY)
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch
deleted file mode 100644
index 8c00fce7e186..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Build supertuxkart against system enet instead of embedded copy
-Forwarded: not-yet
-Author: Vincent Cheng <vcheng@debian.org>
-Last-Update: 2016-07-17
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -105,9 +105,9 @@
- add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
- include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
- 
--# Build the ENet UDP network library
--add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
--include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
-+# ENet
-+find_package(ENet REQUIRED)
-+include_directories(${ENET_INCLUDE_DIR})
- 
- # Build glew library
- if(NOT USE_GLES2 AND NOT SERVER_ONLY)
-@@ -406,10 +406,10 @@
-     bulletdynamics
-     bulletcollision
-     bulletmath
--    enet
-     stkirrlicht
-     ${Angelscript_LIBRARIES}
-     ${CURL_LIBRARIES}
-+    ${ENET_LIBRARIES}
-     ${OGGVORBIS_LIBRARIES}
-     ${OPENAL_LIBRARY}
-     ${FREETYPE_LIBRARIES}
---- /dev/null
-+++ b/cmake/FindENet.cmake
-@@ -0,0 +1,22 @@
-+# - Find ENet
-+# Find the ENet includes and libraries
-+#
-+# Following variables are provided:
-+# ENET_FOUND
-+#     True if ENet has been found
-+# ENET_INCLUDE_DIR
-+#     The include directories of ENet
-+# ENET_LIBRARIES
-+#     ENet library list
-+
-+
-+find_path(ENET_INCLUDE_DIR enet/enet.h /usr/include)
-+find_library(ENET_LIBRARY NAMES enet PATHS /usr/lib)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(ENet DEFAULT_MSG ENET_INCLUDE_DIR ENET_LIBRARY)
-+
-+# Publish variables
-+set(ENET_INCLUDE_DIRS ${ENET_INCLUDE_DIR})
-+set(ENET_LIBRARIES ${ENET_LIBRARY})
-+mark_as_advanced(ENET_INCLUDE_DIR ENET_LIBRARY)
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch
deleted file mode 100644
index 798a6cdea7ac..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Link against system copies of zlib/libpng/libjpeg/bzip2
-Forwarded: not-yet
-Author: Vincent Cheng <vcheng@debian.org>
-Last-Update: 2016-07-17
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -416,6 +416,11 @@
-     ${JPEG_LIBRARIES}
-     ${TURBOJPEG_LIBRARY}
-     #${VPX_LIBRARIES}
-+    X11
-+    z
-+    png
-+    jpeg
-+    bz2
-     )
- 
- if(NOT SERVER_ONLY)
diff --git a/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch b/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch
new file mode 100644
index 000000000000..23e8280a18f4
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch
@@ -0,0 +1,20 @@
+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()
+ 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")
+-    if(CMAKE_COMPILER_IS_GNUCC)
+-        set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
+-    endif()
+-    if(CMAKE_COMPILER_IS_GNUCXX)
+-        set(CMAKE_CXX_FLAGS   "${CMAKE_CXX_FLAGS} -fexpensive-optimizations")
+-    endif()
+ endif()
+ 
+ if(USE_GLES2)
diff --git a/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch b/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch
new file mode 100644
index 000000000000..8158c4bb9e5e
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch
@@ -0,0 +1,43 @@
+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/metadata.xml b/games-action/supertuxkart/metadata.xml
index a5ee37310257..ced8e3e6ee96 100644
--- a/games-action/supertuxkart/metadata.xml
+++ b/games-action/supertuxkart/metadata.xml
@@ -7,6 +7,7 @@
 	</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="wiimote">Support for wiimote input devices</flag>
 	</use>
diff --git a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild b/games-action/supertuxkart/supertuxkart-1.0.ebuild
index 1e666dfcdc15..96746c833f78 100644
--- a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.0.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils desktop gnome2-utils
+inherit cmake-utils desktop xdg-utils
 
 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
 	mirror://gentoo/${PN}.png"
 
-LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
+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 recorder wiimote"
+IUSE="debug fribidi libressl nettle recorder 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-libs/angelscript:=
+	media-libs/freetype:2
 	media-libs/glew:0=
 	media-libs/libpng:0=
 	media-libs/libvorbis
@@ -34,39 +36,47 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXxf86vm
 	fribidi? ( dev-libs/fribidi )
+	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}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.3-intrin.patch
-	"${FILESDIR}"/${PN}-0.9.3-unbundle-enet.patch
-	"${FILESDIR}"/${PN}-0.9.3-unbundle-libs.patch
 	"${FILESDIR}"/${PN}-0.9.3-irrlicht-arch-support.patch
-	"${FILESDIR}"/${PN}-0.9.3-irrlicht-bundled-libs.patch
 	"${FILESDIR}"/${PN}-0.9.3-irrlicht-system-libs.patch
-	"${FILESDIR}"/${PN}-0.9.3-fix-buildsystem.patch
+	"${FILESDIR}"/${PN}-1.0-fix-buildsystem.patch
+	"${FILESDIR}"/${PN}-1.0-system-squish.patch
 )
 
 src_prepare() {
 	cmake-utils_src_prepare
 
 	# remove bundled libraries, just to be sure
-	rm -r lib/{enet,glew,jpeglib,libpng,zlib} || die
+	rm -r lib/{angelscript,enet,glew,jpeglib,libpng,zlib} || die
 }
 
 src_configure() {
 	local mycmakeargs=(
-		# system dev-libs/angelscript leads
-		# to failed assert segfaults
-		-DUSE_SYSTEM_ANGELSCRIPT=OFF
+		-DUSE_SYSTEM_ANGELSCRIPT=ON
+		-DUSE_SYSTEM_ENET=ON
+		-DUSE_SYSTEM_GLEW=ON
+		-DUSE_SYSTEM_SQUISH=OFF
+		-DUSE_SYSTEM_WIIUSE=OFF
+		-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
 		-DSTK_INSTALL_DATA_DIR=share/${PN}
+		-DBUILD_SHARED_LIBS=OFF # build bundled libsquish as static library
 	)
 	cmake-utils_src_configure
 }
@@ -78,14 +88,10 @@ src_install() {
 	doicon -s 64 "${DISTDIR}"/${PN}.png
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }