gentoo resync : 18.05.2019

20 files changed, 193 insertions, 388 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 3cb22e655b69..78fc85af5a9c 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/badland/Manifest b/games-action/badland/Manifest
index a35099359808..17f48a396101 100644
--- a/games-action/badland/Manifest
+++ b/games-action/badland/Manifest
@@ -1,4 +1,4 @@
 DIST Badland_GotY_121.tar 191872792 BLAKE2B ed1c75d378b742a9f2c82f2ca1055837ff302e1438d4d1a48118ff0caf0455ce0001bb3b90e7c80361672435d2a846d67c94d1c8f28e8ecf8afe87d4177aaa86 SHA512 db018e79fada80c2e6f4ce9dc1f23bf43a8b6257207e52dbb583c484bb71e4e6b0109f750ab8fb7b1e221e2618a1994828c4525d478b7d45bf7d60012f9cf13a
 DIST badland.png 42439 BLAKE2B 9439349c8f0a0133fdc042a373a4f625d0988ef4b9de71456ccc1dab4b0f8f56ab386e5f2ba5b322ca5f885c9784c325c9be25d691a740a89dc237afa2216451 SHA512 30387f1906fb35ff9684a8ad28535de7804e456ff545fd69bc6bad3d96c6e2149ca9c5fe19a6dc711f145191d72311538b402d3891971185fc07edabd61ba52f
-EBUILD badland-121.ebuild 1507 BLAKE2B 20e042457ebea78eae092c77de5e82bf53d57d30e5cf43b47cb3ca42fe74fd21da9e3932f95397b4239c80d799f5502ea1abf34b0138656215a1066fe5563d30 SHA512 2cd997c34bfce1497ad257e5b35504e7c64c443dde077df0501c7220772d95f97d64c78e76a2a80f374b327183c7c940a85cabbdaa62f0c41d2a3f10d10e9656
+EBUILD badland-121.ebuild 1520 BLAKE2B 2257a8c870d903ea98e2a5ead9053dee91e23b41143da0803acd32137e8786dc6c0db2d808e90662ea453d5e14c3d5a0e6d84fa899bd16ad790972b441da4b59 SHA512 f0d9d7184c0f9fcc78fe2368507753e8af8787e4d0ea67027b93ec2037efd087a3bc70adf221b823c4166376f7abbf01ca451aa42d48e8e29834a25807f5198b
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/badland/badland-121.ebuild b/games-action/badland/badland-121.ebuild
index 78a303c69884..f62252013b6b 100644
--- a/games-action/badland/badland-121.ebuild
+++ b/games-action/badland/badland-121.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="Badland_GotY_${PV}.tar
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist splitdebug"
+RESTRICT="bindist fetch mirror splitdebug"
 
 QA_PREBUILT="opt/${PN}/*"
 
diff --git a/games-action/bomberclone/Manifest b/games-action/bomberclone/Manifest
index 6dcdd927eb9e..374c880c7364 100644
--- a/games-action/bomberclone/Manifest
+++ b/games-action/bomberclone/Manifest
@@ -1,5 +1,4 @@
 AUX bomberclone-0.11.8-gcc52.patch 223 BLAKE2B bbce3a29a92c94a7e55e02514d1c3d197517d48e8660eabe11e13cf8dd75068a379f9e621f2b864640a7830df2d84b667b2b4356a7704e8403216774b2957f62 SHA512 a536ce4130f6dca9aaaeb79a4b4501edee1f52e020f333202f592477839409f4691ad95735cffd9f178e21c8ea8e885a908684f39e3477fd0d4137b9f8c49012
-AUX bomberclone-0.11.8-underlink.patch 434 BLAKE2B e0cf13a2d51d2597583877c8ab5add8cb76b1482f14fef7cf33c40573864f5c4c42ed346291635ec467c3f2d3baaf3a9673c9ede3f8a37d0a062d37064c71568 SHA512 78738422f3a83a9dbfa03976701bb136c4326b9bb6fca310968518c77c2a6440ba9291a568162773bf0f48691a8039e0c461972c0d8f9e40d4b54525a2db9840
-DIST bomberclone-0.11.8.tar.bz2 7966452 BLAKE2B ab090be622e891ae803529360d8bd753ac64b9d66b045d06946735a06e9203bf07a32dddd165f038ea484d584383ed760a5bf9e5d206638438ecb10583734225 SHA512 a5e52db43f7f508993231ec13bb2705f60e25cfc21d15c17d9b422c6fc948dc14cc8c4519acfac2e9b7b32a3072dc3a521fbf28b2150a86cfb4099ced72ab79b
-EBUILD bomberclone-0.11.8-r1.ebuild 1237 BLAKE2B 6c4ce8f2297f6a442dfa4d9a9f21212cc52c059423a472b6db4ba46f3925de8259f21107baf57ed4d961962905702b267262ce041a2ad7632a165b4f1abd7326 SHA512 9c344cee85908fe7603b763440daacba4d468f9ccf319667bf90b7e8740dfc474474cacee77fada4da1f09a8ccfab381f9ce91a36eedfc8d3a0b915d628ba802
+DIST bomberclone-0.11.9.tar.gz 8109837 BLAKE2B b5ec7cc80b2fe4f7517302029e5e943dd673ce910148f5985a9063f19e67c5fbdb21634f8fead60728b900383f24b67b1fc2b27d1a36c07ab1cfae8f228a4fb7 SHA512 80b3db728d7c54bc421a783c7e3753289e1ecb8500e9c8457d92ce226ebe60f47c2b04fd684c1aae57b1c5968ea3d1fce53c9c269a1fc9e685589fdd0513a439
+EBUILD bomberclone-0.11.9.ebuild 1105 BLAKE2B 1b500275d29529eb784d85ff62c0ea406b835d3b1713ed63af83fa4bcf331efc1fe41da6228c1489fd046eb3bc5137fb7dd9cd2d3c9d1dcc894d165ac11cfd5a SHA512 fcae8e0cb30445831be19c3591c8be072d710d929d7f3622bd36ea3395267db8d5c8e6dda7e9e76389fa234b54af0cb3df4c8b5ed5f3aa8e18ecdbe362a96d95
 MISC metadata.xml 334 BLAKE2B 5d34b252ed17c0a05782417336de98dfc5196ad854dd1705e286781eecee9d7e3081f46d1dc9014a39e8b236ca082a1c14af26e8ce4c26652e510644eda46b18 SHA512 0e309d5ada167696d234e2e2c44cb045607018801b9e03fab79bc2496c66f6e484364200320bf6124fb5fdd787d798de6052fa659862336d233cd6bd1eb8e5e9
diff --git a/games-action/bomberclone/bomberclone-0.11.8-r1.ebuild b/games-action/bomberclone/bomberclone-0.11.8-r1.ebuild
deleted file mode 100644
index 08185dddd02d..000000000000
--- a/games-action/bomberclone/bomberclone-0.11.8-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop vcs-clean
-
-DESCRIPTION="BomberMan clone with network game support"
-HOMEPAGE="https://www.bomberclone.de/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc64 ~x86"
-IUSE="X"
-
-DEPEND=">=media-libs/libsdl-1.1.0[video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mod]
-	X? ( x11-libs/libXt )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc52.patch
-	"${FILESDIR}"/${P}-underlink.patch
-)
-
-src_prepare() {
-	default
-
-	ecvs_clean
-	mv configure.{in,ac} || die
-	sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-	sed -i \
-		-e "s:/share/games/:share/:" \
-		configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with X x) \
-		--datadir="${EPREFIX}"/usr/share
-	sed -i \
-		-e "/PACKAGE_DATA_DIR/ s:/usr/games/share/games/:/usr/share:" \
-		config.h || die
-}
-
-src_install() {
-	default
-
-	dobin src/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r data/{gfx,maps,player,tileset,music}
-	find "${D}" -name "Makefile*" -exec rm -f '{}' + || die
-
-	doicon data/pixmaps/bomberclone.png
-	make_desktop_entry bomberclone Bomberclone
-}
diff --git a/games-action/bomberclone/bomberclone-0.11.9.ebuild b/games-action/bomberclone/bomberclone-0.11.9.ebuild
new file mode 100644
index 000000000000..9958da287a64
--- /dev/null
+++ b/games-action/bomberclone/bomberclone-0.11.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop xdg-utils
+
+DESCRIPTION="Bomberman clone with network game support"
+HOMEPAGE="https://www.bomberclone.de/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc64 ~x86"
+
+DEPEND=">=media-libs/libsdl-1.1.0[video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod]"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.11.8-gcc52.patch
+)
+
+src_prepare() {
+	default
+
+	mv -v configure.{in,ac} || die
+	sed -i 's/configure\.in/configure.ac/g' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	LIBS="-lm" \
+	econf \
+		--disable-werror \
+		--without-x
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		bomberclonedocdir=\${prefix}/share/doc/${PF} \
+		install
+
+	doicon -s 64 data/pixmaps/${PN}.png
+	make_desktop_entry ${PN} Bomberclone
+
+	# Delete useless documentation.
+	rm -v "${ED}"/usr/share/doc/${PF}/{COPYING,INSTALL,*.nsi} || die
+}
+
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }
diff --git a/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch b/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch
deleted file mode 100644
index 18c063b56db9..000000000000
--- a/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.in	2011-06-18 18:23:48.633605738 +0200
-+++ b/configure.in	2011-06-18 18:26:26.910628408 +0200
-@@ -33,7 +33,7 @@
-     )
-     
-     CFLAGS="$SDL_CFLAGS $CFLAGS"
--    LIBS="$SDL_LIBS $LIBS"
-+    LIBS="$SDL_LIBS $LIBS -lm"
- 
- 
- dnl Checks for header files.
-@@ -84,7 +84,7 @@
- 	CFLAGS="$CFLAGS -Wall"
- 	AC_MSG_WARN(Disable Warning as Error Treatment)
- else
--	CFLAGS="$CFLAGS -Wall -Werror"
-+	CFLAGS="$CFLAGS -Wall"
- fi
- 
- 
diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
index f2fde940546b..3a7421ed3755 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -1,4 +1,5 @@
 AUX dxx-rebirth-0.59.100-flags.patch 371 BLAKE2B 7902a9375b9f6782eb1cdaba1d0e27ede3476149554a711473631eb652d953828a67836515c097c459b2e3ea31014a71e3ee5d2c46d1ed25dce97ac0cde6f88e SHA512 c8bb575a172845b2643838c95ccbe3fac4509a3b5c24178816ea5a1a46a0fa2721d3fae841641950e97dec0e3a9fb74d8ddac493183df8834caca7d8d9ce11b4
+AUX dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch 1060 BLAKE2B d9b62b11ae0aa871f667bb8e75eca0efffad2ba5d2781410886588b9c1dd6cefe430bb97381bf66ac0a99fd505c08547d45ffb3353e6d0edf14a08973bafdf2f SHA512 3c631874a910192e0f2fd594029b789bc79eb9b70eb3c2c172967ccc0ae1a994f138f7d57e1f99b3067cc1f199594fd590a2d3a73f35fda3520edb98cf0b80c9
 AUX dxx-rebirth-0.59.100-sharepath.patch 553 BLAKE2B 651db97d70b177754d7053c400a99a79c5ff7cd82af7743ef4588f0981ac2e17143fc0b41cbc62670d896e7f51cfc21e96f0b77d0a4994b4e2b56853ee29b28b SHA512 6f57832df96b6c927ea6f1d93f57662df24c0127b8a22ee08c73c3ecd21ab027fa7367070d0bec09250042e716409b258373e54c9189de68d41b799f785498b8
 DIST d1xr-briefings-ger.dxa 16798 BLAKE2B f5e1f4f91cb3464b3d356fab1e3993700cc19f3f2db8682f5194e59aa5d2623efa427db4135c3595534e5dac0f2589b53aac7df3610501b759407e1ead342458 SHA512 956a3ef1fe7379b71d5f651fdcb1f26b786883a35193a0a22009204e885a12fceb3a69c6accbeb2bd20be65afe087d23532d7ef3439edd97cc8904968bf519e3
 DIST d1xr-hires.dxa 1426884 BLAKE2B c4d9b950353fc450c64568779bc3d2e93a46e17980c8df08a2ef06bff5b9709869fdbbaf4fb6698be994b3faae7a75036a53357743d47b728bb3ef9df126afd8 SHA512 3fc84d5610ba40ee383c1720f80513a21b4644ff8b6da4b84ebca13b11c1131deb4897ded6324b54845b6c847dfc0f16700535e16afdd7ebe83bfff042892302
@@ -8,5 +9,5 @@ DIST d2xr-briefings-ger.dxa 11717 BLAKE2B 27af93656ac91bf5490195d2aebc9c9f252cb7
 DIST d2xr-opl3-music.dxa 22710919 BLAKE2B 82bdf29b6afe88305d4c7b69bb8b094efcf33ad23becec223311775cd50600ed399c207ee3a05da3800bcc5e123d00f9f8fa7d2d4f4d4be57bbf71e1c2482a9c SHA512 876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
 DIST d2xr-sc55-music.dxa 19579531 BLAKE2B 16091e24477a49319f2685884a7538a3597a9132707ac1d59405fa08ce7492158075df4ee680a5c7ba44aa0bd0b16170057f6a8956eab4b56913d00ee2f1f339 SHA512 290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6
 DIST dxx-rebirth_v0.59.100-src.tar.gz 1809614 BLAKE2B 6826380312fa23dbc99459db9272cf7ffb5a00a14cfdd777339633fbd943a288af00f182692ebc3078e4c39bf6b6cc9fb05cc6a533ec126b8c881eb22c465868 SHA512 dc9b7ad263e189e779756b62613d4bc62371cb5fec2176a4013395fc18c9d03ab0c9ddc5ccf2668b87e4a77b25d500bdef373126f176bfce49f73b5a98de23d7
-EBUILD dxx-rebirth-0.59.100.ebuild 3276 BLAKE2B 2fb4ede8bc77e37d698f776cdf2aceb7a969ee821d61f7a9ac06e512b8c504fcb911928588686580bad91b15cebee9d6f4a87a17f777e4e5dd82d93caf6cc596 SHA512 ce48361403cc3696ee8d19b33f9546b41867e2eef330bef6dc821a1995bdb6b2ec10328fc15997942ffa1e0908abf810a0bb479192495a4b84fcc891363895a6
+EBUILD dxx-rebirth-0.59.100.ebuild 3355 BLAKE2B 11173d9573253619102874c4f5fd49088e57f977c97f015b56ca4184e36b8e7b2d8ba11474c83c26c9e4a24978f2dee79064f181e27743315a1850b0583224b3 SHA512 4cdba9cfe109516d574824e360772b2c042b5aab5753b02107c2fccc47a7f71f0048ea177cd04c6a3202727787b075ba7e1d8deca6da3a6f74ab25f7eee52c4d
 MISC metadata.xml 1974 BLAKE2B 654588e63aa9b45daa812b1a79cedc5992ec6a083d37f7abc13643ea49c5e2679ff967af6f5d3f309f832a0d0a8c8877a6b0b3984f2515aeea95a0750fab6b3a SHA512 4c6bcb9366d27b943b5b0e0e77ce4fc3a9424cf7bee7f76a33b33da803fa86440a2ddf2359996871953ebb3e1c51451032f920b73e3d9fe918415a2fca3f5c09
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
index 048eb3cb263c..df2171429517 100644
--- a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,9 +51,11 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-# Remove hardcoded optimisation flags.
-# Change share path to use old d1x/d2x locations.
-PATCHES=( "${FILESDIR}"/${P}-{flags,sharepath}.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch # Remove hardcoded optimisation flags.
+	"${FILESDIR}"/${P}-sharepath.patch # Change share path to use old d1x/d2x locations.
+	"${FILESDIR}"/${P}-physfs-3-no-deprecation.patch # bug #653014
+)
 
 src_compile() {
 	tc-export CXX
@@ -102,6 +104,5 @@ pkg_postinst() {
 		elog "To play the game enable USE=\"data\" or manually "
 		elog "copy the files to ${EPREFIX}/usr/share/games/{d1x,d2x}."
 		elog "See each game's INSTALL.txt for details."
-		echo
 	fi
 }
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch
new file mode 100644
index 000000000000..86e94d43389e
--- /dev/null
+++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-physfs-3-no-deprecation.patch
@@ -0,0 +1,30 @@
+From 8838b46e65c830e8d9ebaeaf568f186eff57d5c7 Mon Sep 17 00:00:00 2001
+From: Kp <kp@valhallalegends.com>
+Date: Sun, 22 Oct 2017 04:20:35 +0000
+Subject: [PATCH] Suppress PhysFS deprecation errors
+
+PhysFS 2.0 only offers PHYSFS_read/PHYSFS_write for I/O.  PhysFS 3.0
+deprecates PHYSFS_read / PHYSFS_write and offers PHYSFS_readBytes /
+PHYSFS_writeBytes.  Converting Rebirth to use the new API is somewhat
+invasive, and would require dropping support for PhysFS 2.0.
+
+For now, for compatibility with PhysFS 2.0, disable the deprecation
+errors and continue to use the older functions.
+
+Reported-by: gabeotisbenson <https://github.com/dxx-rebirth/dxx-rebirth/issues/352>
+---
+ SConstruct | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/SConstruct b/SConstruct
+index 560a6ef1a..78491cb1a 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -3177,6 +3177,7 @@
+ 		def adjust_environment(self,program,env):
+ 			env.Append(
+ 				CXXFLAGS = ['-pthread'],
++				CPPDEFINES = [('PHYSFS_DEPRECATED', '')],
+ 			)
+ 
+ 	def __init__(self,__program_instance=itertools.count(1)):
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
 }