gentoo resync : 28.04.2021

32 files changed, 335 insertions, 200 deletions

diff --git a/games-roguelike/FTL/FTL-1.5.13.ebuild b/games-roguelike/FTL/FTL-1.5.13-r1.ebuild
index 41455eb7e7b3..d1132199d777 100644
--- a/games-roguelike/FTL/FTL-1.5.13.ebuild
+++ b/games-roguelike/FTL/FTL-1.5.13-r1.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils games
+inherit desktop wrapper
 
 DESCRIPTION="Faster Than Light: A spaceship simulation real-time roguelike-like game"
 HOMEPAGE="http://www.ftlgame.com/"
 SRC_URI="FTL.${PV}.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="all-rights-reserved Boost-1.0 free-noncomm MIT bundled-libs? ( FTL LGPL-2.1 ZLIB libpng )"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
+
 RESTRICT="fetch bindist splitdebug"
 
 RDEPEND="
@@ -23,12 +25,13 @@ RDEPEND="
 		media-libs/freetype:2
 		media-libs/libsdl[X,sound,joystick,opengl,video]
 		sys-libs/zlib
-	)"
-
-QA_PREBUILT="${GAMES_PREFIX_OPT#/}/${PN}/bin/${PN}
-	${GAMES_PREFIX_OPT#/}/${PN}/lib/*"
+	)
+"
 
-S=${WORKDIR}/${PN}
+QA_PREBUILT="
+	opt/${PN}/bin/${PN}
+	opt/${PN}/lib/*
+"
 
 pkg_nofetch() {
 	einfo "Please buy & download ${SRC_URI} from:"
@@ -38,6 +41,8 @@ pkg_nofetch() {
 }
 
 src_prepare() {
+	default
+
 	if ! use bundled-libs ; then
 		# no system lib for libbass available
 		find data/${ARCH}/lib -type f \! -name "libbass*" -delete || die
@@ -45,21 +50,21 @@ src_prepare() {
 }
 
 src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
+	local dir=/opt/${PN}
 
-	insinto "${dir}"
+	insinto ${dir}
 	doins -r data/resources
 
-	exeinto "${dir}"/bin
+	exeinto ${dir}/bin
 	doexe data/${ARCH}/bin/${PN}
-	exeinto "${dir}"/lib
+	exeinto ${dir}/lib
 	doexe data/${ARCH}/lib/*.so*
 
-	games_make_wrapper ${PN} "${dir}/bin/${PN}" "${dir}" "${dir}/lib"
+	make_wrapper ${PN} "${dir}/bin/${PN}" "${dir}" "${dir}/lib"
 	make_desktop_entry ${PN} "Faster Than Light" "/usr/share/pixmaps/FTL.bmp"
 
 	newicon data/resources/exe_icon.bmp FTL.bmp
-	dohtml ${PN}_README.html
 
-	prepgamesdirs
+	docinto html
+	dodoc ${PN}_README.html
 }
diff --git a/games-roguelike/FTL/Manifest b/games-roguelike/FTL/Manifest
index a601901cbc93..fa71c2038d47 100644
--- a/games-roguelike/FTL/Manifest
+++ b/games-roguelike/FTL/Manifest
@@ -1,3 +1,3 @@
 DIST FTL.1.5.13.tar.gz 197569383 BLAKE2B 29b61c92dc242c6239e236761a89c464efc3889e1d28bbcd3466548090f4ba23450597ef9cd0a7130d0caea1d45a9cfdd87a56a65998dd4da146f1ade5d9a68d SHA512 129aa9ea13b6889520cb637bcbda0452f3dc2e8d93fb0e4d1c7938436d776b39a0a33b4e9d943e058ab5c80dcbb6e7bb874d0a78bd8a2a5a3a7e34159e1faac9
-EBUILD FTL-1.5.13.ebuild 1508 BLAKE2B acdbffc4442f614ef483d92f25d7135bc66341151db23b00ea8152eb0351b14f249b2f34d7c7a17ef6e6694541c1818fb909a3b53985c788e049bd506ba4f003 SHA512 973adce9ff088cef80e7cf18ca8632b67ecbdc5db1e55e7dd9ebd0718921609b967a5cdcf008bc2075fc26a8294da301efabdcdb3cf3cf8baa5895b9022eb512
+EBUILD FTL-1.5.13-r1.ebuild 1462 BLAKE2B 9a4c0fc9e87321c5800ad3c3cc9bc93f5422f05e8f763b067ac5be7f47e69e373a9120f60a0056d66d503d49983e515c29624b300a6b1a6e5f4f4e8838b44289 SHA512 3a0f1666c2475a3f4ecdf43b0fa00bd005ab47398c3b82f813ea5791dd38c31f7d8928e5961be36ab0ba43f912a28ce06b05a98a788c9584a9a7248f9497cde7
 MISC metadata.xml 326 BLAKE2B 20c0a3a6cbb19e457c09b386a837b4202cf279231a681f3da7d604f3bffcfe6761f849ce82bc0169cc498d9bab565ff75216f4b749068e6663f5acbace935f7b SHA512 87eee3f514c290aba519dad7fdb335424ebd7ed7bb1cfa8650d293136ad2a6efdb44eff2c1c48973e9a587f282a2114866d9e4d66adb857b61a085d5635ecfd2
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 5aa7335aa1a5..36e0c166345e 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/adom/Manifest b/games-roguelike/adom/Manifest
index 2c5626ea69b6..e4c9de72cad6 100644
--- a/games-roguelike/adom/Manifest
+++ b/games-roguelike/adom/Manifest
@@ -1,3 +1,6 @@
 DIST adom-111-elf.tar.gz 1001683 BLAKE2B e8f263c88c910cd3df40f1bec34a32853438090d17c7f48dc3d7d2f321b3f0d24adb40bd5ec74479eb23c7b6782967d2f3e7c5e4ee445c5fb75fdbb175d8889d SHA512 7b1d8916f66273b4ab06edd2d77c30e2edce827d346451d83c677af32492c40e5c578a8450ab3cc9be7888a0052a0960306e97db408e8581700c71c1b480b128
-EBUILD adom-1.1.1-r1.ebuild 800 BLAKE2B 02c581da748f75c77828bdb96da5f7a2bc4f23e5fd395b4417b3831f7b094d68265b5870551d3ebf290db11cd62c7f304bd33befd01bd9b923744cc2ae7ae22f SHA512 1ca12a18e72594b66ad136d915ecb8efc220df497039f3f7e75e2aff01db622b121f31f2b0440754228d5685ec4583cb38e107f343371b065e036970fff62d66
+DIST adom-3.3.3_amd64.tar.gz 1821896 BLAKE2B 612372db457653530d69f2b5711df451a929c0d4a9289132631ea955eb2ba8aa637be651689638c547d2cb99e5cc854923321aead400896af3acec2d35eb4ede SHA512 7ee52b445417d8050de00cb760f9071dd212b8761beaeab2e95b3d6b711e2c5c1cece43ef03587fce7edacc400121c4d1c690a5b63266d4dbbc27a6abeb3a234
+DIST adom-3.3.3_x86.tar.gz 1894237 BLAKE2B 7dc73c162e31fc29cbab11065c8153caf42794d10a41ffb2591397dd295b4d022bcfe70c1452decea926d7f860d07c741d35a0804804c242ccb3057890958c00 SHA512 25e0af09b9585b6e9f68228ba8ef9548ea7d6bfd96f75c9cdfd5faeab8dd4042b4b6e2864de81c23ea5474c49c72feaa64ecd205c850394192b2ef0bd6b906e9
+EBUILD adom-1.1.1-r2.ebuild 730 BLAKE2B f53c621e1674da00a0570a4b28b58f8ae15fe0eef91c4ecf7778097d748e55e16bf272f07e0534ad172c779ec9ca60fc890430ee51ecfb63ebf46b615567ccd6 SHA512 14b497ebfa33a37049e443f53cdb97e87e14159f985ee5cd56e8d328b821e4c924fb7d3e18b1f20e20ed231d39fb8c6584ff64a9334d45d4652822b5be3a39d9
+EBUILD adom-3.3.3-r1.ebuild 786 BLAKE2B cacb29c7ed113fa6b5e880e417f2aa5300be51cc38bb583871aaf421669354afd36a6d763819457f9c62b7194608ed42b11b6d21433d7bfbe7bbc1ec7a95d02a SHA512 0ec82e9bd73a28c52a8eec63683ce708ac40452ae380757dccc3fc0de1e4fe8d1b6054f9ce85412f187cc5dd20deebb880d2f88b36374147b43a67a8cda07cad
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-roguelike/adom/adom-1.1.1-r1.ebuild b/games-roguelike/adom/adom-1.1.1-r2.ebuild
index 02e9d5aacfea..b67288efa3fb 100644
--- a/games-roguelike/adom/adom-1.1.1-r1.ebuild
+++ b/games-roguelike/adom/adom-1.1.1-r2.ebuild
@@ -1,36 +1,36 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit edos2unix
 
 DESCRIPTION="Ancient Domains Of Mystery rogue-like game"
 HOMEPAGE="https://www.adom.de/"
 SRC_URI="https://www.adom.de/adom/download/linux/${P//.}-elf.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="adom"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip" #bug #137340
-QA_FLAGS_IGNORED="${GAMES_PREFIX_OPT:1}/bin/adom"
 
-RDEPEND="sys-libs/ncurses-compat:5[abi_x86_32(-)]"
+# bug #137340
+RESTRICT="strip"
+QA_FLAGS_IGNORED="/opt/bin/adom"
 
-S=${WORKDIR}/${PN}
+RDEPEND="sys-libs/ncurses-compat:5[abi_x86_32(-)]"
 
 src_install() {
-	exeinto "${GAMES_PREFIX_OPT}/bin"
+	exeinto /opt/bin
 	doexe adom
 
-	keepdir "${GAMES_STATEDIR}/${PN}"
-	echo "${GAMES_STATEDIR}/${PN}" > adom_ds.cfg
 	insinto /etc
+	echo "${EPREFIX}"/var/lib/${PN} > adom_ds.cfg || die
 	doins adom_ds.cfg
 
 	edos2unix adomfaq.txt
 	dodoc adomfaq.txt manual.doc readme.1st
 
-	prepgamesdirs
-	fperms g+w "${GAMES_STATEDIR}/${PN}"
+	keepdir /var/lib/${PN}
+	fperms g+w /var/lib/${PN}
 }
diff --git a/games-roguelike/adom/adom-3.3.3-r1.ebuild b/games-roguelike/adom/adom-3.3.3-r1.ebuild
new file mode 100644
index 000000000000..3104784a259b
--- /dev/null
+++ b/games-roguelike/adom/adom-3.3.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}_linux_debian"
+
+DESCRIPTION="Ancient Domains Of Mystery rogue-like game"
+HOMEPAGE="https://www.adom.de/"
+SRC_URI="x86? ( https://www.adom.de/home/download/current/${MY_P}_32_${PV}.tar.gz -> ${P}_x86.tar.gz )
+	amd64? ( https://www.adom.de/home/download/current/${MY_P}_64_${PV}.tar.gz -> ${P}_amd64.tar.gz )"
+S="${WORKDIR}"/adom
+
+LICENSE="adom"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip" # The executable is pre-stripped
+
+QA_FLAGS_IGNORED="/opt/bin/adom"
+RDEPEND="sys-libs/ncurses-compat:5[abi_x86_32(-)]"
+
+DOCS=( "docs/adomfaq.txt" "docs/credits.txt" "docs/manual.txt" "docs/readme1st.txt" )
+
+src_install() {
+	exeinto /opt/bin
+	doexe adom
+
+	einstalldocs
+}
diff --git a/games-roguelike/hengband/Manifest b/games-roguelike/hengband/Manifest
index 6f008ca9f427..59cbe0fd2c89 100644
--- a/games-roguelike/hengband/Manifest
+++ b/games-roguelike/hengband/Manifest
@@ -1,6 +1,7 @@
 AUX hengband-1.6.2-added_faq.patch 6371 BLAKE2B 322267980e2b9ddc75245528a1a29fae0936e6cb3a6d87287e4e4d475090c37c47b9d8268fbe52cc5e6725f6a2d034d28c4fdecba57a23137384340a5e5c3fcb SHA512 254283e117f6bf7d050ec152d7bb04cdcbd23235f56da8ed8aa587e23ef21de0a556cac4027e8a3b0fa32d66448c96ac18e9e76d242b9d1a921befcaf78195a1
-AUX hengband-1.6.2-ovflfix.patch 236 BLAKE2B 7a2fc1e76fb1d4755cb4d45ddd0f7f48ecf38e21b769196ccfeabe7cadaacd278c7e3c25e64711f7d362e310247773fb1e907e402a0b1f11a7ac0065325415ad SHA512 0e51671bce72cd0ab1109111556bfda71ef043475c033548ffd5873d9329597e705b9e6459d5e95369df5f5501e2553f9109622d522534ea43f787087160e3cf
+AUX hengband-1.6.2-autoconf-ncurses.patch 939 BLAKE2B 434adedaf4e301ba504ef4af113e8466634f468e29572a0dbc08f7cfe3a4c1c108df9e2cf2ccc5c15e784ff6fe291d285331f9741a231da66b52ad27763988a6 SHA512 509d50cb3e9080d2e060da3efdc0a8b96e921b0668389f797ec23657a8617932f245ed0da9eb0a9cf1ec97c4f5adfc45d05c8ae4fa45677ed10e02226aabee6b
+AUX hengband-1.6.2-ovflfix.patch 308 BLAKE2B 9ba098376a067d919a569d3fc104f5deff57524e22609871842c244aaf816db076456af16917ec0b6c03b6f42e9e07e0b69d51d60f18b8cd62f86483632a243e SHA512 f50e4d247dfac9df2b0f292f15488179b490db57f2ef919173325e8fd4c0dcd47be1b6a96313940aec06790cefe4c26ce1a26029182691981d2927e58e7ef00d
 DIST hengband-1.6.2-mispellings.patch.gz 11964 BLAKE2B a409161c70d655078396c8774b251cbb467802eaa9d6c96322a49ba1956fb3c9a5ba24d8de74907afea96c1df62fdfee3fe581a45e19b77e51f917e862c63531 SHA512 73838981616e09deca7afc3911386e665ac38fafcdcea42d87bc41e4bc187551278efeaa608a772a444e0c178c3f990e16dd302b6a8dc6dfdd8625d463b9b3b5
 DIST hengband-1.6.2.tar.bz2 2029169 BLAKE2B 3a25a829f3fba8bd265d0b13fc81becbbf505dcb4efd78010d6cc8db29bb4be22911d18bf7c4496e4b408c3742aa12c36060bacd62bb79de0be4fa5c36191afa SHA512 24c67f00556d7899b4f18f3071c4bd50bc754566c4c4736c18248ced243b1332e6c84381250c1a59358e7a914e5d62db05c47ab0921bcf40fbd6cfe4b6717520
-EBUILD hengband-1.6.2-r1.ebuild 1440 BLAKE2B a84f8c11cf8a6ad051544d7b6411d65ca86d1210b684cc886211fbca1e389d2999d6b46d245d3d12daf592ef02b7ef25975a8b4ccef8f1bfbb25a66746566d55 SHA512 09297b3a37a705d0cf247ec5811d6e9c8ef680e083700f6dafb520f7916f6d4dc08a30e05b67e27d169f68dd590976645a67fb40d427d5dff2d86f37a3be2734
+EBUILD hengband-1.6.2-r1.ebuild 1446 BLAKE2B 46baa4715f6e4e074170c3083efcf883ef068a75618579ce2daf7f734f373689bc7d547fe9370ff73a5215297b18421e23c6ef1cb1c77f162c59576cdd67ceed SHA512 58fc37dbbd377fc40f481c1d30bfe35a4303dc9d9856a8298606236cf21db90ac5e207817bd7a19f02d4f0b12f218e1290e6faa4abd82ba71d5caf434a193198
 MISC metadata.xml 334 BLAKE2B 26c821bfd5ecfb9e843418084ffc417e2b22f3c371b442e9473a85ad45aed5861259194c1c1d48dac929d60019d4b040f751afb32caced1aa094086d07d098b6 SHA512 ec8a4116d1ad2f15b2dad0148f912da9123d937cd724eaac00ff20541d64b7ac37190f617b8e82376c571a47cb6b886fc269a477c2c6b4aaa0859204f716add9
diff --git a/games-roguelike/hengband/files/hengband-1.6.2-autoconf-ncurses.patch b/games-roguelike/hengband/files/hengband-1.6.2-autoconf-ncurses.patch
new file mode 100644
index 000000000000..3fabd8e1891e
--- /dev/null
+++ b/games-roguelike/hengband/files/hengband-1.6.2-autoconf-ncurses.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.in b/configure.in
+index 0df0e76..d8ea587 100644
+--- a/configure.in
++++ b/configure.in
+@@ -56,13 +56,14 @@ fi
+ 
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lncurses:
+-AC_CHECK_LIB(ncurses, initscr, [AC_DEFINE(USE_GCU, 1, [Allow -mGCU environment]) AC_DEFINE(USE_NCURSES, 1, [Use ncurses]) LIBS="$LIBS -lncurses"])
+-if test "$ac_cv_lib_ncurses_initscr" != yes; then
+-  AC_CHECK_LIB(curses, initscr, [AC_DEFINE(USE_GCU, 1, [Allow -mGCU environment]) LIBS="$LIBS -lcurses"])
+-  if test "$ac_cv_lib_curses_initscr" != yes; then
+-    AC_CHECK_LIB(termcap, tgetent, [AC_DEFINE(USE_CAP, 1, [Allow -mCAP environment]) LIBS="$LIBS -ltermcap"])
+-  fi
+-fi
++PKG_CHECK_MODULES(
++    [NCURSES],
++    [ncurses],
++    [AC_DEFINE(USE_GCU, 1, [Allow -mGCU environment])
++     AC_DEFINE(USE_NCURSES, 1, [Use ncurses])
++     [LIBS="${LIBS} ${NCURSES_LIBS}"]
++    ]
++)
+ 
+ dnl Checks for header files.
+ AC_PATH_XTRA
diff --git a/games-roguelike/hengband/files/hengband-1.6.2-ovflfix.patch b/games-roguelike/hengband/files/hengband-1.6.2-ovflfix.patch
index 47bb53cf771a..ec8e1273893f 100644
--- a/games-roguelike/hengband/files/hengband-1.6.2-ovflfix.patch
+++ b/games-roguelike/hengband/files/hengband-1.6.2-ovflfix.patch
@@ -1,6 +1,8 @@
---- src/effects.c.old	2010-10-28 11:51:31.000000000 +0200
-+++ src/effects.c	2010-10-28 11:51:59.000000000 +0200
-@@ -5191,7 +5191,7 @@
+diff --git a/src/effects.c b/src/effects.c
+index a97a2ec..3988b04 100644
+--- a/src/effects.c
++++ b/src/effects.c
+@@ -5191,7 +5191,7 @@ int take_hit(int damage_type, int damage, cptr hit_from, int monspell)
  			}
  			else
  			{
diff --git a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild b/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
index 97f4b9bd3cb7..e6fb57c68472 100644
--- a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
+++ b/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
@@ -1,62 +1,70 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools games
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="An Angband variant, with a Japanese/fantasy theme"
 HOMEPAGE="http://hengband.sourceforge.jp/en/"
 SRC_URI="mirror://sourceforge.jp/hengband/10331/${P}.tar.bz2
 	mirror://gentoo/${P}-mispellings.patch.gz"
 
-KEYWORDS="~x86"
 LICENSE="Moria"
 SLOT="0"
+KEYWORDS="~x86"
 IUSE="X l10n_ja"
 
-RDEPEND=">=sys-libs/ncurses-5:0
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libXt )"
+RDEPEND="
+	>=sys-libs/ncurses-5:0=
+	X? ( x11-libs/libX11 )
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-libs/libXt )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.2-added_faq.patch"
+	"${FILESDIR}/${PN}-1.6.2-autoconf-ncurses.patch"
+	"${FILESDIR}/${PN}-1.6.2-ovflfix.patch"
+)
 
 src_prepare() {
 	# Removing Xaw dependency as is not used
-	sed -i \
-		-e '/Xaw/d' src/main-xaw.c \
-		|| die
-	sed -i \
-		-e 's|root\.|root:|' lib/*/Makefile.in \
-		|| die
-	sed -i \
-		-e 's:/games/:/:g' configure.in \
-		|| die
-	epatch \
-		"../${P}"-mispellings.patch	\
-		"${FILESDIR}/${P}"-added_faq.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch
+	sed -i -e '/Xaw/d' src/main-xaw.c || die
+	# Fix syntax for chown
+	sed -i -e 's|root\.|root:|' lib/*/Makefile.in || die
+	# Don't target the games sub-dir, since we're not using games.eclass any
+	# more
+	sed -i -e 's:/games/:/:g' configure.in || die
+
+	default
+
 	mv configure.in configure.ac || die
+
 	eautoreconf
 }
 
 src_configure() {
-	local myconf
-	use l10n_ja || myconf="--disable-japanese"
+	local myconf=(
+		--bindir="${EPREFIX}"/usr/bin
+		--with-setgid="nobody"
+		$(use_with X x)
+	)
+	use l10n_ja || myconf+=( --disable-japanese )
 
-	egamesconf \
-		--with-setgid=${GAMES_GROUP} \
-		$(use_with X x) \
-		${myconf}
+	econf "${myconf[@]}"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	default
+
 	if use l10n_ja ; then
 		dodoc readme.txt autopick.txt readme_eng.txt autopick_eng.txt
 	else
 		newdoc readme_eng.txt readme.txt
 		newdoc autopick_eng.txt autopick.txt
 	fi
-	prepgamesdirs
-	# FIXME: we need to patch around this BS
-	fperms g+w "${GAMES_DATADIR}"/${PN}/lib/{apex,data,save,user}
 }
diff --git a/games-roguelike/neon-chrome/Manifest b/games-roguelike/neon-chrome/Manifest
index 006e6df5d2b3..f00a553a0be4 100644
--- a/games-roguelike/neon-chrome/Manifest
+++ b/games-roguelike/neon-chrome/Manifest
@@ -1,3 +1,3 @@
 DIST NeonChrome-Linux-1.1.12.tar 64140772 BLAKE2B cadda4c659b96b96c4b9b2a1dfc78152a89e53a2662f5e2dc70a0d4c98a813822d8c977deb0d6d6aeca0a2d2608cb04274c0ad33554ce27ab2ddf318499c9750 SHA512 f659bbe87f3b2933346bc17a4ccdcdc37ff8bb2db7a94dc5334db7109d64cd9f5a28b14845f767aaf1e103be826d3cd0fefc528a02df2079123094436e94f2cd
-EBUILD neon-chrome-1.1.12.ebuild 1091 BLAKE2B 4b08260613a192c47ddd9161c37ec3de440a2e2e9dc98963ee6a6385e8e9fad5701bd37cbaec43ba0e4b05f44ddfd51615edbb250eaa6263a827230516ba85c9 SHA512 4a6a1b255f6df7b3fdb487183689325059cd66cf75ff6c096c37a7dafa6768e95b55ba024487651c334d274a557816db5594e1adc7ab07e74feac6e301529019
+EBUILD neon-chrome-1.1.12.ebuild 1093 BLAKE2B fbee6c33aa521bdfd87548f03f32a8fb47e943cea4daa5a585069c77295e1531c11e3151c8fcf8433e9c617c04bd2ce567856a909301579a9c9885a494cc76cc SHA512 d51141a9c1fc7ba4861a50ad507803c203ac4db5cd37886899e954701c8fd86565f75a9ee0aeec78f5ddf41fdec1c1352f5b45e8a3af000595ce888f7be7e675
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-roguelike/neon-chrome/neon-chrome-1.1.12.ebuild b/games-roguelike/neon-chrome/neon-chrome-1.1.12.ebuild
index b3d1fdf14e55..e23b2be6e5ca 100644
--- a/games-roguelike/neon-chrome/neon-chrome-1.1.12.ebuild
+++ b/games-roguelike/neon-chrome/neon-chrome-1.1.12.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils desktop xdg-utils
+inherit desktop wrapper xdg-utils
 
 MY_PN="NeonChrome"
 DESCRIPTION="A ruthless top-down cyberpunk shooter with rogue-like elements"
 HOMEPAGE="https://neonchromegame.com/"
 SRC_URI="${MY_PN}-Linux-${PV}.tar"
 #	https://dev.gentoo.org/~chewi/distfiles/${PN}.png"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
diff --git a/games-roguelike/scourge/Manifest b/games-roguelike/scourge/Manifest
index 309f169a6bf7..4fe344423987 100644
--- a/games-roguelike/scourge/Manifest
+++ b/games-roguelike/scourge/Manifest
@@ -1,8 +1,10 @@
+AUX scourge-0.21.1-Wc++11-narrowing.patch 570 BLAKE2B aa29346cff63b56753b5b5716a389fe193a7b491c5ffc29f72cbf79d399270b402ad78c4b6fa4f5ace391ccb0637358c96afdbb49e8ac124214ceb8359201472 SHA512 a1d3798042186ca1f75c2191d8e6afb419fae8e3a8209b9500db2ebe0f7d363c78991ba7fc902a57b250958a6ec9fde37c10a9edbda07e0d20bd1d5c8386f9dc
 AUX scourge-0.21.1-automake-1.13.patch 288 BLAKE2B e9e9673b357b9ba5b52f5404d7587dfad3eac5bc714a201c9d94cbe6a113cfcd9ef58fc40a34d48c49cd6bfd3cb781a0000f5d00d18b9fe0e3e623d9940e2195 SHA512 24b212c1053fa3445507cc6808abd37cabf43997275f003eb929d7c0671663919b984c2491dc33083d20a09cd67d8e695140ff6957e662ba66f43ddbaf167394
-AUX scourge-0.21.1-freetype_pkgconfig.patch 1083 BLAKE2B a65038dfb1fb031e7566317236c3de2d2b9d50e7903013d92c793420b8c006f3677071ced8361c04c85b717f45c03b7cd2388b18d44801515b7b39a341eef3af SHA512 22dede3318061683ee3fcc2d1b5cb910cb7657d356c14ea7fffaa19921a3393364c9c4b9d12ccb0e0149599dcebeef2abf9127a47c6987cd77d9090b8961f590
-AUX scourge-0.21.1-gcc47.patch 517 BLAKE2B 30a3d2ebec5e25ce4ca9757821996d2a4e8155573b93ec76b2cded90ab4ec102e5796e21854524d3405b10ed798ddca064a2d3c6b11542ddfe2867fe30aae7f8 SHA512 69bca46c3bfad70e42736119da38d7dafba6c589231bdac5ef2591e617ea516337ebf4ed8a547e8da52412711d0eb84f2abae5652ffc19a882fea69f48a4b880
+AUX scourge-0.21.1-freetype_pkgconfig.patch 944 BLAKE2B 7aa97a5dea38a9ee25cb2f1ef91bc1ff11475e697e2f97de67882f75a1d3a78b1f4e10a72411f2c387ba4c815aae730307f0ce7db049243c2319060898e89820 SHA512 ad7fea238417c9140337728b0c5a92f98bc1bf57dc8184bd18af61c5aa3091941e6697b2677639867860bb89097b1827dab9f6374b4d604d39225a33b057df20
+AUX scourge-0.21.1-gcc47.patch 445 BLAKE2B 623b1a84ce9560d7a0aeda0e795a70962248f5f7c8c82cb11b32eddd960594291b7595397e18eacadd075b7bf55a23b3104df4ae4770444b56c95b25a38286d2 SHA512 04319bceb1820d2345d21f17ef4c693fbe91cbfe4433a915ede223e68eef476690d7983336c48ed65ae5a1c59dc6ddcbc6dda41ed85c2e08054baabc62ac3cfd
 AUX scourge-0.21.1-gcc6.patch 601 BLAKE2B 78114f97ac4258cde239926c7012568f76b33c7b0fe3e6a52fc0550910f547e6e70e262ab70ecb89052d126406f94a693432ec2c9a9dd05d828c461b9d822ea8 SHA512 521f5ab76423925cef7f2ead25c947fb042bda67d82c6ccdcf55757d9412c017a8eb3ca7ecb09ffd369cd69fcac919c5ed6928b5c1d16149d64b0b03a70a2104
+AUX scourge-0.21.1-respect-AR.patch 207 BLAKE2B ed9e5f7476668cb1a6063be30cc76c1d9b4dc6574ae3171c5dc2e89e6f74db3fdd3c1a83e50056b9b784dec358ed98adf96ef7f05be1cfbd695b9532ece940a7 SHA512 2254db48095c2bc64319b253e002174849601d05cd8312d3fe1a0487b3234b30522ce6cede66db6499221ce8a934ea70967468fb60714c607dfdeb4f0d2125b2
 DIST scourge-0.21.1.data.tar.gz 142093436 BLAKE2B 68e4cc0bfb40e9a92bc38b3db75f36df665974595ba4978cc34e077901522ece9ec5e15203ad9ab5044a61484d6850367306eb60a0da5d168a33e03130fe5774 SHA512 3701aba0f70d71aeb0e185e808e34cea62a637809a9b4c14fd19bdfbf91d36cf8dafa2a4cfddc3ee493827b40eea657fcdddc8277c57a635bc8ca8e3286376be
 DIST scourge-0.21.1.src.tar.gz 8146157 BLAKE2B ed48b29a54df1b8c7444ac2985ad069f82568b1e7a5aa98e922fb4fcf10c48840c2c38361a4bf15044c71547cd41d06fdd270b379ae0827b9b5f8063b92c1d18 SHA512 e530a8f7bddc1969a02a8b9a8b272f6f60d2c4830d23d96fc671cb79a2c4097fb9c5c0c262004a8157448b601bf58f9bbff95dd6d98275a28d3d404c339ce2ad
-EBUILD scourge-0.21.1-r1.ebuild 1430 BLAKE2B 253248fbd84dd5ffdbdd468bf703e53f08e0dcf948bd62b59dd6c4ab6ae082d95d3ec8ec16a2ad44e45626c2a1f19d689f54f4e94fcb086c49ff8d736e0c049d SHA512 2a17aaa637feff2d8a5b511c6b7fc2a982b21a6357256ae32d7bcc2193212e93669e036873386cdfdd64b4d45627c067967247cf61060cdea00eabf72d8e39a7
+EBUILD scourge-0.21.1-r1.ebuild 1473 BLAKE2B 9f42f5a0d1763ad98b844064d645757a127bef5fca6130e54f25f9a91456e39239f49f46662c1046dc62c90f538f3d37cb9943e4950742fcb2b3da1a788c51a2 SHA512 9e510403fe2c069b9b31aac02349dc28c3789dc99baf617c0c82ec27f1ccb764c6493e25ac52a8c7470865f815fa4f2c3c0dd86ce88b42c6b2c4e0dc89ced379
 MISC metadata.xml 330 BLAKE2B 126bd0ac9b4d619acfe8978859d29f75e84e445fef6c96117d18d8fc93ad58e69c55096ed3c0e47e1907354bffe3f9e08ce105eedd183c65afe70ea7ce3dec46 SHA512 d47d4afa0adafc93aa43d05190f0a65ac486b6ad4aee54bac96b2f99da7c4a55c6df99b512e4c113c2b4232b8ae294f58966b06081eb89d31fc20b8d9de2e07b
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-Wc++11-narrowing.patch b/games-roguelike/scourge/files/scourge-0.21.1-Wc++11-narrowing.patch
new file mode 100644
index 000000000000..a852248c9fc2
--- /dev/null
+++ b/games-roguelike/scourge/files/scourge-0.21.1-Wc++11-narrowing.patch
@@ -0,0 +1,18 @@
+Allow compiling with Clang
+https://bugs.gentoo.org/739330
+
+--- a/src/sdlhandler.cpp
++++ b/src/sdlhandler.cpp
+@@ -1034,10 +1034,10 @@
+ bool SDLHandler::intersects( int x, int y, int w, int h,
+                              int x2, int y2, int w2, int h2 ) {
+ 	SDL_Rect ra = {
+-		x, y, w, h
++		static_cast<Sint16>(x), static_cast<Sint16>(y), static_cast<Uint16>(w), static_cast<Uint16>(h)
+ 	};
+ 	SDL_Rect rb = {
+-		x2, y2, w2, h2
++		static_cast<Sint16>(x2), static_cast<Sint16>(y2), static_cast<Uint16>(w2), static_cast<Uint16>(h2)
+ 	};
+ 	return intersects( &ra, &rb );
+ }
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
index d41ee1a44439..6a5a28d1c7ab 100644
--- a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
+++ b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
@@ -1,7 +1,5 @@
-Index: scourge/configure.in
-===================================================================
---- scourge/configure.in	(revision 3411)
-+++ scourge/configure.in	(working copy)
+--- a/configure.in
++++ b/configure.in
 @@ -56,6 +56,7 @@
  # Set up binreloc (for a relocatable autopackage file)
  AM_BINRELOC
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
index 6f3f7b3e2a65..c018d24ee383 100644
--- a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
+++ b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
@@ -1,5 +1,5 @@
---- a/src/squirrel/squtils.h	2012-08-30 18:06:43.474037926 +0200
-+++ b/src/squirrel/squtils.h	2012-08-30 18:14:13.300261523 +0200
+--- a/src/squirrel/squtils.h
++++ b/src/squirrel/squtils.h
 @@ -8,6 +8,9 @@
  #define SQ_FREE(__ptr,__size) sq_vm_free(__ptr,__size);
  #define SQ_REALLOC(__ptr,__oldsize,__size) sq_vm_realloc(__ptr,__oldsize,__size);
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-respect-AR.patch b/games-roguelike/scourge/files/scourge-0.21.1-respect-AR.patch
new file mode 100644
index 000000000000..e4fea442af22
--- /dev/null
+++ b/games-roguelike/scourge/files/scourge-0.21.1-respect-AR.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/780450
+--- a/configure.in
++++ b/configure.in
+@@ -28,6 +28,7 @@ if test "x${CXXFLAGS-notset}" = "xnotset" ; then
+ fi
+ AC_PROG_CXX
+ 
++AM_PROG_AR
+ dnl Check for ranlib
+ AC_PROG_RANLIB
+ 
diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
index 5eeec7c52315..9d4f7eec6a20 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools desktop wxwidgets
+EAPI=7
+
+inherit autotools desktop
 
 DESCRIPTION="A graphical rogue-like adventure game"
 HOMEPAGE="https://sourceforge.net/projects/scourge/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.src.tar.gz
 	mirror://sourceforge/${PN}/${P}.data.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	media-libs/freetype:2
@@ -24,17 +26,18 @@ RDEPEND="
 	virtual/libintl
 	virtual/opengl
 	virtual/glu"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc47.patch
 	"${FILESDIR}"/${P}-gcc6.patch
 	"${FILESDIR}"/${P}-automake-1.13.patch
 	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+	"${FILESDIR}"/${P}-Wc++11-narrowing.patch
+	"${FILESDIR}"/${PN}-0.21.1-respect-AR.patch
 )
 
 src_prepare() {
@@ -47,22 +50,23 @@ src_prepare() {
 	sed -i \
 		-e '/snprintf/s/tmp, 256/tmp, sizeof(tmp)/' \
 		src/scourgehandler.cpp || die
+
 	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	local myeconfargs=(
-		--with-data-dir=/usr/share/${PN}
-		--localedir=/usr/share/locale
-	)
-	econf "${myeconfargs[@]}"
+	econf \
+		--disable-rpath \
+		--with-data-dir="${EPREFIX}"/usr/share/${PN}
 }
 
 src_install() {
 	default
-	insinto /usr/share/${PN}
-	doins -r ../scourge_data/*
+
+	insinto /usr/share/scourge
+	doins -r ../scourge_data/.
+
 	doicon assets/scourge.png
 	make_desktop_entry scourge S.C.O.U.R.G.E.
 }
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index e5d899898ac4..2c5d69636a6b 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -8,7 +8,7 @@ DIST stone-soup-0.26.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
 DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
 DIST stone_soup-0.26.0.zip 95554775 BLAKE2B 03389bae0471efe674b68dd6b99184d77cae50beaa1a82e26afa2b12e0cd06a3bd7b3eecaf5b11a78150cf3eb4694cd07e62f524630b9113fb49ef9cd328d265 SHA512 269b687ce75d8f6e888f1bcc811be2544cb9d82a1a48689187631aa2e6e0a7999bfc3ac7da81cdc44488db5d97bde48b4d6215ebd994f7ebaa6b89bdc2cba281
 DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
-EBUILD stone-soup-0.25.1-r101.ebuild 4913 BLAKE2B 746e685f9c68c7036e89c419ceec512e5db7a4c262290091b1f47af4c59d279dd09d4c5ca0b2654fe71b62e8f9f9aa7580247e4957a6637a1796f56a1711ba1d SHA512 8c9a3ffa232efdc0889fd1ae4b222569223d085001940def16011f0cd6222e17c692272e743463e7cd0b4eb34f53d8c275b527ae09d5a23898253bf222c891b1
-EBUILD stone-soup-0.26.0.ebuild 4913 BLAKE2B b68717066973fcce0d34d02c0e427ac0a170c8eeecb26629f575566c9f2094c9fe1b4ef3f69fe588d75fa790c4668d9598896a8b413bebb4ce7a7d3d6179fe43 SHA512 d477fdf4717c2e2dce7882ebaa6bc7a388432b3875ffbbc0d2504c99a69438d22f087868458ab169eb83d2617b0beb09dee4016a3c08b58f79572a13b84a461f
-EBUILD stone-soup-0.26.1.ebuild 4915 BLAKE2B 338c41288dbd99824749b62bbf6a1f0614b84afbe6862db4a658f02b5f10efb76d53385dd6e26645a7241aa77a300ede66ffb55b1027f5417f99c94bd38651c1 SHA512 b4084a0e59f9b94015b8900454cd54d78dffb674df7e34c96ed83ba6c7745e0674ed86f30158680bc122ae832e1040a22f3f1f16ccfad3ac9e94fe2b11b556db
+EBUILD stone-soup-0.25.1-r101.ebuild 4906 BLAKE2B 27a656e08f7e4539c71e1c6bced442bd23a54efca2bfd287a369ea8b8cdb0b0b0275a13912ea1316aa62ad92551890cbcfe0e9e5f7acf58d0ca7ded3b69bec78 SHA512 20b3ab2f78bba3b5b344dac9bea7ba8c4e0cfa47a0cc6cf35a7e0afe49ebbbfd5cc18d568e160ac7a9bd3963961c170d6ee79dc342dd33735cc775121eaaa026
+EBUILD stone-soup-0.26.0.ebuild 4906 BLAKE2B 691892c10fd8fce1a232ebc9f25a1ab98faf737a634c9585dfbf50d62250ecf01eaaf82f4a479a2614fbbad6fcf2dffd24523c004289587791d4a1c021d3ff76 SHA512 a23c1ae7253c7bf585c9dbb64213a18b917c796c45971e84ca89187c972182cb0d6639cfb81f206d47b45feb52593ba07c99303aa06e5176298b470aac6c73a5
+EBUILD stone-soup-0.26.1.ebuild 4906 BLAKE2B 691892c10fd8fce1a232ebc9f25a1ab98faf737a634c9585dfbf50d62250ecf01eaaf82f4a479a2614fbbad6fcf2dffd24523c004289587791d4a1c021d3ff76 SHA512 a23c1ae7253c7bf585c9dbb64213a18b917c796c45971e84ca89187c972182cb0d6639cfb81f206d47b45feb52593ba07c99303aa06e5176298b470aac6c73a5
 MISC metadata.xml 1619 BLAKE2B 2977dbcb30328109cf2f2c75535175ce089c4ede9d9ce7e550ae715bb8624abffdcf2ba53cb6dc545112dbf1da10b0237a8bffa7719956763955ff81b31554f7 SHA512 711ef0ab70235f7ab3a447bc49508b3e8f53f2dd0e108b4874f6e5a916b3c373decece2d6e4a134971941261315819c31799fd318d0c7be103356ac8e5218137
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild
index 2b1eac8003bd..36719da120e3 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r101.ebuild
@@ -9,7 +9,7 @@ EAPI=7
 LUA_COMPAT=( lua5-{1..3} )
 PYTHON_COMPAT=( python3_{7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 eutils lua-single xdg-utils toolchain-funcs
+inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
diff --git a/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
index 160cc20606b1..cc9cc94cf890 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.0.ebuild
@@ -9,7 +9,7 @@ EAPI=7
 LUA_COMPAT=( lua5-{1..3} )
 PYTHON_COMPAT=( python3_{7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 eutils lua-single xdg-utils toolchain-funcs
+inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
diff --git a/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild
index 87030f3939cb..cc9cc94cf890 100644
--- a/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.26.1.ebuild
@@ -9,7 +9,7 @@ EAPI=7
 LUA_COMPAT=( lua5-{1..3} )
 PYTHON_COMPAT=( python3_{7,8,9} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop python-any-r1 eutils lua-single xdg-utils toolchain-funcs
+inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
@@ -26,7 +26,7 @@ SRC_URI="
 # Public Domain|CC0: most of tiles
 # MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug ncurses sound test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
diff --git a/games-roguelike/tome/Manifest b/games-roguelike/tome/Manifest
index 64535c326611..7bcb8e5615a6 100644
--- a/games-roguelike/tome/Manifest
+++ b/games-roguelike/tome/Manifest
@@ -1,6 +1,6 @@
-AUX 2.3.5-gentoo-paths.patch 1172 BLAKE2B d51e277eac8d270815a8b48a18bd943489036643d53b80d4adab147a7510e4b41f1f9ff1062327f7b441c2aea9e3d6509a1dffa69b60dca32fe36f73a639f8c9 SHA512 1d3f053abcbfee4f2fb1acc2911927b4a51881b0ce50da72d4d617207411b9cdba42cf70324c47535e9e560ee8878f3d0f51d4471dcc2bcfaffb136700c6fd0f
-AUX tome-2.3.5-format.patch 2925 BLAKE2B f9d186937649bfc3d409a73cf6a8f067784628374de2c5da656e2f871ba71c3f6edd1837bec79972ecea985f3002374f9edd8184aff3d1c101de25e20cd901a9 SHA512 e8e245e6374ac63effc8f3e1341357f137cd8b4fb378a464e2bd3692d50e5cbd54b7b42b8605346c2d617e1dbb95e42bc9f79a36cc378d07881c73136d603ddb
-AUX tome-2.3.5-noX.patch 453 BLAKE2B 4ec72b20f50593b871990d7b65aec1cd51fe5c25c5de29350b7cf1a77063e13d393962efbadc1380aec97ec1889c645faff54470def7c5200be5050c5c7a87c0 SHA512 9c3fe5a8a9fa0e1e1b0e1ffb4ca8a089eda401a04bc6fe14aba8866090cd96ad13f5fac501ae18ce937f13a94439c8c1ebaa80c7fc07d1c4da9c3c8fa80f67c2
+AUX tome-2.3.5-format.patch 2925 BLAKE2B 8490e618151a05976cd93592a5218c234c93e2e38e8cf62af0c8ad4efe8170c7c6d0d475397df52a28f04c9498991d19c80d8c049704570bbeab6c6269ba48ac SHA512 e9a5763ddf3b3b2a0848031c1cfed30e83649df95902db6bb4278e85bd64d9c3c66b1c8680137eda351a7ba9e966da00947f65937416eb5c637dfccaed1c5cde
+AUX tome-2.3.5-gentoo-paths.patch 1032 BLAKE2B 35f96b35c05a12e355040c12307ce83c4e1e6e6bf2beb55c69ac28b17841735d89f8d27210ced170d6fcbb88409de80a9c05ae93e27c342e80b0c4fbea33cee3 SHA512 f1eb53c8afdd62dbfde78576d4307ecd2dbbd3b19023bbba2dbcc7a81a3aec60e11194ad961bc75107ca9999578afb5626fc5e100149525b1517ee72e3b12728
+AUX tome-2.3.5-noX.patch 453 BLAKE2B c16d66c9e3796421f045eebe9b184a3ade5556b0dc5061a71f449320b48e14530e294421c259a2f1ab7a1b7e1c1985af718d6b4ec341bbe4f8a7f41cfd257d23 SHA512 8e887690673021ca0daace4f2e43dcd8ce2d905cf3db5e97c35e90c227037b4e453e11bac6da97808320e6b6b101fc04ff7d5f65ae55e9d3d2c2318645506a58
 DIST tome-235-src.tar.bz2 2951227 BLAKE2B 7a9a6c608873062f9d6deae38c7e39244ca25d2bbb553d338014078c86b9decc36869c2f39f875425f9c3bb26784d3e460a225c5dabd197437781488f3e15d74 SHA512 f456aa91d18397297c213fa67dd14a4d29e024525be99f83b22cbe42f4d426b57fe6115a7124e3ec34de8f351117de525eab996ba7a2a230119e43639c4c9205
-EBUILD tome-2.3.5.ebuild 3632 BLAKE2B 934ccc63c844f796f064bdf7bed82514c5e849dc0d858ab4d39fd22a11a1ab942a0acfe2f4cc9ae77249bf2a0b86c92591fbf0e09f0aa0c9184f93d91eca5a7a SHA512 bd0335cf3229759ff8e8570e6e3ca84414956d3057aa2c4c134d665d6a5cc9b7945ec6eba588e16075a50428d03833be5489edb5758483e1c6343ba2da0ca100
+EBUILD tome-2.3.5.ebuild 3750 BLAKE2B 53b046c729bc8b3fbc2b3935a6712647e21e7c37a41345560d2ad316adc0089f0310fb4ed94676224fde689b2541159059d3e6a2fc0c119df311caf6d7f38f87 SHA512 4cc75d61b1cf921ed6c09ed0e4f7c37549f5f96c0341e6196e94a840e9cf00bce949fe39f36deb8a201dd40886a39a98d585ad19fc7971a149a7c32d94eb432a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-roguelike/tome/files/tome-2.3.5-format.patch b/games-roguelike/tome/files/tome-2.3.5-format.patch
index f3ce1cc96faf..90057b44d19e 100644
--- a/games-roguelike/tome/files/tome-2.3.5-format.patch
+++ b/games-roguelike/tome/files/tome-2.3.5-format.patch
@@ -1,5 +1,5 @@
---- dungeon.c.old	2016-02-07 20:12:39.258150130 +0100
-+++ dungeon.c	2016-02-07 20:12:58.239805610 +0100
+--- a/dungeon.c	2016-02-07 20:12:39.258150130 +0100
++++ b/dungeon.c	2016-02-07 20:12:58.239805610 +0100
 @@ -1489,7 +1489,7 @@
  	{
  		char buf[20];
@@ -9,8 +9,8 @@
  		cmsg_format(TERM_L_GREEN,
  		            "Today it is %s of the %s year of the third age.",
  		            get_month_name(bst(DAY, turn), wizard, FALSE), buf);
---- files.c.old	2016-02-07 20:15:07.736451417 +0100
-+++ files.c	2016-02-07 20:15:27.595089867 +0100
+--- a/files.c	2016-02-07 20:15:07.736451417 +0100
++++ b/files.c	2016-02-07 20:15:27.595089867 +0100
 @@ -4856,7 +4856,7 @@
  
  	/* Terminate */
@@ -20,8 +20,8 @@
  
  	/* Require a "base" name */
  	if (!player_base[0]) strcpy(player_base, "PLAYER");
---- lua_bind.c.old	2016-02-07 20:09:29.071592178 +0100
-+++ lua_bind.c	2016-02-07 20:10:48.094164373 +0100
+--- a/lua_bind.c	2016-02-07 20:09:29.071592178 +0100
++++ b/lua_bind.c	2016-02-07 20:10:48.094164373 +0100
 @@ -490,7 +490,7 @@
  /* Files */
  void lua_print_hook(cptr str)
@@ -31,8 +31,8 @@
  }
  
  
---- plots.c.old	2016-02-07 20:11:35.389308152 +0100
-+++ plots.c	2016-02-07 20:12:19.247513152 +0100
+--- a/plots.c	2016-02-07 20:11:35.389308152 +0100
++++ b/plots.c	2016-02-07 20:12:19.247513152 +0100
 @@ -93,7 +93,7 @@
  	{
  		MAKE(new, hooks_chain);
@@ -42,8 +42,8 @@
  #ifdef DEBUG_HOOK
  		if (wizard) cmsg_format(TERM_VIOLET, "HOOK ADD: %s", name);
  		if (take_notes) add_note(format("HOOK ADD: %s", name), 'D');
---- spells1.c.old	2016-02-07 20:15:47.277731397 +0100
-+++ spells1.c	2016-02-07 20:16:03.373438169 +0100
+--- a/spells1.c	2016-02-07 20:15:47.277731397 +0100
++++ b/spells1.c	2016-02-07 20:16:03.373438169 +0100
 @@ -7312,7 +7312,7 @@
  
  	if (who == -2)
@@ -53,8 +53,8 @@
  	}
  
  	/* Analyze the damage */
---- squeltch.c.old	2016-02-07 20:13:11.872558078 +0100
-+++ squeltch.c	2016-02-07 20:13:42.707997918 +0100
+--- a/squeltch.c	2016-02-07 20:13:11.872558078 +0100
++++ b/squeltch.c	2016-02-07 20:13:42.707997918 +0100
 @@ -399,7 +399,7 @@
  
  				if (!max) continue;
@@ -64,8 +64,8 @@
  				if (input_box("New name?", hgt / 2, wid / 2, name, 15))
  				{
  					exec_lua(format("auto_aux:rename_rule(%d, '%s')", sel, name));
---- util.c.old	2016-02-07 20:14:22.786269296 +0100
-+++ util.c	2016-02-07 20:16:44.227693551 +0100
+--- a/util.c	2016-02-07 20:14:22.786269296 +0100
++++ b/util.c	2016-02-07 20:16:44.227693551 +0100
 @@ -4468,7 +4468,7 @@
  		{
  			char buf2[20];
diff --git a/games-roguelike/tome/files/2.3.5-gentoo-paths.patch b/games-roguelike/tome/files/tome-2.3.5-gentoo-paths.patch
index d171a1cf540f..b3ef7fd98e67 100644
--- a/games-roguelike/tome/files/2.3.5-gentoo-paths.patch
+++ b/games-roguelike/tome/files/tome-2.3.5-gentoo-paths.patch
@@ -1,6 +1,6 @@
-diff -rU 1 tome-225-src.orig/src/files.c tome-225-src/src/files.c
---- tome-225-src.orig/src/files.c	2004-01-14 11:17:02.423263360 -0500
-+++ tome-225-src/src/files.c	2004-01-14 11:17:50.074019344 -0500
+diff -rU 1 a/files.c b/files.c
+--- a/files.c	2004-01-14 11:17:02.423263360 -0500
++++ b/files.c	2004-01-14 11:17:50.074019344 -0500
 @@ -5670,3 +5670,3 @@
  	/* Build the filename */
 -	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
@@ -21,9 +21,9 @@ diff -rU 1 tome-225-src.orig/src/files.c tome-225-src/src/files.c
 -	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
 +	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
  
-diff -rU 1 tome-225-src.orig/src/init2.c tome-225-src/src/init2.c
---- tome-225-src.orig/src/init2.c	2004-01-14 11:17:02.473255760 -0500
-+++ tome-225-src/src/init2.c	2004-01-14 11:17:58.286770816 -0500
+diff -rU 1 a/init2.c b/init2.c
+--- a/init2.c	2004-01-14 11:17:02.473255760 -0500
++++ b/init2.c	2004-01-14 11:17:58.286770816 -0500
 @@ -6686,3 +6686,3 @@
  	/* Build the filename */
 -	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
diff --git a/games-roguelike/tome/files/tome-2.3.5-noX.patch b/games-roguelike/tome/files/tome-2.3.5-noX.patch
index 5c5982fe730d..b3830af50be1 100644
--- a/games-roguelike/tome/files/tome-2.3.5-noX.patch
+++ b/games-roguelike/tome/files/tome-2.3.5-noX.patch
@@ -1,5 +1,5 @@
---- makefile.old	2012-05-28 14:02:44.787705444 +0200
-+++ makefile	2012-05-28 14:03:44.520524011 +0200
+--- a/makefile	2012-05-28 14:02:44.787705444 +0200
++++ b/makefile	2012-05-28 14:03:44.520524011 +0200
 @@ -458,7 +458,7 @@
  	$(CC) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
  
diff --git a/games-roguelike/tome/tome-2.3.5.ebuild b/games-roguelike/tome/tome-2.3.5.ebuild
index cdb3c58fefd5..3e3884187946 100644
--- a/games-roguelike/tome/tome-2.3.5.ebuild
+++ b/games-roguelike/tome/tome-2.3.5.ebuild
@@ -1,97 +1,122 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit toolchain-funcs
 
 MY_PV=${PV//./}
 DESCRIPTION="save the world from Morgoth and battle evil (or become evil ;])"
 HOMEPAGE="http://t-o-m-e.net/"
 SRC_URI="http://t-o-m-e.net/dl/src/tome-${MY_PV}-src.tar.bz2"
+S="${WORKDIR}"/tome-${MY_PV}-src/src
 
 LICENSE="Moria"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X Xaw3d gtk sdl"
+IUSE="gtk sdl X Xaw3d"
 
-RDEPEND=">=sys-libs/ncurses-5:0
-	X? ( x11-libs/libX11 )
-	Xaw3d? ( x11-libs/libXaw )
+RDEPEND="
+	>=sys-libs/ncurses-5:0=
 	sdl? (
 		media-libs/sdl-ttf
 		media-libs/sdl-image
 		media-libs/libsdl )
-	gtk? ( >=x11-libs/gtk+-2.12.8:2 ) "
-DEPEND="${RDEPEND}
+	gtk? ( >=x11-libs/gtk+-2.12.8:2 )
+	X? ( x11-libs/libX11 )
+	Xaw3d? ( x11-libs/libXaw )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	x11-misc/makedepend"
+	x11-misc/makedepend
+"
+
+RDEPEND+=" acct-group/gamestat"
 
-S=${WORKDIR}/tome-${MY_PV}-src/src
+PATCHES=(
+	"${FILESDIR}/"${PN}-2.3.5-gentoo-paths.patch
+	"${FILESDIR}"/${PN}-2.3.5-format.patch
+	"${FILESDIR}"/${PN}-2.3.5-noX.patch
+)
 
 src_prepare() {
-	mv makefile.std makefile
-	epatch "${FILESDIR}/${PV}-gentoo-paths.patch" \
-		"${FILESDIR}"/${P}-format.patch \
-		"${FILESDIR}"/${P}-noX.patch
+	mv makefile.std makefile || die
+
+	default
+
 	sed -i -e '/^CC =/d' makefile || die
 	sed -i -e "s:xx:x:" ../lib/edit/p_info.txt || die
-	sed -i -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c || die
+	# sed -i -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c || die
 
-	find .. -name .cvsignore -exec rm -f \{\} +
-	find ../lib/edit -type f -exec chmod a-x \{\} +
+	find .. -name .cvsignore -exec rm -f \{\} + || die
+	find ../lib/edit -type f -exec chmod a-x \{\} + || die
 }
 
 src_compile() {
-	local GENTOO_INCLUDES="" GENTOO_DEFINES="-DUSE_GCU " GENTOO_LIBS="$(pkg-config ncurses --libs)"
+	tc-export CC
+
+	local GENTOO_INCLUDES="" GENTOO_DEFINES="-DUSE_GCU " GENTOO_LIBS="$($(tc-getPKG_CONFIG) ncurses --libs)"
+
 	if use sdl || use X || use gtk || use Xaw3d; then
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY \
 			-DSUPPORT_GAMMA"
 	fi
+
 	if use sdl || use X || use Xaw3d; then
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK "
 	fi
+
 	if use sdl; then
 		GENTOO_INCLUDES="${GENTOO_INCLUDES} $(sdl-config --cflags)"
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_SDL "
 		GENTOO_LIBS="${GENTOO_LIBS} $(sdl-config --libs) -lSDL_image -lSDL_ttf"
 	fi
+
 	if use X; then
 		GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include "
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_X11 "
 		GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lX11 "
 	fi
+
 	if use Xaw3d; then
 		GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include "
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_XAW "
 		GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 "
 	fi
+
 	if use gtk; then
-		GENTOO_INCLUDES="${GENTOO_INCLUDES} $(pkg-config gtk+-2.0 --cflags)"
+		GENTOO_INCLUDES="${GENTOO_INCLUDES} $($(tc-getPKG_CONFIG) gtk+-2.0 --cflags)"
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_GTK2 "
-		GENTOO_LIBS="${GENTOO_LIBS} $(pkg-config gtk+-2.0 --libs) "
+		GENTOO_LIBS="${GENTOO_LIBS} $($(tc-getPKG_CONFIG) gtk+-2.0 --libs) "
 		GTK_SRC_FILE="main-gtk2.c"
 		GTK_OBJ_FILE="main-gtk2.o"
 	else
 		GTK_SRC_FILE=""
 		GTK_OBJ_FILE=""
 	fi
+
 	if use amd64; then
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DLUA_NUM_TYPE=int "
 	fi
+
 	GENTOO_INCLUDES="${GENTOO_INCLUDES} -Ilua -I."
 	GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_LUA"
+
 	emake -j1 \
 		INCLUDES="${GENTOO_INCLUDES}" \
 		DEFINES="${GENTOO_DEFINES}" \
 		depend
-	emake ./tolua
+
+	emake tolua
+
 	emake \
 		COPTS="${CFLAGS}" \
 		INCLUDES="${GENTOO_INCLUDES}" \
 		DEFINES="${GENTOO_DEFINES}" \
 		LIBS="${GENTOO_LIBS} -lm" \
-		BINDIR="${GAMES_BINDIR}" \
-		LIBDIR="${GAMES_DATADIR}/${PN}" \
+		BINDIR="${EPREFIX}/usr/bin" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \
 		GTK_SRC_FILE="${GTK_SRC_FILE}" \
 		GTK_OBJ_FILE="${GTK_OBJ_FILE}"
 }
@@ -99,23 +124,22 @@ src_compile() {
 src_install() {
 	emake -j1 \
 		DESTDIR="${D}" \
-		OWNER="${GAMES_USER}" \
-		BINDIR="${GAMES_BINDIR}" \
-		LIBDIR="${GAMES_DATADIR}/${PN}" install
-	cd ..
+		OWNER="nobody" \
+		BINDIR="${EPREFIX}/usr/bin" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" install
+
+	cd .. || die
 	dodoc *.txt
 
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}/${GAMES_STATEDIR}/${PN}-scores.raw"
-	prepgamesdirs
-	fperms g+w "${GAMES_STATEDIR}/${PN}-scores.raw"
-	#FIXME: something has to be done about this.
-	fperms g+w "${GAMES_DATADIR}/${PN}/data"
+	dodir /var/games
+	touch "${ED}/var/games/${PN}-scores.raw" || die
+
+	fperms 660 /var/games/${PN}-scores.raw
+	fowners root:gamestat /var/games/${PN}-scores.raw
+	fperms g+s /usr/bin/${PN}
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-	echo
 	ewarn "ToME ${PV} is not save-game compatible with 2.3.0 and previous versions."
 	echo
 	ewarn "If you have older save files and you wish to continue those games,"
diff --git a/games-roguelike/zangband/Manifest b/games-roguelike/zangband/Manifest
index 8f05a411362f..890d843c7009 100644
--- a/games-roguelike/zangband/Manifest
+++ b/games-roguelike/zangband/Manifest
@@ -1,8 +1,8 @@
-AUX zangband-2.7.4c-configure.patch 1506 BLAKE2B a1fe4d0c0f1ce58e9487b282d9a0b5e363016c8df93141c6ef3fd63636693e696ad08d2e57242e2b62670257a395f623c795983dc646981f9bec0df99c244a26 SHA512 a5f0e8265aa05da7881b0e194bd4b1cc07d1376ad14d20bb4707d08ba1042a919d57f5ec7a8c990fd1d7f13d9dd8e5f147c1816eb99f2589dfdf0d399161c3ea
-AUX zangband-2.7.4c-makefile.patch 631 BLAKE2B 0266dbb4b40ef515ac6ab0c1f807fe56ea7f5254f43803900330dfe4e573283b484c88c1e3d953a6e11beec2e12b4ddf7c87495bf8e11a996ed3f2ffe4ab4620 SHA512 c6453d867336a7974757b1240a28715fd0e801d59f61fed23d053be86c7cdf6ea07bc874415b860076a4e5fd08537eff17793f0caa52a2bdb219514a7b8d1fd8
+AUX zangband-2.7.4c-configure.patch 1505 BLAKE2B e945c8aa0408250be05d10a98688ff32b5c752239b576e63355f05119f4272b543659441b950835fcb354c10c0581bf285abe9cfdf169a58058bd019e67e1dec SHA512 3d7a6b4f95b570b8fcedb5926f4bfa68af12925fe5742d935776ba655cf989bbbccbc0c6d1f358d385ff6dc0daf8ab79dde31905715a784386a3512a31fd5d0d
+AUX zangband-2.7.4c-makefile.patch 630 BLAKE2B ac98faa95612ff3d04103ddbab5596e50088911dd45668b0a61b00680de24af5263a6602439106da6684bdfc1121bc998aaa4e5ffb6990c4dd3867b068d7e2ad SHA512 00b6e85933a9128d0b4d6810b94edecc7add9050fa22e14fa1a6817227956952c15f8d35e9e75a8210c85fad33fca63f5144ffc3aaa894f8abe443e4cb6b700c
 AUX zangband-2.7.4c-rng.patch 285 BLAKE2B fa32ebcf9ce2e2da9f004d6973c19355e9ba813d870a5e309084f008ea014452f0d1597d6f92a370f46b29a2571b2914d6519c31b4af506daf6c5ef27271c31c SHA512 ff6e63d15c8d6243b24fc580c8e21c556edf578b5c31b6c0af62db8f096e4e47ebe50d201811d834ba32af678e5c6775b4d4426295dd3d87dbd8ce798d13528c
 AUX zangband-2.7.4c-tinfo.patch 513 BLAKE2B e095db92aa2d350850032d337dbfa7daf345b2ed01870a51ce864b6c01285335f412f79104d966468698bbf8839f9bc6dab494114d5e4979a70ec206d6e41373 SHA512 e0ec33b61f4aff5a6180ff861296a6fd1bf7ee9acb54b7b4dd4b35ccbfaf70e2e36c2dc0da2dbbfbd1d42857c9fec11e5bd7c1d8f2bf7f43acee5b41ba844629
-AUX zangband-2.7.4c-tk85.patch 1405 BLAKE2B 082065c1549874160c348d534167a440ef57ee1d74a4f1fc3f290360216ab58a19e2717d4e8f387d925dc8e67dffd7245ea1309d55d2b4888e6f37d16356f182 SHA512 358edb61b0703dabbe780a2fdca284b80c1fd68dba16e1b70de42b96c7407e5eaf6d9304789c2a37098c1ed2c10690731c9ad10002995f82c6289c1657d2e2c3
+AUX zangband-2.7.4c-tk85.patch 1404 BLAKE2B 88c346359d06439763baa39312e9f65da0acb934427e82754e14781cf8b599afb857689061aff6db4855898573a3bf7436322173242d3a76723316aa9415732c SHA512 41c71ebd62fe0eba51b0a07352729dda67ada6c7ff38a05adc6d66b71128962c324c4e51c7ed20db30fa4438e32704d1c5c32d567d1e115d2b41b1816fcd21f7
 DIST zangband-2.7.4c.tar.gz 2821355 BLAKE2B 5d541ad0e24d61000194beb6d5139b3ff5236de3e48ace9861716c953303f5b37c855c933e7aaab711ff7389a7f81e644654535f88f83cd999484d3e4254f4ad SHA512 491dfeb72b6eb34f7feaa45d5360014da8eaeccd173dd75b3f7a1c2034e4fb634817493957b75babc0d9600077a80d88529cf2e86769948fc86d05e59958356e
-EBUILD zangband-2.7.4c.ebuild 1609 BLAKE2B 0d249d0788841ae1b4a4bce6283e5cd9c0214d24311a268109bd2154acb80686d4ba003792a4abef621e5e19c4b907495c0179feca7f39626661900e41e8e3b8 SHA512 6c4307dcaf5b63d645ba67971fef0a26236306a8556a01c5e476dcdc41ab76e35c418523d924c1a479ef9caa7a68fcaecfbd8d02b1e91e4370f5056de6c80cc3
+EBUILD zangband-2.7.4c.ebuild 1233 BLAKE2B cda232b9f7a6bb0ce7198485aeae4c45730f32fb51a50b213169d1c44a6e36d6e140cc2d3c59d8b9bcee775cfa18303ca59ae73b64d890f399efb3b4545cd4a1 SHA512 714107a5740ea7a25f994e1793ec22438a6091c2636b36a3c6ae009b2c79045e64280248ea387eef2ccef3ab620be56eb87152acb5f41bee6cda53716692da56
 MISC metadata.xml 376 BLAKE2B c9d07a6b1cc2ad8e07c045d37d89534c2df89ac24fef88a632a7b8ecefbf38f4e409d00f0b832935d123cd51570ea360fefff021c399994880c42beaaaaa70ec SHA512 b6f1ab669041ee08a2aceec376775c41dc95e7bbdccff4c51fc930086c82c508d3bf2d92e4bf55f0888d157fec0aec6f7faaad1fc8dbdfacdb6b62c109dc8b19
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch b/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch
index 756ea757845c..b56fed37cfdb 100644
--- a/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch
+++ b/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch
@@ -1,5 +1,5 @@
---- configure.in.orig
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -236,48 +236,5 @@
  AC_CHECK_FUNCS([Tk_SetClassProcs TkpSync])
  AC_CHECK_FUNCS([mkstemp usleep getpwuid getpwnam shmget])
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch b/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch
index bae74904cf02..0fb2821ecfad 100644
--- a/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch
+++ b/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch
@@ -1,5 +1,5 @@
---- makefile.in.orig
-+++ makefile.in
+--- a/makefile.in
++++ b/makefile.in
 @@ -111,17 +111,6 @@
  %.o: %.c
  	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $< -c -o $@ $(DEFS)
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch b/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch
index 73ea2ab5f9dc..6b4eff9d30da 100644
--- a/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch
+++ b/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch
@@ -1,5 +1,5 @@
---- configure.in.orig
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -141,12 +141,12 @@
  ])
  
diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild
index 23fcdc425c07..211bb818327b 100644
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils games
+inherit autotools
 
 DESCRIPTION="An enhanced version of the Roguelike game Angband"
 HOMEPAGE="http://www.zangband.org/"
 SRC_URI="ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/${P}.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="Moria"
 SLOT="0"
@@ -20,44 +21,46 @@ RDEPEND="
 		dev-lang/tk:0=
 		)
 	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
 
-S=${WORKDIR}/${PN}
+DOCS=( readme z_faq.txt z_update.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tk85.patch
+	"${FILESDIR}"/${P}-rng.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-makefile.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-tk85.patch \
-		"${FILESDIR}"/${P}-rng.patch \
-		"${FILESDIR}"/${P}-tinfo.patch \
-		"${FILESDIR}"/${P}-configure.patch \
-		"${FILESDIR}"/${P}-makefile.patch
+	default
+
 	mv configure.in configure.ac || die
 	eautoreconf
 }
 
 src_configure() {
-	egamesconf \
-		--datadir="${GAMES_DATADIR_BASE}" \
-		--with-setgid="${GAMES_GROUP}" \
-		--without-gtk \
+	local myconf=(
+		--libdir="${EPREFIX}"/$(get_libdir)/${PN}
+		--with-setgid="nobody"
+		--without-gtk
 		$(use_with tk tcltk)
+	)
+
+	econf "${myconf[@]}"
 }
 
 src_install() {
-	# Keep some important dirs we want to chmod later
-	keepdir "${GAMES_DATADIR}"/${PN}/lib/{apex,user,save,bone,info,xtra/help,xtra/music}
-
 	# Install the basic files but remove unneeded crap
-	emake DESTDIR="${D}/${GAMES_DATADIR}"/${PN}/ installbase
-	rm "${D}${GAMES_DATADIR}"/${PN}/{angdos.cfg,readme,z_faq.txt,z_update.txt}
+	emake DESTDIR="${D}/usr/" installbase
+	rm "${ED}"/usr/{angdos.cfg,readme,z_faq.txt,z_update.txt} || die
 
 	# Install everything else and fix the permissions
-	dogamesbin zangband
-	dodoc readme z_faq.txt z_update.txt
-	find "${D}${GAMES_DATADIR}/zangband/lib" -type f -exec chmod a-x \{\} +
-
-	prepgamesdirs
-	# All users in the games group need write permissions to
-	# some important dirs
-	fperms -R g+w "${GAMES_DATADIR}"/zangband/lib/{apex,data,save,user}
+	dobin zangband
+
+	einstalldocs
 }