gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /games-misc
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
87 files changed, 665 insertions, 477 deletions
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 9b19680d702f..2a26159b1aa0 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/asr-manpages/Manifest b/games-misc/asr-manpages/Manifest
index 5b0c3eec0566..6e5ba6197728 100644
--- a/games-misc/asr-manpages/Manifest
+++ b/games-misc/asr-manpages/Manifest
@@ -1,4 +1,4 @@
 DIST asr-manpages_1.3-6.diff.gz 3558 BLAKE2B 33435145176e65acad4a7f25ad84457a6fb6b60fbe1914d0b629b7776a26122bfd12898dec5e152a95fbf02a74d647ba18bcee76034c4458c7784a9bdb9fb99f SHA512 3b9d75b36c8417e5fdef7e4f3f17321bb482dc9c0cb6ce936a6ca8e2acf5254a39281925763f125898d1888dac4de457094e0b3fdcb5fd6eac5e4c6ce803b6aa
 DIST asr-manpages_1.3.orig.tar.gz 14711 BLAKE2B 5e2d369145f407bee9c96d292a53e13eba3db4fd6011b0db81cf356714410a788eafaa8963b66f7e373f81ff98a46b402fb92b0694f6603a1899cc2ec79498d4 SHA512 abfc6a9306c128802f0d85faeb27981199e1348d22f9d0afd8f95f59c9c9b0c5eb2c0f028ea0cb10be1fe497146223c93ae787ff90160a9e0809a1965de826af
-EBUILD asr-manpages-1.3_rc6.ebuild 672 BLAKE2B 5837af01a91ec96cd0e5bb56a51eb2654ef3b5b75bb39d01aaf38d11700c8ed7bbcaaa95e5fe18fe89764070ecc06da294a7d066cf2de487c9e74a731146b0cf SHA512 26f68b0499269c4be32336e6777963a75e8d54ee49608a65a3321c09bdbed99ae054268883641c191b495eea564cf44e13dc6696b53a67e76eb6aef7693bf389
+EBUILD asr-manpages-1.3_rc6.ebuild 680 BLAKE2B 509cfa6ec8a8cb9874421849e95cc7ee69bf925998e17e82f4f9fc9ecdb31f36f3eb58b97c9e844c98103e884562271b2a5d643efe1bc58629986b75ebf3d3f8 SHA512 fd131ec0226dbc0537b25708d8fb57c8e6500ae59347c8f564914e257380b09fd8909a7219e56ae6d47a07abc08fc6f8e9367e5677e9b01a75813f81cb03d7c6
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild b/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
index 37e8b84e8c31..fd03b213a0dd 100644
--- a/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
+++ b/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 MY_R="6"
 MY_P="${PN}_${PV/_rc6/}"
-DESCRIPTION="set of humorous manual pages developed on alt.sysadmin.recovery"
+DESCRIPTION="Set of humorous manual pages developed on alt.sysadmin.recovery"
 HOMEPAGE="https://www.debian.org"
 SRC_URI="mirror://debian/pool/main/a/asr-manpages/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/a/asr-manpages/${MY_P}-${MY_R}.diff.gz"
+S="${WORKDIR}"/${MY_P/_/-}.orig
 
 LICENSE="freedist" #465704
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~x86"
-IUSE=""
 
 RDEPEND="virtual/man"
 
-S=${WORKDIR}/${MY_P/_/-}.orig
+PATCHES=(
+	"${WORKDIR}"/${MY_P}-${MY_R}.diff
+)
 
 src_prepare() {
-	epatch ../"${MY_P}-${MY_R}.diff"
-	rm -rf debian
+	default
+	rm -rf debian || die
 }
 
 src_install() {
diff --git a/games-misc/ballerburg/Manifest b/games-misc/ballerburg/Manifest
index 9860d68a6235..c84a7d584c4d 100644
--- a/games-misc/ballerburg/Manifest
+++ b/games-misc/ballerburg/Manifest
@@ -1,4 +1,4 @@
 AUX ballerburg-1.2.0-nomancompress.patch 636 BLAKE2B 16f3bf6ebdf5d7932453e494e4360bc102a58fe8d439c6e1da53728bc8bb1c4d5b1cb0395b11b450022313e3283859d3f373a58f920b7dc7eaa8205d6517490d SHA512 bdbcd28d757e22f83e8f70ae207011a543f60a7e58c8b7ccc4d7f5945d6cba8be4f6ff03c4b9cb3e80390a97b5ecd4413b65383b226bb439ed26fad77a78744f
 DIST ballerburg-1.2.0.tar.gz 99910 BLAKE2B cbc88ec39135847f9a339b37ae52a151880aafe4ef52659fe0a7c57f3a50b67d4cbb9d46226bf85871a9b7b9321aaad1b38c81d89ed159d07769f7a8be3ce9c3 SHA512 d9a911e811871604650df0224633c5338570ed5eee9a2f3eecb35bc012388b9296878b62b2459965c0766dd7e7cded9a23168f39346a2300aac9e9fe4f478760
-EBUILD ballerburg-1.2.0-r1.ebuild 565 BLAKE2B 7378c1eb1d5e1f0ee8f126babe2bbfe4cc58d391d0470cfc7cac9b26da64b2d0cb207358ffabe2e2fdbd4bfe237d077d897c59c76bfd54e2b2266219d4910710 SHA512 6eaf53c796cd24e6b1186a4a657e4c0ad2778f5e8ebc8a4b520950af557226b29e1fd9b53d4757d56660f25139ce486d94b41ffb720b796727d1b9ab0f3013b1
+EBUILD ballerburg-1.2.0-r1.ebuild 567 BLAKE2B 0d949e36740297600cc95380646dde3f1853749e7a99d2c03adc27e04ef7b40d853fad619e8f59d1ebb18f4617abdeabe07e48ce50b6c1cead0e3128d4196f7a SHA512 85164e4c11cae4bf5efcde9bf5fc807c174906501e80c741f6e637bc826a66a9cec156ccb7a3a27ed9998bb34ba0f30827acfce7a83f81d66fdeab7652b61d9b
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/games-misc/ballerburg/ballerburg-1.2.0-r1.ebuild b/games-misc/ballerburg/ballerburg-1.2.0-r1.ebuild
index 6b15169bd6a3..3100c8832da2 100644
--- a/games-misc/ballerburg/ballerburg-1.2.0-r1.ebuild
+++ b/games-misc/ballerburg/ballerburg-1.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR=emake
+CMAKE_MAKEFILE_GENERATOR="emake"
 inherit cmake
 
 DESCRIPTION="Linux port of the classical Atari ST game Ballerburg"
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index f4a90198b77c..9b4748f8b5a3 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -1,9 +1,13 @@
-AUX bsd-games-2.17-64bitutmp.patch 681 BLAKE2B 2ef7ad184787ecab40e3082992bfb562be4477dfe331f2ab68e93f619f9cf5b1ee33b8d4f2b342c44f8a22d19c51b341557670c9bebb5fe827f6fbfd601b99c1 SHA512 ba5a261950bd0f5f5b6aae0ee961a84f06bc6b68504c859db387d9c32875cb4f849c555c56c52f66b00af85d44d9a2324a2d1cccc6811acf6f980cefe9508258
-AUX bsd-games-2.17-bg.patch 732 BLAKE2B 84e76aa2d3e6eeb34b92140adb2cfb1ca6ad1ad23a1261225277d3cc439e98d70ba4e93af5d44e080c71bb4c62c906b68a872191c09aedb93345949b9db512a9 SHA512 006ce0aa632c1ff671bc98584307fcfabed62e81a4680271fcbbaebf93e0f6f7c89cb1fbe311ffa472facd02991c456ced6b198c02753958b1178aa9ef16d8ba
-AUX bsd-games-2.17-gcc4.patch 893 BLAKE2B 54eb6b43592d83dd40c8e00e82438e3cbd818f2fc61cd121f0e9a3c555e57505668946bc6033f799791da96484ec834379ca657640b8541c4ba5b394fcc87070 SHA512 fca57d3887f202b973bf5c03eb0d9a8e62a0ef8f746ccec0cb6e3ad2494bdf1208a1a8833bd3b762281289802b8c58d90cab62fe2642915acaf1ff87233329c5
-AUX bsd-games-2.17-headers.patch 268 BLAKE2B e3b1761e4373e2ed22c3a4b1d31e30f5af8ecd16de8c33bee0f02aa988f5e8dad78395d786a55214ef9f714864723f71ea3913bb832b3fd322bbcc0f8ab01040 SHA512 cc7c62109e835b31db0dfbb84de35fcb962bebee04b901c727b7ff087c194bfb12e4edac6b7e2f3ca0e414bd486c18962e8f5ad1f33a997e2782f58b9b62469f
+AUX bsd-games-2.17-64bitutmp.patch 665 BLAKE2B 1513cb2d08d4749dd20da92664349db25df1833538c6c1494e4f3edeb6ca78290ee0428013212667755ffd02196ae0ae410aafac5ed38867fcb95d59bdc5cc96 SHA512 5f16bbd2538add0f67fdabf108ea6677cd3745b7acc50dd5e4c8b4de9132174a644825239d730a5a5e7bef00a4521e009f5d81f334337b561f446ac6da867e4d
+AUX bsd-games-2.17-bg.patch 660 BLAKE2B 7852051346beb6c33ef0728a64570a8a02c3883e7dd2daa2711d4b83737eb1bc7f4d38484a7365462dd7a275183473317403bc427874149c922917546884fcac SHA512 31584681cfca28e020b8216d8ceafeda1bd37c3fb24d730a05c1aeceb85a49f1dc9e42c61c69247900c18ef31cf0e9db8550184dbb994088afb5a60ace7f700a
+AUX bsd-games-2.17-gcc4.patch 747 BLAKE2B ce3fdad6643efd29c5dd63e82241b5e2f209a682cebed2e696791580491c275c739c2e82e24469fb6efe26e75204bb7ad368db393f27f2beeb58d79f7d2903a7 SHA512 3ac710726807d2893befd0a3ef24ca9d329123c79b68880c2cb18ca4ccd63ceaaf7cf798d77b1026a440e4ed4e6de9d4745d0f5d6b4280a6c963d9b397b398f7
+AUX bsd-games-2.17-rename-getdate-clash.patch 767 BLAKE2B 164e73f598583f46df09b3b5f8651839d4fe878cd57a84830fc25596ae1b9752b0a6b1f7eee13f57b6e06101105a85114fb0574bc4491e7171205fc703460454 SHA512 50338cda948f4186ab9a6590b7177cce74c466a4098b06b396f893e1c63281f99e14a968ae38ce739148a4aeb930dcba2e9ee8ee7689174d14aad4c1f626ff2b
+AUX bsd-games-3.1-no-install-manpages-automatically.patch 295 BLAKE2B e0c02a1fda3a79e6263a52a2155075b286239ac58da3b84bab14d1e3c203806b75928968e89db80f02661011b19ee12758e6f2c6a848661ef7219ee704ca6d59 SHA512 266f523c7bdf46599f99f3bbbf728705a7fa6fbf71548033198dd361468dfe5e233e40c975235b166a099cba5fa4fe0fa88b05825935c3449c2c7e5f884198fd
 AUX config.params-gentoo 1204 BLAKE2B 638b52df3c92928a78a0e0833c2bc84a76906144b36d5a6b3523f4de24452aeeab355268afadb9d32933e5c0c19ab4145062bf3968a9d440af1a659a403b32c4 SHA512 b6734409235caec3deb531bbcdb37527b3090c41b803ccc11895ea403543722437f84bdfa044c6aa70b306384ce94a40979a347e6031bc1d937841c7222d6618
-DIST bsd-games-2.17.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f
-DIST bsdgames_2.17-22.debian.tar.xz 32268 BLAKE2B 2485abc1d80b8319c7eb68e2747c0a4166d18079047eca67c1de549cd011f75a767b6fe69021cb4ce09aaf029823a097e6ac658efcab5e19e976a89ed798d06f SHA512 902d86557dd3813c31333fe18437d8046ae100814c9c1b340ab1f8266c817545f21e000702b1ca93babb9d632896ea5bada1e146436abfa7916b469681fceed5
-EBUILD bsd-games-2.17-r5.ebuild 4367 BLAKE2B b8c622107c70c26e540a780ffbf6ba2f8a2e993967425a2a42ff8cffb213935aa0ddbbff8ade6e856506afc57279a413a8a02784cda16d6484caf6f5bdbaa6db SHA512 c928e89b3a53484636946e5042f815c7ebd732012ff056ec7996e7d50167e5c798a111abf88ae6aa0ffd77bc03f1217cc25a9170644b991cc639bba192a625c6
+DIST bsd-games-3.1-verbose-build.patch.gz 4633 BLAKE2B cc75175ac2ef9d476c03bdb08b8c054d13090d6cdd1a14dd44022d13290112c68a7663d0c03f9ca7535ea10f2bb5e49a84acca4f782f0ced59685f762efd5151 SHA512 120c0859bb73a026dae017bcc2bc7505ca156b454bf5f87c91b4887417d5ac62f3dec706af91b22b11be8b5bce11d168f9205d722a9fd30dea654f682a66b1c8
+DIST bsd-games-3.1.tar.gz 267636 BLAKE2B 116b340e383430fc56e9d2379a398494b43664aa124157bfa01f2c6a76ebdc90128cc676abae83b6d74680b0ad9396d24f1c0d11adcff1f552a3e68717b8cc8f SHA512 3f311e89481913b734a21fc7d0765628637af8251228d5a38349c27cc702c307240e81711785bbd7428e208a142bd07597630d29e97e2c7bf5bd9cac1ebc6ada
+DIST bsdgames_2.17-28.debian.tar.xz 58464 BLAKE2B 3f5a70322341b153a8b3cb8df81fea1e773971d0f3b79ba8fb0c0877e95c61c8e8689952333f8ac4263948d781c2dc64c8178f9dac6a1c09ae702f91794b9583 SHA512 7e2db9f830c0657f3fcd1371635bda4a87e7a68180e486e44752904740c0710c02271522ff2d4b606542b3c502dd28795fcecf883360c3ac5bea78c148281f6a
+DIST bsdgames_2.17.orig.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f
+EBUILD bsd-games-2.17_p28-r1.ebuild 4691 BLAKE2B 48957fd49d61fc12cb118ef1b63adfd7eba179754431f574f8d1638349a33d41b5b8660406879b77618829999b6d7b48e6f55aa972e53113ead0d3eef4c96a25 SHA512 c1708121adaa36105ae2d528b059d9bd5d46e387b295b029bd2bbea51e3e7a25e39d3acb4a8bb220ce0537ef5a4d6f7868ad15e35ddc8f2cc751d7e36525b97a
+EBUILD bsd-games-3.1-r1.ebuild 4649 BLAKE2B b22be924f94aff44fab7968a74ed9773ba8f8e687eb4ac8fa6232752f613dd29164f55ec01ac8c368d314360c5f06a1e81289c675b46bab7d4cc939faa4074c2 SHA512 45e47481b2057c436b9f8a72e7246d1f992e30bc376ad2a0ac69d14f9b6fdf33bea3278abab7ba02ffbeddaf86b9b9c2d43a68c475389abe07e17db64a545f87
 MISC metadata.xml 326 BLAKE2B 264f08d8e1036db642114667e4dd07d5b4212b85c0254c55e2a0ec541b408f7129322dc133cc0bd875714e1535699d067fe0b625048b14ba002744e7269c4b6d SHA512 6e4e98607587faadf0aae1ba28287c2e694ef629b6ce915db751427f8f46c425e7aa120ef5fc978b2a0e4d4e33ad1cb0b0e136b0a0641c555f6471a8c286ccf5
diff --git a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild b/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
deleted file mode 100644
index 6679e61b5fc7..000000000000
--- a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs games
-
-DEB_PATCH_VER=22
-DESCRIPTION="collection of games from NetBSD"
-HOMEPAGE="https://www.polyomino.org.uk/computer/software/bsd-games/"
-SRC_URI="https://www.polyomino.org.uk/computer/software/bsd-games/${P}.tar.gz
-	mirror://debian/pool/main/b/bsdgames/bsdgames_${PV}-${DEB_PATCH_VER}.debian.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!games-misc/wtf
-	!app-misc/banner
-	!games-puzzle/hangman
-	sys-libs/ncurses:0
-	sys-apps/miscfiles"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-# Set GAMES_TO_BUILD variable to whatever you want
-GAMES_TO_BUILD=${GAMES_TO_BUILD:=adventure arithmetic atc
-backgammon banner battlestar bcd boggle caesar canfield countmail cribbage
-dab dm factor fish gomoku hack hangman hunt mille monop morse
-number phantasia pig pom ppt primes quiz rain random robots sail snake
-tetris trek wargames worm worms wtf}
-
-src_prepare() {
-	local d="${WORKDIR}"/debian/patches
-	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
-
-	# Used by gentoo config.params. See bug 531200
-	export GAMES_BINDIR GAMES_DATADIR GAMES_STATEDIR
-
-	epatch \
-		"${FILESDIR}"/${P}-64bitutmp.patch \
-		"${FILESDIR}"/${P}-headers.patch \
-		"${FILESDIR}"/${P}-bg.patch \
-		"${FILESDIR}"/${P}-gcc4.patch
-
-	# Use pkg-config to query Libs: from ncurses.pc (for eg. -ltinfo) wrt #459652
-	sed -i \
-		-e "/ncurses_lib/s:-lncurses:'$($(tc-getPKG_CONFIG) --libs-only-l ncurses)':" \
-		configure || die
-
-	sed -i \
-		-e "s:/usr/games:${GAMES_BINDIR}:" \
-		wargames/wargames || die
-
-	sed -i \
-		-e '/^CC :=/d' \
-		-e '/^CXX :=/d' \
-		-e '/^CFLAGS/s/OPTIMIZE/CFLAGS/' \
-		-e '/^CXXFLAGS/s/OPTIMIZE/CXXFLAGS/' \
-		-e '/^LDFLAGS/s/LDFLAGS := /LDFLAGS := \$(LDFLAGS) /' \
-		Makeconfig.in || die
-
-	cp "${FILESDIR}"/config.params-gentoo config.params || die
-	echo bsd_games_cfg_usrlibdir=\"$(games_get_libdir)\" >> ./config.params || die
-	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params || die
-	echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params || die
-}
-
-src_test() {
-	addwrite /dev/full
-	emake -j1 check
-}
-
-build_game() {
-	has ${1} ${GAMES_TO_BUILD}
-}
-
-do_statefile() {
-	touch "${D}/${GAMES_STATEDIR}/${1}" || die
-	chmod ug+rw "${D}/${GAMES_STATEDIR}/${1}" || die
-}
-
-src_install() {
-	dodir "${GAMES_BINDIR}" "${GAMES_STATEDIR}" /usr/share/man/man{1,6}
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc AUTHORS BUGS ChangeLog ChangeLog.0 \
-		README PACKAGING SECURITY THANKS TODO YEAR2000
-
-	# set some binaries to run as games group (+S)
-	build_game atc && fperms g+s "${GAMES_BINDIR}"/atc
-	build_game battlestar && fperms g+s "${GAMES_BINDIR}"/battlestar
-	build_game canfield && fperms g+s "${GAMES_BINDIR}"/canfield
-	build_game cribbage && fperms g+s "${GAMES_BINDIR}"/cribbage
-	build_game phantasia && fperms g+s "${GAMES_BINDIR}"/phantasia
-	build_game robots && fperms g+s "${GAMES_BINDIR}"/robots
-	build_game sail && fperms g+s "${GAMES_BINDIR}"/sail
-	build_game snake && fperms g+s "${GAMES_BINDIR}"/snake
-	build_game tetris && fperms g+s "${GAMES_BINDIR}"/tetris-bsd
-
-	# state files
-	build_game atc && do_statefile atc_score
-	build_game battlestar && do_statefile battlestar.log
-	build_game canfield && do_statefile cfscores
-	build_game cribbage && do_statefile criblog
-	build_game hack && keepdir "${GAMES_STATEDIR}"/hack
-	build_game robots && do_statefile robots_roll
-	build_game sail && do_statefile saillog
-	build_game snake && do_statefile snake.log && do_statefile snakerawscores
-	build_game tetris && do_statefile tetris-bsd.scores
-
-	# extra docs
-	build_game atc && { docinto atc ; dodoc atc/BUGS; }
-	build_game boggle && { docinto boggle ; dodoc boggle/README; }
-	build_game hack && { docinto hack ; dodoc hack/{OWNER,Original_READ_ME,READ_ME,help}; }
-	build_game hunt && { docinto hunt ; dodoc hunt/README; }
-	build_game phantasia && { docinto phantasia ; dodoc phantasia/{OWNER,README}; }
-
-	# Since factor is usually not installed, and primes.6 is a symlink to
-	# factor.6, make sure that primes.6 is ok ...
-	if build_game primes && [[ ! $(build_game factor) ]] ; then
-		rm -f "${D}"/usr/share/man/man6/{factor,primes}.6
-		newman factor/factor.6 primes.6
-	fi
-
-	prepgamesdirs
-
-	# state dirs
-	chmod -R ug+rw "${D}/${GAMES_STATEDIR}"/* || die
-}
diff --git a/games-misc/bsd-games/bsd-games-2.17_p28-r1.ebuild b/games-misc/bsd-games/bsd-games-2.17_p28-r1.ebuild
new file mode 100644
index 000000000000..c98a641fd78d
--- /dev/null
+++ b/games-misc/bsd-games/bsd-games-2.17_p28-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DEB_PATCH_VER=28
+DESCRIPTION="Collection of games from NetBSD"
+HOMEPAGE="https://www.polyomino.org.uk/computer/software/bsd-games/"
+#SRC_URI="https://www.polyomino.org.uk/computer/software/bsd-games/${PN}-$(ver_cut 1-2).tar.gz"
+SRC_URI="http://deb.debian.org/debian/pool/main/b/bsdgames/bsdgames_2.17.orig.tar.gz"
+SRC_URI+=" mirror://debian/pool/main/b/bsdgames/bsdgames_$(ver_cut 1-2)-${DEB_PATCH_VER}.debian.tar.xz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+
+DEPEND="
+	sys-apps/miscfiles
+	sys-libs/ncurses:0
+	!app-misc/banner
+	!games-misc/wtf
+	!games-puzzle/hangman
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+# Set GAMES_TO_BUILD variable to whatever you want
+GAMES_TO_BUILD=${GAMES_TO_BUILD:=adventure arithmetic atc
+backgammon banner battlestar bcd boggle caesar canfield countmail cribbage
+dab dm fish gomoku hack hangman hunt mille monop morse
+number phantasia pig pom primes ppt quiz rain random robots sail snake
+tetris trek wargames worm worms wtf}
+
+src_prepare() {
+	local debian_patch_dir="${WORKDIR}"/debian/patches
+	for patch in $(<"${debian_patch_dir}"/series) ; do
+		eapply "${debian_patch_dir}"/${patch}
+	done
+
+	# Additional patches on top of Debian patchset
+	eapply "${FILESDIR}"/${PN}-2.17-64bitutmp.patch
+	eapply "${FILESDIR}"/${PN}-2.17-bg.patch
+	eapply "${FILESDIR}"/${PN}-2.17-gcc4.patch
+	eapply "${FILESDIR}"/${PN}-2.17-rename-getdate-clash.patch
+
+	default
+
+	# Use pkg-config to query Libs: from ncurses.pc (for eg. -ltinfo) wrt #459652
+	sed -i \
+		-e "/ncurses_lib/s:-lncurses:'$($(tc-getPKG_CONFIG) --libs-only-l ncurses)':" \
+		configure || die
+
+	sed -i \
+		-e "s:/usr/games:/usr/bin:" \
+		wargames/wargames || die
+
+	sed -i \
+		-e '/^CC :=/d' \
+		-e '/^CXX :=/d' \
+		-e '/^CFLAGS/s/OPTIMIZE/CFLAGS/' \
+		-e '/^CXXFLAGS/s/OPTIMIZE/CXXFLAGS/' \
+		-e '/^LDFLAGS/s/LDFLAGS := /LDFLAGS := \$(LDFLAGS) /' \
+		Makeconfig.in || die
+
+	# Used by config.params
+	export GAMES_BINDIR=/usr/bin
+	export GAMES_DATADIR=/usr/share
+	export GAMES_STATEDIR=/var/games
+	cp "${FILESDIR}"/config.params-gentoo config.params || die
+
+	echo bsd_games_cfg_usrlibdir=\"$(get_libdir)\" >> ./config.params || die
+	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params || die
+	echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params || die
+}
+
+src_compile() {
+	tc-export CC CXX
+
+	emake
+}
+
+src_test() {
+	addwrite /dev/full
+	emake -j1 check
+}
+
+src_install() {
+	# TODO: ${PN} or no?
+	dodir /var/games /usr/share/man/man{1,6}
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc AUTHORS BUGS ChangeLog ChangeLog.0 \
+		README PACKAGING SECURITY THANKS TODO YEAR2000
+
+	_build_game() {
+		has ${1} ${GAMES_TO_BUILD}
+	}
+
+	_do_statefile() {
+		touch "${ED}"/var/games/${1} || die
+		chmod ug+rw "${ED}"/var/games/${1} || die
+	}
+
+	# set some binaries to run as games group (+S)
+	_build_game atc && fperms g+s /usr/bin/atc
+	_build_game battlestar && fperms g+s /usr/bin/battlestar
+	_build_game canfield && fperms g+s /usr/bin/canfield
+	_build_game cribbage && fperms g+s /usr/bin/cribbage
+	_build_game phantasia && fperms g+s /usr/bin/phantasia
+	_build_game robots && fperms g+s /usr/bin/robots
+	_build_game sail && fperms g+s /usr/bin/sail
+	_build_game snake && fperms g+s /usr/bin/snake
+	_build_game tetris && fperms g+s /usr/bin/tetris-bsd
+
+	elog "Renaming monop to monop-bsd to avoid collision with dev-lang/mono"
+	mv "${ED}"/usr/bin/monop "${ED}"/usr/bin/monop-bsd || die
+
+	# state files
+	_build_game atc && _do_statefile atc_score
+	_build_game battlestar && _do_statefile battlestar.log
+	_build_game canfield && _do_statefile cfscores
+	_build_game cribbage && _do_statefile criblog
+	_build_game hack && keepdir /var/games/hack
+	_build_game robots && _do_statefile robots_roll
+	_build_game sail && _do_statefile sail/saillog
+	_build_game snake && _do_statefile snake.log && _do_statefile snakerawscores
+	_build_game tetris && _do_statefile tetris-bsd.scores
+
+	# extra docs
+	_build_game atc && { docinto atc ; dodoc atc/BUGS; }
+	_build_game boggle && { docinto boggle ; dodoc boggle/README; }
+	_build_game hack && { docinto hack ; dodoc hack/{OWNER,Original_READ_ME,READ_ME,help}; }
+	_build_game hunt && { docinto hunt ; dodoc hunt/README; }
+	_build_game phantasia && { docinto phantasia ; dodoc phantasia/{OWNER,README}; }
+
+	# All of this needs to be owned by the gamestat group
+	fowners -R :gamestat /var/games/
+	# ... and so do the binaries
+	fowners -R :gamestat /usr/bin/
+
+	# State dirs
+	chmod -R ug+rw "${ED}"/var/games/ || die
+}
diff --git a/games-misc/bsd-games/bsd-games-3.1-r1.ebuild b/games-misc/bsd-games/bsd-games-3.1-r1.ebuild
new file mode 100644
index 000000000000..5c2e6fdd1312
--- /dev/null
+++ b/games-misc/bsd-games/bsd-games-3.1-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="collection of games from NetBSD"
+HOMEPAGE="https://www.polyomino.org.uk/computer/software/bsd-games/"
+SRC_URI="https://github.com/msharov/bsd-games/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-verbose-build.patch.gz"
+
+LICENSE="BSD"
+# Subslot indicates the fork / new version
+# 3 doesn't include the same games as the classic variant, etc
+SLOT="0/3"
+KEYWORDS="~amd64"
+
+# 'check' target doesn't exist, nor do any actual tests
+# bug #779649
+RESTRICT="test"
+
+DEPEND="
+	sys-apps/miscfiles
+	sys-libs/ncurses:=
+	!games-misc/wtf
+	!app-misc/banner
+	!games-puzzle/hangman
+	!games-misc/wumpus
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-3.1-verbose-build.patch
+	"${FILESDIR}"/${PN}-3.1-no-install-manpages-automatically.patch
+)
+
+# Set GAMES_TO_BUILD variable to whatever you want
+GAMES_TO_BUILD=${GAMES_TO_BUILD:=adventure atc battlestar caesar cribbage
+dab drop4 gofish gomoku hangman klondike robots sail snake spirhunt
+worm wump}
+
+src_prepare() {
+	default
+
+	# Use completely our own CFLAGS/LDFLAGS, no stripping and so on
+	sed -i \
+		-e 's/+= -std=c11 @pkgcflags@ ${CFLAGS}/= -std=c11 @pkgcflags@ ${CFLAGS}/' \
+		-e 's/+= @pkgldflags@ ${LDFLAGS}/= @pkgldflags@ ${LDFLAGS}/' \
+		-e s'/${INSTALL} -m 755 -s/${INSTALL} -m 755/' \
+		-e '/man[6]dir/d' \
+		Config.mk.in || die
+
+	# Yes, this stinks.
+	# Right now, the custom configure script calls pkg-config manually
+	# and seds it a bunch, and this is easier.
+	if has_version sys-libs/ncurses[unicode] ; then
+		# Force looking for both ncurses and ncursesw
+		sed -i -e 's/pkgs="ncurses"/pkgs="ncursesw"/' configure || die
+	fi
+
+	cp "${FILESDIR}"/config.params-gentoo config.params || die
+	echo bsd_games_cfg_usrlibdir=\"$(get_libdir)\" >> ./config.params || die
+	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params || die
+	echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	econf
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_test() {
+	addwrite /dev/full
+	emake -j1 check
+}
+
+src_install() {
+	dodir /var/games
+	emake -j1 DESTDIR="${D}" install
+
+	_build_game() {
+		has ${1} ${GAMES_TO_BUILD}
+	}
+
+	_do_statefile() {
+		touch "${ED}"/var/games/${1} || die
+		chmod ug+rw "${ED}"/var/games/${1} || die
+	}
+
+	# set some binaries to run as games group (+S)
+	_build_game atc && fperms g+s /usr/bin/atc
+	_build_game battlestar && fperms g+s /usr/bin/battlestar
+	_build_game canfield && fperms g+s /usr/bin/canfield
+	_build_game cribbage && fperms g+s /usr/bin/cribbage
+	_build_game phantasia && fperms g+s /usr/bin/phantasia
+	_build_game robots && fperms g+s /usr/bin/robots
+	_build_game sail && fperms g+s /usr/bin/sail
+	_build_game snake && fperms g+s /usr/bin/snake
+	_build_game tetris && fperms g+s /usr/bin/tetris-bsd
+
+	# state files
+	_build_game atc && _do_statefile atc_score
+	_build_game battlestar && _do_statefile battlestar.log
+	_build_game canfield && _do_statefile cfscores
+	_build_game cribbage && _do_statefile criblog
+	_build_game hack && keepdir /var/games/hack
+	_build_game robots && _do_statefile robots_roll
+	_build_game sail && _do_statefile saillog
+	_build_game snake && _do_statefile snake.log && _do_statefile snakerawscores
+	_build_game tetris && _do_statefile tetris-bsd.scores
+
+	# extra docs
+	_build_game atc && docinto atc
+	_build_game boggle && { docinto boggle ; dodoc boggle/README; }
+	_build_game hack && { docinto hack ; dodoc hack/{OWNER,Original_READ_ME,READ_ME,help}; }
+	_build_game hunt && { docinto hunt ; dodoc hunt/README; }
+	_build_game phantasia && { docinto phantasia ; dodoc phantasia/{OWNER,README}; }
+
+	# Install the man pages manually to make life easier (circumventing compression)
+	local game
+	for game in ${GAMES_TO_BUILD[@]} ; do
+		if [[ -e ${game}/${game}.1 ]] ; then
+			doman ${game}/${game}.1
+		else
+			doman ${game}/${game}.6
+		fi
+	done
+
+	# Since factor is usually not installed, and primes.6 is a symlink to
+	# factor.6, make sure that primes.6 is ok ...
+	if _build_game primes && [[ ! $(_build_game factor) ]] ; then
+		rm -f "${ED}"/usr/share/man/man6/{factor,primes}.6 || die
+		newman factor/factor.6 primes.6
+	fi
+
+	# All of this needs to be owned by the gamestat group
+	fowners -R :gamestat /var/games/
+	# ... and so do the binaries
+	fowners -R :gamestat /usr/bin/
+
+	# State dirs
+	chmod -R ug+rw "${ED}"/var/games/ || die
+}
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch b/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
index 3be1b3de074b..7afd0019efb4 100644
--- a/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
+++ b/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
@@ -7,8 +7,8 @@ structure.  Work around is to assign the submembers instead.
 
 http://bugs.gentoo.org/show_bug.cgi?id=102667
 
---- bsd-games/dm/utmpentry.c
-+++ bsd-games/dm/utmpentry.c
+--- a/dm/utmpentry.c
++++ b/dm/utmpentry.c
 @@ -291,7 +291,8 @@
  	e->line[sizeof(e->line) - 1] = '\0';
  	(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host));
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-bg.patch b/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
index 07dc520b77e4..6503d9afcb5d 100644
--- a/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
+++ b/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
@@ -1,5 +1,5 @@
---- backgammon/common_source/fancy.c.old	2007-05-16 20:16:46.000000000 +0200
-+++ backgammon/common_source/fancy.c	2007-05-16 20:19:00.000000000 +0200
+--- a/backgammon/common_source/fancy.c
++++ b/backgammon/common_source/fancy.c
 @@ -58,7 +58,7 @@
  int     lUP;			/* length of UP */
  int     CO;			/* number of columns */
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch b/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
index 7de07effc25d..dabb38460a66 100644
--- a/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
+++ b/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
@@ -1,5 +1,5 @@
---- trek/getpar.h.orig	2005-08-14 19:45:29.000000000 -0400
-+++ trek/getpar.h	2005-08-14 19:46:33.000000000 -0400
+--- a/trek/getpar.h
++++ b/trek/getpar.h
 @@ -31,6 +31,9 @@
   *	@(#)getpar.h	8.1 (Berkeley) 5/31/93
   */
@@ -16,8 +16,8 @@
  int readdelim(int);
 +
 +#endif /*__GETPAR_H_*/
---- trek/trek.h.orig	2005-08-14 19:45:37.000000000 -0400
-+++ trek/trek.h	2005-08-14 19:48:17.000000000 -0400
+--- a/trek/trek.h
++++ b/trek/trek.h
 @@ -31,6 +31,13 @@
   *	@(#)trek.h	8.1 (Berkeley) 5/31/93
   */
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-headers.patch b/games-misc/bsd-games/files/bsd-games-2.17-headers.patch
deleted file mode 100644
index 953a5d35765a..000000000000
--- a/games-misc/bsd-games/files/bsd-games-2.17-headers.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/128348
-
---- include/stdio.h
-+++ include/stdio.h
-@@ -35,5 +35,11 @@
- #include_next <stdio.h>
- 
- #ifndef HAVE_fgetln
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- extern char *fgetln(FILE *stream, size_t *len);
-+#ifdef __cplusplus
-+}
-+#endif
- #endif
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch b/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch
new file mode 100644
index 000000000000..0618abd0d3dc
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-2.17-rename-getdate-clash.patch
@@ -0,0 +1,33 @@
+--- a/hack/extern.h
++++ b/hack/extern.h
+@@ -583,7 +583,7 @@ int role_index(int);
+ void setrandom(void);
+ struct tm *getlt(void);
+ int getyear(void);
+-char *getdate(void);
++char *get_date(void);
+ int phase_of_the_moon(void);
+ int night(void);
+ int midnight(void);
+--- a/hack/hack.end.c
++++ b/hack/hack.end.c
+@@ -360,7 +360,7 @@ topten()
+ 	(t0->name)[NAMSZ] = 0;
+ 	(void) strncpy(t0->death, killer, DTHSZ);
+ 	(t0->death)[DTHSZ] = 0;
+-	(void) strcpy(t0->date, getdate());
++	(void) strcpy(t0->date, get_date());
+ 
+ 	/* assure minimum number of points */
+ 	if (t0->points < POINTSMIN)
+--- a/hack/hack.unix.c
++++ b/hack/hack.unix.c
+@@ -118,7 +118,7 @@ getyear()
+ }
+ 
+ char           *
+-getdate()
++get_date()
+ {
+ 	static char     datestr[7];
+ 	struct tm      *lt = getlt();
diff --git a/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch b/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch
new file mode 100644
index 000000000000..590b595afa5f
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-3.1-no-install-manpages-automatically.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -20,10 +20,6 @@ $O%.o:	%.c
+ 	echo "    Compiling $< to assembly ..."
+ 	${CC} ${cflags} -S -o $@ -c $<
+ 
+-$O%.6.gz:	%.6
+-	echo "    Compressing $@ ..."
+-	gzip -c9 $< > $@
+-
+ ################ Installation ##########################################
+ 
+ ifdef bindir
diff --git a/games-misc/bsod/Manifest b/games-misc/bsod/Manifest
index e26dee1ec69b..80d572277974 100644
--- a/games-misc/bsod/Manifest
+++ b/games-misc/bsod/Manifest
@@ -1,4 +1,4 @@
 AUX bsod-0.1-Makefile.patch 464 BLAKE2B ff9a1653fbbdde19337b5bfc1ba19467917acd9107ca62ed42def5cfb1262092b46e1e5de70f105ae3fc9d5a7199449f677651a909f81f7b7dd4c7fe84e986c7 SHA512 f5cb0912a1b851a7f6bd7d4cf861b11a1832a47674d67632343474f5a7c6e5dbde7c2a1f4e217e2df293c8ea9c780d7de6aa14fa6ce5d07a2b5704d57edbe2a3
 DIST bsod-0.1.tgz 10128 BLAKE2B e0869bd21beb38f369bb010b5a7d73bd3182a8531c9460cb279cedb498ce37830f39f97a30dfad567a14b12be5d50743a097720e3665306f2bef43085d339be9 SHA512 2b3087ee495c83f41c2c582dc1c391ce5b73600244b6183abbcd36a3f88caf16987250d4ad23eb3a556b014669ddd84947e6cddeb8d4c89e12c9bacc545299c8
-EBUILD bsod-0.1-r1.ebuild 600 BLAKE2B cc30ff1ccfccff1d84f95a664a766daaae3e84b5c3704013e116fc010c6c95aa86acf83e563630a30c69bca68369f70211741922f1268d8660c4df4b63a7a582 SHA512 82bb7e45283cc0466c7d917b2b780117a9253fcb9105e10a29dea63541bae8d6f9be14b0e4299db9896ed7ceeffda5cf2c6944d6ffe995fb133aa54db72ac978
+EBUILD bsod-0.1-r1.ebuild 602 BLAKE2B ee3294929ccc994c1be4fe796cd4058b02fdafc888456a80faab4e463661aa8b34577eb406fc4c8d6ece8449814154dbb8531f8b7e88fa042fc0875d0a70e781 SHA512 68e17598076fa333af1a0edfb255dd99543819a120e9cfba2423befd76819ebe25ca87c82417976819ce5d76dd96cea24291f4eab590c346dff83ecddd4a34a0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/bsod/bsod-0.1-r1.ebuild b/games-misc/bsod/bsod-0.1-r1.ebuild
index 3c9c455788c7..dfeb9584c8e8 100644
--- a/games-misc/bsod/bsod-0.1-r1.ebuild
+++ b/games-misc/bsod/bsod-0.1-r1.ebuild
@@ -1,8 +1,9 @@
-# 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 toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="This program will let you experience the authentic Microsoft Windows experience"
 HOMEPAGE="http://www.vanheusden.com/bsod/"
@@ -12,10 +13,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="sys-libs/ncurses:0"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-Makefile.patch
@@ -23,7 +23,7 @@ PATCHES=(
 
 src_prepare() {
 	default
-	tc-export PKG_CONFIG
+	tc-export CC PKG_CONFIG
 }
 
 src_install() {
diff --git a/games-misc/cowsay/Manifest b/games-misc/cowsay/Manifest
index 1d1cb7d4c40f..ec38269f049a 100644
--- a/games-misc/cowsay/Manifest
+++ b/games-misc/cowsay/Manifest
@@ -1,7 +1,7 @@
-AUX cowsay-3.04-mech.patch 554 BLAKE2B 5fc429e9a1e2d068a004fe2076bb13523bf38134c053f7717108e6914e219c3287736133ba3a518669d41444c3b512c51859741dfcaa91d2162b4d208cd5dc58 SHA512 7fd9fd35bc4b0e786f6b57dbb54f4b25eaa050d5b221bc3c7c3eba620ce642a46497c62d7dae5096ef47639f98606b702df0f1672d48d81b03dcf2aab1e8eee0
-AUX cowsay-3.04-tongue.patch 422 BLAKE2B 39bd44587c297ce5971298fb6ef0ab5570de8f79bc7f04f4b9ed59d2372178b60f118b934c87dca768a6892b0cdf968b58334f2bb5fcf249cb2083bf2040bfe4 SHA512 af453db6a528802e3ab974379364b47a068fd9b20ac7631328cb53ea48dd86e2b9d5edc1ad1201bdac493c1533d38813ed6fd0ff18a4af378d9be4d648bffe6a
-AUX cowsay-3.04-utf8.patch 493 BLAKE2B eb966fd8d296c2c961d961ecf9b9a3f15e02d70dcf0ed48bda596ee121ce3b8a84c5ac912bf8257249b5080f9072e71cc3304ca57f937082d0be96ca2580fc2b SHA512 c4dcccce8b784c41b06e3fcb8fbf186025a3d2c020cca981774968b7198f345c3c365ada6d1c649951982e5ac28322b4c485aae8798ce1fe002155d86bd7b99f
-AUX cowsay-3.04-version.patch 481 BLAKE2B 7569860a2274b48c367da8a93872b3926a5128b16526a7054ad1d3777622070b93986fba61e43d7906ea780c1471312503af215dbee55b63543185a701f930ba SHA512 65792dd9fa43f9a00c160dc7b6cad85f6aa62faaff38f23c94b3220703c3059d141c62def5a6de71f24e5f07f047fbda0ff17a47283c95f0d7a59767ecd50ddd
+AUX cowsay-3.04-mech.patch 422 BLAKE2B a1090392e80d65642470ceb13aa4b79b8b75c9f6c35e2ef7767992ee6ec60e0be2fece3eef2546a1d521a75b7ef5a81f141d515f98634de51eac46b19d54dc74 SHA512 ec8ff74f17a19d29584b343fb8eb2217fa97bd863a9d7728e51d8142b8ee850b5128a0b03fa4daa456527591502eec25053a0ebe0ce625ea7fe2f8f3ff80d9ac
+AUX cowsay-3.04-tongue.patch 286 BLAKE2B e92de1eb4506ff4b262b72a0dc90bd2ea00e6964b1d3e8caadca3b204cb758463be9417b2f1a538af2e62a10332801602cce15181a858073672e4a07fb4b8294 SHA512 1d0575ca6ce088f7aea768861034ddf15b387b4dd5b08bc60c4544a371bba4215e6cbdd977075ce82b8532117461e3a25646c5d3cd0ced14fb4247f6bce7d52a
+AUX cowsay-3.04-utf8.patch 301 BLAKE2B 9448e405a588c3d58ee0b7ce4b17bae47a7e64f5f3a487d20adcd0b51b3ea88c546627cf05e66a4ae74c051d88bf25576dd483a998dbdd9364393f1e5e77e242 SHA512 3c4e5b88784bbbf74165dfed41bb40bf6515f077b717fbb1dea8340ba7a4900616c6f67d6977346accb1d9d20f910413d51561f9bb84f39ea3080c6dfcba9c17
+AUX cowsay-3.04-version.patch 344 BLAKE2B 4e429f7b7b9863044c58c8aa23f0f2eabb8430a7b4414786ac5013619322ae6c2915d87451298dbb6d8d247a9550fd21d4f1e797272b4cc899036aee77993c07 SHA512 0ca537f4c9a0dc5e2780ee0fe7243f2d5de90ad2f0f6a4d9af8deb0772076b5e5470ad46f39ca600df16a3b84a86f8ea03249cc064e00171b30b1f0faf7e7f65
 DIST cowsay-3.04.tar.gz 31961 BLAKE2B 93e6e9cb31b8902ee6bccda0f997fa651fa83e0504ccab3e7fbbc5cfddc11256f6adea1ea1b4e2bcf8085746eb4194e8332bfee886d1f3d05ad2b6ac3422eea8 SHA512 99d21ef9a7c7c76056cb7acb2c771fbdabfedde4f6edb5d3035337c59f9e88944690d1b43282c32827ad79339199716366c8be73b0dea09063ec2d52220c1b51
-EBUILD cowsay-3.04.ebuild 1248 BLAKE2B b6bd728a6b29cc7ac52c8a8706a53975b80c129e0da4a91ebbd344a811e6f6631f06b753f2366fbfafe35264ca44ff8974154d0488568004cc4a66084ff538b5 SHA512 d229408e2b98a633de90d030592d0e8fab0c504941210d5487dd87c79753d6a0a4bfd5044b29c4f952fbca3d893b4f8549ab0509d788ab1e592e19106bcc604d
+EBUILD cowsay-3.04-r1.ebuild 1286 BLAKE2B a9e1f2de5469db1ea9c244baafaa33aedbac670a469c27b60b78f3647a0b78257d8e6105feccf26d00429d9510e04bdd8e464369f6ac713b490a5cfb15d67c2e SHA512 af2305b5997c0aa7915da65613217ea11a00f082d2d2f7ee5e5e690b1c3f817b57c55323479fc62706058d06787f1a843e5a53fa4fd858a0879b1be91ec7be62
 MISC metadata.xml 339 BLAKE2B ea192482f0b900c68b90a85ab2d92ac46558075b59c7f3ca87d04141d31166ae7252af9b5078ed06d5f4c1bf9b26c308fd51e5fc45ad0b18c4bf3cd2e2248196 SHA512 bfd3935c1f05236a43762bf78f14d5a268ed9895f3bd1696499d1749115b4a9da990f00607df93225f3080bcf1fd23dc1121a3cbf7b59329874f4bc047647429
diff --git a/games-misc/cowsay/cowsay-3.04.ebuild b/games-misc/cowsay/cowsay-3.04-r1.ebuild
index dd1855cb7d00..00de9a111cee 100644
--- a/games-misc/cowsay/cowsay-3.04.ebuild
+++ b/games-misc/cowsay/cowsay-3.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,20 +6,21 @@ EAPI=7
 DESCRIPTION="Configurable talking ASCII cow (and other characters)"
 HOMEPAGE="https://github.com/tnalpgge/rank-amateur-cowsay"
 SRC_URI="https://github.com/tnalpgge/rank-amateur-${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}"/rank-amateur-${PN}-${P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=dev-lang/perl-5"
 BDEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/${P}-tongue.patch"
-	"${FILESDIR}/${P}-mech.patch"
-	"${FILESDIR}/${P}-utf8.patch"
-	"${FILESDIR}/${P}-version.patch" )
 
-S="${WORKDIR}/rank-amateur-${PN}-${P}"
+PATCHES=(
+	"${FILESDIR}"/${P}-tongue.patch
+	"${FILESDIR}"/${P}-mech.patch
+	"${FILESDIR}"/${P}-utf8.patch
+	"${FILESDIR}"/${P}-version.patch
+)
 
 src_prepare() {
 	sed	-i \
@@ -36,15 +37,19 @@ src_prepare() {
 }
 
 src_compile() {
-	./install.sh "${D}"
+	:;
 }
 
 src_install() {
+	./install.sh PREFIX=/usr "${ED}" || die
+
 	dobin cowsay
 	doman cowsay.1
 	dosym cowsay /usr/bin/cowthink
 	dosym cowsay.1 /usr/share/man/man1/cowthink.1
+
 	insinto /usr/share/${P}
 	doins -r cows
+
 	einstalldocs
 }
diff --git a/games-misc/cowsay/files/cowsay-3.04-mech.patch b/games-misc/cowsay/files/cowsay-3.04-mech.patch
index 9c9ff9d3fe32..a180ef49cb30 100644
--- a/games-misc/cowsay/files/cowsay-3.04-mech.patch
+++ b/games-misc/cowsay/files/cowsay-3.04-mech.patch
@@ -1,5 +1,5 @@
---- rank-amateur-cowsay-cowsay-3.04/cows/mech-and-cow	2009-06-21 03:09:36.000000000 +0300
-+++ rank-amateur-cowsay-cowsay-3.04/cows/mech-and-cow.cow	2010-08-22 01:04:02.670000262 +0300
+--- a/cows/mech-and-cow
++++ b/cows/mech-and-cow.cow
 @@ -1,3 +1,5 @@
 +$the_cow = <<EOC;
 +${thouts}
diff --git a/games-misc/cowsay/files/cowsay-3.04-tongue.patch b/games-misc/cowsay/files/cowsay-3.04-tongue.patch
index 01123587611f..7b620b3499c4 100644
--- a/games-misc/cowsay/files/cowsay-3.04-tongue.patch
+++ b/games-misc/cowsay/files/cowsay-3.04-tongue.patch
@@ -1,5 +1,5 @@
---- rank-amateur-cowsay-cowsay-3.04/cows/head-in.cow.old	2007-05-09 20:28:08.000000000 +0200
-+++ rank-amateur-cowsay-cowsay-3.04/cows/head-in.cow	2007-05-09 20:29:32.000000000 +0200
+--- a/cows/head-in.cow
++++ b/cows/head-in.cow
 @@ -7,6 +7,6 @@
      ^__^         /
      ($eyes)\\_______/  _________
diff --git a/games-misc/cowsay/files/cowsay-3.04-utf8.patch b/games-misc/cowsay/files/cowsay-3.04-utf8.patch
index 3aeaf0d66c14..6e015d36ce69 100644
--- a/games-misc/cowsay/files/cowsay-3.04-utf8.patch
+++ b/games-misc/cowsay/files/cowsay-3.04-utf8.patch
@@ -1,6 +1,5 @@
-diff -Naur cowsay-3.03.orig//cowsay cowsay-3.03/cowsay
---- rank-amateur-cowsay-cowsay-3.04/cowsay.orig	2011-04-21 16:36:03.581377699 +0200
-+++ rank-amateur-cowsay-cowsay-3.04/cowsay	2011-04-21 16:37:07.968430100 +0200
+--- a/cowsay
++++ b/cowsay
 @@ -12,6 +12,13 @@
  use Getopt::Std;
  use Cwd;
diff --git a/games-misc/cowsay/files/cowsay-3.04-version.patch b/games-misc/cowsay/files/cowsay-3.04-version.patch
index 4b8c47462d45..8c9a14006994 100644
--- a/games-misc/cowsay/files/cowsay-3.04-version.patch
+++ b/games-misc/cowsay/files/cowsay-3.04-version.patch
@@ -1,5 +1,5 @@
---- rank-amateur-cowsay-cowsay-3.04/cowsay.orig	2019-10-19 08:44:59.442928870 +0200
-+++ rank-amateur-cowsay-cowsay-3.04/cowsay	2019-10-19 08:45:16.165928638 +0200
+--- a/cowsay
++++ b/cowsay
 @@ -1,7 +1,7 @@
  #!/usr/bin/perl
  
diff --git a/games-misc/exult-sound/Manifest b/games-misc/exult-sound/Manifest
index 228873dddff9..488beb78f32b 100644
--- a/games-misc/exult-sound/Manifest
+++ b/games-misc/exult-sound/Manifest
@@ -1,3 +1,3 @@
 DIST exult_audio.zip 48439905 BLAKE2B ad8a230d9ba92cef94b22b669644a10ae6fcfe92c4dbfc5c3f89535534b4bddfe7d9b69dbf05220033df92b6d172e83340e6571920f42b5e63e66a5417ffa8f4 SHA512 70374a079935b063f41a37aeb90315d55abb584e5542f7fa12c707318db6365e989a5848bba9045a2c2cca1ccd902cc1d31fec8c95511a986de7a75d322d0919
-EBUILD exult-sound-0-r2.ebuild 593 BLAKE2B 8fe821a601cb9e29a7e2f99d5d31b920bb47700f21d17725d2e21d46232ba9bbfc21ca1d09012a0f44ec7a942e6a3ef828b113cb8a9a082c16b28cbd730698be SHA512 568db73a779495121bd725cba42356e6829d7ae8eea6bb0f4329a1dadb980b2f0444cdd07d45ac139ec82bc2dfce17dac886442f9dafe8d3b2a890d39e39bf12
+EBUILD exult-sound-0-r2.ebuild 594 BLAKE2B e22a7f2439d80476e9242ebead9cbdf23ce41b689076e27b979e560577eb42c1ff4cf1e89145afb18f3240a1b3fb7dcbafd3867c289decb83aa1b4e453b6a561 SHA512 a0e98b18a70c8764f5e7016115969571e610170d665bac4e7554b3980d258bdd1d16c62d132ba93a3c4e1dfac762cac975223b30c0f2f3ba0ed7b490e6f04160
 MISC metadata.xml 328 BLAKE2B b895ccfad252cbbeb8fe092b4416086fd43420976392111a9ee7b0f714ee22e32d64b651f7e2370466b32c840b1eb0de8702a6714b9718e6bc90fa4524b84ed0 SHA512 bf9ebdd6a99230e6cb155d0dc42b0d94aa1d15b64afc93420210b6763a46a4c8ab3f18cbc83e54068dc7c62df73baf28ee3cbc13a34c7824a724041ac13be16e
diff --git a/games-misc/exult-sound/exult-sound-0-r2.ebuild b/games-misc/exult-sound/exult-sound-0-r2.ebuild
index e10508635718..379625fd6db1 100644
--- a/games-misc/exult-sound/exult-sound-0-r2.ebuild
+++ b/games-misc/exult-sound/exult-sound-0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
diff --git a/games-misc/fortune-mod-at-linux/Manifest b/games-misc/fortune-mod-at-linux/Manifest
index 6325512164c1..728086be056e 100644
--- a/games-misc/fortune-mod-at-linux/Manifest
+++ b/games-misc/fortune-mod-at-linux/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-at.linux-20030120.tar.gz 81012 BLAKE2B 551b1169acdd863040389d79f5143e0a294293f856fefcadd0fa3b89ccde7c91c15117af9f730ef54476e1acf3933959f13dd83f879cce8b7123dedc056502ce SHA512 804b785194db2f4727e3196d46b317d6b644bd4d05a4f3286617a2b2e3dff2c9a7c9fb88a0f2a6556d66fd0f975fee8564df236085a7864172c6a6b63c33bec4
-EBUILD fortune-mod-at-linux-20030120.ebuild 816 BLAKE2B 10c94caa735ce237f578777594445dc11f71adfe33fbd714f8c849d63fbd96e2817b6764f52caa3b2bc1ea61764595db84360c7daf3450c1450509e24fb7263d SHA512 76cb8f95dff56df477b93ab27ba4ff7f40a78e5e3bdc8a8b9d965fcf81a45a8a12a152dbb97332face75d6fb75a4ea342272d55b55bd62ef93836a1447868175
+EBUILD fortune-mod-at-linux-20030120.ebuild 849 BLAKE2B 272d6a4228032673b1e4131267cb1e44e6cd69a10fe814409c6abb321f0d114aec5282e1f72b427d68dd6da8b66ae48493c52f303276a365e1e19979dc7d0d60 SHA512 344f7f1eb05606eb7efce70f7442d49f8ea9bf55b070850ca25f1083834db81652d430837b1242d71b1787178da0400c8da22ed94eaa5c65b55396c7fe5da34b
 MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
index c19351a2a5d6..2339f337c8b1 100644
--- a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
+++ b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 MY_P="fortune-mod-at.linux-${PV}"
 DESCRIPTION="Quotes from at.linux"
 HOMEPAGE="http://fortune-mod-fvl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -13,17 +15,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~
 IUSE="unicode"
 
 RDEPEND="games-misc/fortune-mod"
-DEPEND="${RDEPEND}
-	unicode? ( virtual/libiconv )"
-
-S=${WORKDIR}/${MY_P}
+DEPEND="${RDEPEND}"
+BDEPEND=" unicode? ( virtual/libiconv )"
 
 src_compile() {
 	# bug #322111
 	if use unicode ; then
-		iconv --from-code=ISO-8859-1 --to-code=UTF-8 at.linux > at.linux-utf8
-		mv at.linux-utf8 at.linux
-		strfile -s at.linux
+		iconv --from-code=ISO-8859-1 --to-code=UTF-8 at.linux > at.linux-utf8 || die
+		mv at.linux-utf8 at.linux || die
+		strfile -s at.linux || die
 	fi
 }
 
diff --git a/games-misc/fortune-mod-bofh-excuses/Manifest b/games-misc/fortune-mod-bofh-excuses/Manifest
index 020826194345..bb72ac2111c5 100644
--- a/games-misc/fortune-mod-bofh-excuses/Manifest
+++ b/games-misc/fortune-mod-bofh-excuses/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-bofh-excuses-1.2.tar.gz 12753 BLAKE2B a16b5e575b1a2fccdbdc85a0ad092d3cd7ed1f3a39bd6bffa2eb5ced6f33fb0d0eb72440f06c8924f1b731551588da72e5f53982d5ef6404e35d61edd1a4717b SHA512 71e9f664a1ceaf20455bc2c49e5efe0a953d188cbcd11e5a536fee73a01623659fbcc379baa4d8b7ac4a6970402c085a508f0e37b7fe182869c7ca9ffc2fce99
-EBUILD fortune-mod-bofh-excuses-1.2-r1.ebuild 571 BLAKE2B 0649a5162db39c3546553fc46a471a4064ef9e3715bf379c2535b339bca2e0c124cbadb77fd84a0aa8df0bd90539cb413651f71136e138cfd0963db1cc875937 SHA512 37f0d9a94c173dde407cfc3939fa56d251ad7b86305dcfc63c031a0d7579e86c111d0e37f20a8264b9f0f021f3c761ad120b05dd9cc5e82f91ea21b248d7e55a
+EBUILD fortune-mod-bofh-excuses-1.2-r1.ebuild 572 BLAKE2B 809ecdeb5797c67ef5715a71f75c940a3ba20b0d5ce4812e343ece6dca6f86bdc31933ea59cf7d2fad838c1deddedbe92b5f4a782567231fa6e87d107cd532da SHA512 c298d2d69e9967221e37b7fa4d12c4785a39bc3d1b492dcefc0456989cc914654e5bbbc489b3fe973563dddb6682fee4a8574c55a054941d4ed3877caa0854d8
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild
index 3e1c541fa8cd..bec71904b505 100644
--- a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild
+++ b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 DESCRIPTION="Excuses from Bastard Operator from Hell"
 HOMEPAGE="http://pages.cs.wisc.edu/~ballard/bofh/"
 SRC_URI="mirror://gentoo/fortune-bofh-excuses-${PV}.tar.gz"
+S="${WORKDIR}"/${PN/mod-/}
 
 LICENSE="public-domain"
 SLOT="0"
@@ -13,8 +14,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~
 
 RDEPEND="games-misc/fortune-mod"
 
-S=${WORKDIR}/${PN/mod-/}
-
 src_install() {
 	insinto /usr/share/fortune
 	doins bofh-excuses.dat bofh-excuses
diff --git a/games-misc/fortune-mod-chucknorris/Manifest b/games-misc/fortune-mod-chucknorris/Manifest
index 1db17621b9d0..412edb55f8ca 100644
--- a/games-misc/fortune-mod-chucknorris/Manifest
+++ b/games-misc/fortune-mod-chucknorris/Manifest
@@ -1,3 +1,3 @@
 DIST chucknorris.tar.gz 23035 BLAKE2B d42b510978321b0857a1e6ff50b80576e5f6af52f9014330a765c78a39b274cfecbe2367811fc31e506b1d0e4f3b65c416ff3c06c6a2d7bf20e302ea41f46417 SHA512 efcee2c1ce5ee747cbdf3cfb0b52958ca76309cbf509627b602cbc56403e67396c879ea46c084b3d82788404829e48990a534eda9e8f3640d39dc894318ca7c2
-EBUILD fortune-mod-chucknorris-0.1.ebuild 552 BLAKE2B 00cb61dc75b95ab75c022fc9deb61cb5142fa6e7a500a92da5398fc4b1328565604303e5004fc1803f3180c4bb70b1fc44be74f754048d8fcb6fdf5bb7132483 SHA512 ffa134562ca684996b3a26c740a3fa43947090e559893845a42b0a1118f94a9ed8f78316dc821128e04921b37bf9dd3e2c3cf6bd6f5c15c792d017cf868fcb63
+EBUILD fortune-mod-chucknorris-0.1.ebuild 546 BLAKE2B 8eaf7f2ff789194a7f9d84b339c09375380b2e759d2edcfba8201481b0e00a872296c9ab69547bad0c104d1a39553dd789eda9ab24c3dbb9317892a5cd7e4714 SHA512 115ce90f3d8e6af930c6848ba1820720887a7bc94a535bdb75993d54d8a2db3a6c42821bdb5686536d7774bb43d08621331c0466a819642f57a0975670afab4e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
index b83bf19e59f3..de8896416f6d 100644
--- a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
+++ b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 DESCRIPTION="Chuck Norris Facts"
 HOMEPAGE="https://www.k-lug.org/~kessler/projects.html"
 SRC_URI="https://www.k-lug.org/~kessler/chucknorris.tar.gz"
+S="${WORKDIR}"/${PN/mod-/}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S=${WORKDIR}/${PN/mod-/}
-
 src_install() {
 	insinto /usr/share/fortune
 	doins chucknorris chucknorris.dat
diff --git a/games-misc/fortune-mod-cs/Manifest b/games-misc/fortune-mod-cs/Manifest
index 20e2b8a1b930..4ea5b04f9fb8 100644
--- a/games-misc/fortune-mod-cs/Manifest
+++ b/games-misc/fortune-mod-cs/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-cs-1.6.9.tar.bz2 390766 BLAKE2B 1f84174bab1274e8c26a10ec5eb4921f0d3199b4bc39b88b4ed3b83ed9fa5e2b1b478348501ade17f9899f6f7490748ad736e2f2c6bea4de08055f73ce7257a7 SHA512 4df546eb450edc1de6bb80f788e29fa4aad6050008c28ed12c4afd630533416f3367c09b43ae098329160a19bebfb28ec56ebb730358689d260709a27317b20c
-EBUILD fortune-mod-cs-1.6.9.ebuild 983 BLAKE2B a67465259770aef5dd019e8a8788718fb8b0fe52fc33038394a002f8a1445a6f57fef7b2726e107e790471e13558a431e16675f1be79c90c33516861b520638e SHA512 7a548cae3af8e0c67c90d13c02925fa83c8ab92e7f0a1ec9920bc0caef701869635276fffc237c14f4bc38ebd2dc8cd703683d20e33bb25fe010b17f32eebcbc
+EBUILD fortune-mod-cs-1.6.9.ebuild 1025 BLAKE2B 73a4e51fe9e9aee69cac652f1889e70069e95c783fb889163a15de94355d54fdbda0e51569d59c12f7e279a5e89e654614bffedef06de19d043a6116d55e7c0a SHA512 6857513a598b374dcc70d0c909f763532d0a8b5f05ac6a8535b356006411196266fe2d383204eba8ef76282d641e9630fed521d7d81ed409635ace6ec07a4174
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
index c6b1a60a3f0d..1129557dd40c 100644
--- a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
+++ b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 DESCRIPTION="Database of the Czech and Slovak cookies for the fortune(6) program"
 HOMEPAGE="http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/"
 SRC_URI="http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/${P/-mod/}.tar.bz2"
+S="${WORKDIR}"/${P/-mod/}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -12,21 +14,21 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~
 IUSE="unicode"
 
 RDEPEND="games-misc/fortune-mod"
-DEPEND="${RDEPEND}
-	unicode? ( virtual/libiconv )"
-
-S=${WORKDIR}/${P/-mod/}
+DEPEND="${RDEPEND}"
+BDEPEND="unicode? ( virtual/libiconv )"
 
 src_prepare() {
-	rm -f LICENSE install.sh fortune-cs.* *xpm
+	default
+
+	rm -f LICENSE install.sh fortune-cs.* *xpm || die
 }
 
 src_compile() {
 	local f
 	for f in [[:lower:]]* ; do
 		if use unicode ; then
-			iconv --from-code iso-8859-2 --to-code utf8 -o${f}.utf8 ${f}
-			mv ${f}.utf8 ${f}
+			iconv --from-code iso-8859-2 --to-code utf8 -o${f}.utf8 ${f} || die
+			mv ${f}.utf8 ${f} || die
 		fi
 		strfile -s ${f} || die "strfile ${f} failed"
 	done
diff --git a/games-misc/fortune-mod-flashrider/Manifest b/games-misc/fortune-mod-flashrider/Manifest
index 8361611cd4ee..da27bc9be3c3 100644
--- a/games-misc/fortune-mod-flashrider/Manifest
+++ b/games-misc/fortune-mod-flashrider/Manifest
@@ -1,3 +1,3 @@
 DIST fortunes-flashrider-1.10.tar.gz 152743 BLAKE2B d70354f25bf8b3072c85f9f2a6271d1a6da8678679e2f1a547d512f023bd4431fa0f87165e58de8b224413ce436f51f25fd580be25775a257f7c7f2ba26c636b SHA512 04a6492f732e918ca0fce72ab5ff5fbf6ca924d61de423f6abfe4a2c3f9a8ce49b2808ef62763e22601264453b43cb5d43170d3247373ad8decdae7346abe7e3
-EBUILD fortune-mod-flashrider-1.10-r1.ebuild 723 BLAKE2B 12bbdb7114015e863423f69a207f85ef83e70fe039393eee0891ff7b70dd8c9c92f9de872697718cf90bebd17fa7ca51f304c3a24f524e96eba3d171eb87482e SHA512 2cedafeab4def9b161111ed4a82e8636b212915bbe081192abab9a15f9041f7397847261c9cad51231e6463598d2103bf46e6201f19a5d0db4bd7dc85a0cf536
+EBUILD fortune-mod-flashrider-1.10-r1.ebuild 727 BLAKE2B 85148f816758389e8e7510a0f1cf452088f3bb10ac2a849aa2e0b215f7d468ca32c13dea2bceb658e53603c56d32b582a0fa44479d99594137fb5b765883c235 SHA512 6434908b4da74ae6ca75231332e6a9f8fcb418a0682e833f115179f4840e5fa4a831861117cc35492e39e1caa9fe18c57866ca62691e949f02bb972c7c430670
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild b/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild
index e1333212ff5a..2ef785f4bb5d 100644
--- a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild
+++ b/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10-r1.ebuild
@@ -17,10 +17,10 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="games-misc/fortune-mod"
 
-src_prepare()
-{
-	sed -e 's#INSTALLDIR = .*#INSTALLDIR = /share/fortune#' -i Makefile
-	eapply_user
+src_prepare() {
+	default
+
+	sed -e 's#INSTALLDIR = .*#INSTALLDIR = /share/fortune#' -i Makefile || die
 }
 
 src_install() {
diff --git a/games-misc/fortune-mod-fvl/Manifest b/games-misc/fortune-mod-fvl/Manifest
index 0277e24e8ae3..7c79b6e31ac2 100644
--- a/games-misc/fortune-mod-fvl/Manifest
+++ b/games-misc/fortune-mod-fvl/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-fvl-20030120.tar.gz 66081 BLAKE2B 78e1fb2887464cf7050dad309f47329ed6eaba1bf153c9d7d9758f9050f2dd77421dcf1a0e58279389811a3cd145b1f6bb3479b9501ee32378482f59098a2117 SHA512 43213abb2772f560d65f8e552a9c384f2163650cb2fa29a9203a05a0c3b36dff6645afb181e317d5e9258cf0597607bb185a8c852289a2f3cf015c6e4f946bf3
-EBUILD fortune-mod-fvl-20030120.ebuild 522 BLAKE2B 54d0c3e925aa0f03f24ad5cc3e5cdde014fb49598f7a37204e8000f58bf818f65bfb0da95275b9ce40c21b8cf82b87ef666cde0e64234feaaa62bd297c32996d SHA512 e096ebc7608ef92417d4904853c762476a45654c9d2e83b20e879207d9eb9124db3efd3e91592c8a81e7dd762630c89b1f08f09557773b8701df22fd7e1ab8c1
+EBUILD fortune-mod-fvl-20030120.ebuild 515 BLAKE2B 422b54cdb36012cce392c49f2b188e29429a5e26fb531ebc5011f2b806401de84825c5f4a269bce558db559a35b66ffb92058afe41a7add598d2e12d6ac5f5af SHA512 8b04fbca5e0af6087600ba1615ea4f618a0a91e3c0dbfa5c1f04af747f195422693fac9d6f409c002a57059ba1dd79b0cf8f4408f2662dc49954de26930785bf
 MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
index d8e58bbe5f7f..78ed35fd72c0 100644
--- a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
+++ b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 DESCRIPTION="Quotes from Felix von Leitner (fefe)"
 HOMEPAGE="http://fortune-mod-fvl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
@@ -9,7 +10,6 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-it/Manifest b/games-misc/fortune-mod-it/Manifest
index 71ee2ba77d2c..5868bafb3c8c 100644
--- a/games-misc/fortune-mod-it/Manifest
+++ b/games-misc/fortune-mod-it/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-it-1.99.tar.gz 739886 BLAKE2B 8f4624f079682defbb34d04de4e3de8140ddeb9765936798f9480ac0a65efcaa67580c9cf201cf811008d97dbf40eb29a2454840e6014f6c0c07758eaded10c3 SHA512 b4b119f5def51a31ee25c5df3e47a0b9aa45341ecb1f7048233aa1d5c1d4fc8127b9eaa29c028a9df5ad71d9868d4006e7d3a1bef776b34d337a5bca47bd5d53
-EBUILD fortune-mod-it-1.99.ebuild 749 BLAKE2B 15031ce1b91fa4a35a2dba1c8d052000e48ec55b5e3bcda67ec088cf34f6066da318eaa20f289211e916e239b48c8c4e812396a69b3832ed91775ecb4886414c SHA512 baabe896ed157cafc853bedf4836cd37677b1d83a9a40126d613daa690abb9b8348f98dbdada3d33d38bf210bbc2280f643c1b364afe7a7e883e9e52d55eee51
+EBUILD fortune-mod-it-1.99.ebuild 783 BLAKE2B 1ea5a0c619faea1a5c98bf1375b6909b2490d306224eee80f9e616462f6a22fc1b04750ce62a4cb58de1d75afa3e6aa959d64f5bab296a747c36665f15e2bd90 SHA512 f459220edf7902ffbb7b7f64a92de50d33c3cf0d5b85ec4e42331657eaa0a9d1420682be854d344eae5caeb3356e73263c3cfa87b0ad3e63562d6678d726c7f7
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
index 9b8290d1d2f7..95613acea165 100644
--- a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
+++ b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 DESCRIPTION="Database of the Italian cookies for the fortune program"
 HOMEPAGE="http://www.fortune-it.net/"
 SRC_URI="http://www.fortune-it.net/download/fortune-it-${PVR}.tar.gz"
+S="${WORKDIR}"/fortune-it-${PVR}
 
 LICENSE="freedist"
 SLOT="0"
@@ -13,10 +15,12 @@ IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
 
-S=${WORKDIR}/fortune-it-${PVR}
-
 src_prepare() {
-	use offensive || rm -f testi/*-o
+	default
+
+	if ! use offensive ; then
+		rm -f testi/*-o || die
+	fi
 }
 
 src_compile() {
diff --git a/games-misc/fortune-mod-kernelcookies/Manifest b/games-misc/fortune-mod-kernelcookies/Manifest
index 9d528ad4296e..1fa7c99f7f4c 100644
--- a/games-misc/fortune-mod-kernelcookies/Manifest
+++ b/games-misc/fortune-mod-kernelcookies/Manifest
@@ -1,4 +1,4 @@
-AUX 9-offensive.patch 4789 BLAKE2B 2778f35d39fd213e215ec679ecabdd145168c35c3a41df0d02a0600f3b2d8e551020cf7ce88f7e4bbe266858593f65642a670935b44b2716acdc2af60e338c74 SHA512 6bf0ae401b55b6e83523ad0b930ff06627499c9b45ba98687843b7d96ffea24dfe92799a581f37ed7d33efb951ab07157467f6034ad8aab9ee86df865005846c
+AUX 9-offensive.patch 4793 BLAKE2B 742dd02a66be1a35e8e1e379040e4d2edede92b0bb5a81412462667ba4a0625b372960da201eae05428c8b50eef29f02119caa3ef904339b783efe82d4084c11 SHA512 0ad9befa6e05b7d1f3d0e68f68b54f66c69a5e3fb759ef22c9ef28be78ecf32aa0a8e73ff4bf4c06dce092c192b65f62d68c7803fa88a779fce640599eb8a4c7
 DIST kernelcookies-9.tar.gz 8966 BLAKE2B c6d503d0c01fe86ac2b59240ba2a1639210b7aef6fb167d8467c4fcad0283880ff00c59e34e811c7bbde3b0bf7e7bb89536e8c3d439b514fb180db2d326847cc SHA512 3d2601ad787928ef852af7d5833c5d32a7c7e364913d451e889eb883d4da450a989c0ff450aef4c07e3700ef3a87f535948d07789c7d2819305a6f36cded7aa3
-EBUILD fortune-mod-kernelcookies-9.ebuild 807 BLAKE2B 5b990ad379dee54708fbf04e49cd2969d27eb6c4906ee226a31e62c0565726a491cee3bb6a6a615fc0c8e775154b101329bca7a36d3ce6a62cbf47cb5310abb7 SHA512 53c6a552f42f4c169f64362ddfc8a3881288a40e86d5e859ff2f4d5c12ce463085bb854401b33a21a2d08c03b9a291c5d11fc265fcdf8ca4d13d598e221397ec
+EBUILD fortune-mod-kernelcookies-9.ebuild 810 BLAKE2B e26962959647add47439c865d172d8830eedb6b26c15047260654eab3b337f3ba1be7eb372cf3af87eb9e853d8e1d493495ff76fb8644f8136257bbfde90a961 SHA512 e02326a7e831654edace9c25d8632ffc8b5d3f798d50c5c5e6d3ffedc61c5438d42f95b43747af9e580851777b641d60c3d0a0613d44bc7f38a992c893d38367
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-kernelcookies/files/9-offensive.patch b/games-misc/fortune-mod-kernelcookies/files/9-offensive.patch
index 0ba0ee128907..cc66a2afbee5 100644
--- a/games-misc/fortune-mod-kernelcookies/files/9-offensive.patch
+++ b/games-misc/fortune-mod-kernelcookies/files/9-offensive.patch
@@ -1,5 +1,5 @@
---- kernelcookies
-+++ kernelcookies
+--- a/kernelcookies
++++ b/kernelcookies
 @@ -1,42 +1,3 @@
 -/* Only Sun can take such nice parts and fuck up the programming interface
 - * like this.  Good job guys...
diff --git a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
index ef3ab273cb8b..72de0e5553e3 100644
--- a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
+++ b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A collection of funny lines from the Linux kernel"
 HOMEPAGE="http://www.schwarzvogel.de/software-misc.shtml"
 SRC_URI="http://www.schwarzvogel.de/pkgs/kernelcookies-${PV}.tar.gz"
+S="${WORKDIR}"/kernelcookies-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,13 +16,13 @@ IUSE="offensive"
 DEPEND="games-misc/fortune-mod"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/kernelcookies-${PV}
-
 src_prepare() {
+	default
+
 	# bug #64985
 	if ! use offensive ; then
-		rm -f *.dat
-		epatch "${FILESDIR}"/${PV}-offensive.patch
+		rm -f *.dat || die
+		eapply "${FILESDIR}"/${PV}-offensive.patch
 		strfile -s kernelcookies || die
 	fi
 }
diff --git a/games-misc/fortune-mod-mormon/Manifest b/games-misc/fortune-mod-mormon/Manifest
index 22de2dd00555..940df8490cf9 100644
--- a/games-misc/fortune-mod-mormon/Manifest
+++ b/games-misc/fortune-mod-mormon/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-mormon-1.1.0.tar.bz2 4750745 BLAKE2B 82fb85e6b78368e2c4541a8af5de7e5e1b4f01b222095fa662395b7f4bf0e3fa041cf3039ba265b572c4242a4531f5902805a8d3aa329170efb043a94df4d602 SHA512 4684e63b1eb2b1fdb2fbe7241f971c9401777a8364333394db0929aca2ee57456ba30bd601df8d2a8077ad41c1aa71737e20806b79e8541d5dd942092be02d4f
-EBUILD fortune-mod-mormon-1.1.0.ebuild 713 BLAKE2B 598650df6f20622f7e6057c89fb49042da7d1f1ee73c40d83edcf7eea974795ff6ad1124b3fce3b90734c56759c0b1d545d388f2c5f71feefb94fad8d3748d31 SHA512 802ed3962c058939301a491ba5c9630db36d4a211988a337792851ea50f5b91bb0a8478e56a5c1cde56298a7cf1e4f59400692979e566fb00dc12b556363c57c
+EBUILD fortune-mod-mormon-1.1.0.ebuild 705 BLAKE2B b663ae9cb71945eb4936fce4965a727cc67dc89e11eee250dc53b77da64a374477beab118e7f8918025b21f821d112e1e8ba93471838a1433b56b2a3ef221a98 SHA512 f4fffe7e6a1de5a8a82ccebc0773b5091672093458012f5845894c85cb2d4b7cc6b3373039164f5681e8f8f00c6a1ac9fa2f11cce82bd2513b5b428dd118043c
 MISC metadata.xml 435 BLAKE2B d2078b922ec0913f54d542179226c22412317c30eea9709b37555768a9527bb4c11277e25d44895c9470792cdb6d77ded27bdcb5e367b5767583ee3fb1ae77fe SHA512 be04acc740eae9bb992cbaf1f25df60ac41880171c9df2eef7a19e6f42a70588966d82f9838cbccad0a289a966f845ce7d9e489d923369d30cbaac8aac2bc34c
diff --git a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
index 7ffdc135b359..e3107d385d22 100644
--- a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
+++ b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
@@ -10,7 +10,6 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 RDEPEND="
 	games-misc/fortune-mod
diff --git a/games-misc/fortune-mod-norbert-tretkowski/Manifest b/games-misc/fortune-mod-norbert-tretkowski/Manifest
index 5efa9e4c8204..2927d8bf7fcf 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/Manifest
+++ b/games-misc/fortune-mod-norbert-tretkowski/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-norbert.tretkowski-20030120.tar.gz 11501 BLAKE2B 4d5662d1dff0795dace05e1ae2780e6c4b76233eef69febf3770b0fb91cbdd307d5a38930e7ab1711db2d4059b26f6029966bf63e828de3c4496396889bf157d SHA512 df4b846581d6dea55226d6e58235a288def209536f43766fa8b56a07e3a5affbb68e8138e2e01711878480550df322ed6999ef35a41330a58a2f516abc5db13e
-EBUILD fortune-mod-norbert-tretkowski-20030120.ebuild 613 BLAKE2B 8ba7579158d0b32d3418f49a74b1783736341b15543c7b94830e365468c99dc85325adb4915e93e318fe860c2e64c8d3bf282ebe5f27e1d8d835041c089c4ae2 SHA512 de57f959c24c493e8a0d2e3be17e55377045125344ca54459d49829ca473f6c690d0e0ee0a39cfac8bac5d85028acc0bae4e8ca8d6078f2ceeee08571aa1b131
+EBUILD fortune-mod-norbert-tretkowski-20030120.ebuild 607 BLAKE2B 273252211ac6d9a3b2391239c7795ba08183fd6152a52205b7a9302d6b47a3dff3c3660a5f16548229b9615b46f8a7ffa9a7e4ca8ea4596fddfc476db1960c94 SHA512 d5c6f0fbc8ed8826d9cf0167dbff375715b38c68ca524b228737048c44bea9e1423bbf0306548f37d39588e00b04792f04d44a4b76d9956ddd6acd9c901d1d0d
 MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
index aff8f8d596fe..5c37548974a1 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
+++ b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 MY_P=fortune-mod-norbert.tretkowski-${PV}
 DESCRIPTION="Quotes from Norbert Tretkowski"
 HOMEPAGE="http://fortune-mod-fvl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S=${WORKDIR}/${MY_P}
-
 src_install() {
 	insinto /usr/share/fortune
 	doins norbert.tretkowski norbert.tretkowski.dat
diff --git a/games-misc/fortune-mod-osfortune/Manifest b/games-misc/fortune-mod-osfortune/Manifest
index ef08288c42eb..fa6fb7c99656 100644
--- a/games-misc/fortune-mod-osfortune/Manifest
+++ b/games-misc/fortune-mod-osfortune/Manifest
@@ -1,4 +1,4 @@
-AUX spelling.patch 6416 BLAKE2B 2cfd9616407a3d66b8fd2529ef93db60e27701f31609f8954a1c6e45af4188b577570f75b4fbaecf0be2eb2c2ed60f45d7be4ca06f6697dbb43f0f02b780cab0 SHA512 657c015bf53105a12981308ecae9fadd9e76892d1f1010e84c48b391b2d37e180d60a0e959f5ce30969ba98fa3733e63fad5a6079950dc93fc48a45c24dede6b
+AUX spelling.patch 6343 BLAKE2B 81168cc38bac3e44852a588ad495cf363d41185cf7a04f77a7aeedf6b7ba2c6e904aabbcb77c78d85e4aabe0a39bbfb2a48b45a520897f125d5be1bd119837fe SHA512 9643e5de9f946330c6076dc5769e3f9b08172ea6c45938d1060d9561845c6f3de9016c7e16c1b5fa42801f3b79aed63fe83ad028487587422487e516b5797277
 DIST osfortune.tar.gz 3097 BLAKE2B 2c6dff9c81762b36f37df682d9f13f1b4c49ec52128f2bce206895ece64af4a2bb31f8e548cca928f674541eebc23cb4f76a7d5db9150740d4a480c91318179e SHA512 e78f40bbbbe94bc70984f01bc4be9c44a15716d60a526797606a6f38fab3533a0cf428a473e479479a7db2c391e44515294519b24cdd3bda33d82c9081919d3e
-EBUILD fortune-mod-osfortune-1.ebuild 748 BLAKE2B da208fce3cf54ab340722d1083595602be25dc3aea96a8324b51b121813dfed8f681eed07d95386182d264045b97a8914535a599ba821e3c9ac9d628f5a4e111 SHA512 e2a8922938d4d55068d954941a64253fc234eaade5b621db4379f9498db083fa7609ac5d61d542b2310f59c93588ee108ff66c9313124d6a892cdbaef692d638
+EBUILD fortune-mod-osfortune-1.ebuild 741 BLAKE2B 25c06b35ab7c018b6c0c0895b03658bd3aa614ba7f108a32e1fda9f3cfa0be24e7e5e8e28bce2e3b1b12b0877dd25e5c6b5932c1d312132c8ed6c437a2e3ebaa SHA512 a718c188fa5bd482637c77fc391fe5faf4b9db0c68cca93553a32ebd2bf7a390f97999f82a182b4cdbeb86ab063c2f06def1eaec001f7d0c8d3af611dea5c564
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-osfortune/files/spelling.patch b/games-misc/fortune-mod-osfortune/files/spelling.patch
index 2871ec2c00e3..70929db65b9e 100644
--- a/games-misc/fortune-mod-osfortune/files/spelling.patch
+++ b/games-misc/fortune-mod-osfortune/files/spelling.patch
@@ -1,5 +1,5 @@
---- osfortune.orig	2004-08-18 07:40:54.000000000 -0400
-+++ osfortune	2004-08-19 07:14:41.008409016 -0400
+--- a/osfortune
++++ b/osfortune
 @@ -15,7 +15,7 @@
  
    -- Bruce Perens, on the future of Open Source software. (Open Sources, 1999 O'Reilly and Associates)
diff --git a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
index 4f66714592db..2c8783a0b9a3 100644
--- a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
+++ b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
@@ -1,25 +1,26 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Open sources fortune file"
 HOMEPAGE="https://web.archive.org/web/20030803031143/http://www.dibona.com/opensources/index.shtml"
 SRC_URI="https://web.archive.org/web/20030919200547/http://www.dibona.com/opensources/osfortune.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 DEPEND="games-misc/fortune-mod"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}
+PATCHES=(
+	"${FILESDIR}"/spelling.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/spelling.patch
+	default
 	strfile osfortune || die
 }
 
diff --git a/games-misc/fortune-mod-rss/Manifest b/games-misc/fortune-mod-rss/Manifest
index 6de63c2e3c7a..3975425ba6f6 100644
--- a/games-misc/fortune-mod-rss/Manifest
+++ b/games-misc/fortune-mod-rss/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-rss-20030120.tar.gz 27294 BLAKE2B 2738ed6a001e2a66b12e72789cff8ad1de114d93567ec5af03cbe4d5eb1fca74236c2c64b1eff35c02188844ffd965b8704e69035d9500e3f8276840ed04027f SHA512 65e3c6afe338bab19fece7111d37eb32270a374b0e62babecb4954bb7209054a6f18886ae67f502f29d148d2ce5a60d3ef401233d91caf765a0ade0d3f5478b4
-EBUILD fortune-mod-rss-20030120.ebuild 527 BLAKE2B e872d60f64f99992484da21a7b3d990c86d63cb9955d340628bd66c8503f9264dc1f9d7f1c568b9762bf4255f80c177dce2ff4eb4d963ffb12ad91e0ebd5bc39 SHA512 7576ecb2ae8649f52ddc86ce61f7e39c8b3ad143c4e7d651a907e095d94b3e6dcb3e846c71db3a1e63a8e91dd61a05e2f250d36b6712a93192374d086d7faa7a
+EBUILD fortune-mod-rss-20030120.ebuild 520 BLAKE2B 8a3fd899d35fa4b04eab5ebe44e32661bcef4ba6078eb58a89367db14cccbf9c5fcbd9c7ca9182e863b1cabad407e65091f1c1ad4a00bc87deaa1fb87ba8c0e2 SHA512 042857658d2267dd05ba41ed1e3fdf298547daa621f627e94f553e06019006a6ff7c099dd3d3e4f517eb5c5de6c437aaee3f5f31c8ca102fad0422aa243072b0
 MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
index 7f3f489d99d5..db335b31b635 100644
--- a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
+++ b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 DESCRIPTION="Fortune database of Robin S. Socha quotes"
 HOMEPAGE="http://fortune-mod-fvl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
@@ -9,7 +10,6 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-scriptures/Manifest b/games-misc/fortune-mod-scriptures/Manifest
index 7d89a83a6a85..55c34119a675 100644
--- a/games-misc/fortune-mod-scriptures/Manifest
+++ b/games-misc/fortune-mod-scriptures/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-scriptures-1.1.0.tar.bz2 2621853 BLAKE2B ac1ff1f4e5fea8e46d065a421c11303bc640fc01d4712c26b47655360a1e816fb451ee8447b6875f384afcafb76ff0ab0978769a7cda205ab66c58a67439d504 SHA512 dc9c98c3f7924c9a1775955a8d1f972035cea27a7505bf51aac9c1ffa323e1447287ec50472f3caca16f31f1a2d2cdc1a17b5b311eb8e5a9746124b19a1d4c67
-EBUILD fortune-mod-scriptures-1.1.0.ebuild 535 BLAKE2B 3a89e8e09d9899b170e77ca4a6b62945b80e32d7e41df9f97f8280c7546e3ba49862139b07f2d715ff73c98e906cf26d6ae8f6c500f5ca896b630e5c71939b1c SHA512 424790d622932cdfbd54255f1e92c9e20c9e8c5357f82d06021fc5eb7c51d2abad27c0f3e9fe71c2606a456d0d518f2aa6bec5c9a5bc29391508c20fb94613e3
+EBUILD fortune-mod-scriptures-1.1.0.ebuild 527 BLAKE2B c993e149a6fa7b4a32c8222812059a4c3b0968815bf1e924266e799305adb5ca0aa254e730e79336230fd305d62f5eba2169cb2181fb0dcbd8b5d6fe9664a3d3 SHA512 e24e6017aed213990a71edb61187f0daf35fb2acc131f56512f0e55fceb5f29b0a8b46ab9a4264b5f7b60c17327ff3d26109f656319692b5f180113311d35d8a
 MISC metadata.xml 435 BLAKE2B d2078b922ec0913f54d542179226c22412317c30eea9709b37555768a9527bb4c11277e25d44895c9470792cdb6d77ded27bdcb5e367b5767583ee3fb1ae77fe SHA512 be04acc740eae9bb992cbaf1f25df60ac41880171c9df2eef7a19e6f42a70588966d82f9838cbccad0a289a966f845ce7d9e489d923369d30cbaac8aac2bc34c
diff --git a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
index c6670acbf8ac..f8c1fc150ad2 100644
--- a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
+++ b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
@@ -10,7 +10,6 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
diff --git a/games-misc/fortune-mod-tao/Manifest b/games-misc/fortune-mod-tao/Manifest
index dba46433ac46..7fbc229f0a35 100644
--- a/games-misc/fortune-mod-tao/Manifest
+++ b/games-misc/fortune-mod-tao/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-tao.tar.gz 15381 BLAKE2B f1ee9c670ad2b849717a2a2c5158dfaf59b94ba7d9d501152b90aef7d63923d2fcaa2c6264d9d4ec8d11cad0d6116042bcb9c60fd4696d97a833a9b5b4a8443b SHA512 ec8d8b679962e9a1af4fb74600d7d7d348efcda0fd9c4f08db881835f8e1665688f77a77b0eb8231274ab5ecc93443f5348976100031d5b0c4b6245f647db0e0
-EBUILD fortune-mod-tao-1.ebuild 574 BLAKE2B e26c3212b951e6731995b2ae2b9239ace424896d1847477f36ea1fb2f6c3fe5578312c1a7847b08cc600e07707736b8b70a8ccad61c3cecff3bc227823805ef0 SHA512 1a0be94d0f66c6a557a331e765532d54377d6e2fac3a7bdb83f4ff891878f503d1d9bd303d35bef24e3ea9fe38983e7b258cd380367e87d668a562c4b3168f28
+EBUILD fortune-mod-tao-1.ebuild 568 BLAKE2B 852c504d9ca3a6990143d460c2c6ec021b7718c0daf4a64958851787eea1b40f9210449aecdc579cefeb948bebb94316a9426b5a6ca34f57b7cf3dc2d9d6998a SHA512 7c333057527026886b5f168f11b6d29119394f4a8146d42947101af5eaa45738360933f530e9ae7915fbcaa2177a54a4767d23a0a5543b1485760878505c1bb2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
index 4f6408693dd2..58a5b27bdde2 100644
--- a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
+++ b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 MY_PN=${PN/mod-/}
 DESCRIPTION="set of fortunes based on the Tao-Teh-Ching"
 HOMEPAGE="http://fortunes.quotationsbook.com/fortunes/collection/67/TAO"
 SRC_URI="mirror://gentoo/${MY_PN}.tar.gz"
+S="${WORKDIR}"/${MY_PN}
 
 LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S=${WORKDIR}/${MY_PN}
-
 src_install() {
 	insinto /usr/share/fortune
 	doins tao tao.dat
diff --git a/games-misc/fortune-mod-taow/Manifest b/games-misc/fortune-mod-taow/Manifest
index 2b41c318a264..af25fb662a86 100644
--- a/games-misc/fortune-mod-taow/Manifest
+++ b/games-misc/fortune-mod-taow/Manifest
@@ -1,3 +1,3 @@
 DIST fortunes-taow-1.0.tar.gz 67835 BLAKE2B 6cf3fc38931204e4b5c71cd0573c3cb854db1ad8b85318a7cd9a606bac66bcb9ceb8570b930f1cdf246ff63f373170578bebaed2f01bd3c03425dcdc784cc3ec SHA512 da1577b36c121028ba2568e4e5a2da96848d70361a3803e93960b357790026a56fb545f42119d013845f6003ffb9f8421de2a1152b189ef93d3a290474259405
-EBUILD fortune-mod-taow-1.0.ebuild 560 BLAKE2B 179defe9384fc0886bb6902e63cb61f18484eb145b6f67a06877f219f51cca6dc2e34792dacae19f370e4f6dd60f6ee2be1abe3a48f7facfdd1511a9f6e12e3b SHA512 38d828c7f06820d6a39e4975c77e47931c22c6418d1b6033c12c006f2a181fa0442f12e4fca03cf9b07bd9bb617d87ff14a04f34003359558e63c060b29b6b72
+EBUILD fortune-mod-taow-1.0.ebuild 554 BLAKE2B ea72b608d160f2b5f21b63afb598e3366ea2e4085ce60373329976c3943b11a8cf686484a9fd53e037f273397ac44f7acbad2a063acf7f034dd4b4e4a35d8eda SHA512 e3ba7fc3a4b9962cc92be057b5d5331d95ec322c8bae9887a018cb385eab1cc17a27b19a2e9d7583cfce31ac47f6bc2d56ae3fee6f029b39a33c67ea60b0ec06
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild b/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
index 036a86da693e..2c699ecc070e 100644
--- a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
+++ b/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 MY_P=fortunes-taow-${PV}
 DESCRIPTION="The Art of War Fortune Mod"
 HOMEPAGE="https://web.archive.org/web/20110823115300/http://www.de-brauwer.be/wiki/wikka.php?wakka=TheArtOfWar"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S=${WORKDIR}/${MY_P}
-
 src_install() {
 	insinto /usr/share/fortune
 	doins taow taow.dat
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/Manifest b/games-misc/fortune-mod-thomas-ogrisegg/Manifest
index 961f98e04d98..9a5e4913a272 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/Manifest
+++ b/games-misc/fortune-mod-thomas-ogrisegg/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-thomas.ogrisegg-20030120.tar.gz 15662 BLAKE2B 58c2bbc1b7c432fad02b201d277eb5608151756efce4126eb20f62f30397bb74577d3dacafab3c5abfa136a61d2ac1d596fd20daf7dc7117eeabd29259244f82 SHA512 e1888b117074ae44eeb34ba499f03793d33cbcf5c2af20eec4171078485d37c06a3ccbcb80a620ea4a8e564840fe832d310ddaa8bc5a5164c8d2f870db0791b0
-EBUILD fortune-mod-thomas-ogrisegg-20030120.ebuild 601 BLAKE2B 2fac93ee4e453b0d91d5db92ed29328a3e7ce3c04d178871bea183af7c2175d8d2cbd263a863754e178417a30fb3bf9b5f1b8f07a0bd8e2cffb6c342697a5aae SHA512 f81d315dda9526198e67e008581aedf7cabc522e716bd15b006145142fb9804d9399d557314d15457eb28a96f6be122fc1e3e33aaa84017097985f52d8b64f0a
+EBUILD fortune-mod-thomas-ogrisegg-20030120.ebuild 595 BLAKE2B 1467228e4a82d1dbbcc6ddc6df5f9a25832bc08a9d4033316bf8e596a65a0ba089c9452c2b45a5e1e9b313ee822b910f07279b30ccdf92e374092cc53d69909e SHA512 e4230fa59bdb1e1f2a1c3e327fe07c10d28d0c984a03942dc84c9e9ec5c4b6e04de71a5a57e094a511d7638a82d5cc0d48d2322ee9deb08fdfbdf476809b3dfb
 MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
index 1771092dc545..94895bfc66a2 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
+++ b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 MY_P=fortune-mod-thomas.ogrisegg-${PV}
 DESCRIPTION="Quotes from Thomas Ogrisegg"
 HOMEPAGE="http://fortune-mod-fvl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S=${WORKDIR}/${MY_P}
-
 src_install() {
 	insinto /usr/share/fortune
 	doins thomas.ogrisegg thomas.ogrisegg.dat
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index be4e2bef910c..b3e1c2c09b43 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -1,5 +1,5 @@
-AUX 01_all_fortune_all-fix.patch 783 BLAKE2B 6624a194f63177a3dd414f7c0612d14343f1663867eee04456d8c7fa6b374c7bd1da48495c5c4e8820aedc93c247357574c7a73b71249970f5bea9feac18ff07 SHA512 52211ad8a5f29bc65314fff58e151a7890f0f5d1d6e613b67e693f0bf4ece09219febdb9291ff006901d48b6c50dab0f5507201d412760ddc5d7857c74e11e86
-AUX fortune-mod-1.99.1-gentoo.patch 2699 BLAKE2B aea72dffd92071d416d8bb239f26f26a59aa2920d5bb25cae36267cd8a12362f6463bf43592c9b5065d218d413bc0d5c5d1ad361f52fd6f8260eef4f447b5204 SHA512 83ad811f73216db89eaea52a1a55b63e6f12f8580fd3e360b7adc6e80066c0d6d79191e6c2fbe3e2b78cf446bdb0500562cd9fe8cf00375af76034861b2ab54c
+AUX 01_all_fortune_all-fix.patch 711 BLAKE2B a4c6802863fe2d19bdb3080e7f8a039ae0c39235b33d6c6a1d0bad6d2d19607a7ae8e72f292ffa1d755985e24cdd92bb31b54ef0013365ce81c0216c69ed45fd SHA512 ebc0bffa0f7d89eb1b88631984742c109b8703e8116e30b6b0b11c28f12bab5aa929a0567f1bc3a603f01f6618d613a881b046646e20fd685133bbb6daa39aa9
+AUX fortune-mod-1.99.1-gentoo.patch 2495 BLAKE2B 755d525da36c6d5b00ac3635082d788a5bd70e3712b23e6227328c726740b5adbf6ce1d254706901ff183bfbe40c04da73a26edf181fe4a9727bb7623dbf5bea SHA512 338861e27cc82baf4a062fe17029a7f2d05ea19d009be8627c04f66bebd74e8801272c1fc3cdeab2f29da797ad6373f38dd0ded011a7176ee93774b396e45cd9
 DIST fortune-mod-1.99.1.tar.gz 1812089 BLAKE2B a5df4a5a518021073ee95ac7e110ac75b961feb1b4dfcc3a40165ea98859f93e6d002ee4906d3f03a40762503ae475b61399a2bd4144609fa4d9815a1a85fa84 SHA512 4c06ea37532dd59f0251d7c49538bee703852c60a3247aba7c516f4f0d4b8ab15b9d7495d004a6423acd74c4dd7532e3dbe1679d6904ab373b617a3386205cde
-EBUILD fortune-mod-1.99.1-r3.ebuild 1700 BLAKE2B 9f9c7f261c359c46f6d5d7f0387537c6b3b93f735e25901979a0c926a2c222531e2314d018a3b7183680712613b9a4dc1d33763906d6c007ebf536198a0d9f9a SHA512 38b28d9145dc5311d7996d578d90d9dd5e36d80262b24c61f41da0ab8c930c33df6709af89d67edbd0f53305a3a78bd8a951a97a329d349a8b46a1c0bbe6230f
+EBUILD fortune-mod-1.99.1-r3.ebuild 1710 BLAKE2B b9af07978e8f4bf7ad975d24c51820b583f5f09f5079f3f1ea20f1013abd553ab4e9e1e928ee36725c3071122c434574b97b25c4ffad2d7504a1d93736777fff SHA512 d13f50c481cbcace84eb958c533f1c1464a6247d5251ef0f900c6e3dd99a720b483fdba0c0e8e4ac8e05e68993fb210ac6a052de4d2211a77e79c11c4229c6b2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch b/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch
index b4175ac81bfc..48807293bf1a 100644
--- a/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch
+++ b/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch
@@ -1,5 +1,5 @@
---- fortune/fortune.c.old	2006-03-11 15:33:14.000000000 +0100
-+++ fortune/fortune.c	2006-03-11 15:43:16.000000000 +0100
+--- a/fortune/fortune.c
++++ b/fortune/fortune.c
 @@ -974,7 +974,7 @@
  	  if (!ret)
  	    ret=add_file(percent, fullpathname, NULL, &File_list,
diff --git a/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.patch b/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.patch
index d9b27fb350e5..97f04259ba92 100644
--- a/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.patch
+++ b/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.patch
@@ -1,5 +1,5 @@
---- fortune-mod-1.99.1/datfiles/Makefile
-+++ fortune-mod-1.99.1/datfiles/Makefile
+--- a/datfiles/Makefile
++++ b/datfiles/Makefile
 @@ -58,7 +58,7 @@
  	if [ $(WEB) = 1 ] ; then cd html && $(MAKE) install ; fi
  	for i in $(COOKIES) ; do \
@@ -9,8 +9,8 @@
  		done
  
  clean:
---- fortune-mod-1.99.1/datfiles/off/Makefile
-+++ fortune-mod-1.99.1/datfiles/off/Makefile
+--- a/datfiles/off/Makefile
++++ b/datfiles/off/Makefile
 @@ -38,7 +38,7 @@
  	install -m 0755 -d $(OCOOKIEDIR)
  	for i in $(OCOOKIES) ; \
@@ -20,8 +20,8 @@
  	done
  
  clean:
---- fortune-mod-1.99.1/Makefile
-+++ fortune-mod-1.99.1/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -65,8 +65,7 @@
  RECODELIBS=-lrecode
  
@@ -32,8 +32,8 @@
  
  # The above flags are used by default; the debug flags are used when make
  # is called with a debug target, such as 'make debug'
---- fortune-mod-1.99.1/fortune/fortune.c
-+++ fortune-mod-1.99.1/fortune/fortune.c
+--- a/fortune/fortune.c
++++ b/fortune/fortune.c
 @@ -97,7 +97,7 @@
  #endif /* killing warnings */
  
@@ -72,8 +72,8 @@
      crequest = malloc(strlen(ctype) + 7 + 1);
      sprintf(crequest, "UTF-8..%s", ctype);
      recode_scan_request (request, crequest);
---- fortune-mod-1.99.1/util/rot.c
-+++ fortune-mod-1.99.1/util/rot.c
+--- a/util/rot.c
++++ b/util/rot.c
 @@ -5,10 +5,11 @@
  
  #include <stdio.h>
@@ -87,8 +87,8 @@
  
      while ((a = getchar()) != EOF)
      {
---- fortune-mod-1.99.1/util/unstr.c
-+++ fortune-mod-1.99.1/util/unstr.c
+--- a/util/unstr.c
++++ b/util/unstr.c
 @@ -96,6 +96,7 @@
  #include	<string.h>
  #include	<unistd.h>
diff --git a/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild b/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
index d9c0b620388c..e3e2019a48a7 100644
--- a/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="The notorious fortune program"
 HOMEPAGE="http://www.redellipse.net/code/fortune"
@@ -16,9 +17,13 @@ IUSE="offensive elibc_glibc"
 DEPEND="app-text/recode:0="
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/01_all_fortune_all-fix.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/01_all_fortune_all-fix.patch
+	default
 
 	sed -i \
 		-e 's:/games::' \
@@ -37,9 +42,11 @@ src_prepare() {
 			Makefile \
 			|| die "sed REGEXLIBS failed"
 	fi
+
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		sed -i -e 's:u_int:uint:g' util/strfile.h || die "sed strfile.h failed"
 	fi
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		sed -i -e 's/-DBSD_REGEX/-DPOSIX_REGEX/' Makefile || die "sed Makefile failed"
 	fi
@@ -48,7 +55,7 @@ src_prepare() {
 src_compile() {
 	local myrex=
 	[[ ${CHOST} == *-interix* ]] && myrex="REGEXDEFS=-DNO_REGEX"
-	emake prefix="${EPREFIX}" CC="$(tc-getCC)" $myrex
+	emake prefix="${EPREFIX}" CC="$(tc-getCC)" ${myrex}
 }
 
 src_install() {
diff --git a/games-misc/funny-manpages/Manifest b/games-misc/funny-manpages/Manifest
index 28cebdf8ed7c..a0c2590e10bf 100644
--- a/games-misc/funny-manpages/Manifest
+++ b/games-misc/funny-manpages/Manifest
@@ -1,6 +1,6 @@
 DIST funny-manpages_1.3-5.diff.gz 2639 BLAKE2B 2234a963be3292e33fadeb12213b11a6a9b81157f60c505df3e9d097cc99cb90a5b180bc1b64636d423a04d44a67fdd2ea8478ac83ce984f6a799896e2251036 SHA512 69110989da9071321a8d8e9ea4f09bd7635704caeaccbdbf7fb2fb1abd540632f19d63d15de3232fabbc35e76dfe2eefb64ce84b6f4606d8dbe581e15f83d24c
 DIST funny-manpages_1.3.orig.tar.gz 22691 BLAKE2B 2b54879992a3c9254e39b175adb060cbcf0ad65597454659fe66bb694ba5be70e97a3e7356ec79d6cd42cfc64f1b5adffd8328edc200a79987687a1227328bc8 SHA512 83c753540d9a9829017246f4a9de22ba09965fa5b8af8276f55ef141129876ca3e641b367ebc31ca99301f37a56132c07eee1ebc9616c954a2e84387fe62383d
 DIST funny-manpages_2.3.orig.tar.gz 23949 BLAKE2B 27f3dc4f548b6012c6830d303980c6871c0079cd123b706bdda75cdc49c90e66171a096b24ef3ba448f3d8e0c6a48f316b8c2783cfa6cc0087ef755311bb5ac3 SHA512 7920e9a62972f8ea0649b50d0b108936a6e0a5d5b68baccadded4999d0219af3f4685349dd881aded9e762e0d1f00575f382d155db0969f7e51a4a1963f0519e
-EBUILD funny-manpages-1.3_rc5-r1.ebuild 744 BLAKE2B dacec1fe749959a8b07e91a18f753faa1911d458c4e845c5d91db4e11d941e8df84c1f11b743460425cf3363f654fd5aff9f9b2c6d489f5b09d6b63beab3846d SHA512 39184b27e321e663d8a911c68311749d8c059b0676087dc54b243a0c74ccf11e9b266fbb17086aafff802b9e9a6d2d1ab3676b2c98ee01ad9771e44ec389368b
-EBUILD funny-manpages-2.3.ebuild 835 BLAKE2B 7469a17360b005da1c6e7b0fae58fbd9bd1bf2bc525683b97cc4f130660476a58b79ea2f4a616ae2a404674db9b43485b833b7d9c631444b0fe6848ead9872a8 SHA512 4c16d2a21b25d1ee7556748972112237c1d582c67561108232d7cb41075727095889b6d7dbf9f9f874c259d4bc9e3bad3e6e257d448362f55b23ca2f62214286
+EBUILD funny-manpages-1.3_rc5-r1.ebuild 747 BLAKE2B a6b6891d4f2255beedef0533efc48e165435717ac748785e783016e01eb0d1c710646c7e1cce5ff124c422d65b63832960b6ab7e4f92d76115625477101d2610 SHA512 9720282788c93b6efe6637128a738c213e9d352bc57ba92d60ef3c844c1113ccb84dd44ddf4a771390d52dfc970b7808404bec0458862b16efbabcc847fcd588
+EBUILD funny-manpages-2.3.ebuild 829 BLAKE2B 60f63ded7563f279ea7964051e43a1405e7f8de548dc7d466c82c9d5a8d119f0580bf94a5a5a91a1bf9668bb269ec2feaf9774188502b75f2db782fff87d5bc1 SHA512 bdd8f529f6a7b258dd4c11b6d87983be6de355344ddfab3e8af514afdaf8c1ea5c8ab697111c2ae9210705a6d707fe7a9a5326489ef8280ccfd930cc4654f709
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild b/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
index 1c7c1840f266..b215501cbb20 100644
--- a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
+++ b/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 MY_R=${PV:0-1}
 MY_P=${PN}_${PV/_rc?/}
-DESCRIPTION="funny manpages collected from various sources"
+DESCRIPTION="Funny manpages collected from various sources"
 HOMEPAGE="https://www.debian.org/"
 SRC_URI="mirror://debian/pool/main/f/funny-manpages/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/f/funny-manpages/${MY_P}-${MY_R}.diff.gz"
+S="${WORKDIR}"/${MY_P/_/-}.orig
 
 LICENSE="freedist" #465704
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~x86"
-IUSE=""
 
 RDEPEND="virtual/man"
 
-S=${WORKDIR}/${MY_P/_/-}.orig
+PATCHES=(
+	"${WORKDIR}"/${MY_P}-${MY_R}.diff
+)
 
 src_prepare() {
-	epatch ../${MY_P}-${MY_R}.diff
+	default
 
 	for f in *.[0-57-9]fun ; do
 		mv ${f} ${f/.?fun/.6fun} || die "renaming ${f} failed"
diff --git a/games-misc/funny-manpages/funny-manpages-2.3.ebuild b/games-misc/funny-manpages/funny-manpages-2.3.ebuild
index d8bd6f0300dd..a2effd00e0c0 100644
--- a/games-misc/funny-manpages/funny-manpages-2.3.ebuild
+++ b/games-misc/funny-manpages/funny-manpages-2.3.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 MY_R="${PV:0-1}"
 MY_P="${PN}_${PV/_p?/}"
@@ -9,21 +9,20 @@ DESCRIPTION="funny manpages collected from various sources"
 HOMEPAGE="https://www.debian.org/"
 SRC_URI="mirror://debian/pool/main/f/funny-manpages/${MY_P}.orig.tar.gz"
 
-if [[ "${PV}" = *_p* ]] ; then
+if [[ "${PV}" == *_p* ]] ; then
 	SRC_URI+=" mirror://debian/pool/main/f/funny-manpages/${MY_P}-${MY_R}.diff.gz"
 fi
 
+S="${WORKDIR}/${PN}/man"
+
 LICENSE="freedist" #465704
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~x86"
-IUSE=""
 
 RDEPEND="virtual/man"
 
-S="${WORKDIR}/${PN}/man"
-
 src_prepare() {
-	if [[ "${PV}" = *_p* ]] ; then
+	if [[ "${PV}" == *_p* ]] ; then
 		eapply "${WORKDIR}"/${MY_P}-${MY_R}.diff
 	fi
 
diff --git a/games-misc/gBhed/Manifest b/games-misc/gBhed/Manifest
index de154e81c4af..dadf122e79bb 100644
--- a/games-misc/gBhed/Manifest
+++ b/games-misc/gBhed/Manifest
@@ -1,3 +1,3 @@
 DIST gBhed-0.17.tar.gz 460425 BLAKE2B f3f0d7ee11aed7efdf4c69b22c45b1f36f44cdbea7b0c497d16eacf7d43dfcdd65d5351bcd3e4c20eae184cddcbea62c093f5448bb94ce9cc256e4be8192c6b0 SHA512 036dcdef2de70ebc0774e9907c7697d28369d71fdb763e9034efe9ab2385ac482d2f301e7291a1b4787338080943260cd22715067d10d5f8c8d3690db2f0cc27
-EBUILD gBhed-0.17-r1.ebuild 873 BLAKE2B 6fff2444d86587a2dcd4a9b1e28971852cbe19c791e4443afa197a544849b68da4d00adcc889114e18256b5d1f6624124e34ed65c91a2e8b7e57a1b87cbb269f SHA512 83c7f629936e8d067b920e31736162e89c2c62c51fe42b4e5b8d0e529784c4a70c7dd332ee0d074ecdb59f03efbcf8ec46c08437dbe620a3a2d8734f8443351f
+EBUILD gBhed-0.17-r1.ebuild 876 BLAKE2B e606915a11feab301a26aa58a945ffe1831b3a13d34c8fe98ff19884d5544cc5cd4fcc8099c56fb59d0bab4af43fa8a813ba36a6123bb3cd3463c49a47f409fa SHA512 196b86b7553912afa0fea3f5161ca984ff6a2458456a435e86b26b0919e2b0bd5405c3142008ab225d3f92d5d888546d9e6d4810e3e275d7e2206d0b33da9565
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/gBhed/gBhed-0.17-r1.ebuild b/games-misc/gBhed/gBhed-0.17-r1.ebuild
index 4386d6edb2f1..30e33c085ccd 100644
--- a/games-misc/gBhed/gBhed-0.17-r1.ebuild
+++ b/games-misc/gBhed/gBhed-0.17-r1.ebuild
@@ -1,8 +1,9 @@
-# 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=7
+
+inherit desktop
 
 DESCRIPTION="An Al Bhed translator"
 HOMEPAGE="http://liquidchile.net/software/gbhed/"
@@ -14,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
 
 DEPEND="gtk? ( x11-libs/gtk+:2 )"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
@@ -36,7 +37,9 @@ src_install() {
 	if use gtk ; then
 		insinto /usr/share/${PN}/pixmaps
 		doins pixmaps/*.{jpg,png,xpm}
+
 		newicon pixmaps/gbhed48.png ${PN}.png
+
 		make_desktop_entry gbhed ${PN}
 		doman doc/gbhed.1
 	fi
diff --git a/games-misc/games-envd/Manifest b/games-misc/games-envd/Manifest
index 07806fee2ad4..400b9f6e57e7 100644
--- a/games-misc/games-envd/Manifest
+++ b/games-misc/games-envd/Manifest
@@ -1,2 +1,2 @@
-EBUILD games-envd-0.ebuild 1252 BLAKE2B ec30f6f943b238220216e68cbd51f410d422556a198353d00d134a7c3e544a8a0516327f94eae2a9940611ccfa9c4f7b0b25f152f3752c5b91baed0ff0896b00 SHA512 9595a1cf97cb731c5856598988fc3b8d6ca780f0457552c5dc9660722aea4f034112c2161e2a5f43c7702f49818cf044f05e9e1016316642c0042b88516f2fb8
+EBUILD games-envd-0.ebuild 1253 BLAKE2B 1e169bb8503044cc81342b8a3f6c05127d4353109f44ff1bc055ec6ac3569b12e23794adeefc2021d0ddc80552996085100219c2758c76d89d13d77f8e225947 SHA512 12f8d5ef962df8e2cc6605d2ab61aaf203df894534b986afa6a678ea71593a07a7e9a6f8e992ef3b867fe2436d743d98c4ba1ff3e454b8a4ebea1a279a17c2ae
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-misc/games-envd/games-envd-0.ebuild b/games-misc/games-envd/games-envd-0.ebuild
index 77d85f5e4231..fe4002ec2d46 100644
--- a/games-misc/games-envd/games-envd-0.ebuild
+++ b/games-misc/games-envd/games-envd-0.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc64 s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S=${WORKDIR}
 
diff --git a/games-misc/little-inferno/Manifest b/games-misc/little-inferno/Manifest
index 7e36af69ab9d..c7d1b0ea76fe 100644
--- a/games-misc/little-inferno/Manifest
+++ b/games-misc/little-inferno/Manifest
@@ -1,3 +1,3 @@
 DIST LittleInferno-20130509.sh 194304242 BLAKE2B 993d387c31cca0a92b7c1cf06581f60dfc31ba001250cfac00036204143350764d5ab023d6cc432e477219ac9cb24223fae21a422ecb501e58f499ae38469aac SHA512 19e2e616b1b1a6e7f8974ba12756c4b54c1daa99c99056891c56f7ed578f20a15143d683960efbb69f3d680243dd219051fc0bdac60ab74dcddc1c69df7d00dd
-EBUILD little-inferno-20130509.ebuild 1604 BLAKE2B 6693c55878933622cdc93be1f6954239cc40b7f9fc809e86e3ce51f2ac288282298a5dee749098ece5fa251b5cb966a2d02e312a51e1eb250bf4c37ceb1d691a SHA512 c9f2bf4c3953d10876b1cb8936e22e4b7614f10979d2955604b14d166af4defb66355f2fd2829f0c3c271678bb4e787cfbf2868805bc1b1f4a82007eba6b0725
+EBUILD little-inferno-20130509-r1.ebuild 1539 BLAKE2B e9f58944632983a8079db78482fdcf46691f6d07973f82bc688fcdea2dfbadc996c177f62105a654e769d6748774ec17aacee16d86721f94ec939e2187761a42 SHA512 ab22e841639e964fa36bbf4955bea3439d58ce9b1db8d8eef3d863b232c5da09ccff17dea756aafc688c9a1b5793d909a294d8c641e4f98086adcc1d79a84abd
 MISC metadata.xml 326 BLAKE2B 20c0a3a6cbb19e457c09b386a837b4202cf279231a681f3da7d604f3bffcfe6761f849ce82bc0169cc498d9bab565ff75216f4b749068e6663f5acbace935f7b SHA512 87eee3f514c290aba519dad7fdb335424ebd7ed7bb1cfa8650d293136ad2a6efdb44eff2c1c48973e9a587f282a2114866d9e4d66adb857b61a085d5635ecfd2
diff --git a/games-misc/little-inferno/little-inferno-20130509.ebuild b/games-misc/little-inferno/little-inferno-20130509-r1.ebuild
index 8461d5670943..91d4eb7d18eb 100644
--- a/games-misc/little-inferno/little-inferno-20130509.ebuild
+++ b/games-misc/little-inferno/little-inferno-20130509-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils unpacker games
+EAPI=7
+
+inherit desktop gnome2-utils unpacker wrapper
 
 DESCRIPTION="Throw your toys into your fire, and play with them as they burn"
 HOMEPAGE="http://tomorrowcorporation.com/"
@@ -12,9 +13,10 @@ LICENSE="Gameplay-Group-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
+
 RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
 
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+MYGAMEDIR=opt/${PN}
 QA_PREBUILT="${MYGAMEDIR#/}/LittleInferno.bin.x86
 	${MYGAMEDIR#/}/lib/*"
 
@@ -25,8 +27,10 @@ RDEPEND="
 	!bundled-libs? (
 		>=media-libs/libogg-1.3.1[abi_x86_32(-)]
 		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-		>=media-libs/openal-1.15.1-r1[abi_x86_32(-)] )"
-DEPEND="app-arch/xz-utils"
+		>=media-libs/openal-1.15.1-r1[abi_x86_32(-)]
+	)
+"
+BDEPEND="app-arch/xz-utils"
 
 src_unpack() {
 	unpack_makeself ${A}
@@ -42,31 +46,29 @@ src_unpack() {
 }
 
 src_prepare() {
-	if use !bundled-libs ; then
+	default
+
+	if ! use bundled-libs ; then
 		rm -rv lib || die
 	fi
 }
 
 src_install() {
-	insinto "${MYGAMEDIR}"
+	insinto ${MYGAMEDIR}
 	doins -r *
 
 	doicon -s 128 LittleInferno.png
 	make_desktop_entry ${PN} "Little Inferno" LittleInferno
-	games_make_wrapper ${PN} "./LittleInferno.bin.x86" "${MYGAMEDIR}" "${MYGAMEDIR}/lib"
-
-	fperms +x "${MYGAMEDIR}"/LittleInferno.bin.x86
+	make_wrapper ${PN} "./LittleInferno.bin.x86" "${MYGAMEDIR}" "${MYGAMEDIR}/lib"
 
-	prepgamesdirs
+	fperms +x ${MYGAMEDIR}/LittleInferno.bin.x86
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-misc/lolcat/Manifest b/games-misc/lolcat/Manifest
index 50b35e277d4f..d511b04e1c75 100644
--- a/games-misc/lolcat/Manifest
+++ b/games-misc/lolcat/Manifest
@@ -1,6 +1,3 @@
 DIST lolcat-100.0.1.gem 121344 BLAKE2B 0105987695990c93e2676babd238f10b586c8f742d40d35281cdf131b1db8ec019cd9c9c2cf1e6d8c248a9e9d2a7d5194aecc5b2fe09d04a11c7358b7d63bb61 SHA512 b257d264f8059e6722eaa66125b990414a77e8d67b47472a8e974418408bcf5fbc0a7c7f1e42517660280202ee2d669c3d3850d546356bd2f5e2e84e61af33ff
-DIST lolcat-90.8.8.gem 56832 BLAKE2B 51bcd05f5bd277ae372b224d3ec8c0a041007ea70dc12261388655a6de8172017d88a1c58f58135181dfbfbc1ec63ab762a28db477618d1e80cf31d328885211 SHA512 2517a2e903c52d16c9773a32fae000917741a0b323abc19cdf4cad68f9ba873f059cda5790819e0d2cb057239dca9ac39a191f9e05417a91ef99f2232e8af3dd
 EBUILD lolcat-100.0.1-r1.ebuild 699 BLAKE2B a6b30f416bf7eb66cfe2184b268245f0c425b2cf0bf5427b2f66c70395a8071bc28fd655616dab1ec7297607cc3a947b28fdfb78c771ba67cdac6906c387174c SHA512 0ac75f4edb7580c8c79c6933aef731f050dd01517a846ea8747147b3307944488ad2cec1fc39d582d0cdb2b9dec793ed37e8aa1e8381edcc1d81a587f1952667
-EBUILD lolcat-100.0.1.ebuild 667 BLAKE2B 6b0dda4d3301478da0e65ffacab01792925aeb0c0ed3a7d2da6ec049d8be57a24dc1d5114b02c7a6ad7f415550c1fdfa91d22993808b5204c5eaafe9a89e1045 SHA512 42849fc0b200ebba9664fee06584d6e5e7da879944d0aabe516975e4b8c4563ada69a2851c84e9855e914329a97019beb4c20f799018b6d84ba6d2b569322e6d
-EBUILD lolcat-90.8.8-r1.ebuild 584 BLAKE2B 060232951ec0373906e693bb542f08524ac31e299c49e5d6c075a9803eb42be4b7d1b6c79a576b5ee7979340a7c70b3ebc1bf0be174526df6d578a6f9f8207ad SHA512 722035d615f498f997266d1a4db3c9fe382137d6c09b0486f0d96ef1987d43ca7d655b4fcc6ffc6ad6da372d348a348ab9633987e81f14ea1f09c70363c7daa4
 MISC metadata.xml 333 BLAKE2B 60f1ec9612c78ba00c9aae4a45ac899651cff451a36ffdfbb317dc1260fd405759fb57c1baff5d9c190fbf3633b2042a1b77c400c063517ba1e437c1a89fda5e SHA512 e31a8b91268a15fad0b382f647e6209b8545163818bab90f16ae7aa43ed0edd46b83a3e94828c3657af65269d17321828f375db5f9ca7402cd8bc6bd8186a3ef
diff --git a/games-misc/lolcat/lolcat-100.0.1.ebuild b/games-misc/lolcat/lolcat-100.0.1.ebuild
deleted file mode 100644
index bcf2f20639c1..000000000000
--- a/games-misc/lolcat/lolcat-100.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="lolcat.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rainbows and unicorns!"
-HOMEPAGE="https://github.com/busyloop/lolcat"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_rdepend "
-	dev-ruby/optimist:3
-	>=dev-ruby/paint-2.1:0"
-
-all_ruby_prepare() {
-	sed -e '/manpages/ s:^:#:' \
-		-e 's/git ls-files --/echo/' \
-		-e 's/git ls-files/find/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_install() {
-	doman man/lolcat.6
-}
diff --git a/games-misc/lolcat/lolcat-90.8.8-r1.ebuild b/games-misc/lolcat/lolcat-90.8.8-r1.ebuild
deleted file mode 100644
index 696d769be5f7..000000000000
--- a/games-misc/lolcat/lolcat-90.8.8-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="lolcat.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rainbows and unicorns!"
-HOMEPAGE="https://github.com/busyloop/lolcat"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_rdepend "
-	>=dev-ruby/trollop-2.1.2:2
-	>=dev-ruby/paint-2.0.0"
-
-all_ruby_prepare() {
-	sed -i -e '/paint/ s/2.0.0/2.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/games-misc/lucidlife/Manifest b/games-misc/lucidlife/Manifest
index 7d5fdc35866c..815c50a97079 100644
--- a/games-misc/lucidlife/Manifest
+++ b/games-misc/lucidlife/Manifest
@@ -1,5 +1,5 @@
-AUX lucidlife-0.9.2-gnome-vfs.patch 1549 BLAKE2B 5960dd039064aaa1d1878b596d847fa939316b6d1b75b68b6060c681a8af65d6a5e4b6cec02fe6e9d72c55b6de488785070ffdb65b15ee63f57dca544edfe5d8 SHA512 57048afec7111940aed0388f17bd4bac9a6e7046d09c07067f0414267a2877cda5d0d04d8ab2a46caea1e6680b7b26a407780c3e77b3d3dc6b2d939364585426
-AUX lucidlife-0.9.2-underlink.patch 317 BLAKE2B 407129ced5f5b9fbe22c6b450c6834fb0f2ce7e59f4d34970826cbbaee1e4b470088995943b8fbc2cf0bd0febcf7f9056e16b178fad4dcd0b7f4901158036134 SHA512 ee33861f9d3f79e1d662ce5ce5c1d1a47aba87b9a45dd04c93ede13ed6d85c0a7365b0f1cca2e7fcf65960985f295ccb12197fcd44679b6196ae1cba11643592
+AUX lucidlife-0.9.2-gnome-vfs.patch 1465 BLAKE2B 0621dcf90a3bcce6606c4da8fbd0ac934abc02008e5446d19f83474f91e03313ec1897c2116107fe4687d61a38f59ee57bb8550842467d7a8f8353582bc1433b SHA512 3c46f18981b51f7fd47f75ef473e2f7f15be0b506b6244844338cedb8205d1caa8712f3dcc78a2871dc2627868cfc3d129517f13eed7fd92ab76f3de0f5e05ba
+AUX lucidlife-0.9.2-underlink.patch 245 BLAKE2B c22bd2859339c588e6913a9df991a6f8cf0a6b15a17b5ce719816aac060a842aa5b3e225641bb1b3b9fa692452c54e72716b5499c586bf3b4d02d027bf92bf26 SHA512 69472de3b26048a81a99f04859f63bdbbcf74b5bb77860426a8e9730d9f584a7804a7aee4b8e496252e6b6dc0ac2e68ebfe594bc6f20fd459e53ecc19b18f1dc
 DIST lucidlife-0.9.2.tar.gz 1506448 BLAKE2B 8e391a60d9cade2c57dece9397f55b945a9b5e182d81f2cceec2e93deea11f50ee250e1b19ecc1a6e88ed437bba98beef4cc098505406d2dce6164de5d07404a SHA512 5184d6a5a2d48b38b2a72edbab6ca4f251547e5c54234792d3821482d39e5fbb2b96ab171544dc3e6843f9976c1dc40935eb3537dcf06c1cb0c717260bd04b01
-EBUILD lucidlife-0.9.2-r1.ebuild 806 BLAKE2B 8d4ee523ad9216b11a4818b810f0dfafab6c8fa9dfa49eba5cfb08dbb078911fd0d4298923d0fdd979189382d0ae8089982da66a623a318d5aab2eb4f4525e0d SHA512 499281f1a4818583abfd81f745c36d5bda85919c9464361d7bf4234817fa4eeb2d2ec97ee19db9d3cc265820f621876b9d1a464e97454c0c40a01d7a157cbe86
+EBUILD lucidlife-0.9.2-r1.ebuild 1066 BLAKE2B 15d8c5d2aad579fc9dc02ede4cd907444211e9181ac07210bc407c6ea69fb18d89544af7220ff1fbeb041176dc9f0035cab94c1537a5a16e514bda54d15f2b02 SHA512 dececcad3e87ec8eb13eed15a374d8fb9dd861ad662a79280e5f16f1276dc0d65fb35e2982f2a8841f6daa08a79cc1b16aeadca58da9f2b2ad795586fefb1cb1
 MISC metadata.xml 247 BLAKE2B 6e885a4bc233754242982df43837c623e79b6e0f9149c9bf81b7ab904ae7f25ef2c1e2657c695f37cd57c2883359a78a09d8c3d1467a90634a857021984bc58d SHA512 fd894fe434a856714537ba8d3dcc8b0ae16889f6b44634e8844143ae15450013d9c4558b2df6215edad3762ebc727d166371b35bcccaa7353426388a04d71216
diff --git a/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch b/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch
index 49918b62146a..68fe0a3b3bc6 100644
--- a/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch
+++ b/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch
@@ -1,5 +1,5 @@
---- lucidlife-0.9.2/configure.ac
-+++ lucidlife-0.9.2/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -23,7 +23,7 @@
  AC_SUBST(CFLAGS)
  AC_SUBST(LDFLAGS)
@@ -9,8 +9,8 @@
  PKG_CHECK_MODULES(GNOME, $GNOME_MODULES)
  AC_SUBST(GNOME_CFLAGS)
  AC_SUBST(GNOME_LIBS)
---- lucidlife-0.9.2/src/lucidlife.c
-+++ lucidlife-0.9.2/src/lucidlife.c
+--- a/src/lucidlife.c
++++ b/src/lucidlife.c
 @@ -35,8 +35,6 @@
  
  #include <gtk/gtk.h>
@@ -55,8 +55,8 @@
  	free(url);
  }
  
---- lucidlife-0.9.2/lucidlife.desktop.in
-+++ lucidlife-0.9.2/lucidlife.desktop.in
+--- a/lucidlife.desktop.in
++++ b/lucidlife.desktop.in
 @@ -2,8 +2,7 @@
  Name=LucidLife
  Comment=A user-friendly version of Conway's game of life
diff --git a/games-misc/lucidlife/files/lucidlife-0.9.2-underlink.patch b/games-misc/lucidlife/files/lucidlife-0.9.2-underlink.patch
index 77bd7092b812..f83c8214b60c 100644
--- a/games-misc/lucidlife/files/lucidlife-0.9.2-underlink.patch
+++ b/games-misc/lucidlife/files/lucidlife-0.9.2-underlink.patch
@@ -1,5 +1,5 @@
---- a/src/Makefile.am	2011-06-17 17:31:54.078600741 +0200
-+++ b/src/Makefile.am	2011-06-17 17:32:05.491299944 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -2,7 +2,7 @@
             -DDATADIR=\""$(datadir)/lucidlife"\" \
             -DDOCDIR=\""$(datadir)/doc/lucidlife"\"
diff --git a/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild b/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild
index d899eb14600c..05012e421cc6 100644
--- a/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild
+++ b/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild
@@ -1,8 +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
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A Conway's Life simulator written in GTK+2 - fork from Gtklife"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -11,13 +12,24 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${DEPEND}
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib
+	dev-libs/gobject-introspection
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gnome-vfs.patch
@@ -37,5 +49,8 @@ src_install() {
 		pixmapdir=/usr/share/pixmaps \
 		DESTDIR="${D}"
 
+	# Let's just shift the docdir
+	mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/games-misc/papers-please/Manifest b/games-misc/papers-please/Manifest
index 269b9c9fcf43..7104be1c7304 100644
--- a/games-misc/papers-please/Manifest
+++ b/games-misc/papers-please/Manifest
@@ -1,3 +1,3 @@
 DIST papers-please_1.1.65_i386.tar.gz 31566799 BLAKE2B 1e7aee7839f5e014d5eba60b5c77381a79c7532610e6daee1a36b22484a59b07e8e6b7bce3fc28720472268b78857894744ef6750dcee37e637003b2bc14a502 SHA512 093990a61c1b61d2999e6484335f4deddfecd3d66b7a5e29555c3170e890f6049f7d42a83529dcd993439de940b5dc96b8485d30ab46995d0f6814d5282669e0
-EBUILD papers-please-1.1.65.ebuild 1410 BLAKE2B 69aba3323d8bbbf309b8b515c9da06bff8f57bd68d70f434d13b0c7487b18a3ff7f9bf0fd6ce3436206d371c3b5181a41e782eeed1904119aefc603b786d08ac SHA512 04d696d06b6dfbab4add2a895f45b044a86ac63403ee33fac4fdaad18bbb6a5092f76e9208edd4eebec9aa5ba5cf8a9492436d91cd3916a5cc273979d89d46e1
+EBUILD papers-please-1.1.65.ebuild 1357 BLAKE2B 288fa22002168098ca42928a22aee1775c3be439fbdff7d40af89622d2c704dbbd0bcd208719e6b1fb2b7375161a368ddbdff9748661081200cd5daa3c60f06d SHA512 3095299955d2b7b8bd4fea14c9f4d1842992af5dc1faeb880d70a7c8e77019b170f9396085dd5b983761605bd5503a706f9e9ed6b661679669d55a8e091f2a77
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-misc/papers-please/papers-please-1.1.65.ebuild b/games-misc/papers-please/papers-please-1.1.65.ebuild
index db15ecb72c8b..ec28d2a4a6d6 100644
--- a/games-misc/papers-please/papers-please-1.1.65.ebuild
+++ b/games-misc/papers-please/papers-please-1.1.65.ebuild
@@ -1,21 +1,21 @@
-# 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="A Dystopian Document Thriller"
 HOMEPAGE="http://papersplea.se"
 SRC_URI="papers-please_${PV}_i386.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="PAPERS-PLEASE"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="fetch bindist"
 
-QA_PREBUILT="${GAMES_PREFIX_OPT#/}/${PN}/*"
+QA_PREBUILT="opt/${PN}/*"
 
 RDEPEND="
 	amd64? (
@@ -39,8 +39,6 @@ RDEPEND="
 		virtual/opengl
 	)"
 
-S=${WORKDIR}/${PN}
-
 pkg_nofetch() {
 	einfo
 	einfo "Please buy & download ${SRC_URI} from:"
@@ -50,21 +48,21 @@ pkg_nofetch() {
 }
 
 src_prepare() {
+	default
+
 	rm -v launch.sh LICENSE || die
 	mv README "${T}"/README || die
 }
 
 src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
+	local dir=/opt/${PN}
 
-	insinto "${dir}"
+	insinto ${dir}
 	doins -r *
-	fperms +x "${dir}"/PapersPlease
+	fperms +x ${dir}/PapersPlease
 
-	games_make_wrapper ${PN} "./PapersPlease" "${dir}" "${dir}"
+	make_wrapper ${PN} "./PapersPlease" "${dir}" "${dir}"
 	make_desktop_entry ${PN} "Papers, Please"
 
 	dodoc "${T}"/README
-
-	prepgamesdirs
 }
diff --git a/games-misc/sound-of-sorting/Manifest b/games-misc/sound-of-sorting/Manifest
index e5d90bafc302..31672cb9e066 100644
--- a/games-misc/sound-of-sorting/Manifest
+++ b/games-misc/sound-of-sorting/Manifest
@@ -1,3 +1,3 @@
 DIST sound-of-sorting-0.6.6_pre20151107.tar.gz 179044 BLAKE2B 8027851e63cf8f3a0cec7e184b1970b9a138bcaa10b345e9fd742950bc397a7eb3d6911fbf8138eab3418c66788c6218b74ed03c1e6e72374b4b7dab0ce06387 SHA512 530caeefe4a37fed401ce56803900806a86efc1e4c0ff083c52e4bfc1cf78f8158539ca3c22f5cdf5cd176c8d6953089d14ca855643ce353457419a4f931a125
-EBUILD sound-of-sorting-0.6.6_pre20151107-r1.ebuild 734 BLAKE2B 9ecd617316db06fd444f512e1dd5bae6fc4c6596247222907222667c56614b8e098edff72cc76b96c413202aec3a40929118b260bd0ee521d198925ac22cda39 SHA512 4ae4904c126a0505c4eef067a3cc3d4da2e82e62407c35f584d4c25ed372b75f31ab52ca4d27d867e177159f5eb08d9e9b8b37a517bd535abb6f88fbf06f129e
+EBUILD sound-of-sorting-0.6.6_pre20151107-r1.ebuild 711 BLAKE2B 12dc05212822125fe5d8f0b86dff376adf583caa0dc4b48117d0f503c63556df0e0cddf0f08627fa25179eba2cf933fe1e101b744b1be58063fda5965f2afac8 SHA512 1e53a32b82357ea525b625e5916f67844b06e09b9f25485b26518e9525f543e8859bd448582ef0e7a7c8e16c72a4338dfd75a910a36d27a777f18f83de0410de
 MISC metadata.xml 342 BLAKE2B 929b4e7e99b167d0d2257654bde3bf4eca115e4c86b1e059a87a37e612747d865359dca06c39631b5cc0715a1a600b3e5d448905e988ec31b1b285d97ad88d24 SHA512 68ea3ba1786f4c5d32a9a56ea9fbaa609ae230b2b493b4853c33330db52288da7eb930d7720c1106d7259b9a9597b464e7c4467d9434035ea010a7ae6d83c8b6
diff --git a/games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107-r1.ebuild b/games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107-r1.ebuild
index f17d1467c1f6..3726a27ef640 100644
--- a/games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107-r1.ebuild
+++ b/games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 WX_GTK_VER="3.0"
 
 inherit vcs-snapshot wxwidgets
@@ -15,15 +16,13 @@ SRC_URI="https://github.com/bingmann/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 RDEPEND="
 	media-libs/libsdl
-	x11-libs/wxGTK:${WX_GTK_VER}
-"
+	x11-libs/wxGTK:${WX_GTK_VER}"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	vcs-snapshot_src_unpack
-	need-wxwidgets unicode
+src_configure() {
+	setup-wxwidgets unicode
+	default
 }
diff --git a/games-misc/wumpus/Manifest b/games-misc/wumpus/Manifest
index 8a126ff22600..93703525b88a 100644
--- a/games-misc/wumpus/Manifest
+++ b/games-misc/wumpus/Manifest
@@ -1,5 +1,5 @@
 DIST wump.6 4821 BLAKE2B b8eee837341f329d60bd27a143d4b9f1e5e5fd27835821efc8b028190f253b090f1d494e4be0b84c16f6c23552b9fbb56d86463749fa2b07a868aa49befeabcd SHA512 51e61efa71d46bace722dae3dbc7ea782f97ef02cb529054c1f5ea56139017b90e6a31ae70314c4a4c82bbcb821f826aa0f6032d934104bf3e7851437377e471
 DIST wump.c 22691 BLAKE2B 569819c0b335a2847864d8d6e468eb9d8abaae245d93fedd7c9d267a106d32fcbd340273c7ca5695b37a5d4ce0d0b375961437cf896a6c073a7ced62ac69d59f SHA512 a914e1eb9e6204e5d763a7c32445721b849a753c3007312c7f9bbbaed9fc3f133639e7ef27a66636e9c5bc7bb13ab7a54f4f607272403014042723de38cbd878
 DIST wump.info 1883 BLAKE2B cb29de61f2756a7a1d53f20e015325bb14364d3bd04e32fad0077c9d8467907f74ce7bae36570f2f6ef0a282ed2e257527c4480db0b76383afe82d813b71d567 SHA512 faee0552c7065f6cc98db53d0ed085b7b4c6aadb5f457733e36a621f9ea1753cb627d4a3813cc9b9aaaa1cd178458fd7ceb4ef9114892e0f8faeb303cc0351d8
-EBUILD wumpus-1.4-r1.ebuild 981 BLAKE2B 86921d3cd2170441dd1aee617155a71679f8847e361ffbbb2394011e9ebaff0a6b67044b2aed1e2dd4e7b77590ac8f3149663ddf1dd221142ec2dd0bf26f4a80 SHA512 c0cc9ae702f9864923e692e59a74a7f0a4325d163d0d43c281ae5764c36dac1793478deb66963506effcf43364eb42586c65c491708faff34b11848dd762b76c
+EBUILD wumpus-1.4-r2.ebuild 1007 BLAKE2B d8912ffb17282eca957054a4fc10489baa9afd598963833c28799f2dd4c8ef36977689c45539a27b4dc9b52f581e2379f8afededce7879c40fffb682c07155f6 SHA512 5fd09b008d795409794d6dfd947b9c64228e93031727e6cc82670ba29a939fcd2f380e27b9b4770d07c3a03c79b3319ce18a3a6e8df667acd30941b83e4c042f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/wumpus/wumpus-1.4-r1.ebuild b/games-misc/wumpus/wumpus-1.4-r2.ebuild
index 56125c56d369..baebcd57240a 100644
--- a/games-misc/wumpus/wumpus-1.4-r1.ebuild
+++ b/games-misc/wumpus/wumpus-1.4-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Classic Hunt the Wumpus Adventure Game"
@@ -9,16 +10,17 @@ HOMEPAGE="http://cvsweb.netbsd.org/bsdweb.cgi/src/games/wump/"
 SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.c
 	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.6
 	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.info"
+S="${WORKDIR}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="sys-apps/less"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}
+RDEPEND="
+	${DEPEND}
+	!games-misc/bsd-games:0/3
+"
 
 src_unpack() {
 	cp "${DISTDIR}"/wump.{info,c,6} "${S}/" || die
@@ -26,7 +28,8 @@ src_unpack() {
 
 src_compile() {
 	touch pathnames.h
-	[ -z "${PAGER}" ] && PAGER=/usr/bin/less
+
+	[[ -z "${PAGER}" ]] && PAGER=/usr/bin/less
 	$(tc-getCC) ${LDFLAGS} -Dlint -D_PATH_PAGER=\"${PAGER}\" \
 		-D_PATH_WUMPINFO=\"/usr/share/${PN}/wump.info\" ${CFLAGS} \
 		-o wump wump.c || die
diff --git a/games-misc/xcruiser/Manifest b/games-misc/xcruiser/Manifest
index d9cfc16e54dc..b0c1a2aa3cfd 100644
--- a/games-misc/xcruiser/Manifest
+++ b/games-misc/xcruiser/Manifest
@@ -1,3 +1,3 @@
 DIST xcruiser-0.30.tar.gz 38667 BLAKE2B 5cc5e296c9c8e73a51b2dc39b58beef09aaf7122c0b41126fc06897a474a057f27b44ff782855fa8f6bb39b6857b928a15e8e258a71f0aeb1b5d3d657788f557 SHA512 77f1dbfd4497e30bb1ee0f41121a6f85cd1bf2b59fc542e88326bded8b806ecd7439689765a73ea88215c768a3bdca1370ae80b956de38a131b927b6af9e674b
-EBUILD xcruiser-0.30-r1.ebuild 657 BLAKE2B 166b423086f51c58267bad1c3f6cf3e28b313eb4109ee56971e51f213fce992ea190348c20a1d227a5fa6edd92f0fa0f766759bd8603f6b37fe47f42b7ce3134 SHA512 d25db0bfacdd1e9caba87ba16934cc2d43a8c1266b60dd8f40b3d43ea636adb198ef14d8654834df11d7e50dfca3c72df291f73181f57dc112be8ec72b3e253e
+EBUILD xcruiser-0.30-r1.ebuild 807 BLAKE2B ca93d1a1cd00d3d577a79ef0fbdc98b538c9ada07b855000a00b3071e91cfbabfa85d09df6c1873de1c5dcc28763a767a74e8968faaf90d54823759d249dee35 SHA512 f6b585b831a200f0c2f8b7f48a4ee9ae0946b60ccfa26c4250b51497a4b5fc73ca8b1e048467aad7a0d25aade34d0b37ae48f1c37eb159784b73aeadebf62165
 MISC metadata.xml 331 BLAKE2B 503f508585b5ad0a23a933c923766a7e50b9ffb531e39f83a77107baeee17e78848db7f48ca2b87ff85ecfd684c6b9a3353d8af2966236e28888c498cd7db3d3 SHA512 6ead6b1b6ef634bd700ce10f4e3c29c2542a5079420ec01f7f8f2d9ecccf1ec4b2cdadb11ea1a9c58e868f3c438dd5ed925da0f3b95fa986f6443c73d9f5d3f1
diff --git a/games-misc/xcruiser/xcruiser-0.30-r1.ebuild b/games-misc/xcruiser/xcruiser-0.30-r1.ebuild
index c5f7a85927f4..0b64f9c5698b 100644
--- a/games-misc/xcruiser/xcruiser-0.30-r1.ebuild
+++ b/games-misc/xcruiser/xcruiser-0.30-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Fly about 3D-formed file system"
@@ -11,22 +12,31 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="test"
 
 RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
 	x11-misc/gccmakedep
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
+
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
+}
 
 src_compile() {
-	xmkmf -a
-	emake CC=$(tc-getCC) CDEBUGFLAGS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}"
+	local myemakeargs=(
+		CC="$(tc-getCC)"
+		CDEBUGFLAGS="${CFLAGS}"
+		LOCAL_LDFLAGS="${LDFLAGS}"
+	)
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
 	dobin xcruiser
-	dodoc CHANGES README README.jp TODO
 	newman xcruiser.man xcruiser.1
+	einstalldocs
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /games-misc
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)