gentoo resync : 20.03.2022

3 files changed, 31 insertions, 34 deletions

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
+}