gentoo resync : 17.06.2021

16 files changed, 139 insertions, 188 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 27ea0218328a..400da2e868ea 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/abe/Manifest b/games-arcade/abe/Manifest
index c38d779980d8..9b16e885abcd 100644
--- a/games-arcade/abe/Manifest
+++ b/games-arcade/abe/Manifest
@@ -1,7 +1,7 @@
-AUX abe-1.1-doublefree.patch 250 BLAKE2B 8d39ae1dd2ba1cc77f3bddc726f6811c232ee30a094531b394e54e6be96af73e280ee4934344d980a7638a545e0e1817ff7b6296f3820475e3394f2b546228eb SHA512 ca3091783c409a02a0aedf22e41829ff9198b2385cf474f9b365d4acdc2806a1ee952741816df7e658e5c48282b45d5e7577db9def01eb24448d5c579c5985ca
-AUX abe-1.1-format-security.patch 2601 BLAKE2B b918881d0de19eafca8da7a9cc47efdc52bfdc68e5f5c75591093db3045fe2bd47872b0f7e73b3c734de49e38b6d45ec9b268c60bfe14cf0690bac321469232e SHA512 9750a765fc46d70c9b322a7ddc363b4680a6f16ebc9a9ccd0c164d7cb61fa4618969db31d9fdf26d5fa993ac2a285db09a67563c5b286131981bc7f3e9a37712
-AUX abe-1.1-format.patch 506 BLAKE2B 9c91f56e58701d26b3a5809b6a764bd1acc38f4628849171f06d61e2eec1f9ffb3076f0e35c4dd26199f110c679a8c66c4a05d297a1d62d3845cb28e47ee642c SHA512 e0ddbaad3034ab28198ddf8fd7cbebc0648c1a4d30e4d597c90fe3c9327194de579da92d5acbd1a6ab99a50f11c8967f4a5cdda00776f404175f060f8e210c24
-AUX abe-1.1-settings.patch 336 BLAKE2B 093ab417049ce54d012557fd7df9dc59ebd6e6095b0983d465aba0813ae6bfbd2c1c76e5d82bd734481781289c26619ef4bd4cb3651b08655030d36adbb35e4e SHA512 a609ec800165859854a132cca4dc1a12407746b832eae2326889212bcf155076f89ceb980e9cf6c678cdd9f160368c915e617d72b7d26bde2ec7fb23a7c05218
+AUX abe-1.1-doublefree.patch 267 BLAKE2B 67b66d4bbca2cfc18630ad7bc9c456e7737a442566049e614676744d83e1fc6d0811b9adb82d9ea715ccfbb70bfadf94b3b111755083fd855dc10775f64bf4e6 SHA512 d6eb436272c3b14cdeb543ca7379c07f656478788e0cc189e31332cf077e1bc0def4efdbfff79c63b825ba32efa428d1b9bb21d14fb31b0eeec75007b004951a
+AUX abe-1.1-format-security.patch 2571 BLAKE2B b8c4ffb1db42b6f5fcf0881d3b1ebac4d35da3d9c5922964ed4cf14c34e0df2488505b2be675a6d0c96621d1abb3a31dc14652d942d3e534314ebaa80fc6bc75 SHA512 94523134c4ad3bb840d9dd8fd216e16a60912c7d82c975c860a15c8cf82a5f8c3c796863926e19b1c82eabbfb15089f2a144142c92a64d3effb768b55dd57204
+AUX abe-1.1-format.patch 539 BLAKE2B 21ca61c24861ed4daace9fa9b87eba30154e5287f0798141f3edafb0db1b5a3014c825aab225a9c146dcbbebb34baa89c660f8e11b3db4d8bdebd1d45953cfd3 SHA512 3a366be92a54b5727bae3783be38550d77efb289f39bc0bb9b6be0a8516f0e28db6b0c7aac84c9a96c3115f2d350681abab26514f9bea434a2b1d9446d1069ba
+AUX abe-1.1-settings.patch 289 BLAKE2B e4500e3a13b9f9e73f6dc27c7eae887d922dc71124bf12f934ed576a2d21cd73eb876e144f944d974a8a0422c902e0962fb58eefd71c0e388fa9fa768e109eb6 SHA512 f6feb687ab7c658dd5a084b75ff300f3ff755959cf0aee8d0859a008d37d90a82715b405fba45b5c5d8538f4df2fd0ea52c77cd2b9c7cd3b1c3774cb3b2e7aa6
 DIST abe-1.1.tar.gz 3321075 BLAKE2B 2ab51bd9103e8954bbc27eceb81b4bb845ec84ee249f21aaefdc59df87689f865d3b62a8c2db9584b8361303028174b1a96b60e0caf88ee857f8ad0d3cd3d920 SHA512 6106fce9c72554596ac3f94551326381e98c0d40f7a5aa8ae7aeadaa234c113733e8df717bd1b18d2ba835f689982e859607c9d88ab2d59790ec00833a4e48c7
-EBUILD abe-1.1-r1.ebuild 1483 BLAKE2B 03c1fcf92b858d6ea82a7c27a50be6f63c33ee516f48114cb5f3b1ceb55d0693eb962aba581536aacc70a1830cb78acb28608f47e55494fd783cec5b90810f17 SHA512 d8ed339e87e23c6eeda805b15d978988a01d1c881dd6d7de770e9e26b5cd6d352ec20a335e0a24ad06337d5d78a3dfc498c0e754d076adfe2ef59132c22b02f6
+EBUILD abe-1.1-r1.ebuild 994 BLAKE2B 7f96af52d6c9348d46e0959d83b118c6e246bf28cd12775c0716cb0acc2f5a9c874f1034cf213a2146eac24376cd77ff8b3a4b37a6ff037b03a59705566167be SHA512 53de8b68aca883f63aa756bfb4dcb87e8cdae302c7daf32ddfcc06521c2c53d58bc5185da9a2deae7bec3b75a930e68f61be499cbd647070b35f0661277a38f8
 MISC metadata.xml 326 BLAKE2B a19b06620dabc908c6b71603bf229a0bbfb5fc8cd604580394c13ddd522ef52261985942321a18b8ce643fee8ad5ff15c915aac3861264111f4dcbefe8406d56 SHA512 85695bf3253d22818b913db2dad61277afe8062258c1b5b80ab9604261304b9f5dd39a50a9565ee4361ea793eff0fa23562c4a20bb9ea63a3296514c33ec1788
diff --git a/games-arcade/abe/abe-1.1-r1.ebuild b/games-arcade/abe/abe-1.1-r1.ebuild
index 9e2dbd751738..db902811eb95 100644
--- a/games-arcade/abe/abe-1.1-r1.ebuild
+++ b/games-arcade/abe/abe-1.1-r1.ebuild
@@ -1,64 +1,50 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit desktop toolchain-funcs
 
-DESCRIPTION="A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game"
+DESCRIPTION="Scrolling, platform-jumping, key-collecting, ancient pyramid exploring game"
 HOMEPAGE="http://abe.sourceforge.net/"
 SRC_URI="mirror://sourceforge/abe/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	x11-libs/libXi
-	media-libs/sdl-mixer[vorbis]"
-RDEPEND=${DEPEND}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unpack ./images/images.tar
-}
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer[vorbis]
+	x11-libs/libXi"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
-	# From Fedora:
-	# Enable changing the video settings.  Sent upstream 2 Apr 2006:
-	# https://sourceforge.net/p/abe/bugs/1/
 	"${FILESDIR}"/${P}-settings.patch
-
-	# Fix a double free() bug.  Sent upstream 15 Mar 2011:
-	# https://sourceforge.net/p/abe/patches/1/
 	"${FILESDIR}"/${P}-doublefree.patch
-
-	# Fix an incorrect printf format specifier.  Sent upstream 15 Mar 2011:
-	# https://sourceforge.net/p/abe/patches/2/
 	"${FILESDIR}"/${P}-format.patch
-
-	# Fix build failure with -Werror=format-security
 	"${FILESDIR}"/${P}-format-security.patch
 )
 
 src_prepare() {
 	default
-	sed -i \
-		-e "/^TR_CFLAGS/d" \
-		-e "/^TR_CXXFLAGS/d" \
-		configure || die
+
+	sed -i '/^TR_CFLAGS/d;/^TR_CXXFLAGS/d' configure || die
 }
 
 src_configure() {
-	econf --with-data-dir=/usr/share/${PN}
+	tc-export CC CXX
+
+	econf --with-data-dir="${EPREFIX}"/usr/share/${PN}
 }
 
 src_install() {
 	dobin src/abe
+
 	insinto /usr/share/${PN}
-	doins -r images sounds maps
-	newicon tom1.bmp abe.bmp
-	make_desktop_entry abe "Abe's Amazing Adventure" /usr/share/pixmaps/abe.bmp
+	doins -r images maps sounds
+
+	make_desktop_entry abe "Abe's Amazing Adventure" applications-games
+
 	einstalldocs
 }
diff --git a/games-arcade/abe/files/abe-1.1-doublefree.patch b/games-arcade/abe/files/abe-1.1-doublefree.patch
index ce7389d97100..82d49031844c 100644
--- a/games-arcade/abe/files/abe-1.1-doublefree.patch
+++ b/games-arcade/abe/files/abe-1.1-doublefree.patch
@@ -1,5 +1,7 @@
---- a/src/Main.c.orig	2005-03-05 09:20:04.000000000 -0700
-+++ b/src/Main.c	2011-03-14 10:08:31.846413904 -0600
+Fix a double free() bug.  Sent upstream 15 Mar 2011:
+https://sourceforge.net/p/abe/patches/1/
+--- a/src/Main.c
++++ b/src/Main.c
 @@ -35,8 +35,6 @@
      for(i = 0; modes[i]; ++i)
        printf("\t%d x %d\n", modes[i]->w, modes[i]->h);
diff --git a/games-arcade/abe/files/abe-1.1-format-security.patch b/games-arcade/abe/files/abe-1.1-format-security.patch
index ad88b4b60486..9f98b080f53d 100644
--- a/games-arcade/abe/files/abe-1.1-format-security.patch
+++ b/games-arcade/abe/files/abe-1.1-format-security.patch
@@ -1,5 +1,6 @@
---- ./src/Game.c.orig	2005-03-05 09:20:04.000000000 -0700
-+++ ./src/Game.c	2013-11-20 12:30:00.000000000 -0700
+Fix build failure with -Werror=format-security
+--- ./src/Game.c
++++ ./src/Game.c
 @@ -6,21 +6,14 @@ Game game;
  
  // path_sprintf should not be used by other .c files, as it does not fit for them.
diff --git a/games-arcade/abe/files/abe-1.1-format.patch b/games-arcade/abe/files/abe-1.1-format.patch
index 529534745712..eed86f83483d 100644
--- a/games-arcade/abe/files/abe-1.1-format.patch
+++ b/games-arcade/abe/files/abe-1.1-format.patch
@@ -1,5 +1,7 @@
---- a/src/MapIO.c.orig	2005-03-05 09:20:04.000000000 -0700
-+++ b/src/MapIO.c	2011-03-14 10:15:33.166949366 -0600
+Fix an incorrect printf format specifier. Sent upstream 15 Mar 2011:
+https://sourceforge.net/p/abe/patches/2/
+--- a/src/MapIO.c
++++ b/src/MapIO.c
 @@ -93,7 +93,7 @@
    // compression step 1: read compressed data from disk
    // FIXME: what would be nicer is to only allocate as much mem as used on disk.
diff --git a/games-arcade/abe/files/abe-1.1-settings.patch b/games-arcade/abe/files/abe-1.1-settings.patch
index ea5809f7386a..c0471a03388a 100644
--- a/games-arcade/abe/files/abe-1.1-settings.patch
+++ b/games-arcade/abe/files/abe-1.1-settings.patch
@@ -1,6 +1,8 @@
-diff -Naur --exclude '*.swp' abe-1.1/src/Menu.c abe-1.1.new/src/Menu.c
---- abe-1.1/src/Menu.c	2005-03-05 08:20:04.000000000 -0800
-+++ abe-1.1.new/src/Menu.c	2006-04-02 15:04:37.000000000 -0700
+From Fedora:
+Enable changing the video settings.Sent upstream 2 Apr 2006:
+https://sourceforge.net/p/abe/bugs/1/
+--- a/src/Menu.c
++++ b/src/Menu.c
 @@ -116,7 +116,7 @@
    if(n == SOUND_ENABLED || n == MUSIC_ENABLED)
      return sound_loaded;
diff --git a/games-arcade/kajaani-kombat/Manifest b/games-arcade/kajaani-kombat/Manifest
index e4caaeab3c04..de047f54ec2b 100644
--- a/games-arcade/kajaani-kombat/Manifest
+++ b/games-arcade/kajaani-kombat/Manifest
@@ -1,5 +1,6 @@
 AUX 0.7-makefile.patch 551 BLAKE2B 4b301ca00a4643f00654e81f3a4396d43106bc2f0f5bbae98d71818a3559472607358a6dd9c2b77a9def3c7772df2ad6ae59e33529de368474b9c4a33a9fee77 SHA512 4d319affec25fe585c0f0af14ed872e71b155be2bab3aabbb72ad01b80395f44b35b13abc765390e19e070305339322598942fa1997463632ee07f4a160ba823
+AUX kajaani-kombat-0.7-gcc11.patch 778 BLAKE2B 95e3b7482729aa7cae0c58e795ebf72b6eb08970eea3151c8480eefbd6dcf7e2c13acccc83cf7737aa66b8652d801038a1f32d721a71cdfc80e4539fbbb4e162 SHA512 d55d1e88165ef35b97a29645e4cdf393c76bf93cebf12446e01578934cfbb7dc79672610469240d0e62562ce7ac8aa7646c0d47baccaa95de8870bfd9765c371
 AUX kajaani-kombat-0.7-ldflags.patch 440 BLAKE2B f63321ed06c0ed26cfe28a1a62650ce9b9b37b29898961fb08b58b5119b023c3335798e36130ad144569c2996e7c4f188caf9cadc3d4a37c01a3bb03bd39d11d SHA512 30a8e6293349a30f6dbcc469fb14377d9461df60227e01d18dfc267f254be62b7cee89bcb6df0b24ec5bcb9cb198701e5b9e0d465f699be4880432a0402b2c71
 DIST kajaani-kombat-0.7.tar.gz 1805504 BLAKE2B 664210a44e5dd5b27ca7b47ca9cb9445373d1243c01fcfb227251c6b48fb8b9e2ebd608eec2244f1b12f47bf5c886482bf70a0700538bbf415d93df41c34fcfe SHA512 84f6923b73c9529fa600c533b5a3de9ea9411f81060c5ad9fb85346fa17c9cb70bf6ba8222319e123372b01286a11b40bb355e8ef8c9bec95cd98f4d0e0460cb
-EBUILD kajaani-kombat-0.7-r1.ebuild 929 BLAKE2B 932dbd1284f76c603448d7f8c29caad55684046d8b87f11f8b3c96600ad726d5a2ed1b86c15e53ff88f81b6f84745b7d36185dc7e48330a96abc36dc43a76514 SHA512 450fe189118c1181ec5ee9f3fca370bc7cebdcf026059ab60613c792e00924b8c74b6c84d22495e4500a411daf16d8a0a7025644aae0710e2a35216bd7131881
+EBUILD kajaani-kombat-0.7-r2.ebuild 998 BLAKE2B 98ab5fe720ddb1cc29ea11a53f673e8ebc4844a7f77236331ad891e184c2e9ceb37551f95e6b5feabe072e4787af260dbd920f86e209bbaecbdf8f4f1ae6172b SHA512 9e8c82324ba87c79a6a7cfe78a6d187214a5333451236e5b850830988efcbedf651f4d754531e8276738831920ea4b8000a29489d609c8a6efc9bb22f9c6e556
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch
new file mode 100644
index 000000000000..9a3968fcf83f
--- /dev/null
+++ b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch
@@ -0,0 +1,31 @@
+These SDL_* return NULL on error, and gcc11/clang won't allow this.
+https://bugs.gentoo.org/739086
+--- a/client_net.cpp
++++ b/client_net.cpp
+@@ -33,3 +33,3 @@
+   cond = SDL_CreateCond();
+-  if (cond <0)
++  if (!cond)
+     {
+@@ -39,3 +39,3 @@
+   mutex = SDL_CreateMutex();
+-  if (mutex < 0)
++  if (!mutex)
+     {
+@@ -47,3 +47,3 @@
+   trans_th = SDL_CreateThread (&client_tcpnet::transf_func, (void *) this);
+-  if (trans_th < 0)
++  if (!trans_th)
+     {
+@@ -53,3 +53,3 @@
+   input_th = SDL_CreateThread (&client_tcpnet::input_func, (void *) this);
+-  if (input_th < 0)
++  if (!input_th)
+     {
+--- a/game_server.cpp
++++ b/game_server.cpp
+@@ -66,3 +66,3 @@
+   con_th = SDL_CreateThread (&game_server::connection_accepter, (void *) this);
+-  if (con_th < 0)
++  if (!con_th)
+     {
diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
deleted file mode 100644
index f61f69728cac..000000000000
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop toolchain-funcs
-
-DESCRIPTION="A rampart-like game set in space"
-HOMEPAGE="http://kombat.kajaani.net/"
-SRC_URI="http://kombat.kajaani.net/dl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-net
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]
-	sys-libs/ncurses:0
-	sys-libs/readline:0
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-makefile.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:GENTOODIR:/usr/share/${PN}/:" \
-		Makefile || die
-	sed -i \
-		-e 's/IMG_Load/img_load/' \
-		gui_screens.cpp || die
-
-	tc-export CXX
-}
-
-src_install() {
-	dobin kajaani-kombat
-	insinto "/usr/share/${PN}"
-	doins *.{png,ttf,ogg}
-	einstalldocs
-	doman kajaani-kombat.6
-}
diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild
new file mode 100644
index 000000000000..6c34c9d2c9d8
--- /dev/null
+++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Rampart-like game set in space"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="BitstreamVera GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	sys-libs/ncurses:=
+	sys-libs/readline:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-makefile.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-gcc11.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "s|GENTOODIR|${EPREFIX}/usr/share/${PN}/|" Makefile || die
+
+	tc-export CXX
+	append-cxxflags -std=c++14 #790743
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.6
+
+	insinto /usr/share/${PN}
+	doins *.{ogg,png,ttf}
+
+	make_desktop_entry ${PN} "Kajaani Kombat" applications-games
+
+	einstalldocs
+}
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
-}
diff --git a/games-arcade/notpacman/Manifest b/games-arcade/notpacman/Manifest
index 05ebad471ab7..c2d0313ca593 100644
--- a/games-arcade/notpacman/Manifest
+++ b/games-arcade/notpacman/Manifest
@@ -1,4 +1,4 @@
 DIST notpacman-1.0.4.zip 439775 BLAKE2B 223017b71220330167d948c46649ea6b98f6a0b165a2879c348ca5e20ce4ba0b60af6486a598bfd2b327b2e32bb9ff1f70e005b90395b1d0cc50c5d23ad8294a SHA512 c64d74cad972c22fe7674b55c0155fcd6e0176c580f53645a0cef7ae1e2c3453807f13fd9bbc9992cdc1176bc1687800f957ef5c11034a2ffe0774ec0118a863
 DIST notpacman.png 1556 BLAKE2B d745ece089b9d829a47202e0e5d9a0cc4bd7365625fd0771b44d28c59d14ac903df586ec395c08a84115bf50e5842b6749239e37ec246fe6d112092db8aa541d SHA512 38fca81429255a5857476cbbcccb188ae4cc7fae4c044b45d82206ffcb41da5737e20135be2a6ab15ec1ff5faa74e5208a33a4966b3e9e99293c0ccb276b0c1b
-EBUILD notpacman-1.0.4-r1.ebuild 941 BLAKE2B 8fbacfa0a9997ea671142160dff6d39fa28824be060f46c2b38ebc8e74057732c2544c37423f7be65f88596d1a3661878de393664b8f22448494eee8442308c6 SHA512 1e34ab5b7c18703b4e3c138994de4cdd0381ff336e0af62a716ac280c6512f99226857cf93d943bd5ae044c756e482b43c9b8c6c76aa94a09d51151789d6507f
+EBUILD notpacman-1.0.4-r1.ebuild 798 BLAKE2B d4c22707340c650e1f49774c91f3b24c4032a331042d65f8dbbcb910042c5f0f5281417337d51d109ac852d458e78652139476cc4f7b510a94c9e3d7daf3b5c2 SHA512 628be3a6251278821f8ed6a4a58e8aa21ca8814e17a9c20c5e94ed012e0d645e88f6e228faa193f3b925ea9432a200adefdf33f8e9aa4824c7847469029214fb
 MISC metadata.xml 642 BLAKE2B 4be7dc3ed30e6fb7af83b8aa2a3cd862c1a7f7e76a97d32fc73485b7b691b77ae0908ff48a986b2e636f39271daf5ab324832046fa869ef3deb1b445da492b60 SHA512 171e756db4c5639b7855c5715fd394ab9c7f8c84a5720257a4655673cbe5f91a3664796bd5f64f52a3f687fad0513c2542df4939b43436a42d80bae99fc2e723
diff --git a/games-arcade/notpacman/notpacman-1.0.4-r1.ebuild b/games-arcade/notpacman/notpacman-1.0.4-r1.ebuild
index 26472c8d2172..de7d45a2d9cd 100644
--- a/games-arcade/notpacman/notpacman-1.0.4-r1.ebuild
+++ b/games-arcade/notpacman/notpacman-1.0.4-r1.ebuild
@@ -1,14 +1,15 @@
-# 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 mashup of \"Not\" and \"Pacman\""
+DESCRIPTION="Mashup of \"Not\" and \"Pacman\""
 HOMEPAGE="https://stabyourself.net/notpacman/"
 SRC_URI="https://stabyourself.net/dl.php?file=notpacman-1004/notpacman-linux.zip -> ${P}.zip
 	https://dev.gentoo.org/~chewi/distfiles/${PN}.png"
+S="${WORKDIR}"
 
 LICENSE="WTFPL-2"
 SLOT="0"
@@ -16,11 +17,8 @@ KEYWORDS="~amd64 ~x86"
 
 LVSLOT="0.7"
 RDEPEND=">=games-engines/love-0.7.2:${LVSLOT}
-	 media-libs/devil[png]
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+	media-libs/devil[png]"
+BDEPEND="app-arch/unzip"
 
 src_install() {
 	local dir=/usr/share/love/${PN}
@@ -34,15 +32,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
-}