gentoo resync : 17.06.2021

3 files changed, 7 insertions, 68 deletions

diff --git a/games-arcade/mrrescue/Manifest b/games-arcade/mrrescue/Manifest
index d384e7871379..5740fa9a5b1c 100644
--- a/games-arcade/mrrescue/Manifest
+++ b/games-arcade/mrrescue/Manifest
@@ -1,5 +1,4 @@
 DIST mrrescue-1.02b-love.zip 11874167 BLAKE2B fce98b602fa276fb922671e6f197d7ad2f7d50539efe2a8c6dcb99b1e904a17039559b7390717ad7be443c291ca37296214a5efb93fa02b9db979a87db75c408 SHA512 24186570c89694889c1d9f17522dd201f20bae2c43237f366397065a7023c89bab3bb9cdc6677cf09bc7cbeaf9926710a3db15818eee9ce8024fedbfcb8fb516
 DIST mrrescue.png 4738 BLAKE2B ca440b008c8870f822c52778aa2ee5eb78a5ec318f133b9d3deba990c49870bcc69d2d6638b3072baedd8cfa27d1ec8a2fc320eda3da643ce2d022a4aff540c7 SHA512 9395e239e300397ed791573758242d75003caaf8c1d66c4f7a0299114ee4f1b40376bb2d532ed4a02fa97f773408ad5ef00ba228ee976fd30ddaa2f60ea80b9c
-EBUILD mrrescue-1.02b-r1.ebuild 938 BLAKE2B a5563ec561c952bca1ee7a451a82e972c3c26bd38158f93bbdb8f0f0352ee2bea18c31b9c506128309fbc48757f1455d28d1000328a24769d094ceee4131e111 SHA512 5aaa9972f594793dcb614f4cd5613ea888b3158b2732dd88c419025c21e4e43d68c26d099f403414d839f08a67286a36ea5c17570ffb0f9f6a1ebc74577728da
-EBUILD mrrescue-1.02b-r2.ebuild 969 BLAKE2B d3c100d83b9776fae34a1db34e25b6a9429d28ea39be292867e8dbe289d46d2a58c88fc82088eebf13b768bb76498d2788f00cc99d86f75ec17a94419bf10f7e SHA512 f977f425d65f223a4cb5be393088005a0bc26e397d49104150d973fde945ad5089e5c6b9c738b9262604ef5fd73de713fb423c14e73347adefd062158690ff36
+EBUILD mrrescue-1.02b-r2.ebuild 795 BLAKE2B 093daa18d5c3f438c547b79ce982b3b4fdd18e2ea3b705a8e2cfe1a9c4743c6351a12669e2d689eb6c7a6952a518a5ec934cc27a5928c0f5586f9dfff6a9def4 SHA512 98cde1afb3615e00b49cded58f34dc744a58a99fc0ae20d601b383c4ebad3efd68a0170d8e1074667f66449e1a698f8fa56b2710d7275d204a7fade7b9f08c7a
 MISC metadata.xml 338 BLAKE2B d2f1a16a96f9ca0b31afedba78fec26f446d2a5d8a1984e6040059cf6e62749fc52806089c0d35c5bd08bbe720cc21be6c0c0f8e81dd5d32d5cebae0624a0d18 SHA512 91e9e003edb4f15c5cb51d1ec9e70941155bb7efc4de7d34272e4c3254e27e59081bb0c843909b0831c1888df4051ca9d8315f7f7251c4d3342dcdd7007daa16
diff --git a/games-arcade/mrrescue/mrrescue-1.02b-r1.ebuild b/games-arcade/mrrescue/mrrescue-1.02b-r1.ebuild
deleted file mode 100644
index 88feab502d79..000000000000
--- a/games-arcade/mrrescue/mrrescue-1.02b-r1.ebuild
+++ /dev/null
@@ -1,46 +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="Arcade 2d action game based around evacuating civilians from burning buildings"
-HOMEPAGE="https://tangramgames.dk/games/mrrescue/"
-SRC_URI="https://github.com/SimonLarsen/mrrescue/releases/download/v${PV}/${P}-love.zip
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
-
-LICENSE="CC-BY-SA-3.0 MIT ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="games-engines/love:0"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${P}-love"
-
-src_install() {
-	local dir=/usr/share/love/${PN}
-
-	exeinto "${dir}"
-	doexe ${PN}.love
-
-	einstalldocs
-
-	doicon -s 64 "${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-arcade/mrrescue/mrrescue-1.02b-r2.ebuild b/games-arcade/mrrescue/mrrescue-1.02b-r2.ebuild
index b770ad759c89..a34d56ef3213 100644
--- a/games-arcade/mrrescue/mrrescue-1.02b-r2.ebuild
+++ b/games-arcade/mrrescue/mrrescue-1.02b-r2.ebuild
@@ -1,25 +1,23 @@
-# 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="Arcade 2d action game based around evacuating civilians from burning buildings"
 HOMEPAGE="https://tangramgames.dk/games/mrrescue/"
 SRC_URI="https://github.com/SimonLarsen/mrrescue/releases/download/v${PV}/${P}-love.zip
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
+	mirror://gentoo/${PN}.png"
+S="${WORKDIR}/${P}-love"
 
 LICENSE="CC-BY-SA-3.0 MIT ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 LVSLOT="0.8"
 RDEPEND="games-engines/love:${LVSLOT}"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${P}-love"
+BDEPEND="app-arch/unzip"
 
 src_install() {
 	local dir=/usr/share/love/${PN}
@@ -33,15 +31,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
-}