gentoo resync : 29.12.2022

21 files changed, 73 insertions, 256 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 3fab7667043f..ccf462fcffd3 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/joycond/Manifest b/games-util/joycond/Manifest
index c0871c3b36c6..2d6fb4195b5d 100644
--- a/games-util/joycond/Manifest
+++ b/games-util/joycond/Manifest
@@ -2,5 +2,5 @@ AUX joycond-systemd-paranoia.patch 1095 BLAKE2B a69fca57e6857265021f1a2b709d06d0
 AUX joycond-systemd-paths.patch 1626 BLAKE2B 6df9c18daf72949e5cc96a99be9da4af9e15d20101c513a5c2db79d912b0ef61348dd442cdc3172a042bce171e05c2d82deed4c05dbb088bd76520d5ac9c4609 SHA512 2c8e912f3f5a6b10d59b01fb40240bb725e75a7d900d9e808c6f501de9f48e89ac3b4028eb0df0d6fe1bf1b4a01fa861b593035ed9fc02fbcee7b5aba4b5e00b
 AUX joycond.initd 205 BLAKE2B e5da9bf96d39796897bd0f819c874c40285a85578c61c12c38c702e1719c238e8ad6e106d282846f8576a38ddd3c1960efdaeed2ab9e186b25e86cc40b0035e0 SHA512 2d96fe9af653f88adc8918733f729e9bf5e7c43ed5a6ae5f24f8ad73d45d05f59b142634377de74a3fccda6704233a862bb4a066068b1aabc428d6d54cd4cb0d
 DIST joycond-0.1.0_p20210730.tar.gz 29947 BLAKE2B d151e9a798a358e142c44722ce5d9892bc63a7c2992aa6b962a02ab971a8aec9bd343bd56cc26ae36e63d5977d1d0a99c52c35aeb779d352f1bbe2d15010e43c SHA512 1d0a82bd9e2aeecef3215232ffb6acb77008845fe0e8094e81d2b81627cca1e5d581986fad6631c5efd2b29514370fbac8a65d9996df762543d050628327a564
-EBUILD joycond-0.1.0_p20210730-r1.ebuild 812 BLAKE2B e9312a59a5859c335e16c5d3668161b632ea444e2607e3f33e356ee69dc0bd9e03c4c5614d49f3399543df49492f6dc78afed3fa4b6bc871a554fbe064fd242a SHA512 2d58ad8387f6d15832b6fcb5bf7a90a27d1f3c8f54838aee669be4b9d2b3390cf4778622d498103b75b753c9dcaff7a5c660a01fa2add59b5e12fcf9e0078510
+EBUILD joycond-0.1.0_p20210730-r1.ebuild 881 BLAKE2B 7ea98fa4f7f9ccc44ae414a14a1a6945bf083aca977e3680c099c86306a143a47e5021f904830e10b9da3f5962170e063b760c003ad514e9bb92820db82385f0 SHA512 169a4fe19fbf7afd06d3f827886be7d6d2e0a01967f9aee07e8bd73e01fdb03da958ea5b1f3f4ef2d73c187afabe44e76333cf1bc4167077df819036a2702859
 MISC metadata.xml 342 BLAKE2B f256215b8ff7fe2d8b1d360f3a3da2a530a5c7b8137a2f38d21a51e303ead2fc3b28c20a9199bd7885a940908cd2b084ce58db14cb9578b3d63c5e86be5f45e8 SHA512 a68b62631acf469245b1c78ad35487390937f5a555251cc0ae75d7756677d760d2c730f891854e16e06cbf0382a649992006a1c7f13b843c03551aa1754f106c
diff --git a/games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild b/games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild
index 89a5d6774449..fb0deb654d53 100644
--- a/games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild
+++ b/games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake linux-info
+inherit cmake linux-info udev
 
 COMMIT="f9a66914622514c13997c2bf7ec20fa98e9dfc1d"
 DESCRIPTION="Daemon that uses hid-nintendo evdev devices to implement joycon pairing"
@@ -41,3 +41,11 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	doman doc/${PN}.1
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index 0c187566bade..4f1b2ec44a92 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1,4 +1,4 @@
-AUX joystick-1.6.0-build.patch 831 BLAKE2B 942038f6997caa84cdbc8c05a6353dd448c1b70f9229f38084e2b8c80df2f8d3df3eb8a0da754a7ba56863aaed58375eec22267f08d304bd550d2237054f6e16 SHA512 071b15e16a1688e2d743dbf0bc44c784184ee93698b660394c83bed719d579952c9d73680e3e24754a41d5de69a65559b61255b0366c3437a193fc526c3d6064
-DIST linuxconsoletools-1.7.1.tar.bz2 53153 BLAKE2B e05d04454fefdd4009d0c75f1caf2e6675a8e5f494f6f2f491f4de3c57101a6323b4de5795fccb9fd6a557a1e7bf4befa312661b022ed0503da83ac4dd3ab7c5 SHA512 2ba97e6c5b57aa5d6b08369bae050256f4d039f5b8479ad03cef4a7c43bf772db312de54d9e70a8a92c9ed7933b524715f1ce5448ccf508e6ffe8646a9dbd349
-EBUILD joystick-1.7.1.ebuild 870 BLAKE2B c26d1ee35834da9a7261ebf7c5cbbe4cbf40f529f82260a2f6b0a70a1d32185387e1d316e34fb0f00499a4e2068ff25a41ac3b61bd6e605476be61a1bf637d84 SHA512 22433c957fef2dcf7b5ba89f7030cd18fe282151ead4ee366f70097f27ed9b22bf36bb6f0413fd65d4de7db28d497f5b9b90ef640fe5d0f7415e112373019c44
+AUX joystick-1.8.1-optional-ffmvforce.patch 583 BLAKE2B e309de0639f9917c7fcc5d5a9d390ccdf252a7d0b3642a528110023a2e4660378ea0f198aae47cdee4d9d9bc59479afe25956b43ec0b31fd31966277e475dc67 SHA512 0ed54f1035f4085d412b6570e700104c5e4ab6192f6a2ed659d02c077400b3d984734dd3f59158f9c4e33ca1b6e2d44c6fcd0e623a0c60e4fb5c3ff0c3c79a39
+DIST linuxconsoletools-1.8.1.tar.bz2 53715 BLAKE2B a0fab44762d9f4edcc1e85037efada2dac617873548579a83c3e7791e5a047e1c88243978fee562992f363102a0cb415c75d1286a3eb46a42dfe6afc7e9a0594 SHA512 407fcba552a3e45c60fb4f08217fe17106bedd6fde2fbce84aa6f4fa68ffc032f1683c6154f79daacaf1dcaf484fe943dd7391e787f0290d5bf42c7089c7c20c
+EBUILD joystick-1.8.1.ebuild 852 BLAKE2B c126bdcd87e862c5faf67748c715e13347de2c7cbacc591993e93fd2e68f3673bd781b2422bc1faf14a65656e756a0c4f3a95e60dce56bdbe2be69a57ccd3e00 SHA512 dc28ceed8fac57143c89afca6050014fb73f95c9cd8f45edc7dda00e6683262c3da319a91c5eb555c29b0aa32f401b84cec2e3a08a7f46218a7c696d055db295
 MISC metadata.xml 336 BLAKE2B 4bc8970a6d397889ee89a784792900188a26a65ec994cd148c6a829e9347f675e9830ef69aa0a2f53c2fbf2870570a01dc19987db3f988376a7c708ed5f16cb4 SHA512 988cd04e5db7046793fc5655309246abb09a5d26844449a392dcafa5362cea4ba94c9fb0f78adb07a6fa2a473a1ed6af651ce344831a5c308bb4451be414b19e
diff --git a/games-util/joystick/files/joystick-1.6.0-build.patch b/games-util/joystick/files/joystick-1.6.0-build.patch
deleted file mode 100644
index fa60ec719917..000000000000
--- a/games-util/joystick/files/joystick-1.6.0-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- linuxconsoletools-1.6.0/docs/Makefile
-+++ linuxconsoletools-1.6.0/docs/Makefile
-@@ -20,9 +20,13 @@
- # 02110-1301 USA.
- 
- MANPAGES	= inputattach.1 jstest.1 jscal.1 fftest.1 \
--		  ffmvforce.1 ffset.1 ffcfstress.1 jscal-store.1 \
-+		  ffset.1 ffcfstress.1 jscal-store.1 \
- 		  jscal-restore.1 evdev-joystick.1
- 
-+ifneq ($(USE_SDL),no)
-+MANPAGES += ffmvforce.1
-+endif
-+
- PREFIX          ?= /usr/local
- 
- install:
---- linuxconsoletools-1.6.0/utils/Makefile
-+++ linuxconsoletools-1.6.0/utils/Makefile
-@@ -27,9 +27,13 @@
- 
- CFLAGS		?= -g -O2 -Wall
- 
--PROGRAMS	= inputattach jstest jscal fftest ffmvforce ffset \
-+PROGRAMS	= inputattach jstest jscal fftest ffset \
- 		  ffcfstress jscal-restore jscal-store evdev-joystick
- 
-+ifneq ($(USE_SDL),no)
-+PROGRAMS += ffmvforce
-+endif
-+
- PREFIX          ?= /usr/local
- 
- compile: $(PROGRAMS)
diff --git a/games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch b/games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch
new file mode 100644
index 000000000000..62f85aea6054
--- /dev/null
+++ b/games-util/joystick/files/joystick-1.8.1-optional-ffmvforce.patch
@@ -0,0 +1,22 @@
+Keep ffmvforce separately optional given it's the only one
+with an additional dependency (sdl)
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -31,3 +31,6 @@
+ ifndef DISABLE_FORCEFEEDBACK
+-MANPAGES	+= fftest.1 ffmvforce.1 ffset.1 ffcfstress.1
++MANPAGES	+= fftest.1 ffset.1 ffcfstress.1
++ifndef DISABLE_FFMVFORCE
++MANPAGES	+= ffmvforce.1
++endif
+ endif
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -39,3 +39,6 @@
+ ifndef DISABLE_FORCEFEEDBACK
+-PROGRAMS	+= fftest ffmvforce ffset ffcfstress
++PROGRAMS	+= fftest ffset ffcfstress
++ifndef DISABLE_FFMVFORCE
++PROGRAMS	+= ffmvforce
++endif
+ endif
diff --git a/games-util/joystick/joystick-1.7.1.ebuild b/games-util/joystick/joystick-1.8.1.ebuild
index 2f1e8014e508..95bfe6728687 100644
--- a/games-util/joystick/joystick-1.7.1.ebuild
+++ b/games-util/joystick/joystick-1.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit toolchain-funcs udev
 
 MY_P="linuxconsoletools-${PV}"
 
@@ -15,32 +15,32 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="sdl udev"
+IUSE="sdl"
 
-DEPEND="sdl? ( media-libs/libsdl2[video] )"
-RDEPEND="
-	${DEPEND}
-	udev? ( virtual/udev )"
+RDEPEND="sdl? ( media-libs/libsdl2[video] )"
+DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-build.patch
+	"${FILESDIR}"/${PN}-1.8.1-optional-ffmvforce.patch
 )
 
 src_configure() {
 	tc-export CC PKG_CONFIG
 	export PREFIX="${EPREFIX}"/usr
-	export USE_SDL=$(usex sdl)
+	use sdl || export DISABLE_FFMVFORCE=1
 }
 
 src_install() {
 	default
 
-	if ! use udev; then
-		rm "${ED}"/usr/bin/jscal-{re,}store || die
-	fi
+	[[ ! ${EPREFIX} ]] || mv {"${D}","${ED}"}/lib || die
+}
+
+pkg_postinst() {
+	udev_reload
+}
 
-	if [[ ${EPREFIX} ]]; then
-		mv {"${D}","${ED}"}/lib || die
-	fi
+pkg_postrm() {
+	udev_reload
 }
diff --git a/games-util/libstrangle/Manifest b/games-util/libstrangle/Manifest
index 696f10552731..a2a77aa0746a 100644
--- a/games-util/libstrangle/Manifest
+++ b/games-util/libstrangle/Manifest
@@ -1,3 +1,3 @@
 DIST libstrangle-0.1.1_p20220222.tar.gz 947358 BLAKE2B 2222550e28d4af1dafc43691f3021fdac30445e3223673b74f69adfe681c9b1879925b3961dc9d086f2e5cadeeca7488e1a53bcdb6e302b2e4087a0f2a19a380 SHA512 5f6d7bc5acb95be4c0083a16134dfe7c6a95ab6a73cca69ec2d92cf75ebf5ecfaea08dda0d887e8e136fd410c988c0bd36289c2a17df3eb1698b453bb38c4011
-EBUILD libstrangle-0.1.1_p20220222.ebuild 1738 BLAKE2B 96016bfee57d1add6e500572d82bc6ca34cc84360ccca795b192e62659b82f728d1cdf121213c2d76d6c80807d82e9070c9cf2649a3bdc3be007f3889996a052 SHA512 9868640ab100395db2bf7dc3edf63464059dc739f351accd2557c48da8e3ba082ad83f6426226e3a0d18ae5b9d4f53f3a9b3d4cdc2d25c204c211633446a3306
+EBUILD libstrangle-0.1.1_p20220222.ebuild 1318 BLAKE2B a161fb8ff97cfe06c5728a91282c1b82f86aa330577f90a0997afabb708afc65dcbaa535c8a20980a2d44c9d8644256b098ac755001e0b9ff9877b12fee7ce4d SHA512 6ac932720acf4ec1401256c213bd6a6a30d8fa2de40629fe416ab166960b20dc3e31e9539bf76794a9533a25f3bb80359ad3850956da98a5a0b7b04e15dd5df8
 MISC metadata.xml 332 BLAKE2B e75edf673556ac4f9fa191394e3984305272379efc2ca67149029dd037a16ea8679081ccde536648e57e61d7fc4cdeab7dd946dfc4dfe2222f9ca777636ae2b8 SHA512 2cd2bdaef93867ff657b5b752e548e74a43663549b02fe71ce0cef61662ed3a69b6d49e90f912486080e266308391f1b93a910ccf18879dd39e563a3327eb095
diff --git a/games-util/libstrangle/libstrangle-0.1.1_p20220222.ebuild b/games-util/libstrangle/libstrangle-0.1.1_p20220222.ebuild
index 1ecf01f317d3..cb3b102c7f5a 100644
--- a/games-util/libstrangle/libstrangle-0.1.1_p20220222.ebuild
+++ b/games-util/libstrangle/libstrangle-0.1.1_p20220222.ebuild
@@ -16,22 +16,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# Note: requires a glibc version with DT_HASH fix or split libdl.so.
-# For the latter, <glibc-2.34 is acceptable but skip so portage
-# doesn't suggest downgrading to stable users.
-# https://gitlab.com/torkel104/libstrangle/-/issues/59
-# (cleanup these after fixed glibc is stable for some time)
-RDEPEND="
-	sys-apps/grep[pcre]
-	elibc_glibc? (
-		|| (
-			>=sys-libs/glibc-2.35-r4
-			(
-				>=sys-libs/glibc-2.34-r12
-				<sys-libs/glibc-2.35
-			)
-		)
-	)"
+RDEPEND="sys-apps/grep[pcre]"
 DEPEND="
 	media-libs/libglvnd
 	dev-util/vulkan-headers"
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index f445a96461b8..c20a01f63b45 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,4 +1,4 @@
 DIST lutris_0.5.10.1.tar.xz 1230464 BLAKE2B 5ba913f5e37956344b59c47c1315cf277ce57b1b771279c8aa4243971ea9f0c5277ad19b18655731048e989f752d957216d055ac6c26bb8731e52b4345d30847 SHA512 f6443fa86d0b38e1b5ba51054e50776eea63d9adda5738a7e69f2fe6b196f99491894d5068d6cddfd35d1baafa4188bd1935598b84266e9e23bd1b58c16dde20
-EBUILD lutris-0.5.10.1.ebuild 2190 BLAKE2B 88c9b4c3d4f0fe06ad4c310d90934ad3fa9a0ab3562f3d233a23f1969a6ca9a7fe7254ec91e984ed1ffc08538157f782947e457d0426e8e9612222b4b4221aaf SHA512 7f251210aec54ea1f3f3708cb2f2caa32e7a866bb4739a24c30d0ee6e7655ff5b1f583d42ba7a2367f2db34af770cf07f99390cd88a4d18a3987f35b78493522
-EBUILD lutris-9999.ebuild 1960 BLAKE2B a47f2bfdb7364ce9c1d0ffe1236c6995b67cbb5d84ef472d7fa059302ad05c5063f0928f9accd05608819ef3d668ec35f2742a2a9c269a8bfd33da78f904aef3 SHA512 cf9576152e735e5fc28cb26dadd0da4e970cee4fbaa6404982e373382fd3a2cb8dcfb0ed9da05fccbee16edf765e5f0aa4d7ff6802c1641500d1a1ec3041243c
+EBUILD lutris-0.5.10.1.ebuild 2190 BLAKE2B 3d1fb2034e0aa73f36c27341a14c18a996787f1133876e3e49cf7fb2e952b03eadfd2e15427c5aa07ef52267f14f2a1821900905b744f1ae2b35be26b0213b16 SHA512 7e3c78b211f21a5817b27e626e50e2bacbb62bb1e55b71bbd75ad6f8cb140227dda1ed1c1f9d0f1d37d3def80d8a71d9690721bf5dabef3ad587f417af811ce2
+EBUILD lutris-9999.ebuild 1960 BLAKE2B 587f7664ba03c1963607998435645bcd3e59ba51945b3d38ab4f05b3820959954fdb4aa33a00d7d32a3285be65433873a12c32b13c2b312a125544ad6de0a853 SHA512 2aeb1ae3d3dd811dc1b80140666c61f9f715f2d0e6de373a22490d7c7c7126706a707ea24a00bfcf7a0ac25f5467f08492f6be855cac062e9e840952e2cb47b8
 MISC metadata.xml 781 BLAKE2B 4f125f51efebe519dab960da879b988cc1d5675449b288a344df7647a660e190ac393d9195daee17fc4e181f1b07f6ffed17c7d1d222217a0afad44c0e15fe59 SHA512 83a29e9fad3e474ef81aa4c07bb6f1f8b77456eaf17f3aad4f34c12c2101cfd55fbd0b1ac8e2c1f682a2ab859c266f920a311aaa01cf9e53b762bd883a65b66f
diff --git a/games-util/lutris/lutris-0.5.10.1.ebuild b/games-util/lutris/lutris-0.5.10.1.ebuild
index f9735e9f61e4..8808cea2f845 100644
--- a/games-util/lutris/lutris-0.5.10.1.ebuild
+++ b/games-util/lutris/lutris-0.5.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="sqlite,threads(+)"
 DISTUTILS_SINGLE_IMPL="1"
 
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index 1b9e6fc4d1db..d0cf69b3a9e0 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="sqlite,threads(+)"
 DISTUTILS_SINGLE_IMPL="1"
 
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index f798bec58257..ed30b0029a22 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,9 +1,7 @@
 AUX configforced-1.15.1.py 153 BLAKE2B 135edf54e69c985693bcdde747eba5e46f7ed1390a77e1a1d40c0a624f3605c3ec8dad2f3526cbd8f406ed39fc67d3b027b7e7e462bbfa48c5649c71f0692da6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe
 AUX pyfa-2.9.3-import-pyfa.patch 666 BLAKE2B 13b67511a64be93335453b617e1fad56768c9c582da4ebbef36b4848aca225220e2057c0fab088a060cc2149aed961f2063a1a34326b71f0cf3bb411105a77a7 SHA512 a0174726777d82229dcd167b005e176012a9c4398f066f183bf0b8d59bd1854411e74bca1c3848396a8c50be327c8ec4e21dde6d56d045b2af4cd13a68e0cc99
 AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
-DIST pyfa-2.33.0.tar.gz 28872031 BLAKE2B fe7fad57e43a8efc78f828d0ff81788147fa64ef02a20a71d6fef8ab0130d39b5ebffc18d58a774a61d805b8d0e570cbedb0b8fa536c8c71e61102fb6d093998 SHA512 bfa4e41b387e9f23aeae41a4884a0492316cc6e51841243ef56dc733edab10e6c9609ca7918d4de9fcd052b4da8f8048ce7578d164ad98237b53cb05f7c168d8
-DIST pyfa-2.37.0.tar.gz 29991827 BLAKE2B d2dd51becc037176ef0e4394799d6d35ea5025b4b9aba7a1e2a12d908b1d8d9a436d2e2b2e9d06b3592ea2276b3dfe24c639d02cd77fe25a6ea673d9f048a238 SHA512 e3ccee3ee3b74644f208afdf719bf1e3dc29335041e3cdd19b5742f51e1fbb0fcab2376c26fc789e7992d1f35215c128bf6480860a0eea75eeb69c9b466ba1cf
-EBUILD pyfa-2.33.0.ebuild 2627 BLAKE2B 67af875c3c233f08b4b70e2597fd44f07d256672610ad9925603ea6f04d857317c2880b85d1827b72ae7c04a175723361692aa0547064db232a7af5d6ad80caa SHA512 301908cd18992a20c324266921eb45c7932b7cfa869d6c9466bb4cf77c5abe6f2860044c3145ae214689b274d3d96d6d8a37e4cf0ddbef07cca9fc1dc3ea32f8
-EBUILD pyfa-2.37.0.ebuild 2627 BLAKE2B e2814731753c6c468916830993c6a1937aff33ab1f374c45511e37af7fd613fe7c47d22b538574aa1f5958eefa856c4af7fe8f67ac1b9be57674a0f08785896b SHA512 c1a47119da6bdd57fe2ce5c87f089da24fe87b898d9eb9406956982d45c2199061ea572e4dc4ed33a0ef414893fc338f4f37127b3fd926d35b69bfa13eafb631
+DIST pyfa-2.43.0.tar.gz 31776698 BLAKE2B 819596e670b62dad4a10edbb49f5b93e5b0d53b1976b6c1f3272731f5769897ec6f12ae681f6503966de2d91d31dc0ee5d5c8ce0cd34354279dc71a6ae20996f SHA512 847ed7b9590103b2d49fa1e60d5162c800c58a94be20bd67bb10aa0b9e2957db987464bec9941feed27b61fd49d38e6c4171d932a5450e317427a8ea54b4e890
+EBUILD pyfa-2.43.0.ebuild 2733 BLAKE2B 742fb98ce9aea88bd097bb5ccfd8d7fa9f2815d3ed7277aafc06384710380d65eb0a437173b8db5030681b006fd9e715d8cf3b22ef9ea94a13f07d95f58b398e SHA512 d671f922d7ca3f9b7d558e1276c1894619766e847f5d4f88efe728dbec41aa339b3511d86d1f87bc63f3ea92b0771dda8c232cb3e128bfad87f1c1c995610e22
 EBUILD pyfa-9999.ebuild 2627 BLAKE2B 67af875c3c233f08b4b70e2597fd44f07d256672610ad9925603ea6f04d857317c2880b85d1827b72ae7c04a175723361692aa0547064db232a7af5d6ad80caa SHA512 301908cd18992a20c324266921eb45c7932b7cfa869d6c9466bb4cf77c5abe6f2860044c3145ae214689b274d3d96d6d8a37e4cf0ddbef07cca9fc1dc3ea32f8
 MISC metadata.xml 775 BLAKE2B 263cdaa1ca901b306a3efd828ed9ff7abf06dc97f00e03355ae2df3bb1979e87e33ff0050e0681d74056d1ff4e5fb8b268393e28401d3d5a798b34756545a079 SHA512 9eec729a2954ec206f385853b1d00871fd18addaed0b386888bb6509497441d29f38474e0a1db9a22fd9ccf37408cc75084f66a07b2b0646ef76c28e42dcacdb
diff --git a/games-util/pyfa/pyfa-2.33.0.ebuild b/games-util/pyfa/pyfa-2.33.0.ebuild
deleted file mode 100644
index 1bf3c9464b03..000000000000
--- a/games-util/pyfa/pyfa-2.33.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit desktop edos2unix python-single-r1 xdg
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ all-rights-reserved"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/Pyfa-${PV}"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="mirror bindist"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-		>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
-		>=dev-python/markdown2-2.3.5[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
-		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_USEDEP}]
-	')"
-BDEPEND="app-arch/zip"
-
-PATCHES=(
-	# fix import path in the main script for systemwide installation
-	"${FILESDIR}/${PN}-2.9.3-import-pyfa.patch"
-)
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py
-
-	default
-
-	# make python recognize pyfa as a package
-	touch __init__.py || die
-
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		-e "s:%%EPREFIX%%:${EPREFIX}:" \
-		"${FILESDIR}/configforced-1.15.1.py" > configforced.py || die
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		pyfa.py > pyfa || die
-}
-
-src_install() {
-	python_moduleinto ${PN}
-	python_domodule eos gui service utils graphs
-	python_domodule config*.py __init__.py version.yml configforced.py db_update.py
-	python_doscript pyfa
-
-	insinto /usr/share/${PN}
-
-	einfo "Creating database ..."
-	${EPYTHON} ./db_update.py || die
-	doins eve.db
-
-	einfo "Compressing images ..."
-	pushd imgs > /dev/null || die
-	zip -r imgs.zip * || die "zip failed"
-	doins imgs.zip
-	popd > /dev/null || die
-
-	dodoc README.md
-	doicon -s 32 imgs/gui/pyfa.png
-	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
diff --git a/games-util/pyfa/pyfa-2.37.0.ebuild b/games-util/pyfa/pyfa-2.43.0.ebuild
index b053388c505f..0487cf9afef8 100644
--- a/games-util/pyfa/pyfa-2.37.0.ebuild
+++ b/games-util/pyfa/pyfa-2.43.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
@@ -30,7 +30,7 @@ DEPEND="
 		>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
 		>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.23[${PYTHON_USEDEP}]
 		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}"
@@ -41,7 +41,9 @@ RDEPEND="${DEPEND}
 		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
 		>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		>=dev-python/python-jose-3.0.1[${PYTHON_USEDEP}]
 		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-cache-0.8.1[${PYTHON_USEDEP}]
 		>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/matplotlib-3.2.2[wxwidgets,${PYTHON_USEDEP}]
 	')"
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index 2a03d834aa1e..424125262e95 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1,6 +1,5 @@
 AUX slade-3.2.0-bundled-libs.patch 2238 BLAKE2B 06395fcbe6dbcd7e3e2e8651fa4386e9b244c2a8b1501195692e0f1f8c7fb5ab6ab1cf9487536599ccc5f1af0d396f2d7bd3ccee13fc7b5bdfe9c86d407629c6 SHA512 a905785b11686a54ec89ad3b2be8911fba6b8a52e2f1fee6ae21651e6f822ce3fc8d2615a55c339c2d7f2feb521bf2f8ff38e07330d8520e4319b0d1828f7b52
-AUX slade-3.2.0-wx3.0.patch 2195 BLAKE2B deda8df72b59972edf7faa8a6eff7932060daa9049d95d29caca9a07c84c6bf3103da1be0af89dbd02a1da709d8cf5f7529b10da0ca39c4d7924dfe0c5968d8e SHA512 30c016d285b08b604538979656c12bc25fc1d3de02f9b6f876fddc0ddd3ae315094973d5d642e35f9eead5afe3df67355240fb2e13e2ba1c395e85c003dc2fe6
 AUX slade-3.2.0_beta2-fluidsynth-driver.patch 790 BLAKE2B ea84ff6515b4b80cbce021624c27dbd4c067758b7e5861402d42628ddee85385a260396163838b1504e2196c3b275977ad5ddde3d684e49de600270d7990a1c0 SHA512 3de05beafc060891d674d388cbb07107ead138ef2a89812dfffabfc8c9de2beb939290b1064b75e14d3cc42621c8ee66ced06eacdcb2afd376a9539fa74c54c8
-DIST slade-3.2.0.tar.gz 6464839 BLAKE2B 8e13f153c64526784bd5fa3d03520942d9dbc1b0b0d1e4d0650fb91ed63a7f860655f5d580b4c0a04a52aa98f617b1f4448f47cd1e55c1b3f78fc552b8101654 SHA512 916be3b9556e76ca815514bb472335af80a72bfb8ecd0ae4287db2c0d6ad092a8ada1b335762f8589d300b1fd81adbdede3e6c315cfdc1d49b1624294b405b92
-EBUILD slade-3.2.0.ebuild 1653 BLAKE2B 98be9416dd2f9a256b606defec8a11acaf8ca3f4f51cbd6cd129420cfeabcbcacf89d300307df091a3aefb2b6fcf45163068171171e64a5649c8276c6adc3526 SHA512 bbc8495ffbd1aaf525b2160640f45150a8ee3accd00a8eb7a340394d686d2e911c43a5d89a212356fc450eb905b2346f87ae329ebe9370f503af123253cdbf25
+DIST slade-3.2.1.tar.gz 6471666 BLAKE2B 17a4f2ec23699a56d4fd970605d7141d3f4593f7ced6fff205c87d9ecddc7b90e6da2991aeea32bd008e24cdfee95b7c16946f78b2701c94e51266afd78863d6 SHA512 b7d5a91c759c5a68af63aa9a8412452a5b2986e70f7189ca92ee99ce4953ef47381be907c8ce1166e479f24679904bf5f0e0b1a5da846fe7873c5b97f4315449
+EBUILD slade-3.2.1.ebuild 1614 BLAKE2B 2350932c2517f32c00a3bf08ef915661fbb1736492e3fd0e61a36f552e78cd8f63c02830b00e0cacf64b5840b88dad816d16141743bce47bbeb72315416155ae SHA512 f770c1c3c20be8f52799382a492aa6aa770f84a220ea399e8a99035f2918c7ceab32cb36de3c09e424d7e4f9fbc6d2777e84c43f6aa5e8731c64b85b393360b9
 MISC metadata.xml 457 BLAKE2B 241e53a5b4e6b85472c19b5431bae365eb740632cc71c9c2df1fb1f6c7f4875e8cb6d7ce17cddef12377a306c7abd8787a9f8e4cdd21b2b892d639ef68e8c077 SHA512 ae81e2d7faa90358dfd5f6511650de78fae50b7356609e7c54b635515e2fd9fb1348e9f34931e1cd82a3ad37206e47a64a02969c7762f38e62c32ffb5512b769
diff --git a/games-util/slade/files/slade-3.2.0-wx3.0.patch b/games-util/slade/files/slade-3.2.0-wx3.0.patch
deleted file mode 100644
index 2e519b45181b..000000000000
--- a/games-util/slade/files/slade-3.2.0-wx3.0.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 45537095187cb5b985713e7558a230651b599589 Mon Sep 17 00:00:00 2001
-From: Simon Judd <sirjuddington@gmail.com>
-Date: Thu, 14 Apr 2022 21:52:16 -0700
-Subject: [PATCH] Keep up wx3.0 compatibility
-
-I'd like to drop it ideally, but for now it'll stay
-
-Fix #1336
----
- src/Graphics/Icons.cpp | 15 +++++++++++++++
- src/UI/SAuiTabArt.cpp  |  5 ++++-
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/src/Graphics/Icons.cpp b/src/Graphics/Icons.cpp
-index 61d5475c..67147f7e 100644
---- a/src/Graphics/Icons.cpp
-+++ b/src/Graphics/Icons.cpp
-@@ -373,7 +373,22 @@ wxBitmap loadPNGIcon(const IconDef& icon, int size, Point2i padding)
- bool icons::loadIcons()
- {
- 	// Check for dark mode
-+#if wxMAJOR_VERSION >= 3 && wxMINOR_VERSION >= 1
- 	ui_icons_dark = wxSystemSettings::GetAppearance().IsDark();
-+#else
-+	auto fg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-+	auto fg_r = fg.Red();
-+	auto fg_g = fg.Green();
-+	auto fg_b = fg.Blue();
-+	auto bg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-+	auto bg_r = bg.Red();
-+	auto bg_g = bg.Green();
-+	auto bg_b = bg.Blue();
-+	wxColour::MakeGrey(&fg_r, &fg_g, &fg_b);
-+	wxColour::MakeGrey(&bg_r, &bg_g, &bg_b);
-+	log::info("DARK MODE CHECK: FG {} BG {}", fg_r, bg_r);
-+	ui_icons_dark = fg_r > bg_r;
-+#endif
- 
- 	// Get slade.pk3
- 	auto* res_archive = app::archiveManager().programResourceArchive();
-diff --git a/src/UI/SAuiTabArt.cpp b/src/UI/SAuiTabArt.cpp
-index 15aad09e..240de8b9 100644
---- a/src/UI/SAuiTabArt.cpp
-+++ b/src/UI/SAuiTabArt.cpp
-@@ -542,6 +542,7 @@ void SAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window, const wxString& text,
- 	int caption_offset = 0;
- 	if (pane.icon.IsOk())
- 	{
-+#if wxMAJOR_VERSION >= 3 && wxMINOR_VERSION >= 1
- 	    // Ensure the icon fits into the title bar.
- 	    wxSize iconSize = pane.icon.GetSize();
- 	    if (iconSize.y > rect.height)
-@@ -554,7 +555,9 @@ void SAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window, const wxString& text,
- 	    dc.DrawBitmap(pane.icon,
- 	                  rect.x+xOffset, rect.y+(rect.height-pane.icon.GetHeight())/2,
- 	                  true);
--
-+#else
-+		DrawIcon(dc, rect, pane);
-+#endif
- 		caption_offset += pane.icon.GetWidth() + px3;
- 	}
- 
--- 
-2.34.1
-
diff --git a/games-util/slade/slade-3.2.0.ebuild b/games-util/slade/slade-3.2.1.ebuild
index 76979d24ed46..e68c8e1e1a4e 100644
--- a/games-util/slade/slade-3.2.0.ebuild
+++ b/games-util/slade/slade-3.2.1.ebuild
@@ -48,7 +48,6 @@ S="${WORKDIR}/${PN^^}-${MY_PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.0-bundled-libs.patch
 	"${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch
-	"${FILESDIR}"/${PN}-3.2.0-wx3.0.patch
 )
 
 src_prepare() {
diff --git a/games-util/xpadneo/Manifest b/games-util/xpadneo/Manifest
index 5d57fb8a2c98..1b5b56a042a0 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 2473 BLAKE2B 1d49b48289fe22271ce39ee5a1fd451b34cd6086ac8f11713003e8b525c321c201058917c31b198a5799abcc3517aeb570977b21fa3016393b3c5cc13929939a SHA512 8fdd8aff6c636b537f562b1d880d5eed9bb8b657eac2b8ddf1b1b2daaf2bb19116ac5d3d8ef230b3ff8924672258d83d33b396897dc74f380076a66b87db965e
-EBUILD xpadneo-9999.ebuild 2303 BLAKE2B 960138b07e9cfc3be48536ecb2975128244b00d44bc15b6961267fa482c8c34ae5727a8bb2a9f26034109c368a37e92a305dc85b7990367cf78c3914bdf1205f SHA512 adb2a879fe617d94797f1679126cdfc412c9a1d08c353f942079dae64678c475eab303aced5be89c8f730cbd40163488582d73d6e7da2d94b7958a97eaaa605c
+DIST xpadneo-0.9.4.tar.gz 1342566 BLAKE2B 82c5bd4e9d68e0b9465047d446a1ffe0c95b9590d76f1c6cec2d6e1c770a6c3f7c6c47cffef5ce27c449f1ada854dd9b6e6413791360c0d8eee8a697718bb320 SHA512 347b0a066044926681863b342a71e5a9a03e9ca58b5f1c5e20b5d7d68d92b373c14ec809b3bd6e0d719f53792b146966a03e169f997a5f65cef762d6058d0d01
+EBUILD xpadneo-0.9.4.ebuild 2303 BLAKE2B d2fb6917074519884902d2037c2d07259ef1e9c65199f0734c0265d29f432712157e1d2ec7e8aa97e005be8b7c7691d8015ef584111afa2a5f284135c6eae858 SHA512 f63983701cd920e01526a7f01d318dc0d66365b1d79628bcf9e3d88ca65d1d4de324b69e904f179e7d0107dd5a60302ef8168d2ad63bb29a94b5d6673d822552
+EBUILD xpadneo-9999.ebuild 2303 BLAKE2B d2fb6917074519884902d2037c2d07259ef1e9c65199f0734c0265d29f432712157e1d2ec7e8aa97e005be8b7c7691d8015ef584111afa2a5f284135c6eae858 SHA512 f63983701cd920e01526a7f01d318dc0d66365b1d79628bcf9e3d88ca65d1d4de324b69e904f179e7d0107dd5a60302ef8168d2ad63bb29a94b5d6673d822552
 MISC metadata.xml 328 BLAKE2B 6511430d43b855d83d42dc94ea83bf20867568e9dbf642240ac279179d9f26d0a315f3fb90bebd4a564d4bc63beefcb8aa24af7acf25a60f9b25f732265de41b SHA512 defbfc601b6b61d10edf8947e2251f96416787a1141fccff1e017a6110eb4d8e8801fcd72cc678f816064eb5a5dc796c9c895ca9f74ad288f1338ccaaf3ee5c8
diff --git a/games-util/xpadneo/xpadneo-0.9.1.ebuild b/games-util/xpadneo/xpadneo-0.9.4.ebuild
index 828d24913b9c..b193e5517951 100644
--- a/games-util/xpadneo/xpadneo-0.9.1.ebuild
+++ b/games-util/xpadneo/xpadneo-0.9.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # pkgcheck note: toolchain-funcs is not unused
 inherit linux-mod toolchain-funcs udev
@@ -37,8 +37,6 @@ src_install() {
 	udev_dorules etc-udev-rules.d/60-${PN}.rules
 
 	dodoc -r ../docs/{[^i]*.md,descriptors,reports} ../NEWS.md
-	newdoc ../misc/kernel_patches/0001-fix_bluetooth_reconnect.patch \
-		L2CAP-fix-for-kernel-5.11-or-older.patch
 }
 
 pkg_postinst() {
@@ -57,8 +55,7 @@ pkg_postinst() {
 	elif [[ $(<${disable_ertm}) == N ]]; then
 		elog "Warning: bluetooth ERTM (Enhanced ReTransmission Mode) is enabled."
 		elog "While keeping enabled is recommended for rumble usage stability, it can"
-		elog "cause connection issues without kernel >=5.12 or the L2CAP kernel patch"
-		elog "provided in ${EROOT}/usr/share/doc/${PF}/"
+		elog "cause connection issues without a fix included in kernel >=5.12"
 		elog "If needed, this mode can be disabled by running:"
 		elog "  echo Y > ${disable_ertm}"
 		elog "  echo 'options bluetooth disable_ertm=y' > ${EROOT}/etc/modprobe.d/no-ertm.conf"
diff --git a/games-util/xpadneo/xpadneo-9999.ebuild b/games-util/xpadneo/xpadneo-9999.ebuild
index 5927d40b0273..b193e5517951 100644
--- a/games-util/xpadneo/xpadneo-9999.ebuild
+++ b/games-util/xpadneo/xpadneo-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # pkgcheck note: toolchain-funcs is not unused
 inherit linux-mod toolchain-funcs udev