gentoo resync : 17.07.2021

3 files changed, 26 insertions, 22 deletions

diff --git a/games-mud/Manifest.gz b/games-mud/Manifest.gz
index 2bbb5185e137..ff26443bb226 100644
--- a/games-mud/Manifest.gz
+++ b/games-mud/Manifest.gz
diff --git a/games-mud/tkmoo/Manifest b/games-mud/tkmoo/Manifest
index ea1f303c8d33..e9d9f473ba15 100644
--- a/games-mud/tkmoo/Manifest
+++ b/games-mud/tkmoo/Manifest
@@ -1,5 +1,5 @@
 AUX 0.3.32-Makefile-noclean.patch 445 BLAKE2B d0bd081129ebf2453118215eb48cebc918484ed948cd6bec22fe20bb81140de8a4d642ee6583d496eb359f63d9cfbe8cad066a3fd299ccf47470836ef131f5f5 SHA512 0bbba363d579527b1cca8fa5c953b9724ea939b416c3681b582959f64f36e8d311e17325bc5ca21cccc02e6209ba7f3687cc26fd3b9abe390e8dfbaee9082e53
 AUX 0.3.32-keys-workaround.patch 377 BLAKE2B 568b5d06b953ab5268174dcef0a903ec33547bfb09b3da718ead97ce889025d62c8e3dc04a1135b6f4ef7c31c3c2f0e85542c8cacbb753ea7cc20a4d0e6dfa1f SHA512 2d454f251f817267482597376e4f65972d766ed8ec90ecf79c085e431c82febf27d8c286bc40c3334d1b7f248258fa6c6ca601425d6767d3d6eab93a30590a02
 DIST tkMOO-light-0.3.32.tar.gz 95332 BLAKE2B 44fd5c1476527c3b1c18e44df71b49007caeb78e1ca788c718a532c716746a9b8df3f42d616bc0384bff167a484c8585a0fe13f607810c74006810635ed1ae6c SHA512 59543692900613eae77b73f5f88a2380a77d1be38d486dc0461d0990ccb941497dd0d35aa109a5697dba3b92157d9943b540a73fe4fc0d519e144f65620443d2
-EBUILD tkmoo-0.3.32-r1.ebuild 952 BLAKE2B bbceaeff20b11c7fda1373783453188f3dc9f17ede4e1c45c2fe946c1b1a219eda89ff4d444669927b20cc17b843476d9472de017d86611524f652503808eed6 SHA512 27eae2fed3d067665079a81462a54a075920e1193060d13324eee252a9c992474af084c4d1394eb2048935764763347bb382496ac1ad164f0b0c73b844a4c947
+EBUILD tkmoo-0.3.32-r1.ebuild 992 BLAKE2B 60af3327be051e480b8fd231c78ad715ec4bca2022f368fd4b4b1bf081f4f145ff4676f0a2eb12893a4d8b83aa4183b193b871889118638d5ec7a8525cf5ad34 SHA512 aa560963a295d20e3add94a983fd697b55589a84e6f3d1c76e0a7eab144d324a4d95042723200359103eb3a605d2eefccbeeb01fd1eaf62f6e95af27ec2f5be8
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-mud/tkmoo/tkmoo-0.3.32-r1.ebuild b/games-mud/tkmoo/tkmoo-0.3.32-r1.ebuild
index 557406e7a29f..6da608115ae7 100644
--- a/games-mud/tkmoo/tkmoo-0.3.32-r1.ebuild
+++ b/games-mud/tkmoo/tkmoo-0.3.32-r1.ebuild
@@ -1,45 +1,49 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=8
+
+inherit desktop
+
+MY_P="tkMOO-light-${PV}"
 
-MY_PN=${PN/moo/MOO-light}
-MY_P=${P/moo/MOO-light}
 DESCRIPTION="MOO Client written in Tcl/Tk"
 HOMEPAGE="http://www.awns.com/tkMOO-light/"
 SRC_URI="http://www.awns.com/tkMOO-light/Source/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="tkMOO"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="
-	>=dev-lang/tcl-8.3.3:0=
-	>=dev-lang/tk-8.3.3:0="
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
+	dev-lang/tcl
+	dev-lang/tk
+"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PV}-Makefile-noclean.patch"
-		"${FILESDIR}/${PV}-keys-workaround.patch"
+	"${FILESDIR}/${PV}-keys-workaround.patch"
 )
 
 src_compile() {
-	emake \
-		WISH="$(type -P wish)" \
-		TKMOO_LIB_DIR="/usr/$(get_libdir)/${MY_PN}" \
-		TKMOO_BIN_DIR=/usr/bin
+	local myemakeargs=(
+		WISH="$(type -P wish)"
+		TKMOO_LIB_DIR="${EPREFIX}/usr/share/${PN}"
+		TKMOO_BIN_DIR="${EPREFIX}/usr/bin"
+	)
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
-	emake \
-		TKMOO_LIB_DIR="${D}/usr/$(get_libdir)/${MY_PN}" \
-		TKMOO_BIN_DIR="${D}/usr/bin" \
-		install
+	local emakeargs=(
+		TKMOO_LIB_DIR="${ED}/usr/share/${PN}"
+		TKMOO_BIN_DIR="${ED}/usr/bin"
+	)
+	emake "${emakeargs[@]}" install
+
 	dodoc README dot.tkmoolightrc bugsmail.txt
 	dosym tkMOO-lite /usr/bin/tkmoo
-	make_desktop_entry tkmoo "tkMOO"
+	make_desktop_entry tkmoo "tkMOO" applications-games
 }