gentoo resync : 15.06.2021

17 files changed, 190 insertions, 25 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index eb7e1a4a8fb9..94b6105ed99b 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/antimicro/Manifest b/games-util/antimicro/Manifest
index 27d1bcfc2cae..8a08f7a5028f 100644
--- a/games-util/antimicro/Manifest
+++ b/games-util/antimicro/Manifest
@@ -1,6 +1,7 @@
 AUX antimicro-2.23-SDL2-include.patch 311 BLAKE2B c5aef415ceefb4ed2b127eb488c69112a116337233c0ef7e236946b84e56495418181f681fb546286dfe30b0ec02b20fc3624876fadbb7994e9503454e358a2e SHA512 f73a5ca33334c97912ff4fcc2fdc735eb8c3e0b54e3e33e2521d7120fdd2cad8123fde53f5bb26d869cbd5b7c815acacccb1cd20c281e11c09ad52d9dc243bba
+AUX antimicro-2.23-gcc11-ptr-compare.patch 356 BLAKE2B 105cc138f0066b80435058ccae4e97f5ac81f026021a7f033395bcdf7f0c1f88b7ac66fda48861f9c3018684e733b63a9a3348a159195b68a90d5353d82725e9 SHA512 4c54ed6faee466053132588762a11122efaa6715aa0c734925fad85a85c0b6ccabfa7172dd1da6338afdcff7c8119cdb9da6f9c35b1149f5b78060666459a54d
 AUX antimicro-2.23-linking-errors.patch 1659 BLAKE2B c77959abef962ef6448baa6b882e3cdfb6873b8c4c19eb4043bcd53125cd2036984adc9713b642b1141e09182332bbd135ff9ebb3b99273ace1157d9d6e52227 SHA512 e5dfa1442d97d3d16fca7584d8f8979ad33d39e0d007b2ccf3068f65dc225974702884429e26e5b9eb25c0de6dc6651ae44377f435943f9ba09c3c1805763f7d
 AUX antimicro-2.23-no-compress-man-page.patch 443 BLAKE2B 7bc8db24413c9870f5d38ed0b75a97c15f31aada47a3b9ab6f70b2d57550c5e5092384f5fe6392b66c78ea14d8774348f6d11176901d97bd1bab4ac15a408837 SHA512 3aba1a14c28febcd127dce7aa6d9184f4d23003bd7a99a4daf646bcb4c7cbe95a1962efd8f362ea7d05297365b3a850a604187dd529ba1c95781c102fd050573
 DIST antimicro-2.23.tar.gz 1157299 BLAKE2B 4577588414f3145f5e6a817160214d6f2d0fc3cc3c9dda456173c42586247420f413785b7ca26b9d02397fb970e005c386675a478fd07330d5b13683094f28ab SHA512 cd58b5a9771d35fc937306a3452e8776ef754bb5a4fa44aeedb735d8366a38b318c1bf14f105bf8003e4264c35f129224becdade32d2a7b61067ec5a705a1e7e
-EBUILD antimicro-2.23.ebuild 1067 BLAKE2B 8d3293624ff524a39b5965f61c552ed224dcda6adf661bf82a71318a97aa34de6aec4265dc75e41946988a2927ca79bc4a77013822f80f15f95610e4378df4b8 SHA512 41128a18d59ae99308ef2b7422bfa8ac00b9d1618f6f67ce62535b5715dc0d3018d352be679d4d61164f4c6ddc581429377adda1327f8908c9f83a8d75e91ba0
+EBUILD antimicro-2.23.ebuild 1117 BLAKE2B 5c61a75d144d63af08ff8384c0f00f8f4c0f6aa57d0977b5e03c0fd7b56adda5c94748ac785ab789fb8287a831e241d7b4278260ee9c78fd6109de5107a3e441 SHA512 a2fccf5cbc489df9b8ca7a154f0ddf8b4e24766de91c17a519cba47650e2aaca9c1c20eaf11209499397a582f2671e325434b3e6513b8ea244b0405c11fe5c40
 MISC metadata.xml 336 BLAKE2B 356b2f4e6c4e30467d1d84264432d49a2bc60d6dcfdde3f7e019c8191b91d2f105016832990d188cfa0451509c88b543a7f5f0b99a843295dd92d1d838268ce8 SHA512 6df67abd609cd6d4e29875695481bca8857c6a1d1c8f4803c40d584cacd47a46ed3f9fdaa6a7369950a795ce07cc61ad47fa096ea35a463a6594916ae52a4968
diff --git a/games-util/antimicro/antimicro-2.23.ebuild b/games-util/antimicro/antimicro-2.23.ebuild
index 1363ec031a9d..965970f2d3b4 100644
--- a/games-util/antimicro/antimicro-2.23.ebuild
+++ b/games-util/antimicro/antimicro-2.23.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-linking-errors.patch
 	"${FILESDIR}"/${PN}-2.23-no-compress-man-page.patch
 	"${FILESDIR}"/${PN}-2.23-SDL2-include.patch
+	"${FILESDIR}"/${PN}-2.23-gcc11-ptr-compare.patch
 )
 
 src_prepare() {
diff --git a/games-util/antimicro/files/antimicro-2.23-gcc11-ptr-compare.patch b/games-util/antimicro/files/antimicro-2.23-gcc11-ptr-compare.patch
new file mode 100644
index 000000000000..2ed157c1e84b
--- /dev/null
+++ b/games-util/antimicro/files/antimicro-2.23-gcc11-ptr-compare.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/791145
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -364,7 +364,7 @@ void MainWindow::makeJoystickTabs()
+         ui->tabWidget->addTab(tabwidget, joytabName);
+     }
+ 
+-    if (joysticks > 0)
++    if (joysticks->size() > 0)
+     {
+         ui->tabWidget->setCurrentIndex(0);
+         ui->stackedWidget->setCurrentIndex(1);
diff --git a/games-util/gamemode/Manifest b/games-util/gamemode/Manifest
index f8087ba22d9a..e075517df73d 100644
--- a/games-util/gamemode/Manifest
+++ b/games-util/gamemode/Manifest
@@ -1,4 +1,4 @@
 DIST gamemode-1.6.1.tar.xz 71224 BLAKE2B aafa3123a2c672197d28fafbc7331004b6e4c87808e831f5e0341fd9a690acda8305da114651391fe39e6702bac805cede9d696280d03d4cc3d03d6f4d782efd SHA512 99403a68675522d3b412424591ab7f0cef54968a699f8f68aa59a42a43df73db4bc8a84ee8f97b9f78f329ecd1ed2f3a50e3cb539458f23e7c5fbe28f7978e47
-EBUILD gamemode-1.6.1.ebuild 4051 BLAKE2B 6962384b196f2d3f762ce4220aad1467b79e1badf13c09a30a49443469391a908d58a08a016d816d185852551e9d5f8cbd530bf33c34e8948e4ae26296dfeb0f SHA512 43df152c784d3838207d8c0512e86412ccf92839bec4f80aa4f0ab88451973cc0ad4c400df93ca38f5cbcab4f58f9bcf3b48b6b8e1c24b72ded0e9d5e1f9e363
-EBUILD gamemode-9999.ebuild 4051 BLAKE2B 6962384b196f2d3f762ce4220aad1467b79e1badf13c09a30a49443469391a908d58a08a016d816d185852551e9d5f8cbd530bf33c34e8948e4ae26296dfeb0f SHA512 43df152c784d3838207d8c0512e86412ccf92839bec4f80aa4f0ab88451973cc0ad4c400df93ca38f5cbcab4f58f9bcf3b48b6b8e1c24b72ded0e9d5e1f9e363
+EBUILD gamemode-1.6.1.ebuild 3968 BLAKE2B 33ec5cfbbecf4efd06696a6401fc87549cb9a12e796555647754148c50091a2beebebe70d257489f2991339a8da39799d628571668a2488fecae0f48f7399aaf SHA512 76b58596849cbafc891881c6d439b3e707db7e09baf76662dec59cda397666632f7621324d8e6d87638088a5d1412df2f654d6aeed35d8806a6a347df6f6701f
+EBUILD gamemode-9999.ebuild 3968 BLAKE2B 33ec5cfbbecf4efd06696a6401fc87549cb9a12e796555647754148c50091a2beebebe70d257489f2991339a8da39799d628571668a2488fecae0f48f7399aaf SHA512 76b58596849cbafc891881c6d439b3e707db7e09baf76662dec59cda397666632f7621324d8e6d87638088a5d1412df2f654d6aeed35d8806a6a347df6f6701f
 MISC metadata.xml 560 BLAKE2B b894c7d2b65e2a824fa8f1229022f44a16e4a40fd3eabc41f85df7695e50fa5da768cf3fed064de053e3a389ba8106be5434661f02e3a1ba2c2c4321f343a12f SHA512 f16e141add8027671f7844fc66cb8d8e04fa8e8b86bd1179ed5cc97d655f4ff55683ed59c57d5f1adff4c591a0fd28e10f7950ac5eb899b879fe2902004eac76
diff --git a/games-util/gamemode/gamemode-1.6.1.ebuild b/games-util/gamemode/gamemode-1.6.1.ebuild
index 65304e1c6223..1c2a2df1c374 100644
--- a/games-util/gamemode/gamemode-1.6.1.ebuild
+++ b/games-util/gamemode/gamemode-1.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 
-inherit meson multilib-minimal ninja-utils systemd
+inherit meson-multilib systemd
 
 DESCRIPTION="Optimise Linux system performance on demand"
 HOMEPAGE="https://github.com/FeralInteractive/gamemode"
@@ -89,12 +89,7 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
+multilib_src_install_all() {
 	if multilib_is_native_abi; then
 		insinto /etc/security/limits.d
 		newins - 45-gamemode.conf <<-EOF
diff --git a/games-util/gamemode/gamemode-9999.ebuild b/games-util/gamemode/gamemode-9999.ebuild
index 65304e1c6223..1c2a2df1c374 100644
--- a/games-util/gamemode/gamemode-9999.ebuild
+++ b/games-util/gamemode/gamemode-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 
-inherit meson multilib-minimal ninja-utils systemd
+inherit meson-multilib systemd
 
 DESCRIPTION="Optimise Linux system performance on demand"
 HOMEPAGE="https://github.com/FeralInteractive/gamemode"
@@ -89,12 +89,7 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
+multilib_src_install_all() {
 	if multilib_is_native_abi; then
 		insinto /etc/security/limits.d
 		newins - 45-gamemode.conf <<-EOF
diff --git a/games-util/glbsp/Manifest b/games-util/glbsp/Manifest
index 62bdd8b5857c..203f0626a28f 100644
--- a/games-util/glbsp/Manifest
+++ b/games-util/glbsp/Manifest
@@ -1,4 +1,5 @@
 AUX glbsp-2.24-ldflags.patch 593 BLAKE2B 56cc840205923798cad39b6930d3d0d8b5b8b9c988064c6d8181c13a257970332ce8dda676d7062cbed9da7380430508d2987a9a26c52c85775c26435d99ad87 SHA512 6a3b0889a0c0cdf3adb8b24f69713b89d88559f4bdb2913fc5b0e697f2c78cd8804b719b4de71792da7d0aae8e6fd109b28eb5dc1d0b21a4d0b9396a8abf855c
+AUX glbsp-2.24-return-type.patch 262 BLAKE2B cd8df7d7ca89a0edb3acd45fd8922e3b12f7b73a4b9f836e3e61b4ef27297f41317cfbb06d0d9842e3aa690d0ae6fd8e69d15bed3f0b365830cbbe6483ab2fc1 SHA512 980f2a952600450cb9f02dee8d67256a7ab3f95977b7566568c58cf236a3b0d0d6ab44dc6f31076dd131df66b1084620a513ed74eb9b4e4169adbb9ef4145500
 DIST glbsp_src_224.tar.gz 230977 BLAKE2B a8fce559e2d37e0662dd773f94d781a63bbce66d7fca87b785b7ba095670844fe441093d721eba95eb679457d6217327e93002e54848ed919cf34e552e152030 SHA512 562201093b69ae1db113479f8dd71e474d2d4ea7798b5e156dc096660e0b725a16ba44e8d2bfd332eba89b66d07ac2a1ddd803e75802c8fb3739a420701b2e1a
-EBUILD glbsp-2.24.ebuild 1515 BLAKE2B 274b57a226df0aca8d002c37a5519e546e37914ab112a12d75111f0b4e88973b1512e507cb1e5b41274c9d1e660fde2c44a8b555b33c0c10ef2c7f06385c5db2 SHA512 fcd6a378003843b92091469ddb01571d6301cfe55f3541081cd51705d1d3b9b1f5ea40f3d8234f41d4de6ecda90ac8233fbd63244297996c4a237751ac4dacd0
+EBUILD glbsp-2.24.ebuild 1553 BLAKE2B ff6ce56e2e08bb64069aee9f486c8de1c6cf1e0bf4a56649910d35db1ef4be38365add1e48a40bd01dc3e7e7cb7ef620369a8ee1ea434e9f8253c5ce38cacdb9 SHA512 5ec505dce7ec7e22e8acc93f060d88699bc47b57fd5957cca3597869517bc7e7309d700a45171c12c6141d89aebbc01c5fdf141bfc23a4083ccdf3aa5ed9c072
 MISC metadata.xml 328 BLAKE2B 642bdaa12af0d72ec65674304abdf376413e4721907ff967369be6234f46fc053792bee05d921d14e86d7432f8f355c8329ace8dab8464bdd8332c0e93c4f624 SHA512 ec7fab9de36fc312330b2e8251da6909a7d6ec1350145a7ef9681085993173f8ff8da796d4c868605c4391c7ad8ea4a11fb40e00b4fde754711dd060e0486347
diff --git a/games-util/glbsp/files/glbsp-2.24-return-type.patch b/games-util/glbsp/files/glbsp-2.24-return-type.patch
new file mode 100644
index 000000000000..c1ae57cec8d1
--- /dev/null
+++ b/games-util/glbsp/files/glbsp-2.24-return-type.patch
@@ -0,0 +1,9 @@
+Fix build failure with USE=fltk due to wrong return type.
+https://bugs.gentoo.org/627412
+--- a/nodeview/path.cc
++++ b/nodeview/path.cc
+@@ -47,3 +47,3 @@
+     PrintWarn("Unable to open path file: %s\n", strerror(errno));
+-    return false;
++    return NULL;
+   }
diff --git a/games-util/glbsp/glbsp-2.24.ebuild b/games-util/glbsp/glbsp-2.24.ebuild
index 79ed87ae1288..335f4b3cd574 100644
--- a/games-util/glbsp/glbsp-2.24.ebuild
+++ b/games-util/glbsp/glbsp-2.24.ebuild
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-return-type.patch
 )
 
 src_prepare() {
diff --git a/games-util/ucon64/Manifest b/games-util/ucon64/Manifest
index caffa529fe65..a501b41ea661 100644
--- a/games-util/ucon64/Manifest
+++ b/games-util/ucon64/Manifest
@@ -1,5 +1,10 @@
 AUX ucon64-2.0.0-ovflfix.patch 609 BLAKE2B 0a79d69ea392eb4015e399e045e3f929ed52b2df96e1dae76b1ada01820c9e71375ec9fa81ddf60a582350a9547461900c78a04bf7d45b7884a3cda0585638fd SHA512 cacf5d0831f647e627601327d2c37aabf78d4a21444132c45f5be00d26be7f3d8b8f5b085e2f2b3cdf41e817bf1252df8a122a608f528b61ee0a5b3c5283d315
 AUX ucon64-2.0.0-zlib.patch 986 BLAKE2B 227b7c17972bc69e5a725d10ba022df11fd1248593fb79759c8d75979b1d58c5c7eaede26bcddd09de27e6ed6c9ff1166babd1e92a95a30936ef11635f0f43a8 SHA512 9274372fe5214b4ac76e1d44252a5abe1e0d61ef25bda4240d7f9d74b292fe01c8d363a1d70c82b1145e3ddb29eb6b05ae61b2861e6044e4b72cd3708a5b9196
+AUX ucon64-2.2.1-change-mem2-64bit.patch 748 BLAKE2B 93cfdd3056b50390a3e476783d17422cb1e8895184ddae87c0e18f411501c931afbb0706b23e8514cb15844ad55d84139064c05047aff6a4a6334a3d40eb240e SHA512 ab0b5b2e5bbc19ba2f40d86787bb146653c562a7e111b4cc41c8b9e2daaaeeb190cc13e0745ee5c77e6e273010172fb79fa04da63b7be79ab783cd1c5c5cb0ac
+AUX ucon64-2.2.1-respect-flags.patch 886 BLAKE2B 9e0ee5dc2738db7881a0d91fcc85a325e91dd86d92eec00bf3df62973e126d92f3067ca9117202fb14082ae5500e97e043203ad3ee94b190bb3e329cfef9438d SHA512 ea4b94a8d37d13ca7e88688837683990b410caadf7c4618e2a3509b7f3a6c1f419690f29ffb71c2182daa0e52fdb7eac0f083effb615b45adb3aaf2af2c61a0f
+AUX ucon64-2.2.1-zlib.patch 627 BLAKE2B bd873a95bdbf3d8d34870b026a56e4d1937b3d9712934d69e0cc5ced105b055a7fe76c0c827f34d5eb7c644ca61c20b2fa7c9ece53a1ec5bae0c7c42912970f9 SHA512 3df1952cf01602e0678990a430c070847f64ad483e70fc716245ec2fcc08c6439e2859c0d68fae7142fc0779245e034beeb45688fb598730d945a2096a496efe
 DIST ucon64-2.0.0-src.tar.gz 1188488 BLAKE2B 846ea6142eb50abc8165c9abb3cc05245f891b78d786798758e393032cc59c1f3cccc0fe0e70e256e308f709870bc1cc2754df30a8fababea30eda84fd1b2b64 SHA512 d021fe6db9530405773e1e209bdfafe41a2bd997f275ca7fb387f9b3d8639f4581c2761cbdce859a1831d6eba9dab4d5df1019605698c6cb6a4695ab091b001c
+DIST ucon64-2.2.1-src.tar.gz 1476080 BLAKE2B 8f7010bde2c7306f6a76dec4ce5e31975c286801e6504bf8bc99287bd7adc4ab10331a8cab308fed83ece9e13bdb01327f6d3439eba776038dbb19eb2b72cf70 SHA512 34453399151e5ed256fdcf387b9d32a052718b264e51b99a2be251b90589337d13cd317f8d1aa7d3c8e39c8e407b22797d4608ec6d14b99c8673ec74f349f6c2
 EBUILD ucon64-2.0.0.ebuild 1450 BLAKE2B 2941c723d27d5bbdb5e390197f3c0d32660c0ef201b38cd2a6cb5b3abf6dd46d0cc5cdd5952ecc6f22f501118e4eeeea444181f2112a0419129d5b3c983f5978 SHA512 f323f68a591e6b2c39079b96c30402e9fc9e4226b53112da0dcaeb3852b3794eccbcd2815c005a148b310d1ed4f3cfef5f81b8b7ad959d6c567d980c3727a87c
+EBUILD ucon64-2.2.1.ebuild 1366 BLAKE2B 77c515c3388ad591a8858d4adba31fbdeb21ca6f278a86d150f8aa201674a39980bda78159ecb6f9b63a7d9cbcd548ebeeceab60dcb35c03fdc222bbbac9be2a SHA512 7a2917bb3bca1957a9c8e51b6d57c1942fc5dcdcfa04f8ee1ef5631e14f5ec8383e5f0a52df6607b85064aab25c9973d1a05110e341f0369fbf4a34f121776ae
 MISC metadata.xml 329 BLAKE2B 7e77481b48419ef3da77a1b758a5e49c3f6686bdec3c14f81fe4f5051aec4b63433b970b6bb8ea5fc3ca4f98893a372cf3fb32c0e8bc3098379729cfd6672995 SHA512 eeaeb79bd3f8931262b87f4956705aea7408f5afd8879e6b8c5d5436a851be22a2e9a9e22ccd5250ea270db0c2876633fbf3d160df47cff9be490e203619ed7f
diff --git a/games-util/ucon64/files/ucon64-2.2.1-change-mem2-64bit.patch b/games-util/ucon64/files/ucon64-2.2.1-change-mem2-64bit.patch
new file mode 100644
index 000000000000..d07a18fdd8f0
--- /dev/null
+++ b/games-util/ucon64/files/ucon64-2.2.1-change-mem2-64bit.patch
@@ -0,0 +1,23 @@
+Fix crash on 64bit platforms in change_mem2()
+https://bugs.gentoo.org/753950
+
+From upstream:
+https://sourceforge.net/p/ucon64/svn/2821/
+--- a/libdiscmage/misc.c
++++ b/libdiscmage/misc.c
+@@ -1875,5 +1875,5 @@
+           if (strpos == pos_1st_esc)
+             setindex = 0;                       // reset argument pointer
+-          if (pos_1st_esc == (unsigned int) -1)
++          if (pos_1st_esc == (size_t) -1)
+             pos_1st_esc = strpos;
+ 
+--- a/misc/misc.c
++++ b/misc/misc.c
+@@ -502,5 +502,5 @@
+           if (strpos == pos_1st_esc)
+             setindex = 0;                       // reset argument pointer
+-          if (pos_1st_esc == (unsigned int) -1)
++          if (pos_1st_esc == (size_t) -1)
+             pos_1st_esc = strpos;
+ 
diff --git a/games-util/ucon64/files/ucon64-2.2.1-respect-flags.patch b/games-util/ucon64/files/ucon64-2.2.1-respect-flags.patch
new file mode 100644
index 000000000000..c1c9ed6f78da
--- /dev/null
+++ b/games-util/ucon64/files/ucon64-2.2.1-respect-flags.patch
@@ -0,0 +1,35 @@
+Respect *FLAGS and toolchain variables in Makefiles where missing.
+--- a/Makefile
++++ b/Makefile
+@@ -12,3 +12,3 @@
+ CFLAGS+=-I. -Wall -W -Wno-implicit-fallthrough -Wno-format-truncation \
+--Wno-stringop-overflow -O3 -fsigned-char
++-Wno-stringop-overflow -fsigned-char
+ # Enable -Wstringop-overflow[=type] when it is no longer a broken, partial
+@@ -19,3 +19,2 @@
+ # ld: warning: option -s is obsolete and being ignored
+-LDFLAGS+=-s
+ endif
+--- a/backup/libcd64/Makefile
++++ b/backup/libcd64/Makefile
+@@ -1,2 +1 @@
+-CC=gcc
+ 
+@@ -7,3 +6,2 @@
+ else
+-CFLAGS+=-O6 -funroll-loops -fexpensive-optimizations
+ endif
+@@ -181,4 +179,4 @@
+ else
+-	ld -r $^ $(LIBS) -o $*.o
+-	ar crs $@ $*.o
++	$(LD) -r $^ $(LIBS) -o $*.o
++	$(AR) crs $@ $*.o
+ endif
+--- a/libdiscmage/Makefile.in
++++ b/libdiscmage/Makefile.in
+@@ -33,3 +33,2 @@
+ # /usr/bin/libtool: -static not specified, -s invalid
+-LDFLAGS+=-s
+ endif
+
diff --git a/games-util/ucon64/files/ucon64-2.2.1-zlib.patch b/games-util/ucon64/files/ucon64-2.2.1-zlib.patch
new file mode 100644
index 000000000000..a618c3bce75a
--- /dev/null
+++ b/games-util/ucon64/files/ucon64-2.2.1-zlib.patch
@@ -0,0 +1,26 @@
+Fix undefined macro issue when compiling with zlib.
+https://bugs.gentoo.org/753950
+
+From upstream:
+https://sourceforge.net/p/ucon64/svn/2817/
+https://sourceforge.net/p/ucon64/svn/2819/
+--- a/libdiscmage/ioapi.h
++++ b/libdiscmage/ioapi.h
+@@ -35,4 +35,7 @@
+ extern "C" {
+ #endif
++#ifndef OF
++#define OF(x) x
++#endif
+ 
+ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
+--- a/misc/ioapi.h
++++ b/misc/ioapi.h
+@@ -35,4 +35,7 @@
+ extern "C" {
+ #endif
++#ifndef OF
++#define OF(x) x
++#endif
+ 
+ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
diff --git a/games-util/ucon64/ucon64-2.2.1.ebuild b/games-util/ucon64/ucon64-2.2.1.ebuild
new file mode 100644
index 000000000000..13ebde02c0b5
--- /dev/null
+++ b/games-util/ucon64/ucon64-2.2.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="The backup tool and wonderful emulator's Swiss Army knife program"
+HOMEPAGE="http://ucon64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ucon64/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src/src"
+
+LICENSE="LGPL-2.1+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug usb zlib"
+
+RDEPEND="
+	usb? ( virtual/libusb:0 )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-change-mem2-64bit.patch
+	"${FILESDIR}"/${P}-respect-flags.patch
+	"${FILESDIR}"/${P}-zlib.patch
+)
+
+src_prepare() {
+	default
+
+	sed "/discmage.so/s|.* \"|\"${EPREFIX}/usr/$(get_libdir)/${PN}/|" \
+		-i ucon64_misc.c || die
+}
+
+src_configure() {
+	local econfargs=(
+		$(use_enable debug)
+		$(use_with usb libusb)
+		$(use_with zlib)
+		--enable-ppdev
+		--with-libcd64
+		--with-libdiscmage
+	)
+	econf "${econfargs[@]}"
+
+	tc-export AR CC LD # for libcd64 with respect-flags.patch
+}
+
+src_install() {
+	dobin ucon64
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libdiscmage/discmage.so
+
+	docinto html
+	dodoc -r ../images ../{changes,developers,faq,hardware,readme}.html
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Be sure to check ~/.ucon64rc for some options after"
+		elog "you've run uCON64 for the first time."
+	fi
+}
diff --git a/games-util/xpadneo/Manifest b/games-util/xpadneo/Manifest
index bc13258c82aa..ee32d59d24ed 100644
--- a/games-util/xpadneo/Manifest
+++ b/games-util/xpadneo/Manifest
@@ -1,4 +1,4 @@
 DIST xpadneo-0.9.1.tar.gz 1353080 BLAKE2B fc2207e005cae629da50048330cbaa7d27183b0bbb083d35c3c144e91470273b8c7006c4b62d10b947dbe4fd003ca39623630923e477aa4eff3c243405d876bd SHA512 51063d104f165018b8430e26d2ab5a622c214efaaba3f7706cc99892b2054f57667b419672de5c2696189d389401b07024658c36a88343d980de9802789bcb10
 EBUILD xpadneo-0.9.1.ebuild 2423 BLAKE2B c1cb53c426940bc3b079c21cb54f5e33a67094bc36dd83ce14063ca1c20f804ebe32640b8670f0542c234d1dea3330c530ae817da12a99482dbb236002e9efe4 SHA512 09792a7fc3eea09162f9facfe85821855840001339ffe366032c988d6a45e6e1dfc837a59b8b8018b4056edf2894bec0978f1bcf92946e81bcc4ac0117c8bc76
 EBUILD xpadneo-9999.ebuild 2253 BLAKE2B 217187d9a9dbde2bff73d2115da5e7057f60bdfc9569cab7f37bce0f6dad3e643e34d8d00fa01a380e4383dafdd6fda53fa3bf7cc3ba3b2345ac975386dae218 SHA512 4e55be1b24232651d10bbf89a523081d1ce79521a58ffc83c95435577dbc79dc52671b1354fcaf663ceff0cdb305aa8c24caf04128f26bde1c06ea415fd3409b
-MISC metadata.xml 476 BLAKE2B 88a9a4d49f902c50d87fe36c98f6f4f2c553c6cb6882966f0d4858413ed8b603f428c7b3b43d157a6ff25fb1ab26231657119e14b4a0260a159a372501593391 SHA512 9f3a4e2063cb3e30b8ba428930715533c0c3fe7defda881d1a86f5f652fc736938e88ce21e4f028f57f9edc14f6528c8a731a6689242c0d369f44a2606425fd7
+MISC metadata.xml 327 BLAKE2B 06f5fa399f550899bb9fea383b90d9058863dd461aef5981165d2de44ef90082adc5ad2a5096f11c8b451bf72b917e18612b650c518159749ec7275de44c920f SHA512 b7a1cbdb9566d8dfd920c966ecb7709931c5c7ed8dec594f1c13c2164e3ab3bf00a3dc7f5db16af27b66752d7456fb1d6a4f35cf087b5f3a16470243585fd5dd
diff --git a/games-util/xpadneo/metadata.xml b/games-util/xpadneo/metadata.xml
index 32782d0fcfbb..9f8ff17d3dea 100644
--- a/games-util/xpadneo/metadata.xml
+++ b/games-util/xpadneo/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>sudinave@gmail.com</email>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">atar-axis/xpadneo</remote-id>
 	</upstream>