gentoo resync : 15.06.2021

10 files changed, 37 insertions, 38 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 9fdcfc4abde4..60092fa87a5d 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/doge/Manifest b/games-misc/doge/Manifest
index 14f42d6ec8cc..a6dcf9ead364 100644
--- a/games-misc/doge/Manifest
+++ b/games-misc/doge/Manifest
@@ -1,3 +1,3 @@
 DIST doge-3.6.0.tar.gz 19530 BLAKE2B 016b5d90aa6c1a29ded035de2d17db4ff6470235969ade60d85c4b1d91baba14d635025308dbb072acd3a37da990a5713a281f70774226c5dca7fcad95e3d90d SHA512 6c03b32c03f2503476fdc979053a586bc62cc8f82eba4c4f4bf6d7fc4d37526b0d9fe4c0f5cd709ef983b7e3e3885e60f765bc4aafb58243ff24d92851d6a39f
-EBUILD doge-3.6.0.ebuild 471 BLAKE2B 797800fdbd64b6782b0e41b1404abc36aec652f0186ac8cb11f29ffa826ba2941f48068804ebfaf6ab5ac5164904c9aa9c12e3842fe4514e6960b3de1e43a2cc SHA512 96404385a4616a83f9c4d3d9a171352007c4794dd705c9e951b26129b303d22e6cb67456ccdcb0267311e2d3711161eae5814d29ec6b3ce7b75f1244c2be125f
+EBUILD doge-3.6.0.ebuild 473 BLAKE2B d2c92ba509517af4afc3eb8ffa4d63cfda2a78dc3e11064950c3ba5904bbc9f9e58ffb7ddb701937ded14c3619fe7099880db446573940d5986bc5bf85f949c7 SHA512 c23c113821fdeb043c94696164227d8b3e77ddffa952a4661dc92b6417378660b7025546b08dc501d4badf907d729dabe319d15474318c67d811d62d512c41ae
 MISC metadata.xml 528 BLAKE2B 9c1cef3240929138f55de955c1446017f35dd966512092aa2740a08dbc0347d9fa9080b8be46f6a35ad85cafee78425e9b4bd919039cce259b6a1ba6cbe51ad2 SHA512 3beff278b720b30a2b486c9fb0343d7017f60808f9acb2c5dbd5ad2d4f85eb2aad8c518be3f314ecd30c9d38625b6d12d772de83f201156df471f7f5cc4c8b2e
diff --git a/games-misc/doge/doge-3.6.0.ebuild b/games-misc/doge/doge-3.6.0.ebuild
index 1d3574713695..15f741213378 100644
--- a/games-misc/doge/doge-3.6.0.ebuild
+++ b/games-misc/doge/doge-3.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/games-misc/nyancat/Manifest b/games-misc/nyancat/Manifest
index ba4afcfd6fa2..cda67e768e6c 100644
--- a/games-misc/nyancat/Manifest
+++ b/games-misc/nyancat/Manifest
@@ -1,3 +1,3 @@
-DIST nyancat-1.5.1.tar.gz 15124 BLAKE2B 31786fc61b8988bd89c398a711f4eec299995f80b86eed674b10dd7fe30219ea32fefc2b32d8b952ead9fa83b131f0a41dfcabc0b23e88bd424097f54f6c5dd3 SHA512 0a45bd0b1a9b9f85650a986c7f9f8120441f6b0bd346281fb44a5470382484738e660dffe17b95088332c50b6aed3feb4b2f949f15f37dd9c1b1885f345e157d
-EBUILD nyancat-1.5.1.ebuild 447 BLAKE2B c9b42f266dccddc1a3c798b77a4a3e13f7db5022178db3b591c4658d964bff1104b8a1179f666ccaa6a340476abffe78a7e04c462ded9e8f3cb93428a7188817 SHA512 73ea95222930083ea5c8fd04599e9482883b9e3cd450c17390b5bf3d6fda4ea34cbdaad53d24f7dc64aae22271f1b6e675ea533da4b442dfa138b02f88449df4
+DIST nyancat-1.5.2.tar.gz 15126 BLAKE2B 4c197c7d630edc7184b57fd2b33fb422a69120e2db2994bc326e772278bca9fa1cc8a837da747bc7a9114090d43133ad48e22ed3319fc92485f82c1e7b5e67b9 SHA512 8eee5da8afacdbe8b6b5f66686c101d42da26ef6c172e6b43b6042e1bacf7dfb5668e006cbbe675aca523b567eea57404af5b5bb6d654d137951e06c9a75463a
+EBUILD nyancat-1.5.2.ebuild 551 BLAKE2B c5656bb01f98178be6549dcb6435c3d019411e09c9f4b8ed7b17278c4ab238b60e54b552b4f4526f02eb465ed04bf107f15aef7b4d58f2cce7a3c6dc780a2cd1 SHA512 723db40964d70b8999860398487d0baedc9682ed17f03e7f10d426f5051bd8cf31ff2e88f6e2e6f636127943d0adcae39db34725bf6285b6b7e53772b15ba839
 MISC metadata.xml 332 BLAKE2B 92b138477f6822f831a4f027ff627befca39076e0890a8231fd76138ef20fa51bb08a77df26e7d1e8601083bd8ddd8f490f922e98fb0116cfe2381063e8acb5e SHA512 fe9cf0cf1505d199791e8ce6dad5b872952d767ace796962d3d6e61d93482f7d5ec9fe671d52ad24b1ead7c92eed601dc03a921029bea6069b152be74ee730da
diff --git a/games-misc/nyancat/nyancat-1.5.1.ebuild b/games-misc/nyancat/nyancat-1.5.1.ebuild
deleted file mode 100644
index 68300e1ed278..000000000000
--- a/games-misc/nyancat/nyancat-1.5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Nyan Cat Telnet Server"
-HOMEPAGE="https://github.com/klange/nyancat"
-SRC_URI="https://github.com/klange/nyancat/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS} ${CFLAGS}"
-}
-
-src_install() {
-	dobin src/${PN}
-	dodoc README.md
-}
diff --git a/games-misc/nyancat/nyancat-1.5.2.ebuild b/games-misc/nyancat/nyancat-1.5.2.ebuild
new file mode 100644
index 000000000000..19dce0d65b5a
--- /dev/null
+++ b/games-misc/nyancat/nyancat-1.5.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Nyancat in your terminal, rendered through ANSI escape sequences"
+HOMEPAGE="https://nyancat.dakko.us/"
+SRC_URI="https://github.com/klange/nyancat/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin src/${PN}
+	doman ${PN}.1
+	einstalldocs
+	systemd_dounit systemd/${PN}{.socket,@.service}
+}
diff --git a/games-misc/usolitaire/Manifest b/games-misc/usolitaire/Manifest
index 4363439a5b87..5939a58c1a8a 100644
--- a/games-misc/usolitaire/Manifest
+++ b/games-misc/usolitaire/Manifest
@@ -1,3 +1,3 @@
 DIST usolitaire-0.2.1.tar.gz 118199 BLAKE2B 99b828d8aeb91897f5d070250a20c1a5f9b49b3be889781dcc3f2348e8f4946fde3ad07d915d87cbd309b2fa6b87777ab8ecd1bfaf65d76bc6989e36a0263785 SHA512 5bd7b222643e2decfc6e1f7749b8632bb0b99f5af28d49088f28746b8ffbd07443855b557e969f40f427ca71f8d2ac9386d8d90c2121880eb8bce5e3b5d4f4f4
-EBUILD usolitaire-0.2.1.ebuild 509 BLAKE2B 07a169a52b213471d2ea6e81eec4e4eaed1710c2748aaeec04724d44613c1e5246445730f6d77c2ecdd3b6a759a1b007461ae6d5bbcbd8c22fdd0893a707ed3f SHA512 784f39d045c87c70d8b0816cedebaccf20d9eedd276c358d70e65325f8e355bd863253222189e7a8c7c0f4c35acc7fd361ff74b520d1ae548a5d4bd77f569c31
+EBUILD usolitaire-0.2.1.ebuild 475 BLAKE2B d06343dda1175238ef24a6f34c8e299e75956e52e72de81a05b68ffc43bed1f9dd80f56d3b9258da9655bcc452869e92c32fef0a82f6aff36ac414bf87917c23 SHA512 21a82b1a201000f04a6aa6d8c227470c95e4d748d89a25050f68f618c513bd60a832d38342c3d2ee42bf887a472257409c973ef6bc6e6b0dc651c5399d6b0ffc
 MISC metadata.xml 413 BLAKE2B 0376b5f01922a8bd36d48d3525c9fdd1659ff1a936a7fda8fe0af3ce7ff669b603d80e560bb02bf690cf77f5fc6ddd830c1cf4d76942fee38e6fa3e6c539c861 SHA512 88efad0cf6e816ef512ca7d821cba3bcfdb3c81f2e54d26458a139a876631703f2a147077b077ab7c1dca74fd05a58a8b003db14625175bd3fb9e9545f6c103b
diff --git a/games-misc/usolitaire/usolitaire-0.2.1.ebuild b/games-misc/usolitaire/usolitaire-0.2.1.ebuild
index fb6bb7eba4c5..2ed15f3eace4 100644
--- a/games-misc/usolitaire/usolitaire-0.2.1.ebuild
+++ b/games-misc/usolitaire/usolitaire-0.2.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
-
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="solitaire in your terminal"
@@ -15,9 +14,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	dev-python/urwid[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]"
 
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+distutils_enable_tests pytest
diff --git a/games-misc/wtf/Manifest b/games-misc/wtf/Manifest
index b1c2a7446007..12532abceb88 100644
--- a/games-misc/wtf/Manifest
+++ b/games-misc/wtf/Manifest
@@ -1,3 +1,3 @@
-DIST wtf-20210130.tar.gz 30840 BLAKE2B 7f959b98495a302d736064d75b63f0847c59b128320b5761efa2b9e13f80e5204e64dfb50c612081b21e5ff00c2782e5a949eb514dc4e5c0d7036ac46918d9e2 SHA512 6cd71f3e5d8a2b40509634717f977cfe1f1b366acb1bfd7a942942af1e8e639ee3ad192a5e4a9d7dd668010dea0172b5966bc2f1667bc497a92773b09c99b973
-EBUILD wtf-20210130.ebuild 622 BLAKE2B dd732822d4c7c68a1d58dfc2ffff643c5fbeff4c3582a80987c38b89298eb5246ab0f63e9cabcad37e1b31be8886ccd0c4e41dc71d463e8be7ce39d3dd4bb2a1 SHA512 1ee907620c4d9f6ba2608e7549460cfeac93b6e653ba5f6ec6d634c680c6074ea21aff8a334e05c573621ae8d9997c6653d4f2751ab28f9fb456c40e9fb23b1f
+DIST wtf-20210416.tar.gz 30867 BLAKE2B 106e6637bcbbbe30d19f5ae9718032c769ebf21c2f394b32f12e5799401b7a94b3f5029a45afea38b76c7e39df558e03b8dbd86cf5f1823ef53ac3ddd10df77d SHA512 9473759b1cae2750d85201938084e44abf1a061c1c12a0275aad0bf7ba47f5702e799802bcff8716c9b82d740123bbacb0ed335666983295c9a5792a1148a3ea
+EBUILD wtf-20210416.ebuild 622 BLAKE2B dd732822d4c7c68a1d58dfc2ffff643c5fbeff4c3582a80987c38b89298eb5246ab0f63e9cabcad37e1b31be8886ccd0c4e41dc71d463e8be7ce39d3dd4bb2a1 SHA512 1ee907620c4d9f6ba2608e7549460cfeac93b6e653ba5f6ec6d634c680c6074ea21aff8a334e05c573621ae8d9997c6653d4f2751ab28f9fb456c40e9fb23b1f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/wtf/wtf-20210130.ebuild b/games-misc/wtf/wtf-20210416.ebuild
index ac5ded279abd..ac5ded279abd 100644
--- a/games-misc/wtf/wtf-20210130.ebuild
+++ b/games-misc/wtf/wtf-20210416.ebuild