gentoo resync : 20.03.2022

18 files changed, 139 insertions, 191 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 54915f17e04c..dae694cae1da 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/game-device-udev-rules/Manifest b/games-util/game-device-udev-rules/Manifest
index 7ecd1d4f501a..03d365ebe302 100644
--- a/games-util/game-device-udev-rules/Manifest
+++ b/games-util/game-device-udev-rules/Manifest
@@ -1,4 +1,4 @@
-AUX 60-game-input-20201228.rules 225 BLAKE2B 049966d6eb8e061bec5b18b3361957ceb29d23782a0cf361bebec618d1a4b4d2924782abb601cc4bdd15ff959346c42a33ff40da17feef02acf284294bbcbdc2 SHA512 1fd23d370d17f7c98445671c1d0138db7e69b405e8c630e54a094da021fb5fb716966d1da1f22043f9dfadc42e89efc3147c9bbc04c4100383de7ca2887a0700
-DIST steam-devices-ebc0f6a9e30bc0db2344df298c061c2c3b01776f.tar.gz 2171 BLAKE2B 01ef2371b13eca38419f90e4d1918370b6f2bdcb40264372e7cc1f8e858d7f5c9149f001c750a53f4c4435cf286fca1ab9f8869e5855eefbdb4d89acc95bb5c2 SHA512 08f2f411e8499469de747145bb159dd97c846a6329cf7aabe3445333fa8c9570c7de52d96c3e63d7e065464b9e4bbe2917a1a4a4f44a19454d3d707d524592f9
-EBUILD game-device-udev-rules-20201228.ebuild 1894 BLAKE2B 8b269fb019ddef18b114c55a45bbe97a6a6a8a512ed7ee2515c6c462ba28e5460d6e6fcecb6d1b6b335877f84b2d74e317a850860ec212fccf6a84474c2cd6c3 SHA512 a74a49d3cdb993b00c9be369726c3edfd0ddf50fc99749ef5f0bb03e37e5e06c010b987579cbc3c6815384483a3835ffabac409d2827c9ab4c769ab2ca198c8e
+AUX 60-game-input-20220311.rules 225 BLAKE2B 049966d6eb8e061bec5b18b3361957ceb29d23782a0cf361bebec618d1a4b4d2924782abb601cc4bdd15ff959346c42a33ff40da17feef02acf284294bbcbdc2 SHA512 1fd23d370d17f7c98445671c1d0138db7e69b405e8c630e54a094da021fb5fb716966d1da1f22043f9dfadc42e89efc3147c9bbc04c4100383de7ca2887a0700
+DIST steam-devices-d87ef558408c5e7a1a793d738db4c9dc2cb5f8fa.tar.gz 2305 BLAKE2B 677cec02dfa1899b9bad9440a5810175b731234db271413c2027a5a1a81dbdaa8c5ccd922478c07304262d5c3bf16891875dcdab08341720b97953035d5ae93d SHA512 54a0a9f293ca03c01c5f3609c08e9e8cc1273a034b1164399623c55ec994414ecacff04d049bc4195da5f0601bb17de52c9e1770a0161caac9bb4b74d921b35b
+EBUILD game-device-udev-rules-20220311.ebuild 1894 BLAKE2B 16be376429e07c1cb5a95ce0541c904b04be78590db59cd07a00782653f9070900aa460717d5dded6d1331d4a1afa4acd60ea5b639c8624665028b47e186a467 SHA512 e200993d248781861911d8d4b37afb77d5481157f76676d56ef0a377b5559cbc50b2e3b0d76195a67eaedce35ce119242fdb707b4a74f1b0a6e8ef33dd521b39
 MISC metadata.xml 362 BLAKE2B dc08f40ec0b96ccae5aae0316565ea1b9b79d27d7c656d52761fa9c6c671e6e8eb37572d6820182b95b383641d3305aca071d802e6feec5e2e406022a5e0ea5d SHA512 ade0f9814d7adb32c77232b9a9e5e00782562b93f330e925f55366c78b4171f731c1916f41447386a5ef8ec3822db2d00c9ec1d2668180e9e5f6423b3423a0c0
diff --git a/games-util/game-device-udev-rules/files/60-game-input-20201228.rules b/games-util/game-device-udev-rules/files/60-game-input-20220311.rules
index be2c499891a7..be2c499891a7 100644
--- a/games-util/game-device-udev-rules/files/60-game-input-20201228.rules
+++ b/games-util/game-device-udev-rules/files/60-game-input-20220311.rules
diff --git a/games-util/game-device-udev-rules/game-device-udev-rules-20201228.ebuild b/games-util/game-device-udev-rules/game-device-udev-rules-20220311.ebuild
index a050aac120d1..c846172a90d0 100644
--- a/games-util/game-device-udev-rules/game-device-udev-rules-20201228.ebuild
+++ b/games-util/game-device-udev-rules/game-device-udev-rules-20220311.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit udev
 
@@ -9,7 +9,7 @@ inherit udev
 # also has its own rules and more may be added later so we version it
 # independently.
 
-STEAM_COMMIT="ebc0f6a9e30bc0db2344df298c061c2c3b01776f"
+STEAM_COMMIT="d87ef558408c5e7a1a793d738db4c9dc2cb5f8fa"
 MY_P="steam-devices-${STEAM_COMMIT}"
 
 DESCRIPTION="udev rules for various game hardware devices"
diff --git a/games-util/joycond/Manifest b/games-util/joycond/Manifest
new file mode 100644
index 000000000000..81e9e2bcca5c
--- /dev/null
+++ b/games-util/joycond/Manifest
@@ -0,0 +1,4 @@
+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.ebuild 756 BLAKE2B 0cd4d88b137eb29d43c94c2748727fdace281c57b5d70f074c4059205d86c923d10d0ca1e54a1977b3b88ca07791cd06ca828f2b3b4bfce7b80ccd84a4820b0f SHA512 12c55cacef7844a7f7d061bff509e48045425e144f9ed457cdbe049e5638d087014b931f2289ffcddf23b8ac790df3c9874381471b9f9fd92ad95b35a331eee4
+MISC metadata.xml 342 BLAKE2B f256215b8ff7fe2d8b1d360f3a3da2a530a5c7b8137a2f38d21a51e303ead2fc3b28c20a9199bd7885a940908cd2b084ce58db14cb9578b3d63c5e86be5f45e8 SHA512 a68b62631acf469245b1c78ad35487390937f5a555251cc0ae75d7756677d760d2c730f891854e16e06cbf0382a649992006a1c7f13b843c03551aa1754f106c
diff --git a/games-util/joycond/files/joycond.initd b/games-util/joycond/files/joycond.initd
new file mode 100644
index 000000000000..f23e1131e753
--- /dev/null
+++ b/games-util/joycond/files/joycond.initd
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/${RC_SVCNAME}.pid"
+command_background="true"
+command="joycond"
diff --git a/games-util/joycond/joycond-0.1.0_p20210730.ebuild b/games-util/joycond/joycond-0.1.0_p20210730.ebuild
new file mode 100644
index 000000000000..e06a319c6811
--- /dev/null
+++ b/games-util/joycond/joycond-0.1.0_p20210730.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake linux-info
+
+COMMIT="f9a66914622514c13997c2bf7ec20fa98e9dfc1d"
+DESCRIPTION="Daemon that uses hid-nintendo evdev devices to implement joycon pairing"
+HOMEPAGE="https://github.com/DanielOgorchock/joycond"
+SRC_URI="https://github.com/DanielOgorchock/joycond/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/libevdev
+	virtual/udev
+"
+
+RDEPEND="
+	${DEPEND}
+"
+
+CONFIG_CHECK="
+	~HID
+	~HID_NINTENDO
+	~HIDRAW
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_install() {
+	cmake_src_install
+	rm -r "${ED}"/etc/modules-load.d/ || die
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	doman doc/${PN}.1
+}
diff --git a/games-util/joycond/metadata.xml b/games-util/joycond/metadata.xml
new file mode 100644
index 000000000000..c529738df197
--- /dev/null
+++ b/games-util/joycond/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">DanielOgorchock/joycond</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/lgogdownloader/Manifest b/games-util/lgogdownloader/Manifest
index 2c7d0dda65e4..9ecdceaf59ae 100644
--- a/games-util/lgogdownloader/Manifest
+++ b/games-util/lgogdownloader/Manifest
@@ -1,4 +1,6 @@
 DIST lgogdownloader-3.8.tar.gz 85271 BLAKE2B ff8e9f80dbec849649b4074ab5890f833a5bfaf120246e7ca5eae83f414af469da29302323dc22632eb0a7259e49e9cf3660ea8953adda75fc7a5308204767bd SHA512 ccc6116f22a5c0bff5e4ef650f6386d5bfc507cc667b7154b021ecdbd45e7553ac33ae6b81531e2cea52a5022ee9c810033518a07374d4e9f7c672344e7ccad3
+DIST lgogdownloader-3.9.tar.gz 86351 BLAKE2B 4ba1a39e2c040910cb3fdef908c229ce8a7def70ba430167977ab4eaa7fdcdfd132a314d256300904dd14052aecffceec92652cfa3eba3c2a54d83b1920ed2b7 SHA512 5ac15776c0ab7416013782652fead180f75e3bd075a3b67c9cb672122c13401ebc91e785daa9e7d332011474240dbb4d8383ddadea2abf0d3bddfc13d6892066
 EBUILD lgogdownloader-3.8.ebuild 824 BLAKE2B 8f66e5a1761eda13849def434d2bfe95d4c06ef0ca222f8b8b986178a59f7c7ce04e7f8c1b73acdaff6dcd58129d5b0376d74e75045f44393e44d1a68f0c1f66 SHA512 6360c6238d29c2033ec40196a4bcbe5c939dfd280107c776108d77b6b9e4fd479c127b7bb16ac3e7a05595b89965abc3f24f8c616ee5111bce9e1b0791aa2f37
+EBUILD lgogdownloader-3.9.ebuild 836 BLAKE2B 9562b45e361db27b3ad1885776f1a78995f7756ff115d9f7aae0133cc138e9d2f88fc6e1af3fdecb17568c5f4a22f43a9df52f8bfc14eeeaff35dd0cb5427a9d SHA512 fdde01bfa79c7930686183830657ab48be929e8f6672cb2935a58634717aea864ce5738240409c21a1dd2b9cb77b302dffdf9cccc689c1b5876e89545ef18bb9
 EBUILD lgogdownloader-9999.ebuild 802 BLAKE2B 7b58e8cdf6ed1e69e9b6d1dd05c23170c5d92d1a70f72b7d3034990cdb3531b106dbc35a71e98ad2da95b9f7fb6c53556d16caa204144c1f5048d887d919aa01 SHA512 239b12971fff5743930a2780327f43b8a9d6ff7396b331fec0001a5ab850d03909ac662c506cf6c49f351a265969a154100230afcb4d8f755eb915648805e723
 MISC metadata.xml 1098 BLAKE2B 154a5ed56c5e935723180acca12ae6e0a14ee2353b1a1626e16e1932922121b8d4b5eb6b5e1f2ade2f707eff696f744677e7d8f9059cdfd6f1357c77a6dc3196 SHA512 b28a6adab900d56756f206983b4fc39f5b0158702cc7a053d4c6a60f926d0dfd5d2853e0df7e99684891d7b6451829b3908c3fe9ff6a320d4fcf51c0910d417e
diff --git a/games-util/lgogdownloader/lgogdownloader-3.9.ebuild b/games-util/lgogdownloader/lgogdownloader-3.9.ebuild
new file mode 100644
index 000000000000..6e34f09c1bc1
--- /dev/null
+++ b/games-util/lgogdownloader/lgogdownloader-3.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Unofficial GOG.com downloader for Linux"
+HOMEPAGE="https://sites.google.com/site/gogdownloader/"
+SRC_URI="https://github.com/Sude-/${PN}/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+
+RDEPEND=">=app-crypt/rhash-1.3.3-r2:0=
+	dev-cpp/htmlcxx:0=
+	dev-libs/boost:0=[zlib]
+	>=dev-libs/jsoncpp-1.7:0=
+	dev-libs/tinyxml2:0=
+	>=net-misc/curl-7.32:0=[ssl]
+	gui? ( dev-qt/qtwebengine:5=[widgets] )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="sys-apps/help2man
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT_GUI=$(usex gui)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	gunzip "${ED}"/usr/share/man/man1/${PN}.1.gz || die
+}
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index d396ff272c2a..7004cd614cad 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,7 +1,5 @@
 AUX lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch 307 BLAKE2B fe4f822b99f1f76ab62a669e9108b0dd724503fdbf4b26fa8f67f63da8d8cbd17a56aca18b373053c87a93603f90c99c252e213c30f133789a11b2ef2d72dcdd SHA512 f97100f240165e28bd26a0fb68125252fd4d02a8d1e5d71875aa4ab8583c835dcd15eedaf60f5b0873013bd1dd3b71f46282a008e432fb56efde7049cfe587c3
-DIST lutris_0.5.8.4.tar.xz 957004 BLAKE2B f3acce5d9ea7368063a3135c1f503e0644c1cbc7676e966c262c8e04c5e0d23b4882793fe2df1beab265ab4128e8a90b5bb69401f8e567b0cceeea3008ff4fa7 SHA512 f79a9fd06788bc28e59ad6d2c403b83f8bdeaee0116ae7fbf765e80e4e08bf760a462c71f75a2ff46739e5757cb8609f5110a51d83266d3aba2f0c91524b6df9
 DIST lutris_0.5.9.1.tar.xz 1046920 BLAKE2B 469e7707e74d957be3bb0f5f1caeaeaaf7c01dc3b998c16d8be4b4b780e408763bbe0df5c0b5f6a53ebcb3eb478aaaf25f9cf16437ae682dfcd1d2213222fa18 SHA512 a94e37d1a3f5b80353af38900f3e67763af9c0e3cc3013f7998e23ff70cb6f329730b1802f996866dac541af6e50388a5308c772e3a2ee97f87e5ae60878e7e7
-EBUILD lutris-0.5.8.4.ebuild 1874 BLAKE2B 7f5d0fde126ff51cfb149a8cb12c668cf07a883849c3934e117eeda9abc7acc5c385aca9830abf3036a3d544d6f97e968b07474bb7afef0ef04ad38fca51e1a8 SHA512 72c941a3fd1e17dcc6bef9e05b6e01abfe90bad6eea1641a717fd4a371e7e8597e2ab986725ceabefadfb41eef240129396b94150b3e65eb1c746fdf3f81890e
 EBUILD lutris-0.5.9.1.ebuild 2038 BLAKE2B 65569dc4aeae25047d15e010958237e650a557c5fa93bc1a4e95f25c38c79e63b4ac00dbdab9255edc9f14a1925643ecf502ba41555f58a799544ec42326b69d SHA512 d32735d27fbc0a31ba3ed3ec0a89aec395be1fd7f9f3e6a184ad66713fa8606364eeeb995264d78b14aa3866907be2ca24a038e508cc19db5dab29186372bbbe
 EBUILD lutris-9999.ebuild 1961 BLAKE2B 85ecbd85696a6495560ba8b407d8ba858db3a16d8719db9a27b12ba60c6a1c5bd5b40f0b7c526659353d0eed94c13376dfa444bf9c30a3e77bd83d8516ad878f SHA512 a5884d53660bea34320d308399f267e054ed720ccde5bbe5d794e9ecabcdfb3d3550c30b5944e9760925725f23e692e598d2f5cec96a1e26d74f6b0b41ce2584
 MISC metadata.xml 662 BLAKE2B 8abb7777ddfa43be8e9b039941611e9e9acc6381a0ab7c237685839ae16513df5315eb40f93391762534be56808a47694166bab8b18b9bfd7124377bde3e6e49 SHA512 74d676fa1baeb7e21a1b0466b3e67fe70f196e55a4305ca390747597ecdf60b5a8b9ffe821ce84b8a95de18c583899a6a4a513fa28a393745a5d547ea22ccf7b
diff --git a/games-util/lutris/lutris-0.5.8.4.ebuild b/games-util/lutris/lutris-0.5.8.4.ebuild
deleted file mode 100644
index b29f07d71d87..000000000000
--- a/games-util/lutris/lutris-0.5.8.4.ebuild
+++ /dev/null
@@ -1,77 +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,threads(+)"
-DISTUTILS_SINGLE_IMPL="1"
-
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="An open source gaming platform for GNU/Linux"
-HOMEPAGE="https://lutris.net/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/lutris/lutris.git"
-	inherit git-r3
-else
-	SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unzip
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/python-evdev[${PYTHON_USEDEP}]
-		dev-python/python-magic[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	')
-	gnome-base/gnome-desktop:3[introspection]
-	media-sound/fluid-soundfont
-	net-libs/libsoup
-	net-libs/webkit-gtk:4[introspection]
-	x11-apps/mesa-progs
-	x11-apps/xgamma
-	x11-apps/xrandr
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-"
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst docs/installers.rst )
-	distutils-r1_python_install_all
-	python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048
-}
-
-python_test() {
-	virtx nosetests -v
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Quote README.rst
-	elog "Lutris installations are fully automated through scripts, which can"
-	elog "be written in either JSON or YAML. The scripting syntax is described"
-	elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also"
-	elog "available online at lutris.net."
-}
diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
index 809f8239c020..222759212249 100644
--- a/games-util/nml/Manifest
+++ b/games-util/nml/Manifest
@@ -1,3 +1,3 @@
-DIST nml-0.5.3.tar.gz 532842 BLAKE2B dbd775ca8b066fd60cd8fa1a377c95d337a61ba353fa527bb45f929d13b89a41c65156cff22f8ded6526444fdc74c82987da045e6355b411a30c0593a3a39edb SHA512 518be737273af6bfff23f223d07328312c4b7e070a334d4b0ecffc303aab8257ad8b26ff3b74e992db263d446fedc3e0080573b6670f0061ca78bb933c959c6a
-EBUILD nml-0.5.3.ebuild 660 BLAKE2B 30afd8cb2ef876cb641151eee97e304e4b0d23bcd693b7ba4cd000182a31bf179e1d1cbe2c98c52d8c0566e2cdafb6ed470f6fc916568a10152733196bc53031 SHA512 0b0b83398774690b93c62814b08db2a4aa08d8449bd620a09c21b0a7bd6deaab44a895c08eb5431d7288f5925ba4b75079af7bd49309daa36a8bd66461e967d2
+DIST nml-0.6.1.tar.gz 543048 BLAKE2B c602ad37cd6a321d8e5d0a1cbac22844b2cd2f182e768972db4eb171215a4fe67f9ffe632d50c85c55d00e437dff93bec17d65a3dff2e2912bc474ce9fcc4b6c SHA512 41b1f1c256543ef42067ef3bb81dbb10771498f3dc06e6ce1b328723710380b2a6dad52b2258716b6caab3e4f17d22d57992c76e0800440b9daff5811304e016
+EBUILD nml-0.6.1.ebuild 689 BLAKE2B 93cfba7fab4d9dca7f0de72edcd076e40ba112dae917cb8e81e6232da2646ec6a0f127e0a5d8f065f8fa2c99835a6fea3c296c92a8878732433e26fd4c4121ca SHA512 2b7e25b2e7cfe80aa46beb363683ed8ccaf6faee11ad3402b36da856686bdae40bdae75feadffa87669577d70ca97dfc70dfb62602406b7ef60331e20c82f404
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-util/nml/nml-0.5.3.ebuild b/games-util/nml/nml-0.5.3.ebuild
deleted file mode 100644
index bf6acd0040b6..000000000000
--- a/games-util/nml/nml-0.5.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Compiler of NML files into GRF/NFO files"
-HOMEPAGE="https://github.com/OpenTTD/nml"
-SRC_URI="https://github.com/OpenTTD/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/pillow[zlib,${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "README.md" "docs/changelog.txt" )
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/nmlc.1
-}
diff --git a/games-util/nml/nml-0.6.1.ebuild b/games-util/nml/nml-0.6.1.ebuild
new file mode 100644
index 000000000000..a378873b7b05
--- /dev/null
+++ b/games-util/nml/nml-0.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Compiler of NML files into GRF/NFO files"
+HOMEPAGE="https://github.com/OpenTTD/nml/"
+SRC_URI="https://github.com/OpenTTD/nml/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_USEDEP},zlib]
+		dev-python/ply[${PYTHON_USEDEP}]')"
+
+src_install() {
+	local DOCS=( README.md docs/changelog.txt )
+	distutils-r1_src_install
+
+	doman docs/nmlc.1
+}
diff --git a/games-util/springlobby/Manifest b/games-util/springlobby/Manifest
deleted file mode 100644
index 8a767105a55b..000000000000
--- a/games-util/springlobby/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST springlobby-0.269.tar.bz2 4576001 BLAKE2B bd55b480c98d74bc83f99bf32148ef2be5e1f59e1539fdb432430d5e36e653e1c3d550bc7a3c996e5df029a19ea729d456f34ae3522a2a6385a0d646697e537c SHA512 32e9b5bfc72bcfccd1487621e6035e7338977f7262702cd39ec2c43734bff5b8757a97428d1207f8e6721dd450c1cddd68e43cea416503dd1987596e61e126e1
-EBUILD springlobby-0.269.ebuild 1049 BLAKE2B 5fdab39c6447599522bf3911c6fd83d31992384f244cbe3462c15bc9fb8bc254b4e29054afc9fefa722ae6add95706725bf1417a5fe59e693f83f6c4ce85ab02 SHA512 97cec0d40ea58ad54f35f5b33e61075b5772b855b705ace3d317548dbe8593f156d14d38b214052467b769aa8304453c8df5f064c66ba58feb6bd7067ca972b4
-MISC metadata.xml 864 BLAKE2B dec15b7e739435b5d3e76c98ae840926a1c846b62ffde42686a7ab9fbce325b3ea50d2399750c793ca44c187261c7fa6e94e2c8f4a73ad82e3a3c8a4a93fb745 SHA512 a57b4ec58709eea35e9d855816ecf837cc2f9c4f2ad1f8d6ab449e634ca04681a8ed77a42f81400af54dd158d3e9c6d502c3f8147975960db690f4a8d355fd0e
diff --git a/games-util/springlobby/metadata.xml b/games-util/springlobby/metadata.xml
deleted file mode 100644
index 80ef44e55181..000000000000
--- a/games-util/springlobby/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-The official lobby client for SpringRTS community games: Balanced Annihilation; Journeywar; Metal Factions; Spring:1944 World War II; Star Wars: Imperial Winter; Tech Annihilation; The Cursed; Evolution RTS; ...
-	</longdescription>
-	<longdescription lang="fr">
-Le client officiel du lobby pour les jeux de la communauté SpringRTS : Balanced Annihilation; Journeywar; Metal Factions; Spring:1944 World War II; Star Wars: Imperial Winter; Tech Annihilation; The Cursed; Evolution RTS; ...
-	</longdescription>
-	<upstream>
-		<remote-id type="github">springlobby/springlobby</remote-id>
-		<bugs-to>https://github.com/springlobby/springlobby/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/springlobby/springlobby-0.269.ebuild b/games-util/springlobby/springlobby-0.269.ebuild
deleted file mode 100644
index d35dc36a2bb7..000000000000
--- a/games-util/springlobby/springlobby-0.269.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0"
-inherit cmake xdg-utils wxwidgets
-
-DESCRIPTION="The official lobby client for SpringRTS community games"
-HOMEPAGE="https://springlobby.springrts.com"
-SRC_URI="https://springlobby.springrts.com/dl/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +libnotify +nls +sound"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	net-misc/curl
-	sys-libs/zlib[minizip]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	libnotify? ( x11-libs/libnotify )
-	sound? (
-		media-libs/alure
-		media-libs/openal
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_configure() {
-	setup-wxwidgets
-	local mycmakeargs=(
-		-DOPTION_NOTIFY=$(usex libnotify)
-		-DOPTION_SOUND=$(usex sound)
-		-DOPTION_TRANSLATION_SUPPORT=$(usex nls)
-		-DAUX_VERSION="(Gentoo,${ARCH})"
-		)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}