gentoo resync : 15.06.2021

18 files changed, 235 insertions, 25 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index e4947e5d3ebd..80a3ceb85852 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index 2ad267e1752c..83086ba2fed6 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -2,5 +2,5 @@ AUX cegui-0.8.7-icu-59.patch 444 BLAKE2B 7ba31c1a856638be317c0d3166159bea14be9f3
 AUX cegui-0.8.7-musl.patch 2017 BLAKE2B a7735ce19c17505be2ba1da5c0aa8fde00ed6cca9926a1586a426a6b56d0fa9bb402a54a8c99b79f58a8adde3edfb79856a2766ca28f8ac92930d4e4004b4dc1 SHA512 c9bece96a6f7600cc59b94391b774acc016e2f33fb608d33aa25ef603b5782f47d338cad6ad244224c861fa00a8ebc0f80f7aa1df4800a7c8347029f2b5e996d
 AUX cegui-0.8.7-python3.patch 1045 BLAKE2B 702c30e85d08e117888d56adaf2c131f9c6410916f08b03ac66efd69230e14b53ee05975e04489f3526fba964a372b340b86acf5a31dda36ddbab40d7f65d944 SHA512 9870e996697775938ca9ba6708dc93d5e59e8a640dd2542c1e8cc8b903ebd1738b11e733f2e9d012f932558a6f77ee8014f0d98133252e2cee2025e664a38e61
 DIST cegui-0.8.7.tar.bz2 18114465 BLAKE2B cf0a4867f0e32c6a6b585821c915dc1fbd532e0f95effe28f6d3e4f1a2bccd23f47c7c33a3115befdf8b3f094d49a5af042d28c1e1fbb88e7c7f6da7f3fa173b SHA512 271ff2a1e19f46c7d40cbc210bc665666e45b56cd0efea460db4d08df134d929337846eaf923db1b915597965aab27ad39512d6567cc63ef883555cbff542e56
-EBUILD cegui-0.8.7-r100.ebuild 3333 BLAKE2B fb413b80a0341228b6c38ae78ffbcd5e81ab009c9de5596bd585c001b217d5c397006275904ad74180bb4d8518e3eeda2033d0b27033fc02c4da9d9677c60688 SHA512 c88db516a7fdcc587aa78f917d47ad3dcd7af9ec374cf705c2ee5f8a808164f745d82698c4f69e1925393184d4b317e432446516c632092d999d15b8c0412fd1
+EBUILD cegui-0.8.7-r100.ebuild 3337 BLAKE2B 2e662fb4d0c9c5fbfd951149be629cc994c4f816e7308a080b9488ba8412d5e4ef9aeb8c52f3b5df07ae6bbac0c69c314f1f076499cbdd26f2edbbe16892f258 SHA512 084d6848a698eca918947ffa5fd5dd4c09ebd66deb03358c2bca46319409f99d05e22e4199f6427c4ee9a1120d40171d9ef147825cadc94b5a69b2f9b8c85097
 MISC metadata.xml 803 BLAKE2B da9534a051925be6cd6d285ce3335c65ba799481840f95aadedb2f81f7a06e05253e8949bf77e7626635437bc5ad5b91af11d6aa452f3524669efdd6216b3bd6 SHA512 47d0eeed54ab5b192051b976a5e1a9790c9e0321753cdc8da73fda4131ac30e40fb57f418418ea7b2bbb30041f76def1a79803d699962488ea4dc1dad50c4996
diff --git a/dev-games/cegui/cegui-0.8.7-r100.ebuild b/dev-games/cegui/cegui-0.8.7-r100.ebuild
index 7c84fecbec66..d47ffdaeeddb 100644
--- a/dev-games/cegui/cegui-0.8.7-r100.ebuild
+++ b/dev-games/cegui/cegui-0.8.7-r100.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # TODO: multiple ABI?
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit flag-o-matic cmake lua-single python-single-r1
 
 DESCRIPTION="Crazy Eddie's GUI System"
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index cf18803b85b5..9138d9ac3f3e 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -14,7 +14,9 @@ AUX clanlib-4.0.0-freetype_pkgconfig.patch 1101 BLAKE2B 07d6ad6d64998fced66fd395
 DIST ClanLib-0.8.1.tgz 7629019 BLAKE2B 7f238111931212e3f9c82ed43842706bf16ee145896735ca35595e29dd357e52364cc592be55d88e231f962adc313bc8f57357bc74c9f1b8b134bc411497f5e9 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b
 DIST ClanLib-2.3.7.tgz 26132425 BLAKE2B 109ba92baf21174022c8dbc4044e39ec16ec77c730b57590733418e246ab71d18d81bbf281cd469dd9e2aebd4ac4302fbb581f27dc7fc0054a8c7ce69699e19d SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a
 DIST clanlib-4.0.0.tar.gz 7435551 BLAKE2B 243fc2519ee90a12af37e8925c99db77785a9a5da497d870545bb489e76cbfcbb4cac81352731326a0cc59689a361b8ab14db2bb1e255da07696e378a9cfb6e5 SHA512 e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe
+DIST clanlib-4.1.0.tar.gz 6871886 BLAKE2B 0aeb9e89998a9ef6975bf16a2e77f461e6415aacda9a26a5c0a9c6ec3c19a136a5f092c7866b60898251fbd6cb8aa7e96c86f6b87afb564824298fac77bf20c3 SHA512 34f5d1fdb7b071a218f081a6b06a6018a9c20cedc4c8500a9796be02d335f06fa148304379eeb1a35e08b9a734e504ceb490a6558a43d1611187bd97be01f4b0
 EBUILD clanlib-0.8.1-r1.ebuild 2252 BLAKE2B 5d04c8d1291f961c1567ae34cb9f148fe6993cc6a4c1694b3beaa454082248276eb0eda6edecfdddd704a57e98b0395cc49b38011c0fa71ea5f1fcfea1feb75b SHA512 380c236592632dcdd1b8743390678b72fa3420f0cfb92c001645fe73fc8ba5cee4fbb3437e69c81241a88181a2587d0813fbaee01b0439ea01bb694d63d8fb4b
 EBUILD clanlib-2.3.7-r1.ebuild 2149 BLAKE2B 5fb4ed60cb8ef0e0d10c4d3048bb05573019afce36129e09e680ae017604a78b950f80e6e8bbe95542a136099f059d272a3971eb18b7c74e99bbe03226eeef71 SHA512 abbbd82e4474b76c6bb3fb957f59599ac916276959ae30c42a5c53471aa67f51b76c80f5cb443fe29358f91c66197cce39ddca4ca7880fd5a9f27a7a67b34b0c
 EBUILD clanlib-4.0.0.ebuild 1604 BLAKE2B d7caae80e28aa0f4d40b34b5407282230c621a494d0bffe1739886dfd0e24966d1a5d73ac6a3bf64a8fcd3bc40ca60c936c2c81e1ddbd107d961e957e2c380eb SHA512 b73e467cea5bea574e53a74b125b96da408944ef2006ef3a31a044780ccbcd3d754362fdc138d7d153210b7722beb87ba0a9dceaf78c383d0ed383639f024b67
+EBUILD clanlib-4.1.0.ebuild 1491 BLAKE2B da46029e71367101d4ecbe76015b13660255732d93df2bfcc6f3d2b53feb7b0a70a85a5bd9f691822582a140eb0a5e1a800ece9f56ea2d25d3fefd373c24d1c9 SHA512 2548f5db4749ad2d4b569a1992370c1d56ad0d8120e67b246a9a787ce3c78da0ed350a626a0507a30d55a4ec2dd46b19d895f8287b78a1d41c7b4ddb65b98878
 MISC metadata.xml 3096 BLAKE2B 2424f96e26408b05e8cc272dabf45ea1b865207364eee064fdf7132f6293629e69864779011d5cac55a42671ca0adae6f34e09209b636d2ad224f413de4c5ee5 SHA512 bb84df024ebfc5f59ef035537b8f2d19c3b7e7cf2b9c832fed8a973062807a95671bdbd2ce76529d8d424d664c9b37ad79e0839248d6099f8ba237f0d49cb76a
diff --git a/dev-games/clanlib/clanlib-4.1.0.ebuild b/dev-games/clanlib/clanlib-4.1.0.ebuild
new file mode 100644
index 000000000000..257d24b427cb
--- /dev/null
+++ b/dev-games/clanlib/clanlib-4.1.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_PN=ClanLib
+
+DESCRIPTION="Multi-platform game development library"
+HOMEPAGE="https://github.com/sphair/ClanLib"
+SRC_URI="https://github.com/sphair/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="ZLIB"
+SLOT="4.1"
+KEYWORDS="~amd64 ~x86" #not big endian safe #82779
+IUSE="cpu_flags_x86_sse2 doc examples ipv6 opengl sound static-libs X"
+REQUIRED_USE="opengl? ( X )"
+
+RDEPEND="
+	sys-libs/zlib
+	X? (
+		media-libs/freetype:2
+		media-libs/fontconfig
+		x11-libs/libX11
+		opengl? (
+			virtual/opengl
+			x11-libs/libXrender
+		)
+	)
+	sound? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-lang/perl
+		media-gfx/graphviz
+	)"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc docs)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable opengl clanGL)
+		$(use_enable opengl clanUI)
+		$(use_enable X clanDisplay)
+		$(use_enable sound clanSound)
+		$(use_enable ipv6 getaddr)
+		$(use_enable static-libs static)
+	)
+
+	tc-export PKG_CONFIG
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake html
+}
+
+src_install() {
+	default
+
+	use doc && emake DESTDIR="${D}" install-html
+	use examples && dodoc -r Examples Resources
+
+	# package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-games/mygui/Manifest b/dev-games/mygui/Manifest
index 23758d0c6e3b..d08efcae2ec1 100644
--- a/dev-games/mygui/Manifest
+++ b/dev-games/mygui/Manifest
@@ -6,6 +6,6 @@ AUX mygui-3.4.0-build.patch 2492 BLAKE2B 2819c235df3d479d42831fcf2a80a9a2e165b98
 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 3765 BLAKE2B 97e1bbfbb6287fd0963677ed84297bace17efffa5779b0972981d2fe1576d9a43379870275537a097903c4bfe92baa3f32a467b514166992fb5b4feba50bf1bb SHA512 2ea444ba8dd5830b0c423f4c65201557739e8c3759e95924b153518dd634c51c0cd10a6443f31a467b211b24f18b68f304ef7f1af798651b981a08ea1111bea0
-EBUILD mygui-3.4.0.ebuild 3758 BLAKE2B 1d456f5e82b7357ae624b19ef43103d55a30df7ba2c9df856cbe22f5a118842cf183eb5a0ff2eaf4d40f6eef95faa5c4b021905845a158ef30e1f93ce2373144 SHA512 eecc3f87a738021a43fc3d48e34fdc1492fd3de557a0f520fda9437669436813635136e1ba4535a406e636b0f64d6abd3274fc8d70100017649eecdc5daf47f7
+EBUILD mygui-3.2.2.ebuild 3764 BLAKE2B c049422721ae3108e005e733203482d1dbdb71b69199bac962a2389ee4446af68fc9449c456588ab08a46e6a3c5ccd08ac72050fa43d19a3d836fb1966a01c47 SHA512 362d03af0d91d919c099c3d32954b5039fa4b6fa211c026f0f7a71937d06ae51162308b3117cf57d33d1ea3c01c461b7c45c48dbee86028d7aa32b6271ea2e21
+EBUILD mygui-3.4.0.ebuild 3757 BLAKE2B b26ff57ef8140c3d81b37cde00aa4ca55256a343f49b6be8de2947e0c922d86f96670f5e28f79984ddeabd0cbd14439fe3a33b12e33e2c13445be03ca478a5db SHA512 e91dd037e258fd1dc445280a697295aa5e6b6580bdea5a8334936b3aad1a9de64b6b2e34f68d54165ad03d10bd625bc1938654050986f5039e6bb088a145de15
 MISC metadata.xml 2012 BLAKE2B 6f3b20aa2f4f557b3499d98b758d4e402903a6f56580062ae9442b38508abe3841584e550bb20cbce31b93a052ef78231c8ba9568dba1d8bb9459a11f32d625a SHA512 05633f451013eff1de94fc2707bf9df21a2b8e6a8466a988f743ec12e04c12e6e81a0fbc4c74c081905ff81ba45f571459d3584a264ae5347e13cc2b4139ff79
diff --git a/dev-games/mygui/mygui-3.2.2.ebuild b/dev-games/mygui/mygui-3.2.2.ebuild
index dc3766716faf..8d9f41e07cc2 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/MyGUI/mygui/archive/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug doc +ogre -opengl plugins samples static-libs test tools l10n_ru"
+IUSE="debug doc +ogre opengl plugins samples static-libs test tools l10n_ru"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="ogre? ( !opengl )
 	opengl? ( !ogre )"
diff --git a/dev-games/mygui/mygui-3.4.0.ebuild b/dev-games/mygui/mygui-3.4.0.ebuild
index 896d211683f2..ab008898965f 100644
--- a/dev-games/mygui/mygui-3.4.0.ebuild
+++ b/dev-games/mygui/mygui-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/MyGUI/mygui/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc +ogre -opengl plugins samples static-libs test tools l10n_ru"
+IUSE="debug doc +ogre opengl plugins samples static-libs test tools l10n_ru"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="ogre? ( !opengl )
 	opengl? ( !ogre )"
diff --git a/dev-games/ois/Manifest b/dev-games/ois/Manifest
index 85c7d05033fd..e411788a443c 100644
--- a/dev-games/ois/Manifest
+++ b/dev-games/ois/Manifest
@@ -5,6 +5,6 @@ DIST ois-1.5.1.tar.gz 554124 BLAKE2B a975cbd629b86618a607b275bfcd35fedfd897c8aec
 DIST ois-1.5.tar.gz 552786 BLAKE2B 2ac2d1d74c03804cdc1c0b8cd1e2a3661d9edfc8ae230d036f108dbffd6d8aa5778e2f708b468fd3364c0ba403d07b04c1744eb5a11b39d658ef5a21943a9df3 SHA512 5ab1dda7c25c1959ccbbb758ea3fda36bd62ad65f46e2c6b418317a5eb39e0bace52a44ae079dfb69fc58c90df54f8e50d589daae1100ec615325363c9d77513
 DIST ois_v1-3.tar.gz 136739 BLAKE2B 88dd3af2c8b253d9cacc5c65510c150ba50c6a47c1c2cd241bf366f38fba0560a7cef08392e338984e8b172020c4a4c37e5eab024fabc695b2f06f93393850ed SHA512 48b7355a9be9c66233691aa5461192fb6e537d284e4366ebf931a76ee3be30f2cf17a4aa350fce6b433eaecf4259414062b9dd5854eaf872b9a18294cfc640c3
 EBUILD ois-1.3-r1.ebuild 613 BLAKE2B 7f3c42b517ec592d693c0ce54a7cf0582ca181a3f8049f466b8465e0e9edcecfdf67d3092707e4c7a1f1eb1b7ee394bdb26ef5b9b8da0bc466e221f34869f119 SHA512 b7afdadc166810462135c61a1b067c11637688392765a7e874cf548129073a467d6a2b53ea731a3ba91c8f67259ccfe9c62fca2ef65d8f01328e7df34c5cfba5
-EBUILD ois-1.5.1.ebuild 474 BLAKE2B 7d9fdd249efd6edc0ef5d5e5cc613f660a81c16c58e41461bf107c16da734f4bd0b5c236954ed6410f5c3af11f60f8838dbc1127eb4918deca020191cb1a4e15 SHA512 1efc6e7fb64d2c2a3d686cded9855051af5b90d97aeb234d7be189220099edf443fa0b74562e09422a7db5881f35d6b5593110a7833bd95c3192357a6aad181f
+EBUILD ois-1.5.1.ebuild 472 BLAKE2B 38c5409e21de309e09a57d45e7e026d4428e871c6614c08c7cbfa2dbd7167b27a270c90f4ebce4a1bd3cb9297403cdcf57fc174967328bb0d4234b49265212ea SHA512 03393782b7606e422cb8521d8c401af9fb8c5b31df96a21d52448d8d0942d663886e69e9f3c27b8d99363658508104dfe9916013bb7d551906d5677da9cc52c2
 EBUILD ois-1.5.ebuild 498 BLAKE2B d15400a1caf013163870b17c3fe1848e7173a6f302854baa4d91b0f179452276248c22888e695ac80cd47cbae5b20f303f6f1e41e0754d9315cbc97f8298efb8 SHA512 d1bc5f379067bf033896fd43e943d6aa1976965cd93b35cfea808572e64ad0f52ae7a520c8b80bc96e3bd8a6dc36b9d3c493dc2ae7a20055d13163568b752afc
 MISC metadata.xml 377 BLAKE2B 6bf12a2da0459bbe02d99361f77fa759217ede6da059fe7f23c97436c45927cc481cbc910af4509f4e432a0bf3dd98a4d534600f406721a5e36bb74bc9e24ff8 SHA512 646270ba21d37a69e9aa1880851af5fa729b64848a60e298bba684af783185ec73e9a6013176fb758acfd782af7f044aee54f2539fd11f64ba8e190f0dccc262
diff --git a/dev-games/ois/ois-1.5.1.ebuild b/dev-games/ois/ois-1.5.1.ebuild
index 3d987d1af471..0ab196280b9f 100644
--- a/dev-games/ois/ois-1.5.1.ebuild
+++ b/dev-games/ois/ois-1.5.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P^^}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND="
 	x11-libs/libXaw
diff --git a/dev-games/openscenegraph-openmw/Manifest b/dev-games/openscenegraph-openmw/Manifest
index cedf64396d50..f7392ad5cae7 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -1,6 +1,7 @@
 AUX openscenegraph-3.4-cmake.patch 4485 BLAKE2B 3d63d45b7af01dc4153c03edb828a609a0877e30a8aee9a36fbf69b171df04fac5945e69f91c5e107b55b3c771c5dbcba721f607fcb5a73e1c14dd5351854f22 SHA512 e0dd21ecbf92dec251bc40680106adea4c309badafef408473397b8078e20cd7fbd1d9cb1b1912466ded4156275cd5a1fc1e86caa2471670938e3d39c0c84a97
+AUX openscenegraph-3.4-gcc11.patch 1038 BLAKE2B d460790c49c060f79e0311913314f38d32d3cae0056fa2b65462eeefdc7637750a04d3d13a54756e8d5129b9a8bde262e41ce540f480b55934dc23a933234143 SHA512 5e22bf470d18f166927a744f39b21cf9de72abfd17e7d96095943cb4ea698134d9cf4f68a99d4bf2b918f594951d9b9179e29e13d1016e1c0ffee1eb2e17513b
 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-r100.ebuild 4362 BLAKE2B a8c82b42c5aa43847cef4cbafa0a171ca172760c147e65d2cf4476bd42d52744f75e86566a99b0e10a65f9ee78af5c5f61bb3d795ec6769d45739b8e7ae3d601 SHA512 514cbdabd064d058b0530d42c1393f351e277aee7706ea9971ba4603fabedbf4ed6de13f0fbae5fb2c52f6d451b90c074f144578a4afddd9b78305576f7258d0
 MISC metadata.xml 1690 BLAKE2B 4c99a953f827084c2a9d848f1bed0f1b7c885343ac2bb8ca57b2ada30ab8901e56ff1f7a37e97394c2fd0f8b0eff452ac0dc2a5fcab270ea8781999fd4bd45f6 SHA512 44a3d3a9af55c002330282ce036c3c455ffd7e9800c854657bd643fb3033645217e365a1a8dc8c7dbbff0d7038a9c6b0265fc824af71404a5b42d9a26a147645
diff --git a/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch b/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch
new file mode 100644
index 000000000000..0d2dc2d0f73b
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/788301
+--- a/include/osgDB/ObjectCache
++++ b/include/osgDB/ObjectCache
+@@ -72,7 +72,7 @@ class OSGDB_EXPORT ObjectCache : public osg::Referenced
+ 
+         class ClassComp {
+         public:
+-            bool operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs);
++            bool operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs) const;
+         };
+ 
+         typedef std::pair<osg::ref_ptr<osg::Object>, double >           ObjectTimeStampPair;
+--- a/src/osgDB/ObjectCache.cpp
++++ b/src/osgDB/ObjectCache.cpp
+@@ -16,7 +16,7 @@
+ 
+ using namespace osgDB;
+ 
+-bool ObjectCache::ClassComp::operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs)
++bool ObjectCache::ClassComp::operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs) const
+ {
+     // check if filename are the same
+     if (lhs.first < rhs.first) return true;
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
index 202f18429af9..08efaabeceae 100644
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -87,6 +87,7 @@ PATCHES=(
 	"${FILESDIR}"/openscenegraph-3.4-cmake.patch
 	"${FILESDIR}"/openscenegraph-3.5.1-jpeg-9.patch
 	"${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
+	"${FILESDIR}"/openscenegraph-3.4-gcc11.patch
 )
 
 pkg_setup() {
diff --git a/dev-games/t4k-common/Manifest b/dev-games/t4k-common/Manifest
index e24e7fd80c59..4ae6ea33dd9e 100644
--- a/dev-games/t4k-common/Manifest
+++ b/dev-games/t4k-common/Manifest
@@ -1,6 +1,9 @@
 AUX t4k-common-0.1.1-ICONV_CONST.patch 193 BLAKE2B 9761594d7a48c44728414440247bbfc7757463c6898108d2c76ecedd9b2ad498a60cd4de4408159abc8263a3c0efd4a8d68c87f1d32fb0449862de4154d23bb7 SHA512 1f2718cd2be30436a342ef33236a4b456e8d14c104af5080a407cb770adcd5ac10575737a80ff0a1fde928bc4fb2782f747d6df976f137335cbbe37e9b42d45a
+AUX t4k-common-0.1.1-fix-declaration.patch 441 BLAKE2B 3b21c72a8f5e4609d70a0bb4edd83eba25f8032d4ae8578e9a52076783bc45f4e6023b2476faa270dd1aac1195909dea206e7ba37562b80683a28f8fa6c4c23e SHA512 92747a5d8b449425773779256b888b94dca1ffc879ac859f3cbd3a1f2bc5d5eabf2fb6e74fa8f3db079dddc3e8663bb939e90493197f4d9a2c0ddfa708bea8df
 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
+AUX t4k-common-0.1.1-missing-text.patch 532 BLAKE2B 8bc1f7803806f86f9e33fbdb0dc5bb9bbab279ad52a81833eaab1ffeb52be49bbf73a2f278fa6637cddb9a9e61bf231c40de8e6f0b80c684d3a7faef78b8fa63 SHA512 503c9d9e4ee68e5f5b869649e315ec4c3bb3630e488476424fdb1d0e86686edf6f6f4004134edac7e27c728968b8c0718ad6f9a604aeff64294fa240e81391c5
+AUX t4k-common-0.1.1-svg-libxml2.patch 2860 BLAKE2B 0a4d53638107044e9a817244dbd77231047ebc5050b13a89118c652538a0615ea508186a5fd3d1ae7a6c29089362cae3daed45e4ace0ae49a2f9773900489a76 SHA512 b6ddf673b15aecc0d7bd16d14ce1d9790ebce4884c0304a849649e87a872b67b227713694f5391491be591b84ac981e48a89585c0de93585b62698d977d962ef
 DIST t4k-common-0.1.1.tar.gz 622239 BLAKE2B f2ddbb3b8815ad05001f99b8cfd49fda3c1f59e9dc340bf9739c2072e9f4a2faf069bf9f774f95818a0cb59302e557d3d6408530e8ff82adb6b9fd84b36e2641 SHA512 d7fdb469452637187adcb4b5d2907c05687765b1b75cd3a28b75222b2a0358f1962e1a245d88129b4dbede845fde8ff718cf9a7b0f97a12cb21a8791073fbe3d
-EBUILD t4k-common-0.1.1.ebuild 1127 BLAKE2B f9a716db65334c6efb3de17208a8c3d7893ecb847a6dadb540500bcccaf50de82137b57faca7d0be1d39bde4dc324c08c3ee1bbfbe0b5a6a61a838521048293a SHA512 52f895adfb5e63754ecbb09b50b79a02ca6c2db874a561400e76c92056090e9e2e2495b5e9465a5fca4e4466a9eef4d2191962656b954511c0fdf0c17ab75f45
+EBUILD t4k-common-0.1.1-r1.ebuild 1333 BLAKE2B d320443f2954055ce2775cbbe7c046d652d0f50bf25958a4c45382caad6f80cf42e0784108518dbe3738c613e67af7ad8d05e2fafe4f030e05442f78d778c366 SHA512 5670ef68640bd1567198b849a5dc79d52f3d825b69025d26b7f70af856f8e8dfc73ec4e7c667517e4213c00518c1dedb985d874f266835d180bc74bb8f481ac5
 MISC metadata.xml 336 BLAKE2B 6e8da7610b8afe5bae34c30ff55d49fac65fcd8889a24e8295516e2a59f41a54b6728c34bedb6588ea6707c0837103a0d2b95598d1743a2a122cc2e54d50f10c SHA512 7f43f1bcfa355ebfe96ae7dfc7165ffa54cf90ea3aa7e58b816f85d04d7c4ba5dcf7a8c7d7eb4395bcff7e8f1206423f853cbc6729774ee582d48603afc123bc
diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-fix-declaration.patch b/dev-games/t4k-common/files/t4k-common-0.1.1-fix-declaration.patch
new file mode 100644
index 000000000000..8b1188039f42
--- /dev/null
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-fix-declaration.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/759574
+--- a/src/t4k_menu.c	2013-12-02 10:50:23.000000000 -0500
++++ b/src/t4k_menu.c	2021-01-04 19:49:20.561524579 -0500
+@@ -152,5 +152,5 @@
+ char*           find_longest_text(MenuNode* menu, int* length);
+ int             find_longest_menu_page(MenuNode* menu);
+-void            set_font_size();
++void            set_font_size(bool uniform);
+ void            prerender_menu(MenuNode* menu);
+ int		min(int a, int b);
diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-missing-text.patch b/dev-games/t4k-common/files/t4k-common-0.1.1-missing-text.patch
new file mode 100644
index 000000000000..72cb5372c282
--- /dev/null
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-missing-text.patch
@@ -0,0 +1,14 @@
+Fix some missing (transparent) text with libsdl-1.2.15_p20210224
+e.g. empty menus in tuxmath
+--- a/src/t4k_sdl.c
++++ b/src/t4k_sdl.c
+@@ -1401,3 +1401,3 @@
+   /* Use color key for eventual transparency: */
+-  color_key = SDL_MapRGB(bg->format, 30, 30, 30);
++  color_key = SDL_MapRGBA(bg->format, 30, 30, 30, 0xff);
+   SDL_FillRect(bg, NULL, color_key);
+@@ -1448,3 +1448,3 @@
+   SDL_SetColorKey(bg, SDL_SRCCOLORKEY|SDL_RLEACCEL, color_key);
+-  out = SDL_DisplayFormatAlpha(bg);
++  out = SDL_DisplayFormat(bg);
+   SDL_FreeSurface(bg);
diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-svg-libxml2.patch b/dev-games/t4k-common/files/t4k-common-0.1.1-svg-libxml2.patch
new file mode 100644
index 000000000000..590be3858de0
--- /dev/null
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-svg-libxml2.patch
@@ -0,0 +1,73 @@
+https://bugs.gentoo.org/763591
+
+https://github.com/tux4kids/t4kcommon/commit/99e9d3895b480d5998513592f6af25096c6d1c50
+From: Paul Huff <paul.huff@gmail.com>
+Date: Wed, 1 May 2019 19:56:12 -0600
+Subject: [PATCH] Use libxml2 to get info from svg files for frame counts since
+ librsvg doesn't let you access the description anymore.
+--- a/src/t4k_loaders.c
++++ b/src/t4k_loaders.c
+@@ -41,4 +41,6 @@
+ #include<librsvg/rsvg.h>
+ #include<librsvg/rsvg-cairo.h>
++#include <libxml/parser.h>
++#include <libxml/tree.h>
+ #endif
+ 
+@@ -49,4 +51,5 @@
+ 
+ #ifdef HAVE_RSVG
++int             get_number_of_frames_from_svg(const char *file_name);
+ SDL_Surface*    load_svg(const char* file_name, int width, int height, const char* layer_name);
+ sprite*         load_svg_sprite(const char* file_name, int width, int height);
+@@ -161,4 +164,43 @@
+ #ifdef HAVE_RSVG
+ 
++int get_number_of_frames_from_svg(const char* file_name) {
++    xmlDocPtr svgFile;
++    xmlNodePtr svgNode = NULL, nodeIterator = NULL;
++    int number_of_frames = 0, found = 0;
++
++    svgFile = xmlReadFile(file_name, NULL, XML_PARSE_RECOVER | XML_PARSE_NOERROR | XML_PARSE_NOWARNING);
++
++    /* If it's null something's really wrong because we're trying to load a sprite that doesn't exist */
++    if(svgFile == NULL) {
++        DEBUGMSG(debug_loaders, "get_number_of_frames_from_svg: couldn't load svgFile: %s\n", file_name);
++        return 0;
++    }
++
++    svgNode = xmlDocGetRootElement(svgFile);
++
++    /* If it's null then something's really wrong because there should be a root in every svg file... */
++    if(svgNode == NULL) {
++        DEBUGMSG(debug_loaders, "get_number_of_frames_from_svg: couldn't load the root from the svgFile: %s", file_name);
++        xmlFreeDoc(svgFile); /* be clean */
++        return 0;
++    }
++
++    nodeIterator = svgNode->children;
++    while(nodeIterator) {
++        if(xmlStrcasecmp(nodeIterator->name, (const xmlChar*)"desc") == 0) {
++            sscanf((const char*)xmlNodeGetContent(nodeIterator), "%d", &number_of_frames);
++            xmlFreeDoc(svgFile);
++            return number_of_frames;
++        }
++        nodeIterator = nodeIterator->next;
++    }
++
++    /* if we get here we had no description, which means something's really wrong */
++    DEBUGMSG(debug_loaders, "get_number_of_frames_from_svg: couldn't find the description frame number count from svgFile: %s", file_name);
++    xmlFreeDoc(svgFile);
++    return 0;
++}
++
++
+ /* Load a layer of SVG file and resize it to given dimensions.
+    If width or height is negative no resizing is applied.
+@@ -215,5 +257,5 @@
+ 
+   /* get number of frames from description */
+-  sscanf(rsvg_handle_get_desc(file_handle), "%d", &new_sprite->num_frames);
++  new_sprite->num_frames = get_number_of_frames_from_svg(file_name);
+   DEBUGMSG(debug_loaders, "load_svg_sprite(): loading %d frames\n", new_sprite->num_frames);
+ 
diff --git a/dev-games/t4k-common/t4k-common-0.1.1.ebuild b/dev-games/t4k-common/t4k-common-0.1.1-r1.ebuild
index e0a6d5009ab5..c395867aa56f 100644
--- a/dev-games/t4k-common/t4k-common-0.1.1.ebuild
+++ b/dev-games/t4k-common/t4k-common-0.1.1-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit autotools
 
-DESCRIPTION="A library of code shared between tuxmath and tuxtype"
+DESCRIPTION="Library of code shared between tuxmath and tuxtype"
 HOMEPAGE="https://github.com/tux4kids/t4kcommon"
 SRC_URI="https://github.com/tux4kids/t4kcommon/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/t4kcommon-upstream-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="svg"
 
 RDEPEND="
@@ -20,40 +21,45 @@ RDEPEND="
 	media-libs/sdl-image
 	media-libs/sdl-mixer
 	media-libs/sdl-net
-	media-libs/sdl-ttf
 	media-libs/sdl-pango
 	svg? (
 		gnome-base/librsvg:2
-		media-libs/libpng:0
+		media-libs/libpng:=
 		x11-libs/cairo
 	)"
 DEPEND="${RDEPEND}"
-# need sys-devel/gettext for AM_ICONV in iconv.m4
+# need sys-devel/gettext for AM_ICONV added to configure.ac
 BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-S="${WORKDIR}/t4kcommon-upstream-${PV}"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-libpng.patch
 	"${FILESDIR}"/${P}-fno-common.patch
 	"${FILESDIR}"/${P}-ICONV_CONST.patch
+	"${FILESDIR}"/${P}-fix-declaration.patch
+	"${FILESDIR}"/${P}-missing-text.patch
+	"${FILESDIR}"/${P}-svg-libxml2.patch
 )
 
 src_prepare() {
 	default
+
 	rm m4/iconv.m4 || die
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-static \
-		$(usex svg "" --without-rsvg)
+	# note: sdlpango<->sdlttf breaks ABI, prefer default pango
+	local econfargs=(
+		$(usex svg '' --without-rsvg)
+		--disable-static
+	)
+	econf "${econfargs[@]}"
 }
 
 src_install() {
 	default
+
 	find "${ED}" -name '*.la' -delete || die
 }