gentoo resync : 25.11.2020

30 files changed, 351 insertions, 113 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index ba7dfb43c5ba..75c2840586d0 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index 7f21bfd2c528..8a724e8c37ea 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,6 +1,4 @@
 AUX freecell-solver-5.22.1-no-docs.patch 1013 BLAKE2B d766bb4a12e546c7a2e6ccdaf00d234f2d1e9fc874c146e3d8755733915ab2cf58472551f46115347678b92ee6b4d14453f051960f5076932bbb15b8a0337794 SHA512 dbb78cb9f67e2d0d71516d765020c91a074a9984a26b3d5d5baf031a852c4c35efebfd1e331aaa009a2a066bd303c405e60b84be690a1bfe86a94ac832281f2e
-DIST freecell-solver-5.24.0.tar.xz 422468 BLAKE2B 3fc98a6ba5116bbbdc79c8c09c820b3992fd666c14736fca98b2191c752b5c5a465dcf4ad3fc79ac944d2189647097aad70f99b140e6feff133bae26d4d52411 SHA512 264a7e016a5dbd093f126aab520b36c98c02111a3834ba09646ba527046973163aeefe41449e05d161d1790d2f599c6a3302402442b96b9bd524e97fc4f54b91
-DIST freecell-solver-6.0.1.tar.xz 421700 BLAKE2B 1effa1c16c90ca09078728eb698b48c30c3489e2c05ef8163dfba825bc44422ec3897a89d4094bedef42e796d3ebfdfe5b65d2783965458d0c11218eb56cc197 SHA512 4e8a810a6385cb448432a54a0791ed948bacd0e4b8d02dfa1a5aed4544846384c6921ca6322496387daba825930d6f9d9fa01bdc1e3e31094fc9e6d3b0ae78e5
-EBUILD freecell-solver-5.24.0.ebuild 1161 BLAKE2B 73860259237a23fdde5991db845c36125a6a811c3c76ca27e5b5a65af0f2b207c06189f8eef3f365046641799e18d4192d0c80178f063ae19f661586a5120538 SHA512 1dd80ab38e2bba567ef1526a92bf6b924851b762317622ffa0d1a9c4d3c6e010272c39c745ccf447dd39ce231cf2e7e75a59e2c1410320b9f50e70688c2b8233
-EBUILD freecell-solver-6.0.1.ebuild 1179 BLAKE2B 8b4265c16779ba206c9b420a5baf94d2354f0c38c6825a5a44941ee6ec5d3f6dbbf0da5fc72b219890fc4566e44bfd1420716c8a2721171f2923634777f2c75c SHA512 b51ab1643e5629a8923110db56cde7a846e770733e202c8ef390a014c2438a0ff0cc26249aba5bfbfd0009cc5faa4981b3d3183d07bd6c5f9912b948324f3682
+DIST freecell-solver-6.2.0.tar.xz 426616 BLAKE2B f48d1b67c56a42f42e00e765a911944ae7d2eb97db81a8ebb58baa1603bd274c9ceb460bdf5c232c4f2b3f54d33acc0057e25c8c0bce897bb862eedc16613f05 SHA512 090f6b93c3f354b5c6bcb1ea67d9313639d23e81998cdc15316246a1cdac26450cf8fd04172bfd5539d875edf407dcdf7ce2c872221b7261f89dbbe309c27560
+EBUILD freecell-solver-6.2.0.ebuild 1178 BLAKE2B 98f7182ea1599d72b261795b10e5b0f136972db3d87210997b7675b26553ddcf6f52df16c988f0595b927fe33473ebcd252b18b75cb1b53ae01a07433fe3985a SHA512 4cadff9b87541cb2092c6c129887be8cd60803caec92901173c196bbf349db624d2ab5b932b257f3f089ad2b0f1216f94c846bbb25651e4f01d154eb4d93e344
 MISC metadata.xml 330 BLAKE2B 2d2fad43c972b00253e7740bb472027d4edc54537d6d2564f2804b13c7b02b43a34598bf698255d0f42962b14e207da31cf69f021793d0ae16e198d0a1765e8a SHA512 8e5d4cfa7283a489ea757e3dede6b82334b2ceee2a28a98a8dd3b269a2f8bba02e2f0e6a169712e5ff890dcb7bec2feeedef496143bde90ad587771c87a12726
diff --git a/dev-games/freecell-solver/freecell-solver-5.24.0.ebuild b/dev-games/freecell-solver/freecell-solver-5.24.0.ebuild
deleted file mode 100644
index e2375962e0ee..000000000000
--- a/dev-games/freecell-solver/freecell-solver-5.24.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake python-single-r1
-
-DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
-HOMEPAGE="https://fc-solve.shlomifish.org/"
-SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="tcmalloc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pysol_cards[${PYTHON_MULTI_USEDEP}]
-		dev-python/random2[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-	')
-	tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
-	dev-perl/Path-Tiny
-	dev-perl/Template-Toolkit
-"
-
-DOCS=( README.html )
-
-PATCHES=( "${FILESDIR}/${PN}-5.22.1-no-docs.patch" )
-
-src_prepare() {
-	python_fix_shebang board_gen
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBRARY=OFF
-		-DFCS_BUILD_DOCS=OFF
-		-DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies
-		-DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-games/freecell-solver/freecell-solver-6.0.1.ebuild b/dev-games/freecell-solver/freecell-solver-6.2.0.ebuild
index 9816507ca29f..5fb0e0560f86 100644
--- a/dev-games/freecell-solver/freecell-solver-6.0.1.ebuild
+++ b/dev-games/freecell-solver/freecell-solver-6.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit cmake python-single-r1
 
 DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
@@ -12,7 +12,7 @@ SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="tcmalloc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-games/libmaitretarot/Manifest b/dev-games/libmaitretarot/Manifest
index 41f6e8b5a9bf..a6a97ecec37e 100644
--- a/dev-games/libmaitretarot/Manifest
+++ b/dev-games/libmaitretarot/Manifest
@@ -1,3 +1,3 @@
 DIST libmaitretarot-0.1.98.tar.bz2 158060 BLAKE2B 0883c6232e53caa633091022e9f2488362b400723e78c71b836cf79a0189d304e5aaeadff0de4d3a67f9316c37a848ef5ae56312c79a6f20c287f196dec5675f SHA512 1626f7cd8d53be97b70f4258e83fccefc8edc0605e8850466e94a09f9cfbecf9f763ca7b9154f1fb77da15e9856398b8fce12b12064463a0a9293f8273e95d90
-EBUILD libmaitretarot-0.1.98.ebuild 444 BLAKE2B 9626dde5315059cbf88fba3eddc585d23a5ebd45f7509f15a839a1ec186127b51577e390fe5800d5c50e810470a38d0913b98977d34d8e45f33cf252947eb84d SHA512 ef0d212322583dfb722bb07806380e1e67277ced204cf24691e5d154bfc8085bcf92a2c0594a9fa4a10cffbf87e97ce3092a78e77d4bbeac1793c883bba9cb6c
+EBUILD libmaitretarot-0.1.98.ebuild 548 BLAKE2B e532686a607a812bcf9768ac06a9764b321f60d8a5fc1735511c236e534b59dfcf1b99b1b7493466d6d1e98723b191e850a36c91ccc1635d6f0a2621baafcf17 SHA512 1ddaaacab565778268409087b2d208a0943892e4c266147cc01157eb1ca2fb82eadd275c9e7b219f4056a19338c40b68bd808d730fbf6249441546195308b668
 MISC metadata.xml 910 BLAKE2B 8faa891eaa254f955ca28de28073d7d3d2026a5fad5a296e0f196d1e1087f4dd0ec08a4a613c28de345bb4ae626b292e5432640513a35dfed8a031ba5c452a99 SHA512 7721bd73046e7215f409f070ba0eb222ab05b84db6152cece5ac0fa9b1fd6259805b1c241cd515c62ed78567bce4fa5ef2bd3f9a01a5f2ad2ab7cc2d15ebde3b
diff --git a/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild b/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild
index 82da3cb36b6c..ef9389f6791c 100644
--- a/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild
+++ b/dev-games/libmaitretarot/libmaitretarot-0.1.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,9 +9,17 @@ SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.t
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/libxml2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-games/libmt_client/Manifest b/dev-games/libmt_client/Manifest
index bcdd049851be..af17aa22b919 100644
--- a/dev-games/libmt_client/Manifest
+++ b/dev-games/libmt_client/Manifest
@@ -1,4 +1,4 @@
 AUX libmt_client-0.1.98-format.patch 2325 BLAKE2B 01827a1a89ae4ad36c6c655b1bfa6a0391cb0e556777873fcf01840ab13ef133dde7e0330b9ef266d3a6b0eb5c5a85fe731bff03ec8be6e7ffbb499edd8b9dd1 SHA512 c4ee6b5a5ef2a62f8022fe6672c2cf9769e9f120fad3abcbbd86c1ff12bc66c5d36ba285b8576eb410cb337c9bbb3e11c9941761a024f0d445b143a1d3de4d65
 DIST libmt_client-0.1.98.tar.bz2 146319 BLAKE2B 0edd2690f8139f62a9f31a19bd869e98f213b613a76ca735b5b95fdc7fb01f8d3e4739828f0d5c3ab0f0f4597875c1334304b1888e3dd237d0e2f6fb19c553ba SHA512 1eb53bd36a171dbc3138942ec8314aaf8a71ca207060ea6d7499d18c2680fe8ebc822d8ec9843675a7c329039d2c985783f239b74b13c004e47a38250a8c4411
-EBUILD libmt_client-0.1.98.ebuild 523 BLAKE2B b8b7e48304fdbdf63c702af39a3e11de5175260141cceae61a8438cc7cf591a643a204e94282bb870add106190a80928ccd576a48ff5d492c2d31e1d02a0d4e1 SHA512 9ab7c7e1052c912e92221f7f73f26315bb057ed2cf70630f3e8801512c2b2cd1088f5523a56fd8ac2cafe6b0446b179d78a0975eb341137e1b82a91f2ef4b44b
+EBUILD libmt_client-0.1.98.ebuild 630 BLAKE2B 5d8377f1f2364e0c5859005223a977355c35f311ffeb1ff70c5266205123da90f1c0183bfcab9d1d93a18246861f2059968da97af3a570b58547b4c76ece85ce SHA512 dee8355439cc7fe7cbfd346c196ac6f80afd0e8da6ed26fbe6325c2f5f9dee302c892c0dcb6aa83ce1f1716dde5dbbd7abc574e685c4759ed654b9d8e4954b55
 MISC metadata.xml 910 BLAKE2B 8faa891eaa254f955ca28de28073d7d3d2026a5fad5a296e0f196d1e1087f4dd0ec08a4a613c28de345bb4ae626b292e5432640513a35dfed8a031ba5c452a99 SHA512 7721bd73046e7215f409f070ba0eb222ab05b84db6152cece5ac0fa9b1fd6259805b1c241cd515c62ed78567bce4fa5ef2bd3f9a01a5f2ad2ab7cc2d15ebde3b
diff --git a/dev-games/libmt_client/libmt_client-0.1.98.ebuild b/dev-games/libmt_client/libmt_client-0.1.98.ebuild
index 46c1e6efde71..611635f26520 100644
--- a/dev-games/libmt_client/libmt_client-0.1.98.ebuild
+++ b/dev-games/libmt_client/libmt_client-0.1.98.ebuild
@@ -12,7 +12,6 @@ SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.t
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DEPEND="dev-libs/glib:2
 	dev-libs/libxml2
@@ -22,3 +21,12 @@ RDEPEND=${DEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-format.patch
 }
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-games/libnw/Manifest b/dev-games/libnw/Manifest
index 7feda622ba2d..45fed7db8036 100644
--- a/dev-games/libnw/Manifest
+++ b/dev-games/libnw/Manifest
@@ -1,3 +1,3 @@
 DIST libnw-1.30.02.tar.gz 317336 BLAKE2B 0e7298b409bfa6034a28f5f27e3c4103367fd8adca58bb7510d12aa641a3bea162e82e17343adbd3a1ded94ec9834231def9e4d0ad264512923ffcc0b63625f1 SHA512 5175fe6737dc1a3ddd5e53354435ff0db56ad560f24e330f348190b2ed9e6d2418dc20497dcb64f316572c4c75b298fe12794fde73516347d70e737700f67939
-EBUILD libnw-1.30.02.ebuild 648 BLAKE2B af2d39bc7da110cc96b3ce1464be80cd4ae5fd5ad8527cfab52e2d5f5891f17f193e5fc65d63fc56765427556482e19016059558cbc4d531aa8e3e4937955ed2 SHA512 ed38b757ccb6a879f746d926a6ad0028a77dd8250d09bfcac425a4ce2ab41978104714c1d0756ecd7d54b88fbae1d559b1a32e2c29e6161b80ff10b386c65517
+EBUILD libnw-1.30.02.ebuild 869 BLAKE2B 59cf65af8b2d0f25b3f8a1a0ac79e3653eafe903f1653ca9dfaf12e91e7fd72d18e6cfdd66aee4afae4b3b5ee4e6220f013d9fde589e74d8ef9e25dbf9d4b27d SHA512 795b6113d971e460cc3082244570760d32a51fcc116aaffa880f609d9973eb38318752773ed432bb5d838f2f4298eb651e6641b6534c4c024dd3093f76f0711b
 MISC metadata.xml 1005 BLAKE2B c05bcb17a2d3154e59d8df433ae4d2d4a68243d8031b1393890e528dec94886434a45bf967e9f3c5e11cdd0487d200b517c39bc95ddf8047054ad953c122d974 SHA512 126197d5c5117e3a491dfe5c18103a3544ffdef8c6bd8ac300fecb716e4324f2d0ea07183cd648ac552c8a2b2c37a3cb9a33a5a2898596678da88416bd697ab7
diff --git a/dev-games/libnw/libnw-1.30.02.ebuild b/dev-games/libnw/libnw-1.30.02.ebuild
index 7cd617c7c93e..2d64032d35d8 100644
--- a/dev-games/libnw/libnw-1.30.02.ebuild
+++ b/dev-games/libnw/libnw-1.30.02.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Tools and libraries for NWN file manipulation"
@@ -11,21 +12,33 @@ SRC_URI="mirror://sourceforge/openknights/${P}.tar.gz"
 LICENSE="openknights"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND="sys-devel/bison
-	sys-devel/flex"
 RDEPEND="!sci-biology/newick-utils"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex"
+
+DOCS=( AUTHORS ChangeLog NEWS README README.tech TODO )
 
 src_prepare() {
-	sed -i \
-		-e '/^CC =/d' \
-		-e '/^CXX =/d' \
-		$(find . -name Makefile.in) || die
+	default
+
+	local f
+	while IFS="" read -d $'\0' -r f; do
+		einfo "Removing hardcoded CC/CXX from ${f}"
+		sed -i \
+			-e '/^CC =/d' \
+			-e '/^CXX =/d' \
+			"${f}" || die
+	done < <(find "${S}" -name Makefile.in -type f -print0)
+}
+
+src_configure() {
 	tc-export CC CXX
+	econf --disable-static
 }
 
 src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README README.tech TODO" \
-		default
+	default
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-games/mygui/Manifest b/dev-games/mygui/Manifest
index ee69eae76801..23758d0c6e3b 100644
--- a/dev-games/mygui/Manifest
+++ b/dev-games/mygui/Manifest
@@ -1,10 +1,11 @@
 AUX mygui-3.2.2-FHS.patch 1209 BLAKE2B 7bd14cfe0653ac74df4ab5ac6be69a9d95837795820baf5e0e6a11a03448f57cf761f240d3fa62e2f1ef121ac2e9b48b802edf74905fdf68f6744773f612cbe9 SHA512 21aba7d654a7197423bdeaa06fa79219d850c76248546227ece1f4916072289f0ebf68a9ad9a4569a1d5dfc15cf86762db3c0d4d58f4c233c1b4293ffb35e50e
 AUX mygui-3.2.2-build.patch 2801 BLAKE2B c414f7249f63c5addd0c616df3a0ac0979fc7c8565b9c12c8f81007f152c129d868ec9359641ce59abca4b9958bc3fa39bb906b221d66fef4e9df53135bf18da SHA512 954f95759967a1a4f4eb6952f6abbabbe3157703d5d0014299a8cd5060cd5fb0c7faa635ad10e5c23e0bc0c8d8089c29c14952058a7bdcc2643f06c226f5524d
+AUX mygui-3.2.2-c++17.patch 824 BLAKE2B d70fb25cffd51ac28aa0d443d0162ed76f11624e311fdbf71f1fd0321670203b9925fb9494586e9f289f9781faee3822073b06ac0ebd61a739350b7fdf38c401 SHA512 cf532e56e9324ac956745639a1a625cd54a494dafe1aa0bb086ce851428d758c71f13c77e415f2e0611b6772335902b225e128f15883c7adfd4d7c11a625c6ed
 AUX mygui-3.2.2-underlinking.patch 398 BLAKE2B 0e4ebdf58228ac6b6368202c40137feadf5f3adeb4f2e20020d2ed8db6db17a1ca0715e1018a5e851cc8a38163e4607e9f705f20f3190fa09de9de0eb7ab3099 SHA512 ad0e5e0e8aacdb65ea9195175f597eb95f265b07d0154482f2380ae6e837672d5d41b6d43b1266abb12dec319625426dd65a892aca7fdca297131bd4db2312b9
 AUX mygui-3.4.0-build.patch 2492 BLAKE2B 2819c235df3d479d42831fcf2a80a9a2e165b98acc87c7cd3105b5285b0bfa0d0e84ae2c8642d91260096cf2404e9a690812008e92cd5a5167e1dffc89f49809 SHA512 9dc685f71d14e369a8a3fff5e10572817a4d1a943471decb94e3d25133d53c5cc7401f8c360f0bcb1cc1188beb6e1a76521d51cdb88cb1f32eda1715c765da2e
 AUX mygui-3.4.0-underlinking.patch 491 BLAKE2B bc7d2facd04637f4d6b4ca2c2a353a66c16ce781050ecf6f59a461acedaa0dcb6293742bd83214c4e32bdbcda18ae461b9f60e90fd6f450832ba5ef002fb468f SHA512 0cdcd0906b52abc7843ae588d7afd8f1450bcf7162d41efb2af6a3744a64bb6e02ffdcdc6cd3346f72be7f5361a25bf35d937fac983814077deb339ed7b7dbfa
 DIST MyGUI3.2.2.tar.gz 22081236 BLAKE2B 3a28e0838a8203d20565822d5a19423a733149cca250dc4169de43f22beb7d37fccbf3d282ea9b4f284cb71df2df9a9073bac40124e1d8a90d15c5fda2af798a SHA512 1290ce1d78b9e4bfe72bea3fb1bc6cdd25969b44be2844df62a1f425b3e221a68b61658fdf45271fb50a1957f12b5ada1c9be971e00ecfe41f53ae0a83ae18d4
 DIST mygui-3.4.0.tar.gz 22391483 BLAKE2B 5628cca98625285368b9363acd95e541e1ba7d86fd1d471f687c553d0f0abd9ccb2f47981cf0bb91f44a68489bb7ec3fbcb451734758e2435ab9ef320214465a SHA512 3f560fd9c7e5b514da40e41c7753dc20649f80b763f5ee20afc9627df3be14242ea833eff09eac16b9e88b1c9fbed7c09def0c5068c832e710c247191fb53487
-EBUILD mygui-3.2.2.ebuild 3733 BLAKE2B 0b356da39fa55bd4b53befe2ee1fda7505e6daa61a49b9af0aa7b85e168dd247f8a731b81c65be6046de0d315fcb9fc0237f8818dba3be0a56c0f89fb62c3a12 SHA512 32609bf5200de72f267d493d99bf23c0baf97005e2d8c126ba3638bd5d08f2a26c2430d4801fca91f529946f5aff98687b58eaf17e173627a5bdad29c20c3da8
+EBUILD mygui-3.2.2.ebuild 3765 BLAKE2B 97e1bbfbb6287fd0963677ed84297bace17efffa5779b0972981d2fe1576d9a43379870275537a097903c4bfe92baa3f32a467b514166992fb5b4feba50bf1bb SHA512 2ea444ba8dd5830b0c423f4c65201557739e8c3759e95924b153518dd634c51c0cd10a6443f31a467b211b24f18b68f304ef7f1af798651b981a08ea1111bea0
 EBUILD mygui-3.4.0.ebuild 3758 BLAKE2B 1d456f5e82b7357ae624b19ef43103d55a30df7ba2c9df856cbe22f5a118842cf183eb5a0ff2eaf4d40f6eef95faa5c4b021905845a158ef30e1f93ce2373144 SHA512 eecc3f87a738021a43fc3d48e34fdc1492fd3de557a0f520fda9437669436813635136e1ba4535a406e636b0f64d6abd3274fc8d70100017649eecdc5daf47f7
 MISC metadata.xml 2012 BLAKE2B 6f3b20aa2f4f557b3499d98b758d4e402903a6f56580062ae9442b38508abe3841584e550bb20cbce31b93a052ef78231c8ba9568dba1d8bb9459a11f32d625a SHA512 05633f451013eff1de94fc2707bf9df21a2b8e6a8466a988f743ec12e04c12e6e81a0fbc4c74c081905ff81ba45f571459d3584a264ae5347e13cc2b4139ff79
diff --git a/dev-games/mygui/files/mygui-3.2.2-c++17.patch b/dev-games/mygui/files/mygui-3.2.2-c++17.patch
new file mode 100644
index 000000000000..1cdf7babeb12
--- /dev/null
+++ b/dev-games/mygui/files/mygui-3.2.2-c++17.patch
@@ -0,0 +1,27 @@
+https://github.com/MyGUI/mygui/commit/ced30dac10082ff9593a2c971d26b3aebce6b2be.patch
+https://bugs.gentoo.org/732778
+
+Part of:
+
+From ced30dac10082ff9593a2c971d26b3aebce6b2be Mon Sep 17 00:00:00 2001
+From: George Evmenov <george.evmenov@geocv.com>
+Date: Fri, 26 Jun 2015 12:25:26 +0300
+Subject: [PATCH] do not use nullptr define
+
+--- a/MyGUIEngine/include/MyGUI_Prerequest.h
++++ b/MyGUIEngine/include/MyGUI_Prerequest.h
+@@ -19,13 +19,7 @@
+ #define MYGUI_DEFINE_VERSION(major, minor, patch) ((major << 16) | (minor << 8) | patch)
+ 
+ #ifndef MYGUI_DONT_REPLACE_NULLPTR
+-#	if MYGUI_COMPILER == MYGUI_COMPILER_MSVC
+-#		ifndef _MANAGED
+-#			ifndef _NATIVE_NULLPTR_SUPPORTED
+-#				define nullptr 0
+-#			endif
+-#		endif
+-#	else
++#	if __cplusplus < 201103L && !defined(_NATIVE_NULLPTR_SUPPORTED)
+ #		define nullptr 0
+ #	endif
+ #endif
diff --git a/dev-games/mygui/mygui-3.2.2.ebuild b/dev-games/mygui/mygui-3.2.2.ebuild
index ac582627a70d..dc3766716faf 100644
--- a/dev-games/mygui/mygui-3.2.2.ebuild
+++ b/dev-games/mygui/mygui-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -41,6 +41,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-underlinking.patch
 	"${FILESDIR}"/${P}-build.patch
 	"${FILESDIR}"/${P}-FHS.patch
+	"${FILESDIR}"/${P}-c++17.patch
 )
 
 pkg_setup() {
diff --git a/dev-games/openscenegraph-openmw/Manifest b/dev-games/openscenegraph-openmw/Manifest
index e2b37bd1fcf3..50ac8a452f80 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -2,5 +2,6 @@ AUX openscenegraph-3.4-cmake.patch 4485 BLAKE2B 3d63d45b7af01dc4153c03edb828a609
 AUX openscenegraph-3.5.1-jpeg-9.patch 1211 BLAKE2B 7fedf10332a13270a489c5d2e662947ca84659ad5abc43190d0415212b083b72933b01f84caed161d457490587c8236e38e070e734c649c44b0d67fdc7399a2d SHA512 404439415f8ff6881a90be44281e4a811f018c3e82c2981d076a106e63a3c44fd769867496b8f8a7d53669ba660ab9076a6ccab31e921e9abab65d2ba652b5cc
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
 DIST openscenegraph-openmw-3.4_p20200425.tar.gz 5698786 BLAKE2B 43684fa898912434dae9a7b41070a893c407dceba7e468a3f3dede32e24aea55d921098faf8d9d05708d2ef01a3507b2f126939dc13b8693002a0bec189bbaf7 SHA512 9bb4d2a6ca4694ee22a29508b74a095a483584ea801dc8298ec8a9b41c4d4fe18c52a21849ae9ec1065060479dcad5156227f82feed13c177415662ecba1da70
+EBUILD openscenegraph-openmw-3.4_p20200425-r100.ebuild 4316 BLAKE2B c5d475494f271839ad50da59caf9b9f07d5144841d64741fc4266b2f1b5eba1aca98ba8ad954a41e99bd01fefdbeb3d93b21fc7f78e0b45da75b9825314a08e4 SHA512 171d766ff3083009f2abe54a55a580d77e56f117072dd78e76f7a81c90d671387a54716ef45ff0923379bccc8ef540275fd99b7636ce936a284bf2c19a166332
 EBUILD openscenegraph-openmw-3.4_p20200425.ebuild 4066 BLAKE2B 0580b24b98c4d2a85d7c28feac3a57cf60159c479891b0533c00bced734962018a849683ebf587c8088f0cc3b23f55cd0cf8caea022e273fc157c1542ad8b1d4 SHA512 d45b664b2fef01d26de6011e90d0e91df889dafa30311954f451bd0d602012740275109f41456085637b1af0d95ef96d6f2aeb41eae443335de1c673b1d78597
 MISC metadata.xml 1660 BLAKE2B 57921674c11a78f14a142bfccea979751b718ceab534358265394801abfa2d7193c5024d8336c6748cef561761d2bb9287e9a30239e524e241724a27a98661f1 SHA512 ace5614136e12a0d7deaa1feb6c83673b01aa2477663baf553cf90230877174a5a06358c2e1abab132a18479a59286344051d9a7afecca478525add69a99f356
diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
new file mode 100644
index 000000000000..202f18429af9
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+WX_GTK_VER="3.0-gtk3"
+inherit cmake flag-o-matic lua-single wxwidgets
+
+DESCRIPTION="OpenMW-specific fork of OpenSceneGraph"
+HOMEPAGE="https://github.com/OpenMW/osg"
+MY_COMMIT="8b07809fa674ecffe77338aaea2e223b3aadff0e"
+SRC_URI="https://github.com/OpenMW/osg/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0/132" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
+KEYWORDS="~amd64 ~x86"
+IUSE="curl debug doc examples egl ffmpeg fltk fox gdal gif glut gstreamer jpeg
+	lua openexr openinventor osgapps pdf png qt5 sdl sdl2 svg tiff
+	truetype vnc wxwidgets xine xrandr zlib"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	sdl2? ( sdl )
+	openexr? ( zlib )
+"
+
+# TODO: COLLADA, FBX, GTA, OpenVRML, Performer, DCMTK
+RDEPEND="
+	!dev-games/openscenegraph
+	media-libs/mesa[egl?]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libXext
+	curl? ( net-misc/curl )
+	examples? (
+		fltk? ( x11-libs/fltk:1[opengl] )
+		fox? ( x11-libs/fox:1.6[opengl] )
+		glut? ( media-libs/freeglut )
+		sdl2? ( media-libs/libsdl2 )
+		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	gdal? ( sci-libs/gdal:= )
+	gif? ( media-libs/giflib:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jpeg? ( virtual/jpeg:0 )
+	lua? ( ${LUA_DEPS} )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	openinventor? ( media-libs/coin )
+	pdf? ( app-text/poppler[cairo] )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( media-libs/libsdl )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vnc? ( net-libs/libvncserver )
+	xrandr? ( x11-libs/libXrandr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/osg-${MY_COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/openscenegraph-3.4-cmake.patch
+	"${FILESDIR}"/openscenegraph-3.5.1-jpeg-9.patch
+	"${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
+)
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i "s/ FIND_PACKAGE/ MACRO_OPTIONAL_FIND_PACKAGE/g" CMakeLists.txt || die "can't replace FIND_PACKAGE"
+	cmake_src_prepare
+}
+
+src_configure() {
+	if use examples && use wxwidgets; then
+		setup-wxwidgets
+	fi
+
+	# Needed by FFmpeg
+	append-cppflags -D__STDC_CONSTANT_MACROS
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDYNAMIC_OPENSCENEGRAPH=ON
+		-DLIB_POSTFIX=${libdir/lib}
+		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
+		-DOSG_PROVIDE_READFILE=ON
+		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
+		-DWITH_Lua51=OFF # We use CMake-version FindLua52.cmake instead which can find any lua
+		-DWITH_Lua52=$(usex lua)
+		-DWITH_Asio=OFF # Fails to build, similar to https://github.com/chriskohlhoff/asio/issues/316
+		-DWITH_CURL=$(usex curl)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
+		-DBUILD_OSG_EXAMPLES=$(usex examples)
+		-DWITH_FFmpeg=$(usex ffmpeg)
+		-DWITH_GDAL=$(usex gdal)
+		-DWITH_GIFLIB=$(usex gif)
+		-DWITH_GStreamer=$(usex gstreamer)
+		-DWITH_GLIB=$(usex gstreamer)
+		-DWITH_GtkGl=OFF
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_Jasper=OFF
+		-DWITH_LIBLAS=OFF # dep failed to build https://bugs.gentoo.org/725938
+		-DWITH_OpenEXR=$(usex openexr)
+		-DWITH_Inventor=$(usex openinventor)
+		-DWITH_Poppler-glib=$(usex pdf)
+		-DWITH_PNG=$(usex png)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_SDL2=$(usex sdl2)
+		-DWITH_RSVG=$(usex svg rsvg)
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_Freetype=$(usex truetype)
+		-DWITH_LibVNCServer=$(usex vnc)
+		-DWITH_Xine=$(usex xine)
+		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
+		-DWITH_ZLIB=$(usex zlib)
+		-DOSG_USE_QT=$(usex qt5)
+		-DDESIRED_QT_VERSION=5
+	)
+	if use examples; then
+		mycmakeargs+=(
+			-DWITH_FLTK=$(usex fltk)
+			-DWITH_FOX=$(usex fox)
+			-DWITH_GLUT=$(usex glut)
+			-DWITH_wxWidgets=$(usex wxwidgets)
+		)
+	fi
+	if use lua; then
+		mycmakeargs+=(
+			-DLUA_INCLUDE_DIR="$(lua_get_include_dir)"
+			-DLUA_LIBRARY="$(lua_get_shared_lib)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
+}
diff --git a/dev-games/openscenegraph-qt/Manifest b/dev-games/openscenegraph-qt/Manifest
index a4ca5133db6d..ded727861b5e 100644
--- a/dev-games/openscenegraph-qt/Manifest
+++ b/dev-games/openscenegraph-qt/Manifest
@@ -1,5 +1,5 @@
 AUX openscenegraph-qt-3.5.5-cmake.patch 3190 BLAKE2B c8a52a2d0b626e7a12b3f683380d6d3f20973330220f53be288413616d0ccf063cd40b864b1fb77ff2762313d24624533380d20a37538b92664647fc2f42c7c0 SHA512 b5350082a9755f73274103b1bc6d5b08954cd6b23e22d15e26e617bd55016ab3df29c0712af775e4e357213456fd8daa4d443f28b06979e76e32ce0df60393a1
 AUX openscenegraph-qt-3.5.5-qt-5.11b3.patch 1115 BLAKE2B 0a90b65caf3209d51ec699490dd6b1863fc965c54cb5fac5dcfa2efc4997225563d44842c9fffa07b6b2c75d62fe9577f56fcb067966bbf1cd9031c8677f41be SHA512 9223a53ae700fc25aaa02a0feef5f69313c94d05415c0372d55f56a9996ab3edb6712ea19b07bc507d7b1c8db21e4c9dda177eeaad094d94fc04133cdeb7ac10
 DIST osgQt-3.5.7.tar.gz 1000217 BLAKE2B f0279b122fc9492d29ea0c55afa81376d2ad4a35c42b301312137ca6d375fd2ef519efacfaf2f77b9dc3a7a26313b3d3213fc0589359c89695835f12488e6efb SHA512 5698b824f6e747eaf19b970784dce6e38fbe50176e6c5d0cab86dab417c8831036c0f050fc52f1ab2a79925f8356dd43559aa123aab4b70a4df28273125e4d03
-EBUILD openscenegraph-qt-3.5.7.ebuild 1019 BLAKE2B 0287159f2698e4598331872367545f89090fa65d3470dd907ab2076b230167bafa0d2fbd716f0ab724550debc5fceef8a8e35001936936ee6e5c7e9e5525349a SHA512 9a2520187e86889d3217ec603764d6ff9dd61a84a0082e6e0cbfa27f762e8a7d3f52c6852a290e99c8e2555edb6bcf858124e0c683afce736b686d91f10ba0ec
+EBUILD openscenegraph-qt-3.5.7-r1.ebuild 983 BLAKE2B 518ecb8e161ed4cd6c42905f26c89f94c4e842c9340fc3567d47532ffd3c667634a6a49be1c3593cbf7088bdecea6a665d189faae2d8ba8a7b61dbb465e24ff7 SHA512 858a261b5512cde3c09268ed37a27689f78a7b25527ca64483d9e4036748aa107437b9dee8805e9020e81b73c450c11e3466dba40f5ad601958ab7f12895569b
 MISC metadata.xml 1082 BLAKE2B b03aba1cb34ba9e0a98819db75093c9e8ee5a58ff97b33a236eae5d5653779ddae020be745207df5a13b4e12db8fd81a8828cc9ccc7d210d6f566aa807add29f SHA512 7c1fc8c502e4068f5bdc19543146fedad0cee507fc478c653d15798678422c2010463d2fb0859911646b69543f6d040f9b21b01ed3e1c8f45ea1a3d633279b47
diff --git a/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7.ebuild b/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7-r1.ebuild
index 96ab9bcba0b6..ebbcc46e59cd 100644
--- a/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7.ebuild
+++ b/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/openscenegraph/${MY_PN}/archive/${PV}.tar.gz -> ${MY
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
 KEYWORDS="amd64 ~ppc64 x86"
-IUSE="examples webkit"
+IUSE="examples"
 
 RDEPEND="
 	>=dev-games/openscenegraph-3.6.3:=
@@ -22,7 +22,6 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtopengl:5
 	dev-qt/qtwidgets:5
-	webkit? ( dev-qt/qtwebkit:5 )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -41,8 +40,7 @@ src_configure() {
 		-DDYNAMIC_OPENSCENEGRAPH=ON
 		-DDESIRED_QT_VERSION=5
 		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		$(cmake_use_find_package webkit Qt5WebKitWidgets)
+		-DCMAKE_DISABLE_USE_FIND_PACKAGE_Qt5WebKitWidgets=ON
 	)
-
 	cmake_src_configure
 }
diff --git a/dev-games/paklib/Manifest b/dev-games/paklib/Manifest
index c7041723434a..2fb2e2486bf2 100644
--- a/dev-games/paklib/Manifest
+++ b/dev-games/paklib/Manifest
@@ -1,3 +1,3 @@
 DIST pak-0.3.tar.gz 12885 BLAKE2B d2d5815fcb358e6848b4739b0a949e99bbf9ddc2e61fd33aa76527c192eab822ea6c83a79969269fff2e5d6a6b83776d2e757691cc7fbbf244bf840b9297e5df SHA512 05eb8402fc1b1b0ab381dbf815c59fa1fde1e1aa081c124d0f2f3b257fdefd23e9c7995c055b368f53dabab60722b6505976bc601d991265581ee36cb96b7750
-EBUILD paklib-0.3.ebuild 683 BLAKE2B 5fb6cd1463e1f0644d5e3247e1fe8243b84565876840b7139247879566c975742fe1f798998289ed05033435767fb0507ec9202290cf307eb50162ed6b9339fc SHA512 dfbb47532a6107e6093cf19c317669eebfc7a749f8a9e056fdfb146c0f327a60ff18bbf195979f4d9b561666d717f7ce9f6e1bde7289ef099f914c5afa118b84
+EBUILD paklib-0.3.ebuild 637 BLAKE2B 551833d470225c9385082580879af6efd979fe8d050f017184d8f9a6e06296a16aaf649674221a6ef3461f76d38d8ee620f581a899a80ff04aa209314e81e965 SHA512 618295d4e870382c1182c0cf9695442124747b231f9f9ff0a72c87527028e3a6900295ef84787d988c4aa62ad2cd09a7766529e1cd8c7fe6b5cc9b0998e44910
 MISC metadata.xml 329 BLAKE2B 0b663ce7d95e0454d7e928ee3de952071fa19ae50d29f9a2dd163e02577ba5f034ce665ab545e19b425ba45264c8730d9051590ef124645cf3b0edc27aa11269 SHA512 949275b2029d9a51b2c076b5706a2b58c6e9a41ca0a5d126871ca9580d861f8a8882d257fb0a07c150f86d21a6084429e4f55a990a884a861d31e54e6d888cca
diff --git a/dev-games/paklib/paklib-0.3.ebuild b/dev-games/paklib/paklib-0.3.ebuild
index b046ce39026f..746547e06b5b 100644
--- a/dev-games/paklib/paklib-0.3.ebuild
+++ b/dev-games/paklib/paklib-0.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="library for accessing Quake pak files"
@@ -11,19 +12,23 @@ SRC_URI="mirror://sourceforge/paklib/pak-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-S=${WORKDIR}/pak
+S="${WORKDIR}/pak"
 
 src_compile() {
-	$(tc-getCC) ${LDFLAGS} ${CFLAGS} -fPIC -shared pak.c -o libpak.so || die "pak.so failed"
-	$(tc-getCC) ${CFLAGS} -c pak.c -o libpak.a || die "pak.a failed"
+	"$(tc-getCC)" \
+		${LDFLAGS} \
+		${CFLAGS} \
+		${CPPFLAGS} \
+		-Wl,-soname,libpak.so \
+		-fPIC \
+		-shared \
+		pak.c -o libpak.so || die "pak.so failed"
 }
 
 src_install() {
 	dolib.so libpak.so
-	dolib.a libpak.a
-	insinto /usr/include
-	doins pak.h
+	doheader pak.h
+
 	dodoc AUTHORS NEWS README TODO pak.c pak.h
 }
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 7a7583a649c3..ae9fd41309d5 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,6 +1,7 @@
 AUX simgear-2019.1.1-gdal3.patch 388 BLAKE2B 364d5f6692809c67d73a3191f387cbd9735e7183a25696e612827c1a796c872ee5d4a09085fa8a24a0fd524725fdeca9303c5c5ee71981de054ab5a8833d5285 SHA512 44d59cf379c8c7d82b87a31a4d29dd02aaa865c37f12c7e565c641bf3fb14497f4d63b69bbc973551b53d74919ddce5495e3f29b598ed87a6a4565e22ec81667
 AUX simgear-2020.1.2-boost.patch 299 BLAKE2B e62fa6dd8cd88306e5cc1b043f5bc174fd64b228517d7dc48c32f5174de807af073ef0b41aa00aa3567d91dd0a2571bfbc036dda4da2135e208b076185d42448 SHA512 bdbf7e15927d62a1e78486ca6ecdd7a9f7306f5d4e0fe2fad7de18556758b3c92d8cf794c309e4a66f8b3b96941de5b0ff1a3266e136518c2da6f1198c2eada8
+AUX simgear-2020.1.2-do-not-assume-libc++-clang.patch 629 BLAKE2B 1ce89c84f6ac94d7f29a3d9fc8b66cd972dcca809188ac487f7b1d961b9bad6ecdaf31882e5a0beb239cf2fb0d946bff7c5838dca7ac7872cbab22480a7b7aed SHA512 a294c55b84331bdabdea5d950b5a9a53c17eb4b949a863cb0b77c9dd585cb6a43b74f86323e1cc4de48564e064927cd49d7dec032361e50f75bfc82351319a26
 DIST simgear-2020.1.2.tar.bz2 1393059 BLAKE2B 62fa15d88368177e23cf52edf51e8c56252399d8f2661e518911c1093a0d7f9f11069da8d65b479f2d4b45792dcd011194e57fa99ac3991f749e8196aaff9552 SHA512 c2e835de471f374a6c33cfd1769b7079d178ee66075bfe87cc9eb1f06dc2648db93c31f62f0ac7a664703406817cb1e909a531812cb76c99cd8751eb7e6782e7
-EBUILD simgear-2020.1.2.ebuild 1571 BLAKE2B 18c0d444f7839f2bb259d5591ae9679368480a68809b9bb25ac9a620eab412cc94d88ec5c55d49a1c7b5124aee4ddc3061a52decb9628b6bd21e78730a740fbc SHA512 648be7da517c9e298951848a680afa45b8be574480d58cadbf4b08b3e030177a7752370b80a403021f97c079727ac44e4f7496cf05649cd64952e3b9a8dc235b
+EBUILD simgear-2020.1.2.ebuild 1634 BLAKE2B 0bc81b0d4a0b2bdcdc87d0291774943827804be5e6519303e7c356a936abad003bdf097bd2a627475a22a8a01da2151c808716a1d11bb87e558082ca355aceaa SHA512 f150a4b40b863afd0e1ca46bda8bf594f52a03d0ca90d878c33849a452008a5e757a5d0709d5fe179ff0c52e315c0309cb1097973b9ade1b6c0773cc8574c3f4
 EBUILD simgear-9999.ebuild 1601 BLAKE2B 2abe5a461a36bc073eb134133a2b648fd1b699441e99730bad0f01497c4005d492f7363dcb1e59f4325e6b2a709f53f6365a9b227b9bd9f5b2dce916d4c608bd SHA512 37a6cc57913c1a5d4d313748bafe6f93eb55c1c35c6c5389f2f65dba67d13504cebcac050e5d867e0021689f8d77c30b4986a8e3f1525c6becd32cd823119c44
 MISC metadata.xml 911 BLAKE2B 978dd6e83dce780a6b6250e86def3f5f3052d7c09cda9d4974ec9f63d151cb0040c9434cde00007a8821b28854d2c49c5a040e29f176d1ebb91600e97ba09f17 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8
diff --git a/dev-games/simgear/files/simgear-2020.1.2-do-not-assume-libc++-clang.patch b/dev-games/simgear/files/simgear-2020.1.2-do-not-assume-libc++-clang.patch
new file mode 100644
index 000000000000..3ff70aeebdc5
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2020.1.2-do-not-assume-libc++-clang.patch
@@ -0,0 +1,12 @@
+diff -ruN simgear-2020.1.2/CMakeLists.txt simgear-my/CMakeLists.txt
+--- simgear-2020.1.2/CMakeLists.txt	2020-05-24 17:13:35.000000000 +0200
++++ simgear-my/CMakeLists.txt	2020-10-17 15:48:58.375116913 +0200
+@@ -442,8 +442,6 @@
+     set(WARNING_FLAGS_CXX "-Wall -fPIC -Wno-overloaded-virtual -Wno-redeclared-class-member")
+     set(WARNING_FLAGS_C   "-Wall -fPIC")
+     set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+-    # fix Boost compilation :(
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+ 
+     # override CMake default RelWithDebInfo flags.
+     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
diff --git a/dev-games/simgear/simgear-2020.1.2.ebuild b/dev-games/simgear/simgear-2020.1.2.ebuild
index 2408384dadbc..c8ea38b80be6 100644
--- a/dev-games/simgear/simgear-2020.1.2.ebuild
+++ b/dev-games/simgear/simgear-2020.1.2.ebuild
@@ -36,6 +36,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
 	"${FILESDIR}/${P}-boost.patch"
+	"${FILESDIR}/${PN}-2020.1.2-do-not-assume-libc++-clang.patch"
 )
 
 pkg_pretend() {
diff --git a/dev-games/t4k-common/Manifest b/dev-games/t4k-common/Manifest
index c6ac7fc2838f..e24e7fd80c59 100644
--- a/dev-games/t4k-common/Manifest
+++ b/dev-games/t4k-common/Manifest
@@ -1,4 +1,6 @@
-AUX t4k-common-0.1.1-libpng.patch 799 BLAKE2B 3248451847f0b06a2926287b6af09eb2d86aa234cff7a640f499a849955f3faa1646264cbdcace7a30024124fbc647fe5283b96339cc8e55850cec616cce5ac4 SHA512 e9d8c4a2487d972231ef631feac67cea679ec585faf0453cf513290f318778070222b6e9a54725f18f5ea874c009a370ec55245a05151e9ecf19403b876be6ac
+AUX t4k-common-0.1.1-ICONV_CONST.patch 193 BLAKE2B 9761594d7a48c44728414440247bbfc7757463c6898108d2c76ecedd9b2ad498a60cd4de4408159abc8263a3c0efd4a8d68c87f1d32fb0449862de4154d23bb7 SHA512 1f2718cd2be30436a342ef33236a4b456e8d14c104af5080a407cb770adcd5ac10575737a80ff0a1fde928bc4fb2782f747d6df976f137335cbbe37e9b42d45a
+AUX t4k-common-0.1.1-fno-common.patch 424 BLAKE2B 2a844d9d9fe8cea071b6541ef99281106c00d441bff291d7f30c467fdc5773af80e6fb5d48f2c0fa3737a4e63311a895de7f5d819b03d83b891126862df5a049 SHA512 226c4497eca10f202ac58d51b37bde004385276da6f64cf18e8737634469f524fe2ec6c34e12576b4d88e55e8c9f565231512a9fcf5111de459016e4a10df1bb
+AUX t4k-common-0.1.1-libpng.patch 685 BLAKE2B 8d6df4219586670725cba5bd8437d256d5c0ff0f372d9f0764b9456b7dd9d5b54c20a337b454249edb97251f8027d9f3c87a76f5ba741c7283c748e2b97086e4 SHA512 be6f47f6115b5da190cdfd21bf33b7e87ed5912d3300fec7cd503289acc954f15dcd997afc150b5e755510003138bd035cfec7248c12bb7af088f8d85a9660d6
 DIST t4k-common-0.1.1.tar.gz 622239 BLAKE2B f2ddbb3b8815ad05001f99b8cfd49fda3c1f59e9dc340bf9739c2072e9f4a2faf069bf9f774f95818a0cb59302e557d3d6408530e8ff82adb6b9fd84b36e2641 SHA512 d7fdb469452637187adcb4b5d2907c05687765b1b75cd3a28b75222b2a0358f1962e1a245d88129b4dbede845fde8ff718cf9a7b0f97a12cb21a8791073fbe3d
-EBUILD t4k-common-0.1.1.ebuild 955 BLAKE2B 58b0473bf7fba3cc96cc36ac85f01a823ad522a66d5216b3318976f095f7128aae2f05611d01df73338b71a31071b5300d40df168f568344877d81ccba842eb4 SHA512 43a4cf43912e72a20f325eb5d180260bb75054bc4585ccc7dfba7d51df404dcab7e4c3ca317920ca58b4a9eafa01fcf3bf1d1d9f51cd1d23636db097e3d2480b
+EBUILD t4k-common-0.1.1.ebuild 1127 BLAKE2B f9a716db65334c6efb3de17208a8c3d7893ecb847a6dadb540500bcccaf50de82137b57faca7d0be1d39bde4dc324c08c3ee1bbfbe0b5a6a61a838521048293a SHA512 52f895adfb5e63754ecbb09b50b79a02ca6c2db874a561400e76c92056090e9e2e2495b5e9465a5fca4e4466a9eef4d2191962656b954511c0fdf0c17ab75f45
 MISC metadata.xml 336 BLAKE2B 6e8da7610b8afe5bae34c30ff55d49fac65fcd8889a24e8295516e2a59f41a54b6728c34bedb6588ea6707c0837103a0d2b95598d1743a2a122cc2e54d50f10c SHA512 7f43f1bcfa355ebfe96ae7dfc7165ffa54cf90ea3aa7e58b816f85d04d7c4ba5dcf7a8c7d7eb4395bcff7e8f1206423f853cbc6729774ee582d48603afc123bc
diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-ICONV_CONST.patch b/dev-games/t4k-common/files/t4k-common-0.1.1-ICONV_CONST.patch
new file mode 100644
index 000000000000..037d2acd292b
--- /dev/null
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-ICONV_CONST.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,6 +39,7 @@
+ AC_PROG_MKDIR_P
+ AC_PROG_YACC
+ AC_PROG_LIBTOOL
++AM_ICONV
+ 
+ 
+ # -----------------------------------------------------------------------
diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-fno-common.patch b/dev-games/t4k-common/files/t4k-common-0.1.1-fno-common.patch
new file mode 100644
index 000000000000..2bdf418649c2
--- /dev/null
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/t4k_common.h
++++ b/src/t4k_common.h
+@@ -239,7 +239,7 @@
+ #define MAX_LINES 128     //!< Maximum lines to wrap.
+ #define MAX_LINEWIDTH 256 //!< Maximum characters of each line.
+ 
+-char wrapped_lines[MAX_LINES][MAX_LINEWIDTH]; //!< Global buffer for wrapped lines.
++extern char wrapped_lines[MAX_LINES][MAX_LINEWIDTH]; //!< Global buffer for wrapped lines.
+ 
+ //TODO separate headers for different areas a la SDL?
+ 
diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch b/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch
index 29991544ddbf..fad91de2d205 100644
--- a/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-libpng.patch
@@ -1,5 +1,5 @@
---- src/t4k_common-0.1.1/src/t4k_loaders.c	2011-04-08 05:46:07.000000000 +0300
-+++ src.new/t4k_common-0.1.1/src/t4k_loaders.c	2012-05-02 10:35:41.836670434 +0300
+--- a/src/t4k_loaders.c
++++ b/src/t4k_loaders.c
 @@ -1028,12 +1028,9 @@
        {
          png_init_io(png_ptr, fi);
diff --git a/dev-games/t4k-common/t4k-common-0.1.1.ebuild b/dev-games/t4k-common/t4k-common-0.1.1.ebuild
index 3c366660d4d6..e0a6d5009ab5 100644
--- a/dev-games/t4k-common/t4k-common-0.1.1.ebuild
+++ b/dev-games/t4k-common/t4k-common-0.1.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A library of code shared between tuxmath and tuxtype"
 HOMEPAGE="https://github.com/tux4kids/t4kcommon"
@@ -11,9 +12,10 @@ SRC_URI="https://github.com/tux4kids/t4kcommon/archive/upstream/${PV}.tar.gz ->
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="static-libs svg"
+IUSE="svg"
 
-RDEPEND="dev-libs/libxml2:2
+RDEPEND="
+	dev-libs/libxml2:2
 	media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-mixer
@@ -25,22 +27,33 @@ RDEPEND="dev-libs/libxml2:2
 		media-libs/libpng:0
 		x11-libs/cairo
 	)"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+# need sys-devel/gettext for AM_ICONV in iconv.m4
+BDEPEND="
+	sys-devel/gettext
 	virtual/pkgconfig"
 
-S=${WORKDIR}/t4kcommon-upstream-${PV}
+S="${WORKDIR}/t4kcommon-upstream-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libpng.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-ICONV_CONST.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng.patch
+	default
+	rm m4/iconv.m4 || die
+	eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(usex svg "" "--without-rsvg") \
-		$(use_enable static-libs static)
+		--disable-static \
+		$(usex svg "" --without-rsvg)
 }
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index a8c61cc03497..cb227d99c081 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,5 +1,5 @@
-DIST tiled-1.4.1.tar.gz 17481260 BLAKE2B 81bbc8026e067fe8a6fc9c474868a7097ecab574c42a679b546bf7ee9a13889898237011114852d0a69f4703c2a9a2f7bdc19221164d350a2d407ff7035e3824 SHA512 68543e70a5b601e1426b12116da47d8c9b961a1d321bdf410287149d3f5cc76e3ef9724e61ae7c9a8b1314679eacd9b34f60faf5e49a090199e4e1707fc061e6
 DIST tiled-1.4.2.tar.gz 17806729 BLAKE2B 9f9e6b97c6d95b1f8a1ad6da3540aaf9310a705b412005752afe72c3ce8e35025559ed0e7aaf36a1d65284c29d8406bdc58121f6c13bb658ff84ff43fde7f403 SHA512 1fddd8c8d67e4eaf116c82e276b0941e6dae7c529f2132e49da77d7e215fc7106d5fd3ef55d118f799153b57340effcf2481a131a436be7f00f61c4fc4bd45d2
-EBUILD tiled-1.4.1.ebuild 1298 BLAKE2B 7db9afff2be3971278d279755ca778271879689e4c5859606a4ff603aa04bad5ed9e3398868444db0bd75fb2da54386e4287b37d62f33e1b36cab8b5b22bd3ef SHA512 e31d9da0b1da445cc386e852865b698071b819eb62f7c3ec50daf0319c72eb7273ef0e417a17499e0511e189049e1f76807e2f70e5c837ed193d1b62f4450f4f
-EBUILD tiled-1.4.2.ebuild 1372 BLAKE2B 06303c0bf6943dbdbd0d450e00bc81897b999d445a40934b582bfd5a4199d91a7de96d2c634d13749fa895533d59c32b69194facc723090a93ab166fc536c4ad SHA512 fa8137e781cb3334dd2f1f9d98b29c684d192444c13207e6880411f32622e7db7dd5699f2e48b46fc701212e7efad951d21ecf64a913f5f7e14e9dde6b6f78bf
+DIST tiled-1.4.3.tar.gz 17806808 BLAKE2B 81b5a32cc1e6f5f3b4af5520752d34572f0e78aad90df435d075b53ac18b39961aa22d23cff614cd83f0883fd2fd2bca69026160cb8b1b727fddaeff5764babe SHA512 1e75e323733e05563bf542364778d95f2f22484ec0d85b4a9e7fac782c117934b37b049724979be5c83de86a3900c7ca2e9f3c5a660c530d2ecd0f023eb22c2e
+EBUILD tiled-1.4.2.ebuild 1371 BLAKE2B f617f685c1798996af236f5de5323c50ee7d179a5003b0b53b66a8c6e5de310958c39feeaa4cb17db26aa00c5bbda62b2cc0a1ab69bbf2c3dd4f25ed81aa716d SHA512 ec75cea172395dd2bf0a76728950dc1888ebe1b5e37048bf213a7bedbf2183e5be0472992bf533de22c6bf3039254e18979ef431cb61fe3eb59a4063177feac1
+EBUILD tiled-1.4.3.ebuild 1372 BLAKE2B 06303c0bf6943dbdbd0d450e00bc81897b999d445a40934b582bfd5a4199d91a7de96d2c634d13749fa895533d59c32b69194facc723090a93ab166fc536c4ad SHA512 fa8137e781cb3334dd2f1f9d98b29c684d192444c13207e6880411f32622e7db7dd5699f2e48b46fc701212e7efad951d21ecf64a913f5f7e14e9dde6b6f78bf
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/tiled-1.4.2.ebuild b/dev-games/tiled/tiled-1.4.2.ebuild
index fc9a62d7bd92..b355ebdb4fb8 100644
--- a/dev-games/tiled/tiled-1.4.2.ebuild
+++ b/dev-games/tiled/tiled-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-games/tiled/tiled-1.4.1.ebuild b/dev-games/tiled/tiled-1.4.3.ebuild
index 2579d6320997..fc9a62d7bd92 100644
--- a/dev-games/tiled/tiled-1.4.1.ebuild
+++ b/dev-games/tiled/tiled-1.4.3.ebuild
@@ -12,12 +12,13 @@ SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="examples python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
+	app-arch/zstd:=
 	>=dev-qt/qtcore-5.14:5
 	>=dev-qt/qtdeclarative-5.14:5
 	>=dev-qt/qtgui-5.14:5
@@ -27,7 +28,10 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS COPYING NEWS.md README.md )
 
@@ -36,7 +40,11 @@ pkg_setup() {
 }
 
 src_configure() {
-	eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+	eqmake5 \
+		LIBDIR="/usr/$(get_libdir)" \
+		PREFIX="/usr" \
+		SYSTEM_ZSTD="yes" \
+		DISABLE_PYTHON_PLUGIN="$(usex !python)"
 }
 
 src_install() {