gentoo resync : 19.01.2018

12 files changed, 60 insertions, 516 deletions

diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index 4f57951096ab..2595e7268c9c 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,20 +1,11 @@
-AUX supertuxkart-0.9.2-fix-angelscript.patch 1114 BLAKE2B 03c361af65d699c23225b7551dd8110346b0d23da772b506782844586f019fa48b0eb15e16bd5d6fe1748df367de35d5fb72fa9151c01d5b56c3e6c5cc111aae SHA512 6e87046b760bb059c0e30692c1da6306ebfcfaf1b68a6ad19b0a563bae64ef7d30c955aec075600a4e36f327c6670779fa8923b438898389be35618112a7fbc5
-AUX supertuxkart-0.9.2-fix-buildsystem.patch 3381 BLAKE2B 4b02439f6b58c7a3c2f08ebba48f9226867fdb58b2d0caaaf4fe661c8ec54b8776a2d9295db28953066a9687b10634de41b775ffc321d12bf52883e32f6ee7e9 SHA512 aba636401f6aa5957ddcaca6983c029d3abfbca0fc67f5ac408bda8053a39d9013a190182aae68506740ff8ab336e47dd39dd6dc045c5b21572a22e939b297d2
-AUX supertuxkart-0.9.2-irrlicht-arch-support.patch 1575 BLAKE2B 5fb30761ae0ccf42da7ee4c3d01320526707a96f3130f04a63ec1c192a266517dedb9a36f773af1c05b6ee812ea6cdb511f30696c882093e56c47e986e945558 SHA512 c2cbb2c7644c85863722bc6179196251bbe75db021717f6d7136385ad87d5d9a32beb74d876b32525cc5e44a9994156e7fe44fa8ff3c65cdf0556e4ed8d1e611
-AUX supertuxkart-0.9.2-irrlicht-as-needed.patch 883 BLAKE2B 7456d4e220b87b46f6fe39a382fe369921277f3bdc683680fbe9f1b988f73f03a7e0ee992bc05b3c079bef461885980dab4d1ad9ec573ad55855540ae967297e SHA512 dd2b1319d9a46449ce60ad19eabd5e78ed94f5f780798e47ddedeb8da91e1eb7f065f94a3c0ffd028cb1d241ad921f410cff105f439ff4b5b967a4d0799b6d31
-AUX supertuxkart-0.9.2-irrlicht-bundled-libs.patch 1244 BLAKE2B b1e4bcf0225a3d6b56cb15afeabd727b2c73aa40011b1acbe469a16936caf2f671ac1508cfbe41a4fb8a0544f65d77480e7e746a69d179411eb8887863a29522 SHA512 d004b7808d9e2977d76f9b7cfe2dbed23765a6216d4ae9f69a868b42b541ed1cee5550a9d27ebea9c2884371f7caa8fdaed1b48f090f32da0db7d675b1f67397
-AUX supertuxkart-0.9.2-irrlicht-system-libs.patch 5294 BLAKE2B c33d0ff62328fa33b14ab684c20ad4d7b9c8acf2e426f99cfb25200c5d1870308d2fb78149663ef6fc3846d062d4874253d2e4a321359c6f5a6024ba3a54bcc5 SHA512 10f904c7626471a075dd639f8988b36b903c56b8cdcb5519e72fd93cd500c377a3015d70e055d193acc282b103ed41835b10152fa6323215a633fbe1449792ac
-AUX supertuxkart-0.9.2-unbundle-enet.patch 1590 BLAKE2B 461a78539c472a212d37b053638e2faf0d7b432fa0558e0a9d3b321683e73f78c464b8f5e314aa492a3e9f4ddedced46e82d3fc94502a51f27b91942b26e722e SHA512 28e5a9704636fd018599d16540d15f6dc0c07f19a848cdea460a4be610e85a41289a327ebceb5ae054c2989d0a09b3357405e95322ed3e202738c2a833484524
-AUX supertuxkart-0.9.2-unbundle-libs.patch 370 BLAKE2B 8cfd28cbe5d9d331c566df9e58a974f30e974aab84d533ef04af97412697255e9ea04648661c48e7f8d0b0147b4cbf98edf5e680b7bf41f367bdc180bff6ff5a SHA512 08df379c8ce590541c718fcbf6b8405d923c02053854d7601269e606f16f893a62d1f296d4fffb961950a30aa1314ba4a315f2a827c08117c3f58136808b3370
 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.2-src.tar.xz 501606188 BLAKE2B cc77900ef49b31bfa26cd7be244279a64422757fce6bd020b262bfb8159d486d454a0bcfe49b6c958b8951b60accdbf7a41061cd69b1e2c74e9dfd7ac736919e SHA512 57f11d518736f88044d1cb73e1dfcc92f5667f3b1147ab7e54435f6bc560fe856c3650410410da5fa048bf23d0b64fc8a9887c830001e1435b0359c9163e71b0
 DIST supertuxkart-0.9.3-src.tar.xz 544517772 BLAKE2B 84ab64371a59bf302905181ad98dd12542a9ffda18b9081ecfa6fcbb61d89c6b1f76f3598184459bbb40a42a1c968767837e76bbd0c9b2ade6b4c18831bc61fb SHA512 29eb1d8fb8e336453e590273089af09eac9a563f82c0bc797d43d5e21d5c9d1274a84ea7ee46487b3d127c47e55e3d233ad7e0e8c502c15dbafc1cc0f5c861c9
 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
-EBUILD supertuxkart-0.9.2.ebuild 2128 BLAKE2B fd42ae09d08811f110c5a76540197dc63cdae5b52470b26b849d1b7e2f3274489e002174ad96c6161ba78ff9f9cf189eed371ad87f931dc512cc9aa3609b93e8 SHA512 b14efb9e7a1ca2f236784b9ee1eb37e3f260a8917be32ccb220b9fa997d084bad4c6066d756c92390f426302f9febcfccb4d208b70764bb2c7964cce631f3c00
-EBUILD supertuxkart-0.9.3.ebuild 2108 BLAKE2B 5b23baf2e6cc62ef0d090957fd75282dda687f22e0c8fdb1e4f193fe2b7a7df3c7d1c5b26a535b5c9c78eb0ecc61b7d7fb68d0de9da2d6bd88eef83bd5aed5b6 SHA512 7cb2f869a45e0ae54fbcc6d83049ed6592d9328d1139d78db06423e1947c86a1eae8e25b79796704fe7067881a05c7b889579159c74f84ecdb7b5078f5c1dedc
+EBUILD supertuxkart-0.9.3.ebuild 2148 BLAKE2B ca991ebcbde7bf63d12925b0dbf21ec830a66365b9219099a603c69751c6e2d45e688fa5e015f0620759bd0697ec18bfa49b7952d2c794ba24306c07936b9d9d SHA512 1e821d4a659ad7db8a2f1fbe1c7d7622d26f896338276d4eb3cdc08f43ad5edc4b5d8ff8219f5f63e9b1e03f8253af19a750c4bec44d40d07672d545f782a490
 MISC metadata.xml 573 BLAKE2B 6a6ec70954841483c605afdf11e8b6d8e2b1b4eec660597010df8672e6726bf512aa59acd767df7ab53aeb4975a4a3f1650fb745950f078d9abe64a4753cd6d9 SHA512 c321e0f7c53b06f71d61b02185abd4f8901c21b9e59e1bf53a9a1d6f9569483307fdd1666a9a12c603971b16a47dc4780d39f8419f1396239e75cb10b289a3a9
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-angelscript.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-angelscript.patch
deleted file mode 100644
index a2f4fb1829e7..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-angelscript.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix FTBFS on arm64, mips/mips64/mipsel, ppc64el, s390x
-Origin: upstream, https://github.com/supertuxkart/stk-code/commit/5e05f1178ce6bc5f3a653b55ab3dc6d016196341
-Bug: https://github.com/supertuxkart/stk-code/issues/2569
-Bug-Debian: https://bugs.debian.org/830748
-Last-Update: 2016-12-03
-
---- a/lib/angelscript/projects/cmake/CMakeLists.txt
-+++ b/lib/angelscript/projects/cmake/CMakeLists.txt
-@@ -68,6 +68,7 @@ set(ANGELSCRIPT_SOURCE
-     ../../source/as_bytecode.cpp
-     ../../source/as_callfunc.cpp
-     ../../source/as_callfunc_x86.cpp
-+    ../../source/as_callfunc_mips.cpp
-     ../../source/as_callfunc_x64_gcc.cpp
-     ../../source/as_callfunc_x64_msvc.cpp
-     ../../source/as_callfunc_x64_mingw.cpp
---- a/lib/angelscript/source/as_config.h
-+++ b/lib/angelscript/source/as_config.h
-@@ -844,7 +844,7 @@
- 			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
- 			#define AS_X86
- 			#undef AS_NO_THISCALL_FUNCTOR_METHOD
--		#elif defined(__LP64__) && !defined(__arm64__)
-+		#elif defined(__x86_64__)
- 			#define AS_X64_GCC
- 			#undef AS_NO_THISCALL_FUNCTOR_METHOD
- 			#define HAS_128_BIT_PRIMITIVES
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-buildsystem.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-buildsystem.patch
deleted file mode 100644
index 6f1c39b36937..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-buildsystem.patch
+++ /dev/null
@@ -1,97 +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
-@@ -68,37 +68,10 @@
- include_directories(${ENET_INCLUDE_DIR})
- 
- # Build glew library
-+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")
- 
--if((WIN32 AND NOT MINGW) 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)
--    set (PNG_TESTS FALSE)
--    set (PNG_SHARED FALSE)
--    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
--    include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
--
--    #build jpeg library
--    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
--    include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
--
--    set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
--    set(PNG_LIBRARY png15_static)
--    set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
--    set(JPEG_LIBRARY jpeglib)
--endif()
- # Build the irrlicht library
- add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
- include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
-@@ -130,6 +103,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 "
-@@ -245,14 +219,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
-@@ -342,7 +308,7 @@
-     bulletdynamics
-     bulletcollision
-     bulletmath
--    glew
-+    ${GLEW_LIBRARIES}
-     stkirrlicht
-     ${Angelscript_LIBRARIES}
-     ${CURL_LIBRARIES}
---- a/lib/irrlicht/CMakeLists.txt
-+++ b/lib/irrlicht/CMakeLists.txt
-@@ -20,15 +20,6 @@
- elseif(MINGW)
-   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 -I/usr/X11R6/include")
--  set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing -I/usr/X11R6/include")
--  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()
- 
- # Xrandr
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-arch-support.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-arch-support.patch
deleted file mode 100644
index ec5683839590..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-arch-support.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Christoph Egger <debian@christoph-egger.org>
-Subject: [PATCH] debian/arch-support
-
-Building on non-linux architectures currently fails with unpatched
-irrlicht because irrlicht tries to create Joystick support using
-linux-specific headers. However there's infrastructure to disable
-Joystick support, we just need to activate that on non-linux
-architectures.
-
-Additionally if built on a sparc machine irrlicht assumes wrongly it's
-a solaris system. We fix this wrong assumption as our sparc builds are
-all on linux.
-
-Finally irrlicht exceeds the size constraights for -fpic requiering to
-build with -fPIC. As upstream doesn't do that we need to fix this for
-sparc and s390 builds (powerPC?).
-
-Signed-off-by: Christoph Egger <debian@christoph-egger.org>
-
----
- lib/irrlicht/include/IrrCompileConfig.h |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
---- a/lib/irrlicht/include/IrrCompileConfig.h
-+++ b/lib/irrlicht/include/IrrCompileConfig.h
-@@ -101,6 +101,10 @@
- #ifndef _IRR_SOLARIS_PLATFORM_

- #if !defined(__linux__) && !defined(__FreeBSD__)

- #define _IRR_LINUX_PLATFORM_

-+#include <endian.h>

-+ #if __BYTE_ORDER == __BIG_ENDIAN

-+  #define __BIG_ENDIAN__

-+ #endif

- #endif

- #endif

- #define _IRR_POSIX_API_

-@@ -406,11 +410,7 @@
- 	#undef _IRR_WCHAR_FILESYSTEM

- #endif

- 

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

--#define __BIG_ENDIAN__

--#endif

--

--#if defined(_IRR_SOLARIS_PLATFORM_)

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

- 	#undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_

- #endif

- 

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-as-needed.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-as-needed.patch
deleted file mode 100644
index b6cb0fe4c151..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-as-needed.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Christoph Egger <Christoph.Egger@gmx.de>
-Subject: [PATCH] debian/link-against-needed-libs
-
-There are quite some libraries irrlicht needs but does not link
-against. This patch makes irrlicht link correctly against all the
-needed libraries.
-
-Signed-off-by: Christoph Egger <Christoph.Egger@gmx.de>
-
----
- lib/irrlicht/source/Irrlicht/Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/lib/irrlicht/source/Irrlicht/Makefile
-+++ b/lib/irrlicht/source/Irrlicht/Makefile
-@@ -88,7 +88,7 @@
- LIB_PATH = ../../lib/$(SYSTEM)

- INSTALL_DIR = /usr/local/lib

- sharedlib install: SHARED_LIB = libIrrlicht.so

--sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm

-+staticlib sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lX11 -lz -lpng -ljpeg -lbz2

- staticlib sharedlib: CXXINCS += -I/usr/X11R6/include

- 

- #OSX specific options

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-bundled-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-bundled-libs.patch
deleted file mode 100644
index 1a1013e415a9..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-bundled-libs.patch
+++ /dev/null
@@ -1,35 +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,11 +2,7 @@
- find_package(PNG REQUIRED)
- find_package(JPEG REQUIRED)
- 
--include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
--                    "${JPEG_INCLUDE_DIR}"
--                    "${PNG_INCLUDE_DIRS}"
--                    "${ZLIB_INCLUDE_DIR}"
--                    "${CMAKE_CURRENT_BINARY_DIR}/../zlib/") # For zconf.h on WIN32
-+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)
- 
- find_package(OpenGL REQUIRED)
- include_directories(${OPENGL_INCLUDE_DIR})
-@@ -508,7 +504,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(WIN32)
-     target_link_libraries(stkirrlicht imm32)
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-system-libs.patch
deleted file mode 100644
index f82dc5060d06..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-system-libs.patch
+++ /dev/null
@@ -1,105 +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/CIrrDeviceLinux.h
-+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
-@@ -23,7 +23,7 @@
- #include <GL/glx.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
-@@ -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

- 

---- a/lib/irrlicht/source/Irrlicht/Makefile
-+++ b/lib/irrlicht/source/Irrlicht/Makefile
-@@ -43,7 +43,7 @@
- 	CImageWriterBMP.o CImageWriterJPG.o CImageWriterPCX.o CImageWriterPNG.o CImageWriterPPM.o CImageWriterPSD.o CImageWriterTGA.o

- IRRVIDEOOBJ = CVideoModeList.o CFPSCounter.o $(IRRDRVROBJ) $(IRRIMAGEOBJ)

- IRRSWRENDEROBJ = CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRNormalMap.o CTRStencilShadow.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o CTRTextureGouraudVertexAlpha2.o CTRTextureGouraudNoZ2.o CTRTextureLightMap2_M2.o CTRTextureLightMap2_M4.o CTRTextureLightMap2_M1.o CSoftwareDriver2.o CSoftwareTexture2.o CTRTextureGouraud2.o CTRGouraud2.o CTRGouraudAlpha2.o CTRGouraudAlphaNoZ2.o CTRTextureDetailMap2.o CTRTextureGouraudAdd2.o CTRTextureGouraudAddNoZ2.o CTRTextureWire2.o CTRTextureLightMap2_Add.o CTRTextureLightMapGouraud2_M4.o IBurningShader.o CTRTextureBlend.o CTRTextureGouraudAlpha.o CTRTextureGouraudAlphaNoZ.o CDepthBuffer.o CBurningShader_Raster_Reference.o

--IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o

-+IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o

- IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o

- IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o

- ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o

-@@ -56,14 +56,14 @@
- EXTRAOBJ =

- LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \

- 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \

--	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \

--	$(BZIP2OBJ) $(EXTRAOBJ)

-+	$(IRRGUIOBJ) $(LIBAESGM) \

-+	$(EXTRAOBJ)

- 

- ###############

- #Compiler flags

--CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng

-+CXXINCS = -I../../include # -Izlib -Ijpeglib -Ilibpng

- CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1

--CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing

-+CXXFLAGS += -Wall -pipe -fno-exceptions -fstrict-aliasing

- ifndef NDEBUG

- CXXFLAGS += -g -D_DEBUG

- else

-@@ -154,6 +154,7 @@
- 	mkdir -p $(INSTALL_DIR)/../include/irrlicht

- 	cp ../../include/*.h $(INSTALL_DIR)/../include/irrlicht/

- 	cp $(LIB_PATH)/$(SHARED_FULLNAME) $(INSTALL_DIR)

-+	cp $(LIB_PATH)/$(STATIC_LIB) $(INSTALL_DIR)

- 	cd $(INSTALL_DIR) && ln -s -f $(SHARED_FULLNAME) $(SONAME)

- 	cd $(INSTALL_DIR) && ln -s -f $(SONAME) $(SHARED_LIB)

- #	ldconfig -n $(INSTALL_DIR)

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-unbundle-enet.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-unbundle-enet.patch
deleted file mode 100644
index 259627adb2a5..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.2-unbundle-enet.patch
+++ /dev/null
@@ -1,58 +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
-@@ -63,9 +63,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
- add_definitions(-DGLEW_NO_GLU)
-@@ -342,11 +342,11 @@
-     bulletdynamics
-     bulletcollision
-     bulletmath
--    enet
-     glew
-     stkirrlicht
-     ${Angelscript_LIBRARIES}
-     ${CURL_LIBRARIES}
-+    ${ENET_LIBRARIES}
-     ${OGGVORBIS_LIBRARIES}
-     ${OPENAL_LIBRARY}
-     ${OPENGL_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.2-unbundle-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-unbundle-libs.patch
deleted file mode 100644
index 1ea29e1db3cf..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.2-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
-@@ -351,6 +351,11 @@
-     ${OPENAL_LIBRARY}
-     ${OPENGL_LIBRARIES}
-     ${FREETYPE_LIBRARIES}
-+    X11
-+    z
-+    png
-+    jpeg
-+    bz2
-     )
- 
- if(UNIX AND NOT APPLE)
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch
new file mode 100644
index 000000000000..75830b8ba8f2
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch
@@ -0,0 +1,56 @@
+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/supertuxkart-0.9.2.ebuild b/games-action/supertuxkart/supertuxkart-0.9.2.ebuild
deleted file mode 100644
index 3a6bb3ccb47a..000000000000
--- a/games-action/supertuxkart/supertuxkart-0.9.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils gnome2-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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug fribidi 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="
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	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
-	fribidi? ( dev-libs/fribidi )
-	wiimote? ( net-wireless/bluez )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.2-unbundle-enet.patch
-	"${FILESDIR}"/${PN}-0.9.2-unbundle-libs.patch
-	"${FILESDIR}"/${PN}-0.9.2-fix-angelscript.patch
-	"${FILESDIR}"/${PN}-0.9.2-irrlicht-arch-support.patch
-	"${FILESDIR}"/${PN}-0.9.2-irrlicht-as-needed.patch
-	"${FILESDIR}"/${PN}-0.9.2-irrlicht-bundled-libs.patch
-	"${FILESDIR}"/${PN}-0.9.2-irrlicht-system-libs.patch
-	"${FILESDIR}"/${PN}-0.9.2-fix-buildsystem.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled libraries, just to be sure
-	rm -r lib/{enet,glew,jpeglib,libpng,zlib} || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# system dev-libs/angelscript leads
-		# to failed assert segfaults
-		-DUSE_SYSTEM_ANGELSCRIPT=OFF
-		-DUSE_FRIBIDI=$(usex fribidi)
-		-DUSE_WIIUSE=$(usex wiimote)
-		-DSTK_INSTALL_BINARY_DIR=bin
-		-DSTK_INSTALL_DATA_DIR=share/${PN}
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc CHANGELOG.md TODO.md
-
-	doicon -s 64 "${DISTDIR}"/${PN}.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
index 04fa2e6dba1c..cfda52536ec4 100644
--- a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}
 	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