gentoo resync : 15.06.2021

3 files changed, 5 insertions, 66 deletions

diff --git a/games-action/trosh/Manifest b/games-action/trosh/Manifest
index 291f5dc0f1a2..54a3e204c9cd 100644
--- a/games-action/trosh/Manifest
+++ b/games-action/trosh/Manifest
@@ -1,5 +1,4 @@
 DIST trosh-20.zip 5182303 BLAKE2B b22d0e5138c5d5ce3bbbe8e3fe8cdc732b9002d67ceccf636b93c6c48acc8a32898de978ccb752742a3be0e8e1bdee97507a469d87d30af8a493ad4104fc657c SHA512 2a8988f5715340850a61acde54403c968947d41d5f0a1ac098c4cc3959f69f150cee567933fd5148a2c23c237210c10dc58005de1bd949d6db59cd794a0003ec
 DIST trosh.png 242 BLAKE2B 3f9a2fcd08669004f40f5ade1c4f119d18b1983b2d0ff73fb61fdd9764aa9903c5b053267507ec5cc3f4a8dd5d2246df6830b96fbfaa3f536fd7cad458f09436 SHA512 85ff46c8c75b018a59a8e7dace85fc5ccf2439babedb0e4d134301eb9f7edfe5d7f4f3af1329f04257c16d978f27df38f10cb3ffbc4b424808a5f3c5c78bfc69
-EBUILD trosh-20-r1.ebuild 902 BLAKE2B c76c484f4c60c1474c0fb7dec1cab27a96383ae8d8513cfd48c88a49669d08d7215d09160c9d7f34502652bd875e43126be0e70b2b4d79de8caf8cb566ca80d1 SHA512 e7cda13fde3e0c46f6ab8520cc0d4bf4c738c6c1b5f19c360a089b0b81f5b13037c183dfea5127b96ad06aeeaf6dff61479687888202e9ee053b8eed4d1997f2
-EBUILD trosh-20-r2.ebuild 923 BLAKE2B 8c086d74910cbf6e504ee5a13e2888b399274f6d3b2852758b305ec0d5a3106f209b25e332b2a4b5899eec616747546f351461d1a2f9ec7c20769f8f041a299b SHA512 f01f2e93717a591ca16374da3f99ad8d3b0803a1de522346a0f19b2862bd94478ae6750eedc49b935aa93e3557bb9c889804744420b1fda0fe00e31eb9671ed5
+EBUILD trosh-20-r2.ebuild 785 BLAKE2B 3821d7cdfcdba786b568274b294ce76302613346c144462aabef4ff5127080172e24d3d0c25595d3628a82cd765366ad87a3726f81c18a7409dc50773ddb757d SHA512 5eb3cfe97d2817ecee7b6f0199950981423b28a613af2c7e2c081962a3aa2799e0c88036f34aa671ba4f1a98b3e2ccbf3ce26abca62d10a6aa7ccb98ef4f5067
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/trosh/trosh-20-r1.ebuild b/games-action/trosh/trosh-20-r1.ebuild
deleted file mode 100644
index 874648908a66..000000000000
--- a/games-action/trosh/trosh-20-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils gnome2-utils
-
-DESCRIPTION="A game made in 20 hours for a friend. It has explosions"
-HOMEPAGE="https://stabyourself.net/trosh/"
-SRC_URI="https://stabyourself.net/dl.php?file=trosh/trosh-linux.zip -> ${P}.zip
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=games-engines/love-0.8.0:0
-	 media-libs/devil[png]
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	local dir=/usr/share/love/${PN}
-
-	exeinto "${dir}"
-	doexe ${PN}.love
-
-	einstalldocs
-
-	doicon -s 32 "${DISTDIR}"/${PN}.png
-	make_wrapper ${PN} "love ${PN}.love" "${dir}"
-	make_desktop_entry ${PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/trosh/trosh-20-r2.ebuild b/games-action/trosh/trosh-20-r2.ebuild
index 328de7284521..a610e273eda3 100644
--- a/games-action/trosh/trosh-20-r2.ebuild
+++ b/games-action/trosh/trosh-20-r2.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=6
+EAPI=7
 
-inherit desktop eutils gnome2-utils
+inherit desktop wrapper xdg
 
 DESCRIPTION="A game made in 20 hours for a friend. It has explosions"
 HOMEPAGE="https://stabyourself.net/trosh/"
@@ -18,7 +18,7 @@ LVSLOT="0.8"
 RDEPEND="
 	games-engines/love:${LVSLOT}
 	media-libs/devil[png]"
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
@@ -34,15 +34,3 @@ src_install() {
 	make_wrapper ${PN} "love-${LVSLOT} ${PN}.love" "${dir}"
 	make_desktop_entry ${PN}
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}