gentoo resync : 02.09.2020

22 files changed, 244 insertions, 89 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 176fda44835e..dd5763ed69ba 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/four-in-a-row/Manifest b/games-board/four-in-a-row/Manifest
index f9f7d2a37b56..ad29db4ca9e3 100644
--- a/games-board/four-in-a-row/Manifest
+++ b/games-board/four-in-a-row/Manifest
@@ -1,5 +1,5 @@
 DIST four-in-a-row-3.34.4.tar.xz 508780 BLAKE2B 4528642e82438c52706d068d01f5d167f83f4b6dc0a9883bd95a046d9c9772ac642f27f0b1b1197a4ce81b3b5a5a14ce7f9ed8eacbaca189692c0a3c34faeda1 SHA512 7bdfbf1c8953175af8dccbe0514215349a48246f949723628a940db6e5b1e3d89990aa57b5994e5460a79db19ba207de939fe81da53d5782a762695d1588776f
 DIST four-in-a-row-3.36.4.tar.xz 558244 BLAKE2B 63a61de3150fe067faebffc021f78398a267b0788e5353d6953dbf6b6836a21901f9bb8f498872a083b1d8c9ccd9dfe2a58c529e2655959084a64102f2ac4d3b SHA512 5f73f2b2548c9b9dfdf1310cdb22c65e7f96135367d55e113b1c779ed21aab5ed01eaaa009c346035a222fa8c87c6224334d546407963a90f068b5ca8ae1b58d
 EBUILD four-in-a-row-3.34.4.ebuild 905 BLAKE2B b98c3d4d1c69dc03409b09349ca2fabe7dedacda7515650279fa3c487f841ba8b16f2c0de1a75fbe5e7a6b63d642c738666c458af52cc4ece0905272d3ca4a5e SHA512 b5f803e151b6b5ee4015c2c417ef698ca90c18098dc543bdb25d02a4307452c19ea0bf09ff372099f3e6c802326698edc27e2bf42c5d6332b3b94354341c6f12
-EBUILD four-in-a-row-3.36.4.ebuild 936 BLAKE2B 5d9f5c07b3c45740858f83715fdf625e31cb42db301724454632b0b4e5751361d282b91f7e8d65dec317fc3d4376c3244b2911f845915b3a069bb8ecc0e622f8 SHA512 19580e202029445c14f2a38afa32564f96fe62540bd2f544f254d5ccadd9ae28a0259fa52e7950ebb1f10078b613179240c2b2b59607fbd37b93a2b56e0b0137
+EBUILD four-in-a-row-3.36.4.ebuild 934 BLAKE2B 1df0ef48fd99b8b77af105be86dc7e1635b30e5d07c553fd2c3b3a12cb24c155defb5a61c23428d3591acba61dae5924759bc1cb8d84e81ae5c91b51e4741360 SHA512 b5624d550927698301651981135070b51891f6ce078f4ab3cb97a6d3d515f4992de7cbc1cabb4fb7722f3ac1894da9016fc5b23d41ad452e2418fdc17374230b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/four-in-a-row/four-in-a-row-3.36.4.ebuild b/games-board/four-in-a-row/four-in-a-row-3.36.4.ebuild
index 667c8dc8de34..b9236389d794 100644
--- a/games-board/four-in-a-row/four-in-a-row-3.36.4.ebuild
+++ b/games-board/four-in-a-row/four-in-a-row-3.36.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row"
 # Code and most themes are GPL-3+, CC-BY-SA-3.0 is user help license in v3.32.0
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gambit/Manifest b/games-board/gambit/Manifest
index aece8b881dd7..63645bccf5ec 100644
--- a/games-board/gambit/Manifest
+++ b/games-board/gambit/Manifest
@@ -1,3 +1,4 @@
+AUX gambit-1.0.4-compile-flags.patch 1478 BLAKE2B b57ae05465ce29f81a69e438f50f3bfa310b38b6427a150ccda7a434cf14789d26ac25075d3902423a07c3f40f9252d3b046b121d2d7067804538be30fe9df60 SHA512 97682079ea3c3b8e751df8acf71db0f32a6dd2c615e0a4178e9babbe9f6a0b624bee80d326d2a4a3c6eb82451abc5f77dfa38909dc02f4b28a3f2ff7d3f9520f
 DIST Gambit-1.0.4-src.tar.xz 1675576 BLAKE2B 4545bee38509d44f80af874473ff562b441e570be3681b166b064574e12bfad8b8a2fb5043b9d0b9089160de2d97407160336cb58864168232cf0921244cf92d SHA512 9ba12e0e9598e2b08228aa009690e6a05677916dcea1413a42be20d620accbe7cef4f4300e3ccc5d4d99e37c7fb85d923df8f5fa9146ee8049bbde2ce66ab7a9
-EBUILD gambit-1.0.4.ebuild 1163 BLAKE2B 38cd5c10193233956e100427e733988f3ce4a7559ebece715166fd72154887ceef6fa5bdb88803c1c75cd1b54ebdc6a6810065fb0c15c30aacc213dd6b79c3d8 SHA512 8bbc7170cf3095533c331d5f974f2bae421e2097cffe44d9031c748f873561039d0f8bdbd67db77f7fb61f3e9d61f6359c2cb123c809c98b60ac8a3f1ade2605
+EBUILD gambit-1.0.4-r1.ebuild 1213 BLAKE2B 074a10ba30baa167d5fc98e5944352598cb2611346ac352073f1af5effebd402cb81f3f6bdb9c5b2aefdc3c364211ce196e1149a68ba822ae2ad6a2e16285100 SHA512 6dd7dd6cb811623f8288fa9230f5011e612e652cf317ff8b624a24d140434a53973bea3dc008cce014ed2e2d10335558eab24d97fb26a25bf1e862ebd1fdf60a
 MISC metadata.xml 330 BLAKE2B b37539dff6327ec46e89a9a93c5a23c0efdf321cafc5e851e98b9b265f1d561e8c70f96737b455b65958dbbd9b8a8e6efd7b44e9d589e26fb768851e23fb23ef SHA512 284c29ce4b5ae3cb4e7f1b3472cd3430ce474cd395f44b730301b37fed45c57387646e6643ab9ba2f80885e7bf2e36bd9dd018045d7a0ccefa2c73dbcfae2146
diff --git a/games-board/gambit/files/gambit-1.0.4-compile-flags.patch b/games-board/gambit/files/gambit-1.0.4-compile-flags.patch
new file mode 100644
index 000000000000..c8df686b86af
--- /dev/null
+++ b/games-board/gambit/files/gambit-1.0.4-compile-flags.patch
@@ -0,0 +1,28 @@
+From f573e47d095b114e07255537d754ef4ee4bf2885 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 31 Aug 2020 19:51:56 +0200
+Subject: [PATCH] Respect custom CFLAGS and CXXFLAGS
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1be8b83..fa5f5b6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,9 +114,9 @@ if(POLICY CMP0020)
+     cmake_policy(SET CMP0020 NEW)

+ endif()

+ 

+-set(CMAKE_C_FLAGS "-Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wbad-function-cast -Wformat=2 -Wundef -pedantic -Wno-long-long")

++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wbad-function-cast -Wformat=2 -Wundef -pedantic -Wno-long-long")

+ 

+-set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wredundant-decls -Wformat=2 -Wundef -pedantic -Wno-long-long")

++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wredundant-decls -Wformat=2 -Wundef -pedantic -Wno-long-long")

+ 

+ if(DEVELOPER_MODE)

+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -pedantic-errors")

+-- 
+2.27.0
+
diff --git a/games-board/gambit/gambit-1.0.4.ebuild b/games-board/gambit/gambit-1.0.4-r1.ebuild
index e078316f6b20..fd20cc73c5d7 100644
--- a/games-board/gambit/gambit-1.0.4.ebuild
+++ b/games-board/gambit/gambit-1.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}-src"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-compile-flags.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCONFIG_ENABLE_UPDATE_CHECKER=OFF
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
index d77a58008a2a..14500a9b1d69 100644
--- a/games-board/gnome-chess/Manifest
+++ b/games-board/gnome-chess/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-chess-3.34.0.tar.xz 648464 BLAKE2B c06474fbdaeb9dfc26fbadaa6f5dc83179cdc6d09b8007b2dfcd88a4af4a6113913cffa8f00ada7a788585d723c5917f7ad7944bf466411119e7979545f40f29 SHA512 dcd4c2cfb0ebb5d3481bb6f722ac847cb8976e31352286a245457a62291445f50ad86ce26a37c222112801dc807bb567ed4d71d2d6ccb1628c2cab0767445012
 DIST gnome-chess-3.36.1.tar.xz 738308 BLAKE2B 14d328b9939afb12f14b513cfa009e3fb197f6c35c5272df107ce844890339caecbb5dafbd0bd28a19d001ebc0574464b33ea2ca10a9f7578b49d1e6f637e190 SHA512 4c89f91fe16323a799cf1eb3fe1f8e37fd506248ca32ad605ca3d5ecd37cf29f046da50383e0d0c3d82acf4e472843f3fd40927283f37e02d42cee5d8c72d8b3
 EBUILD gnome-chess-3.34.0.ebuild 1038 BLAKE2B 0bfd04d1981eb5b20525ee9061a775757a71cc41fe41859eda8dc51721d6d75fbdaccbf375efd324b27a98fda021ff6acefdd1a6d267ecba65f6cf566833df71 SHA512 c4c6b5def2103422d604edfee8c3cfe1c8561143368bd243860e3df76b1632f0297f9487fe89af4bd7714bbe1fa3b4039470edbb6cd42fb77d26c4465181414a
-EBUILD gnome-chess-3.36.1.ebuild 1040 BLAKE2B ac4f95ee04326e1d29224b26eb3eae912b5f330660066ecfabc3367282b2405729365c6c9763adfa47e86c65803944938b352713a95e78813db7b94a33061168 SHA512 7412c3c58c333385690f234f882e323acd9e94eeeebb7bbdf0e7532777d6fb047e8c160373b2372f37e0891469274435160d70cad7100880685bec8c94df4a21
+EBUILD gnome-chess-3.36.1.ebuild 1038 BLAKE2B 4af1426f1efe41ac44aed3169d5bbd16da26caf62602cca500afb382e636db4d372025abc072378313be0a6bd7226bbe75cd46e923943a3fda3da4f6d8c6d69d SHA512 5f6b6b3ca6b21f2429d1f52152af42637da78b9cae81c2902ba777dcdee1f7b90854c874d4014a4be17ea687c275f9e26e056214fe8831593bd172954a3417dd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-chess/gnome-chess-3.36.1.ebuild b/games-board/gnome-chess/gnome-chess-3.36.1.ebuild
index 78cac2a1a480..d67e331fb03e 100644
--- a/games-board/gnome-chess/gnome-chess-3.36.1.ebuild
+++ b/games-board/gnome-chess/gnome-chess-3.36.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnome-mahjongg/Manifest b/games-board/gnome-mahjongg/Manifest
index f9a9929b1ec1..8d02f0993b89 100644
--- a/games-board/gnome-mahjongg/Manifest
+++ b/games-board/gnome-mahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-mahjongg-3.34.0.tar.xz 3065320 BLAKE2B a0e706a6e12c9cea7fa35a106b6b9f104af42fecc01b5f84aa07b1d12ccd9fe80e06accbe64681676fb2a081fc6dd232807f0f3e1b3f49cac46529194128a2ba SHA512 3dbd1953f88cd454ddfa84e9976ca5848dbac0d0fc426738d2e98117d12fe90b1875365071fc4299c02bd298ce27ecfcae709aa2ef7399c41f217a2548521f61
 DIST gnome-mahjongg-3.36.2.tar.xz 3049356 BLAKE2B bbb7b67580dc6189a02e2695d5952706911bd64c75c34164c19e70e4ac721b1e6c1af57b5ffd1edeae37f10103a1418e6f1134d327d9befc6bd086948076f62b SHA512 f7ed69e5196b6d5df1f6c207df04af7935f54bb838cdd9cfb802d8ea094929a4cb13afa6748056377ef74c96715a748aaffb9c69075c1b00e9a41c82a47ec070
 EBUILD gnome-mahjongg-3.34.0.ebuild 821 BLAKE2B a5b31bf91dc34da5ae10315987910c2cb52956fcbf17220329a3a58bd3bbf60961afd54a576f8565de9b9152a0a55ee317a87af67ebea3538b4ba3f39ae20539 SHA512 864aa19bbda24fe8bcded0cdf97937171cb8b5f5887781d38b176aa99c3d3bbbee5f461f5a59871eef19feb408df519b8603231ae3ecd027208792eac71f9eb7
-EBUILD gnome-mahjongg-3.36.2.ebuild 823 BLAKE2B 114223148bf1f89bf64c063ba21a1c6202c7590f1edabf4e09020c5bce4fa9bd86b8b8b0c10dbf020b101620bb367fca88b52a621e8d0c37fdeb45e10ac46d75 SHA512 eae1fc258dd58eb43bda850da447519c335bc78e4e0d1006d6c730be6340a441305f51db2998b300c2e9baad776b13d1476cf003815c0bb2e505f32d78eccc89
+EBUILD gnome-mahjongg-3.36.2.ebuild 821 BLAKE2B f79e1771a2c413918c4774465333cf36b1b7ce44a03b332b7d2da14ca36abc82a3974a248e01e99a82c683449c5195e12f26f665fbea395b0422a92ab884d168 SHA512 92fbf6bdf8a161cc0d9a43634a26e99dd402858086e09fdbcdda26a3564db1cf92dcf1d6fa2962acfb65d18e2b2f8a86a6c863cdd166e723a8bd5a3b746c2ae2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.36.2.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.36.2.ebuild
index 70b735a2e257..c6f8a047e5a0 100644
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.36.2.ebuild
+++ b/games-board/gnome-mahjongg/gnome-mahjongg-3.36.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Mahjongg"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnome-mines/Manifest b/games-board/gnome-mines/Manifest
index c15e606e2efe..11fad1f124f6 100644
--- a/games-board/gnome-mines/Manifest
+++ b/games-board/gnome-mines/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-mines-3.34.0.tar.xz 272448 BLAKE2B 9c290293117ff7a843794636f5af90bc0a9956d39c4cfd5fa516b8f6ffff99165d60cc93bf0e7c5fa1b92c4c0e8c4a9c6801d5f9ad9fda5e4d151949d6c530a8 SHA512 90486f28427d51b9c1a4f959bd3f0f41087c881486d9cd3e130fd3371a4375c844ca650d9850c43878da6e95d366137ca99003b5a9ae7699f17e1d7719f81ce1
 DIST gnome-mines-3.36.1.tar.xz 274896 BLAKE2B 355275857ff63df5383f45dfb8161bcde4de7adcc088f00cc016d7564f7afa17362307a642e78d9e087be32e44f178282c49a42df5f8f97d530a75473e50adf2 SHA512 3c1080b949ec3ba620048f2c46f844ecf7a872a9d165c3a3c38b103602cebf05c084763a489d58ffda2be23ec42b6803418570936150974cb302cd4d5e4af189
 EBUILD gnome-mines-3.34.0.ebuild 842 BLAKE2B 784d5f4fb6562894fdf040be40e2a88369c20184b9c3be7c106d73ec8b2cfa42dddba4d6e069910fc2baaaa0fd9685eb15996dc58e1ecbb761045c319e48d396 SHA512 e74a13352977fd50ae172c9b9d6636aed62e15820fa0e4b75cba7fd6ebb3ad51b29059119e4207cdce27705c6d6bcf33cc8e08cd5c7e2a4a327eb3fa61ebad58
-EBUILD gnome-mines-3.36.1.ebuild 844 BLAKE2B 1ced60239b7e871fed354b270ca43cb37bde429d2ac104c161e35c1256ddb83c3d8549b7153c86ee1a28c80e0cc6a998e3c9c6808754d687fa11c0f9e2257df8 SHA512 9229d162d985c1137bac46db1229a967fa468ff44d96a569df7d9a4277f4fb1788863aeacb7e0100f380af031696cacb0dc4a1b9b02897726c51eea4a8e796d8
+EBUILD gnome-mines-3.36.1.ebuild 842 BLAKE2B 784d5f4fb6562894fdf040be40e2a88369c20184b9c3be7c106d73ec8b2cfa42dddba4d6e069910fc2baaaa0fd9685eb15996dc58e1ecbb761045c319e48d396 SHA512 e74a13352977fd50ae172c9b9d6636aed62e15820fa0e4b75cba7fd6ebb3ad51b29059119e4207cdce27705c6d6bcf33cc8e08cd5c7e2a4a327eb3fa61ebad58
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-mines/gnome-mines-3.36.1.ebuild b/games-board/gnome-mines/gnome-mines-3.36.1.ebuild
index acfa64f7c54d..05b1d54cccd7 100644
--- a/games-board/gnome-mines/gnome-mines-3.36.1.ebuild
+++ b/games-board/gnome-mines/gnome-mines-3.36.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/iagno/Manifest b/games-board/iagno/Manifest
index a80f6320f235..5b0db1b2b554 100644
--- a/games-board/iagno/Manifest
+++ b/games-board/iagno/Manifest
@@ -4,5 +4,5 @@ DIST iagno-3.34.8.tar.xz 565656 BLAKE2B cf06f9259b8f31d69c6f734c0239dc89432cd7a4
 DIST iagno-3.36.4.tar.xz 799480 BLAKE2B 430aa403c974728b929a7715e783dd594f00300dd9b0bf8b6f84da7265e31536a5cae17db94bcbdbebe3ef2690cb05bf18292af158016ec18bb695e58ca20f3d SHA512 43775149f76904a19316e5eac990d8dae0a730c3f6798ad88648892d4795b6892a86fb93b78a72fd30853ad36cc5e4b241e1cbd4067c78d6648f1630543f87be
 EBUILD iagno-3.34.5.ebuild 929 BLAKE2B e8fea8bf42ec33050ae200298bf41a9424262799f44f3fa9b85baeeefc7e13e7cd67c9d3372eb1cf15e99219104b23af1442975a1001dacd5d9fe24bb37c398d SHA512 447d87f833e112306e3d61c522001b767b1eb1326f5592a5944c9b1a577f364f1f1f310aae5bc322b8f8c4f8824af966a05437b6ffa14f03a559a1a03a5aef17
 EBUILD iagno-3.34.8.ebuild 931 BLAKE2B 847a74e955715be6106768e12e5ee1b934bb813d401a0f3ca247fa995633fc7e4e5fde3b48ec2c704fd3c964bfea436b3d28af4da75fd4273f254112e3a6bfc6 SHA512 e010ad0aa85a5c1b405230a0a5389d00866e6b546452301742392c1961b29bfb551322e4d58d9fdb262d0768674dca8daae10709831d1b2fe89599d7192b34b2
-EBUILD iagno-3.36.4.ebuild 1013 BLAKE2B c44828fdd3c451aecd2efd648044b88a61f05a23d48db3a02dea75c868f56c7bcd4fe6e7254cfaa451282baa93b16ca75d8b0269946af25baa8a2bbe4cce344e SHA512 59ce4ed2620b9eec77876a1cfb793e0acb0084d5129698a0d6bc10cfeb14d5e8f579a701310e2fb45e9292ba8e6b07b8b41e2d4f599fe0a8cef1923d112c1085
+EBUILD iagno-3.36.4.ebuild 1011 BLAKE2B 12f4d69a409686f0ad8cedc7fe725f66bc864656026256a4c6cdd2ea5fbaf701fc66289d6257274132973434bbfa3ab28445ad0cf8d5ad1b15228f08c6d65309 SHA512 b4c967c5943ed482015d017357a29d737992a5085ea225e70f7c7bfbd7bd3f606b2f4f9596e5785fa6ce14dc6c3523ad05d555f9b4220f8296cd4c71916cd09c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/iagno/iagno-3.36.4.ebuild b/games-board/iagno/iagno-3.36.4.ebuild
index 73465afff709..37d961b52406 100644
--- a/games-board/iagno/iagno-3.36.4.ebuild
+++ b/games-board/iagno/iagno-3.36.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Reversi"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/tali/Manifest b/games-board/tali/Manifest
index f1b2b41a2a1e..df856e466b60 100644
--- a/games-board/tali/Manifest
+++ b/games-board/tali/Manifest
@@ -1,5 +1,5 @@
 DIST tali-3.32.1.tar.xz 1636032 BLAKE2B 2d8ea2bac7c0a74833a3cd6768bb5cd394c4b02ee5a7fad151d662f417a536b5cc4784ad4338435d80bdc9db025da2a258c05cbb54b7edd038a37b0c990889ca SHA512 78abdfca84a86100be94a1509f0bd00bb84d9f97bfed87f6378e55adedb0c8d7349a9ebead6d8eac8b9c52b52ae6e7b2a868ac9a2262dffafc4e5ad23a455e7d
 DIST tali-3.36.4.tar.xz 1765348 BLAKE2B 0d4d8bb3b66d58295ecd13e6f985149efb412a6af420baefaea603c9cb043aaa3d353a4930abb18809f42ed2690c81455954778b1a326ca2e9ce36426d0a4668 SHA512 cd01a93ba96d5c8c264e2a73fba3dc16be72a1a1d50f40555e3ef381d3ab03797f25de2a2c7603bd35ac87568f3d43e3763ee65e95dffebe92eafb59d332a3df
 EBUILD tali-3.32.1.ebuild 652 BLAKE2B 3a56bce9d44b48ee7ad4c11e8c050044a77836e4f473155e2475cc86c8772e49b51424d361a1d9c915c8f4196f5a440ab3034a8bf18c958751cde20e09c7524d SHA512 6fb9ee7efbb1122fb2caa966729b85ced4a05a09e742acb0e70868b761ce826d26b0367aa327137a5d6fed1f91602a09bfc996d21f6f9dbac98e5f366adfd8b8
-EBUILD tali-3.36.4.ebuild 654 BLAKE2B bd56cdc1e651b87d93b9442e9213440d9f6a663212848bdd21bd3cfdd59e41d731e8f0f839eadcc03b85724ef38df528b475f7be98153193873622503582891a SHA512 05170f6ba82594574dfbd446caf262dd50894c2b0b2389f898ce668d78f194e7633e34b123ff9cf4b0d2d42a267e8c87aeeb4a2c0aeffb55a7b00558669839e1
+EBUILD tali-3.36.4.ebuild 652 BLAKE2B 588e7bf429366457b0f8b70de68889359fb42d4c1dc5b91c50dad0cdddfbefc79ea0f1d126febf18bf58a6079b9e2c64544af65c674153105e33bb45c5de73b9 SHA512 212402bff4f44a927adbb18462b90fcce98594f5961cbec96ddae23641c70427bef5f8675b23075acce183e816294b5c04903c6a9b7e719de551c9cb501c938e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/tali/tali-3.36.4.ebuild b/games-board/tali/tali-3.36.4.ebuild
index 30aa2eafaba5..63eb85f2a0e9 100644
--- a/games-board/tali/tali-3.36.4.ebuild
+++ b/games-board/tali/tali-3.36.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/games-board/xgammon/Manifest b/games-board/xgammon/Manifest
index b42c73c0c1e4..dd7a0e5590a1 100644
--- a/games-board/xgammon/Manifest
+++ b/games-board/xgammon/Manifest
@@ -1,6 +1,7 @@
-AUX gcc33.patch 3599 BLAKE2B 7004c25311efc2de6ea13068b645608944562ff4a2b88b9531f7bf0744985dc66fad704d7a46a0d5e69d682ab08a7f9b379fb5535010ac39c4d606b71be346e1 SHA512 ad18ff67dd7b7ec0a0cb187e30e6e0f576c5bb0f03a1f5fde28562a673557fb056ab2862ef823e41b61da37461642d40d755ab23e5a1c0fbddbf598a79e77736
-AUX xgammon-0.98-broken.patch 196 BLAKE2B 0005a7f1be80eb8be8b400e0d762cbd8fa83f7508d207f9144e47513be11d1494ce9560a4a3b726a07e557049ff530986a35e591418c0b6ae1f7c9b5b3749575 SHA512 87d6d4250e9a0b3c7276425861f77bbe506fbce6fd5ca5b55a94921ae02a36edebc382eec4eee88ffb33b8fbf41883f63d69dec8c52296e24289640f6ef9ad98
+AUX xgammon-0.98-broken.patch 3796 BLAKE2B d99b3336ccf598755a516f498e1fdb3b76c401df21bf39b57a366dc8e74194b7b4b96be26801d6833c12336ead97f2c4148817aa9d04f0808f3464c514a341b8 SHA512 5cd79e9701ba8489c172ec22f280b39a8ddccbadab855dd2e1cf08d4ffcd374de8419a39ea96a600c13ee54f6637a4b8bc21585bd6562e3ebc33bf046be38c94
 AUX xgammon-0.98-config.patch 655 BLAKE2B 5ef155a55f75482a0a269451ca09a9e78d21de8bfa96e870bd5d3c5f52faffe04c0639c1a629eec940bca98f802b2400e059b759fd824fff89172807561754a6 SHA512 45478fc0a93bcef9a8d47e615333d9496791e8605a164d4527ff42c8e14fddacccbfabf09a684bfae01d468dfb58adb260c616adad71733fd3650ce6df981e21
+AUX xgammon-0.98-fno-common.patch 2284 BLAKE2B 88dcb8c85d4659a7f381ade1b4197ba9cc6c274ca32c66ca48550956bd0d6d91db5f92958a18dfab2ab51d436963fce05c75ec7d2739005178dcfc19f5f3f29a SHA512 d0dafe63ed9ee9c03f9f2ca6b1e9027f275a5ed6c5b5596454b36d6edbb0fe8768677cb4a30456e07caa369ef07a069d6b9fd838b3c146184e1e00a60ffd4f24
+AUX xgammon-0.98-glibc-2.32.patch 440 BLAKE2B 593dfaf0ecea283d5843b8864e9aeee9b1d3f5d8000f938b8dab733b93688e129c04055030446a844021845006e1a41d166d911f7cafd23a91c031e48a8d269b SHA512 d39dd68fcda62a4f1d57dc6a24aca9a5df4f3849ec96460dbcd07b50adfa10db99557e2f713a5b59ed0ad79cd315baaa3212190c635c42088d9111c0dbd3fe67
 DIST xgammon-0.98a.tar.gz 76415 BLAKE2B 617ca76b8ebe22f753f20f94fc536008c119237e24ad1011a88780416405db95c5155759548e6719c328067387e1cbc052b0ebbbc020ad8e028f564cfcd3c3f1 SHA512 1176146d7cf4d5cbf47e911190de329d87650084044d1a2e5a53ed367d2b90ec63c0e906946c4523c2fb21b68df8b86cf0567527a91058e8db66a76086a02092
-EBUILD xgammon-0.98-r1.ebuild 949 BLAKE2B 724a28818381c487e911cacf0067700f6fe5d16a21a12421e6eec95069074b54dbdfe8c2d0d3c9a20fd9857a781002285ca5f36f743c453a5dd39aa15e669c3c SHA512 a6dc0bec5ba59b94d0649bfdf74ed7cc8e4875104b6cfdcde12c11b7500460305aff3889d8ca3cdd0a4a31ace46b92b3b17b73ce554cb7f6b352854377a3d5ad
+EBUILD xgammon-0.98-r1.ebuild 1029 BLAKE2B d5ebde46a139925e99e4d27fcbc91c4846098b9d9a1252334a9cd1adcc117aa221c02567899d299123083d4a1299cc6ab65cd2ead3908a5cedb5223a5ce65634 SHA512 233bcc731e518a1c5ceef5c78f86599cbc802ba9eb8536b084d113152fd91d8912105234a1be3508cc47fc76a61072f4f2ac9cbf0cc9b2e669ca4d0e7e2398ab
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xgammon/files/gcc33.patch b/games-board/xgammon/files/gcc33.patch
deleted file mode 100644
index 093eaa1f453b..000000000000
--- a/games-board/xgammon/files/gcc33.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/xgammon.c
-+++ b/xgammon.c
-@@ -944,31 +944,31 @@
- 	for (option=1; option<argc; option++) {
- 		if (strcmp (argv[option], "-?") == 0 ||
- 		    strcmp (argv[option], "-help") == 0) {
--puts ("xgammon [-otherdisplay (display)]
--        [-boardgeometry (string)]
--        [-boardcolor (color)] [-bc (color)]
--        [-darkcolor  (color)] [-dc (color)]
--        [-lightcolor (color)] [-lc (color)]
--        [-barcolor   (color)] [-b  (color)]
--        [-whitecolor (color)]        the stone color for \"white\"
--        [-blackcolor (color)]        the stone color for \"black\"
--        [-doublerfont (font)]        sets the (big) font for the doubler dice
--        [-doubling   +doubling]      sets if you wish the computer to double
--        [-h (black|white)]           set the color for the human player
--                                     (implies a human versus computer game)
--        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either
--                                     human vs. human computer vs. computer
--                                     or human vs. computer (default)
--        [-winat      (points)]       play a tournament up to \"points\" points
--        [-watchmove  +wachmove]      if you wish to see the flying stones
--        [-buttonmove +buttonmove]    set stones by simply pressing button
--        [-autoplay   +autoplay]      automatic play when only one move
--                                     is possible
--        [-stonesteps (number)]       sets the stepsize the stones fly
--                                     in pixel (implies +watchmove)
--        [-delaytime (tsec.)]         sets the time the cumputer waits
--                                     after each turn (implies -watchmove)
--        [-?] [-help]                 print this string");
-+puts ("xgammon [-otherdisplay (display)]\n"
-+"        [-boardgeometry (string)]\n"
-+"        [-boardcolor (color)] [-bc (color)]\n"
-+"        [-darkcolor  (color)] [-dc (color)]\n"
-+"        [-lightcolor (color)] [-lc (color)]\n"
-+"        [-barcolor   (color)] [-b  (color)]\n"
-+"        [-whitecolor (color)]        the stone color for \"white\"\n"
-+"        [-blackcolor (color)]        the stone color for \"black\"\n"
-+"        [-doublerfont (font)]        sets the (big) font for the doubler dice\n"
-+"        [-doubling   +doubling]      sets if you wish the computer to double\n"
-+"        [-h (black|white)]           set the color for the human player\n"
-+"                                     (implies a human versus computer game)\n"
-+"        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either\n"
-+"                                     human vs. human computer vs. computer\n"
-+"                                     or human vs. computer (default)\n"
-+"        [-winat      (points)]       play a tournament up to \"points\" points\n"
-+"        [-watchmove  +wachmove]      if you wish to see the flying stones\n"
-+"        [-buttonmove +buttonmove]    set stones by simply pressing button\n"
-+"        [-autoplay   +autoplay]      automatic play when only one move\n"
-+"                                     is possible\n"
-+"        [-stonesteps (number)]       sets the stepsize the stones fly\n"
-+"                                     in pixel (implies +watchmove)\n"
-+"        [-delaytime (tsec.)]         sets the time the cumputer waits\n"
-+"                                     after each turn (implies -watchmove)\n"
-+"        [-?] [-help]                 print this string");
- 		exit (0);
- 		} else {
- 			fprintf (stderr,"xgammon: unknown option %s (ignored)\n", argv[option]);
diff --git a/games-board/xgammon/files/xgammon-0.98-broken.patch b/games-board/xgammon/files/xgammon-0.98-broken.patch
index 5e334e83aecb..eff5bf509e53 100644
--- a/games-board/xgammon/files/xgammon-0.98-broken.patch
+++ b/games-board/xgammon/files/xgammon-0.98-broken.patch
@@ -1,7 +1,7 @@
 --- a/lib/db.c
 +++ b/lib/db.c
-@@ -259,10 +259,11 @@
-     close(fid);
+@@ -267,10 +267,11 @@
+     fclose(fid);
  }
  
 -void main()
@@ -13,3 +13,62 @@
      set_V_Werte();
 +    return(0);
  }
+--- a/xgammon.c
++++ b/xgammon.c
+@@ -944,31 +944,31 @@
+ 	for (option=1; option<argc; option++) {
+ 		if (strcmp (argv[option], "-?") == 0 ||
+ 		    strcmp (argv[option], "-help") == 0) {
+-puts ("xgammon [-otherdisplay (display)]
+-        [-boardgeometry (string)]
+-        [-boardcolor (color)] [-bc (color)]
+-        [-darkcolor  (color)] [-dc (color)]
+-        [-lightcolor (color)] [-lc (color)]
+-        [-barcolor   (color)] [-b  (color)]
+-        [-whitecolor (color)]        the stone color for \"white\"
+-        [-blackcolor (color)]        the stone color for \"black\"
+-        [-doublerfont (font)]        sets the (big) font for the doubler dice
+-        [-doubling   +doubling]      sets if you wish the computer to double
+-        [-h (black|white)]           set the color for the human player
+-                                     (implies a human versus computer game)
+-        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either
+-                                     human vs. human computer vs. computer
+-                                     or human vs. computer (default)
+-        [-winat      (points)]       play a tournament up to \"points\" points
+-        [-watchmove  +wachmove]      if you wish to see the flying stones
+-        [-buttonmove +buttonmove]    set stones by simply pressing button
+-        [-autoplay   +autoplay]      automatic play when only one move
+-                                     is possible
+-        [-stonesteps (number)]       sets the stepsize the stones fly
+-                                     in pixel (implies +watchmove)
+-        [-delaytime (tsec.)]         sets the time the cumputer waits
+-                                     after each turn (implies -watchmove)
+-        [-?] [-help]                 print this string");
++puts ("xgammon [-otherdisplay (display)]\n"
++"        [-boardgeometry (string)]\n"
++"        [-boardcolor (color)] [-bc (color)]\n"
++"        [-darkcolor  (color)] [-dc (color)]\n"
++"        [-lightcolor (color)] [-lc (color)]\n"
++"        [-barcolor   (color)] [-b  (color)]\n"
++"        [-whitecolor (color)]        the stone color for \"white\"\n"
++"        [-blackcolor (color)]        the stone color for \"black\"\n"
++"        [-doublerfont (font)]        sets the (big) font for the doubler dice\n"
++"        [-doubling   +doubling]      sets if you wish the computer to double\n"
++"        [-h (black|white)]           set the color for the human player\n"
++"                                     (implies a human versus computer game)\n"
++"        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either\n"
++"                                     human vs. human computer vs. computer\n"
++"                                     or human vs. computer (default)\n"
++"        [-winat      (points)]       play a tournament up to \"points\" points\n"
++"        [-watchmove  +wachmove]      if you wish to see the flying stones\n"
++"        [-buttonmove +buttonmove]    set stones by simply pressing button\n"
++"        [-autoplay   +autoplay]      automatic play when only one move\n"
++"                                     is possible\n"
++"        [-stonesteps (number)]       sets the stepsize the stones fly\n"
++"                                     in pixel (implies +watchmove)\n"
++"        [-delaytime (tsec.)]         sets the time the cumputer waits\n"
++"                                     after each turn (implies -watchmove)\n"
++"        [-?] [-help]                 print this string");
+ 		exit (0);
+ 		} else {
+ 			fprintf (stderr,"xgammon: unknown option %s (ignored)\n", argv[option]);
diff --git a/games-board/xgammon/files/xgammon-0.98-fno-common.patch b/games-board/xgammon/files/xgammon-0.98-fno-common.patch
new file mode 100644
index 000000000000..924f0e549c07
--- /dev/null
+++ b/games-board/xgammon/files/xgammon-0.98-fno-common.patch
@@ -0,0 +1,97 @@
+--- a/allow.c
++++ b/allow.c
+@@ -34,6 +34,8 @@
+ MOVE	     current_move[4] = {{0, 0}, {0, 0},
+ 			        {0, 0}, {0, 0}}; /* global only for un_do() */
+ 
++MOVE possible_moves[8000], *list;
++
+ int  test_move             (void);
+ int  create_possible_moves (int dice_to_set, int *w, int actual_pin);
+ int  move_is_allowed       (int from_pin, int to_pin);
+--- a/gammon.h
++++ b/gammon.h
+@@ -117,12 +117,14 @@
+ 	MoveFunc MoveFunction;
+ 	BOARD board;
+ 	X11SET X11Set;
+-} Player[2];
++};
++extern struct _Player Player[2];
+ 
+ struct  _PinTable {
+         int count;
+         int color;
+-} Pin[29], rollout_position[29];	/* 0, 25 = bar, 1 - 24 = board and 26, 27 finished[color] */
++};
++extern struct _PinTable Pin[29], rollout_position[29];	/* 0, 25 = bar, 1 - 24 = board and 26, 27 finished[color] */
+ 
+ 
+ /* if you have the dice values 1 and 1 and all stones are on different
+@@ -137,7 +139,7 @@
+         int to;
+ } MOVE;
+ 
+-MOVE possible_moves[8000], *list;
++extern MOVE possible_moves[8000], *list;
+ 
+ struct _move_hist {
+ 	int	    from [4];
+@@ -151,16 +153,17 @@
+ struct _Tournament {
+ 	unsigned int   game_number;
+ 	unsigned int   winning_point;
+-} tournament;
++};
++extern struct _Tournament tournament;
+ 
+ struct _RolloutSave {
+ 	int turn;
+ 	int doubler_value;
+ 	int doubler_owner;
+ 	int roll[2];
+-} rollout_save;
++};
+ 
+-FILE *endgame_database;
++extern FILE *endgame_database;
+ 
+ extern void switch_turn();
+ 
+--- a/rollout.c
++++ b/rollout.c
+@@ -48,6 +48,9 @@
+ void   rollout_roll_dice  ();
+ void   exec_rollout       ();
+ 
++struct _PinTable Pin[29], rollout_position[29];
++struct _RolloutSave rollout_save;
++
+ void RollOut (void)
+ {
+ 	Widget toplevel = Player[0].X11Set.toplevel;
+--- a/xgammon.c
++++ b/xgammon.c
+@@ -178,6 +178,10 @@
+ MOVE		*compi_choice;
+ 
+ FILE*		protokol_file = NULL;
++FILE*       endgame_database;
++struct _gammon_resource gammon_resource;
++struct _Tournament tournament;
++struct _Player Player[2];
+ 
+ char * greetings = "Wellcome to xgammon  version 0.98\n   (C) 1994   Lambert Klasen   Detlef Steuer\n    We hope you enjoy it\n\n";
+ 
+--- a/xgammon.h
++++ b/xgammon.h
+@@ -70,7 +70,8 @@
+ 	char	*server;
+ 	int     port;
+ 	int     button_move;
+-} gammon_resource;
++};
++extern struct _gammon_resource gammon_resource;
+ 
+ /* diawin.c */
+ extern void AppendDialogText ();
diff --git a/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch b/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch
new file mode 100644
index 000000000000..538f873b4132
--- /dev/null
+++ b/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch
@@ -0,0 +1,19 @@
+--- a/save.c
++++ b/save.c
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <signal.h>
+ #include <X11/Intrinsic.h>
+ 
+@@ -142,7 +143,7 @@
+ 	fclose(save_file);
+ 
+ #ifndef AIX
+-	fprintf (stderr, "xgammon: %s.  Sorry and bye!\n", sys_siglist[n]);
++	fprintf (stderr, "xgammon: %s.  Sorry and bye!\n", strsignal(n));
+ #else
+ 	fprintf (stderr, "xgammon: Caught signal %d.   Sorry and bye!\n", n);
+ #endif
diff --git a/games-board/xgammon/xgammon-0.98-r1.ebuild b/games-board/xgammon/xgammon-0.98-r1.ebuild
index d00b4f94fe5f..9e8b8fb2d55a 100644
--- a/games-board/xgammon/xgammon-0.98-r1.ebuild
+++ b/games-board/xgammon/xgammon-0.98-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit toolchain-funcs eutils
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="very nice backgammon game for X"
 HOMEPAGE="http://fawn.unibw-hamburg.de/steuer/xgammon/xgammon.html"
@@ -11,19 +12,23 @@ SRC_URI="http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/${P}a.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
 	x11-misc/imake"
 
-S=${WORKDIR}/${P}a
+S="${WORKDIR}/${P}a"
 
 PATCHES=(
-	"${FILESDIR}/${P}-broken.patch"
-	"${FILESDIR}/${P}-config.patch"
-	"${FILESDIR}/gcc33.patch"
+	"${FILESDIR}"/${P}-broken.patch
+	"${FILESDIR}"/${P}-config.patch
+	"${FILESDIR}"/${P}-glibc-2.32.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_configure() {
@@ -34,7 +39,7 @@ src_compile() {
 	env PATH=".:${PATH}" emake \
 		EXTRA_LDOPTIONS="${LDFLAGS}" \
 		CDEBUGFLAGS="${CFLAGS}" \
-		CC=$(tc-getCC)
+		CC="$(tc-getCC)"
 }
 
 pkg_postinst() {