gentoo resync : 29.06.2021

23 files changed, 333 insertions, 209 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 20327f3fe6cf..5b26a8f00e37 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/funnyboat/Manifest b/games-arcade/funnyboat/Manifest
index a8a46b8628ac..7a4c7bc4250b 100644
--- a/games-arcade/funnyboat/Manifest
+++ b/games-arcade/funnyboat/Manifest
@@ -1,4 +1,4 @@
 DIST funnyboat-1.5-src.zip 3839990 BLAKE2B 30576f2bb20a236d518a5aca1b173d0e6f876a8411eef87d85950059536b3c6f1801b6f5a498d854ce6f390911ecc3a604f3c9bd438692943721b064f9c6d708 SHA512 7d38070e73825602d6f0a82e810fe8937fe919ce12f6e802ee25147ca1a2333c2b90821d92e20b8e071070505099bf9ec562e8c7b8cd8d241c3021b840e707cc
 DIST funnyboat_1.5-11.debian.tar.xz 12572 BLAKE2B 691a547cdc2ad07515268fe3e5c828d557f691746e9a9f136dc2634b9130210330ebd68b89fdc783373e5b660ddfe1caf2b74465e6d473b8e7c66a602b3a3f10 SHA512 9dd117e71715ec0a421061c1b71447ac9413b0d80f0337ab4cecc941324f6b9b2466981ed39a9670fa0c56075e60499eeb619ec0bfd8c7c010469d56d3ed66ec
-EBUILD funnyboat-1.5_p11-r2.ebuild 1210 BLAKE2B ba02030658bc7bdbfa56bf1e9b075dfe66f23a4a8ed797cbaad99e35be8cbc76de0cf2e1e5413574ed2f87e00ad0e5afbc96e0c439712969d598e5f05620550f SHA512 e7da11d7637e77df3c40fccfc92cb58167e9e9dfc51c0fa09e3d9f52b56d6406e70cdc04696a855d853bfdee10cdc38e8e474b358a0ec0e2610e251fa9ceb6bb
+EBUILD funnyboat-1.5_p11-r2.ebuild 1206 BLAKE2B 4336fa7e9d2b134cc3f82e4c22d3572af49f576a1c62bf40c651e9f7a15f9db6f6c060460644458ed1222b548b7b098f55120ee0d179e85146cc5a914c43997c SHA512 7443c5d068930b54a2f2ed21a2c9197334fdc38083a0d433bf602a201d09963ccdc156dfb869d8585fdaa83c7319b39b10fcf8a5c57718e02796be6c73f8339b
 MISC metadata.xml 332 BLAKE2B 0f043d28ad918706a08b16364c276af4e7cb3c7f686d799ccf40e54a673d87eceb011a1c72bff3332ce2ca2a9ea62268365f00c26b5bbc5d1f0f4a367522441f SHA512 840d32294f544c648307a82c390a64aea38a6f2931734e377d576ceff26047d9dbff9486d60b0164570a4826fbd148a5af14528c336aa41c4ad6dd51790095b7
diff --git a/games-arcade/funnyboat/funnyboat-1.5_p11-r2.ebuild b/games-arcade/funnyboat/funnyboat-1.5_p11-r2.ebuild
index 0d431c264d41..4f5dae983289 100644
--- a/games-arcade/funnyboat/funnyboat-1.5_p11-r2.ebuild
+++ b/games-arcade/funnyboat/funnyboat-1.5_p11-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..9} )
-inherit desktop python-single-r1 wrapper xdg
+inherit desktop python-single-r1 wrapper
 
 DESCRIPTION="Side scrolling shooter game starring a steamboat on the sea"
 HOMEPAGE="http://funnyboat.sourceforge.net/"
diff --git a/games-arcade/jazz2-data/Manifest b/games-arcade/jazz2-data/Manifest
index 7398ac5c46a1..4e92aa9aa202 100644
--- a/games-arcade/jazz2-data/Manifest
+++ b/games-arcade/jazz2-data/Manifest
@@ -3,4 +3,4 @@ DIST jj2plus-v1.zip 153487 BLAKE2B 49867cd3d30ee26e8795a7983657f7092710d43b0b8f0
 DIST setup_jazz_jackrabbit_2_1.24hf_(16886).exe 58050816 BLAKE2B 6a6492aedc3d7387e5ef5bfc641d54c46dbe850f65f9269268c962cf963164dcd98c2f2651e9dc3b7c2d0ea9ea00836e9cc1332a158b08c34f8fa9fbfb44859e SHA512 df6fc47abf24aaa1895df5f897f698b53865fdc499e2454e07b273eddc8fcdeeebe8fc2992292fb27e077da252d3d5728823ce6a2e83412c150fb8742a52116f
 DIST setup_jazz_jackrabbit_2_cc_1.2x_(16742).exe 57273872 BLAKE2B 85cd51fbe706bd6a040931d084102cf46c13d3508653ac429f721b93b8bcef131bea688a1d49cc6e789fa108fed5611e2bd476a2f50ceee4ac0c16531d49795a SHA512 fafce9bb318903970b8ba8e3c08cd261c748180158c162db4f67408d12b436a1a091b2423e2df0859e6c65df5ffe1e7e07d370089b6ebf70f8fc32ff5c260a86
 EBUILD jazz2-data-0-r20200327.ebuild 1776 BLAKE2B f9675dbb7487d4f0a7d5958dd3f6a9779c45eff546ad3ce325ebd9d6fda5fafee6dad49b7e09c68ddbeb400cf41118f965ffc20ea62b4cb3083e79b340e2684e SHA512 639a526f0eb5c064f2af574a9be3a90610f0e0b9bc75e05595c8d609290b3bfe5dd3b34eaf5a0e879a1b71d7b788642f1abc2fbb98bf1a318014162907a73f24
-MISC metadata.xml 593 BLAKE2B 67adaa430c4dc2579b2ff26ea546d139b8fc8f2bf736d67988ada0b41274b13ecf8ff7c5c39733ee928785ecb296ef417c86986e1e9a43f210f51171e7b00063 SHA512 b5a00de5f6a30b8a99258379e8b620821cfbc7d3d0245c042e011e93a555c6e668acad1dbb3c0c1d8e4c698c6e04e6fd215e261834a286d6506f700ed95779b5
+MISC metadata.xml 511 BLAKE2B a373acd01cb8f2ee970e7305e379d0c1ff610e74f2497a2e5eeca9277b712625723e4ff268c35e7c0d895681d8de381f50a3cb056b174d229dcefb7d0fcd99b1 SHA512 8909c894d2448f1f56b9e1d338ec1c8cc3734cd21bc690a5512de10c1fe4759770eb83caa7f560450d04ca4955e773e4bcd02f5acb652ae8454ea592e139d726
diff --git a/games-arcade/jazz2-data/metadata.xml b/games-arcade/jazz2-data/metadata.xml
index 9ac6d5d0b96a..4d57d219692d 100644
--- a/games-arcade/jazz2-data/metadata.xml
+++ b/games-arcade/jazz2-data/metadata.xml
@@ -11,6 +11,5 @@
 	<use>
 		<flag name="cc">Install The Christmas Chronicles additional data</flag>
 		<flag name="demo">Use the free demo data instead of the full retail game data</flag>
-		<flag name="gles2-only">Use GLES 2.0 or later instead of full OpenGL 2.1</flag>
 	</use>
 </pkgmetadata>
diff --git a/games-arcade/jazz2/Manifest b/games-arcade/jazz2/Manifest
index 2173ce5e3d8c..d2e9302bd004 100644
--- a/games-arcade/jazz2/Manifest
+++ b/games-arcade/jazz2/Manifest
@@ -1,3 +1,3 @@
 DIST jazz2-0.6.6.tar.gz 11030519 BLAKE2B c354ba9b20ea8fc559da66411ba6561dcc8943d2a87113f1166515cefd7c1cd4e13c5d9b257ee15f06a8016d0ff145bd8875ff195355d70f1c2a55088b85931c SHA512 ff896da1ec0ebc9968b469aeba3c44f599340550e3ad2cf590b9f63a50b64a59153632de1374a94d53a3b735dec0791f486c1f7c521ad3be96e2f69745486aad
 EBUILD jazz2-0.6.6.ebuild 1897 BLAKE2B 224442d63f6c54ca783d88aa12f22b644ecee5f757119d6b033ac9588ea77385da21cdf2d7a8242707b64e5deccdc0ef181e53f282945ad90c47843f2abb33a7 SHA512 8dfd2d4135837640740be8d7716e0f5de9a6a92d3e5d41342f99dcf72d22a31778308b6e27dd7aedc94e5a6796aaa4fc9205e2b5d552e16e276bcdfd1253a531
-MISC metadata.xml 495 BLAKE2B 38d96adaa7df348574ca3a8f1602a2bb08ec578c21fbbffe5138b0c394d045c8cc66f40383401d8aeb372189e8dc55a2290b7951063554ed68d88db413ec3fe4 SHA512 a851ade899d6e3b6f2983246cd4771cf3b05792f9a3acab18edff3f90839a05718491e9870ab917f30dfbcd7b739f753fc1294a52b3aa25c20f1d2f415a85aef
+MISC metadata.xml 413 BLAKE2B 4951d29e0e2c8c94b95b4a7728af705aeb615969506c5b5c79d3e8ea9e5d10da9cb69a218f021cc484904e16495ba73e23074cb2deda248dec913b69ff263248 SHA512 826ca7350339385e3dbd40b8e64cfa0a5fc1d03e351b38028ce073d515d176be5282346e9837d5e0f4a7bc55f635cdc398ae8cd5052e7c1d0d002beb8749f772
diff --git a/games-arcade/jazz2/metadata.xml b/games-arcade/jazz2/metadata.xml
index 3a5cc6dbaf84..2008bfb9782c 100644
--- a/games-arcade/jazz2/metadata.xml
+++ b/games-arcade/jazz2/metadata.xml
@@ -9,7 +9,6 @@
 		<remote-id type="github">deathkiller/jazz2</remote-id>
 	</upstream>
 	<use>
-		<flag name="gles2-only">Use GLES 2.0 or later instead of full OpenGL 2.1</flag>
 		<flag name="server">Build the multiplayer game server</flag>
 	</use>
 </pkgmetadata>
diff --git a/games-arcade/lbreakout/Manifest b/games-arcade/lbreakout/Manifest
index 91c252f8e5bf..6a5012c5f9d1 100644
--- a/games-arcade/lbreakout/Manifest
+++ b/games-arcade/lbreakout/Manifest
@@ -1,3 +1,3 @@
 DIST lbreakout-010315.tar.gz 655418 BLAKE2B f8d893c16de045f172e2ece3158420a880fff4775e81f714d390cc92cfbc6296cc968442388097d6be7fd23e19be614d872fe4b9e730284dcb7044d06bf9d72f SHA512 92421ceb4e643df2123d084b0d2c5edfd311e39dd8da85c01da5cfd872f787a6969e514efab2c5f110979434e773fce211e755e4c45438c4469ab9095cb595b7
-EBUILD lbreakout-010315-r1.ebuild 617 BLAKE2B 3106ce3654440c8c5dfc431d0c006f7541d6616136972f24d8f90d267a54c1c9e686f0c66273044e2badf6c02971f82301fdbe04a791c5a29fbad65dfadf9a60 SHA512 7eddaf43df8189c64e390dc5b2a8284132ee03631b4756ced32d19db617df33a3f913dacbe6967bc8a59b09cbb8a31b18ed9c0f960af0c60acc855e4ed7c53ff
+EBUILD lbreakout-010315-r1.ebuild 923 BLAKE2B a710e785f619bc30a3c1ed32a40b8a09948f0115135809747bc1f6bd6b06b31ca9d2a7053248da45a1725349741beb87391548b50e7589b08251f1143267cc4a SHA512 d12f7b8fbf4c4026879371831e24c873b57ba32f6f3f28b2f1f520083a6f94a8085f7340e842b3c809dd6651ea814ca2331cbb7b6bab3fd4db97eae5107cd437
 MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-arcade/lbreakout/lbreakout-010315-r1.ebuild b/games-arcade/lbreakout/lbreakout-010315-r1.ebuild
index 4a465d929cfc..a00036389b17 100644
--- a/games-arcade/lbreakout/lbreakout-010315-r1.ebuild
+++ b/games-arcade/lbreakout/lbreakout-010315-r1.ebuild
@@ -1,30 +1,44 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Breakout clone written with the SDL library"
 HOMEPAGE="http://lgames.sourceforge.net/LBreakout/"
 SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.1.5"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[sound,video]"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( lbreakout/manual/. )
 
 src_prepare() {
 	default
-	sed -i \
-		-e '/^sdir=/s:$datadir/games:$datadir:' \
-		-e '/^hdir=/s:/var/lib/games:$localstatedir:' \
-		configure \
-		|| die "sed failed"
+
+	# remove /games from datadir, and use /var/games for highscore file
+	sed -e '/^sdir=/s|/games.*||;' \
+		-e "/^hdir=/s|=.*|=${EPREFIX}/var/games|" \
+		-i configure || die
+
+	tc-export CC CXX
 }
 
 src_install() {
-	HTML_DOCS="lbreakout/manual/*"
+	dodir /var/games #655000
+
 	default
+
+	fowners :gamestat /usr/bin/${PN} /var/games/${PN}.hscr
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/${PN}.hscr
+
+	make_desktop_entry ${PN} LBreakout applications-games
 }
diff --git a/games-arcade/lbreakout2/Manifest b/games-arcade/lbreakout2/Manifest
index 68c89231df8c..c4ad69bd5aa7 100644
--- a/games-arcade/lbreakout2/Manifest
+++ b/games-arcade/lbreakout2/Manifest
@@ -2,5 +2,5 @@ AUX lbreakout2-2.6.5-gentoo.patch 2134 BLAKE2B ba98ce2153009499c8ab1f59674a2e762
 DIST lbreakout2-2.6.5.tar.gz 3491519 BLAKE2B b382b391f3aa12f975ed52ec9f7de21f864c2171e0b6d1469ae1224b3cb240ff8a680ebae9ea37a85aa95c432c164058e8a9a0a1d094bbef572670bdbd17ca4e SHA512 45c54bc9401131c96eba5fdcc08ca1324904fb50d3967acf7f29034045cbcd4c1d0b65f38eb33d8aace4cfe35f2a2e7a6c2319e4a6d6a1b41274dbe293a1747b
 DIST lbreakout2-levelsets-20141220.tar.gz 372221 BLAKE2B 16da9ee84e856734645a2ddf1665a8ebf8a52aa63be5d91e20f359bfb270d7bed16e7a4903c0847543141120d8d633bf84ceda867000354eedf201e389faf0db SHA512 482c1e95a37735f7bca510fa34d0f046e89b5aa9528b9af9dfff5bcb3fe656140285a95670caae2565cc9ebd30c3dc87a1fe77a6b75061ce9349ee7e36aa13d5
 DIST lbreakout2-themes-20141220.tar.gz 34006503 BLAKE2B 5262e04368d1c77b2690f70ded0c3da17b7ce31175271f22142b0418dfabb840561f4dbd97d16a12da6addb9d15e22e5ca97f96c8380bd0e7983642ee55fd1e3 SHA512 6088ff4bd9dfbbeb91c74e4adb500593af88ea6796bdec577afb43fc4ea9819c4f2dae76b6b7a8ad1ce2ec32ef575e41a6fa924463107a5dcd211f50bb94a906
-EBUILD lbreakout2-2.6.5-r1.ebuild 2055 BLAKE2B db034b277b8db6b0f86a6333d96fcdb6d5cde48a21fd4851d28b4112282d58f899efbfd1154998c7fdea76461e09382b55f94a6f0b15f36d1cfd5fe97ac5b3c8 SHA512 51cf1392f60e00fc68494bfddefefcc26829f128707b10574e86f0f5072b56a4fed2910258efd6252c902aea3d8a2a424b76ed14429693223a4a0ab90dfcf5ca
+EBUILD lbreakout2-2.6.5-r2.ebuild 2080 BLAKE2B 938e33d030e38dc8694bcf861e0a4c8594185cba0623bf97ff1c4794646980d342dccd771f12469469aeb09b09223e5a1a82545b04cbbb66173efb049aac7d3d SHA512 2674ddc4477cf43392daba9e8469a75d3953ea2245a0c76194438252fb06b50b3781012377bd46e48d2d7eebf08e6865998920bc5be5acd3e5a035e1cb50f561
 MISC metadata.xml 413 BLAKE2B 483149bf4aab9f2a8fea8fbaa6cdcf8ea0c029750acc79b8c4203f27f139a96bf80f5c73c972802ac9eea89f29e98c71214d7a723b82d81290a776fd49480ad7 SHA512 152c0d0d5ac6e3babb26c8eba16c31ed687e0a39ee7b6a86442a1a1efcb4f2d63ccd7f6062857df78047dca8466f548548d40c8baf8359cbaf1758ac03eb1661
diff --git a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild b/games-arcade/lbreakout2/lbreakout2-2.6.5-r2.ebuild
index 4f0c9cc48e96..d96256696ace 100644
--- a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
+++ b/games-arcade/lbreakout2/lbreakout2-2.6.5-r2.ebuild
@@ -1,94 +1,95 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools desktop flag-o-matic gnome2-utils
+inherit autotools desktop
 
-levels_V=20141220
-themes_V=20141220
+LB_LEVELS_V="20141220"
+LB_THEMES_V="20141220"
 
 DESCRIPTION="Breakout clone written with the SDL library"
 HOMEPAGE="http://lgames.sourceforge.net/LBreakout2/"
-SRC_URI=" mirror://sourceforge/lgames/${P}.tar.gz
-	mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-levelsets-${levels_V}.tar.gz
-	themes? ( mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-themes-${levels_V}.tar.gz )"
+SRC_URI="
+	mirror://sourceforge/lgames/${P}.tar.gz
+	mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-levelsets-${LB_LEVELS_V}.tar.gz
+	themes? ( mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-themes-${LB_LEVELS_V}.tar.gz )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls themes"
 
 RDEPEND="
-	media-libs/libpng:0=
-	sys-libs/zlib
-	media-libs/libsdl[sound,joystick,video]
-	media-libs/sdl-net
+	acct-group/gamestat
+	media-libs/libpng:=
+	media-libs/libsdl[joystick,sound,video]
 	media-libs/sdl-mixer
+	media-libs/sdl-net
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="
+	${RDEPEND}
+	sys-libs/zlib"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	themes? ( app-arch/unzip )"
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
 
 src_unpack() {
 	unpack ${P}.tar.gz
 
 	cd "${S}/client/levels" || die
-	unpack ${PN}-levelsets-${levels_V}.tar.gz
+	unpack ${PN}-levelsets-${LB_LEVELS_V}.tar.gz
 
 	if use themes; then
 		mkdir "${WORKDIR}"/themes || die
 		cd "${WORKDIR}"/themes || die
-		unpack ${PN}-themes-${themes_V}.tar.gz
+		unpack ${PN}-themes-${LB_THEMES_V}.tar.gz
 
 		# Delete a few duplicate themes (already shipped with lbreakout2
 		# tarball). Some of them have different case than built-in themes, so it
 		# is harder to just compare if the filename is the same.
-		rm -f absoluteB.zip oz.zip moiree.zip || die
+		rm absoluteB.zip oz.zip moiree.zip || die
 		local f
 		for f in *.zip; do
-			unzip -q "${f}" || die
-			rm -f "${f}" || die
+			unpack ./${f}
+			rm ${f} || die
 		done
 	fi
 }
 
 src_prepare() {
 	default
+
 	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	filter-flags -O?
-	econf \
-		--enable-sdl-net \
-		--with-docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+	local econfargs=(
 		$(use_enable nls)
+		--enable-sdl-net
+		--localstatedir="${EPREFIX}"/var/games
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+	econf "${econfargs[@]}"
 }
 
 src_install() {
 	default
 
+	fowners :gamestat /usr/bin/${PN} /var/games/${PN}.hscr
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/${PN}.hscr
+
 	if use themes; then
 		insinto /usr/share/lbreakout2/gfx
 		doins -r "${WORKDIR}"/themes/.
 	fi
 
 	newicon client/gfx/win_icon.png ${PN}.png
-	newicon -s 32 client/gfx/win_icon.png ${PN}.png
-	make_desktop_entry lbreakout2 LBreakout2
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	make_desktop_entry ${PN} LBreakout2
 }
diff --git a/games-arcade/missile/Manifest b/games-arcade/missile/Manifest
index 9cf5ad13b9ce..9bd6aa841e9c 100644
--- a/games-arcade/missile/Manifest
+++ b/games-arcade/missile/Manifest
@@ -1,4 +1,3 @@
-AUX missile-1.0.1-ldflags.patch 441 BLAKE2B 165f02176acb378833043931c696459c449b4c77389a84cefb62a11cb77c7c743157e29d7c2de927f57babcb6790c307676bae6d022a181963cf29b9da923992 SHA512 f29ce3eacbde93ec61a327462ab8096a1530752bec6391f98b5999af9b3fec5cd0ffc6a02e592a74ea5d7f535b3e6224bf9bb10537a55ab0c9bdbdd85e50d0f2
 DIST missile-1.0.1.tar.gz 214933 BLAKE2B a1131971051008b9be4d79b3b92d630653cc045988c62ba1090f482bccd62ba4f63320882e75c889c64c9b54bad0c5270400c0b9f54dfc6be4cb1e3ac2f42a36 SHA512 32d30213d433fd3d02d74c4614747bdc2e3012c77793dfb7b869d774b7f43f4d0eb6b1a0e5db805d976e7919404c57cbbaa20f21954dfd4475ddaa6c2f6c0cc2
-EBUILD missile-1.0.1-r1.ebuild 1040 BLAKE2B 79710c97bb71b8ec2b23bbd43d5f015457e4b2880254ad983ba3936a6cdd4df8a556f7aafe0fe914a1d6fac73cbd8d7014976f1c0107ec5b98b724a36ecbe182 SHA512 58f6dcc1aac56aec4500e3ba83a38563de5485aedae66322bbf3d7c4a6faee98ca8d1b36157f9c4624da7292508b6863cf1f289d87e93c7e2d0862f5fbf16e36
+EBUILD missile-1.0.1-r2.ebuild 1119 BLAKE2B e4f7f5ace081ed0bea536fd610c5dee42f2efb084bf8bfc293ccd221e2fc3dfa05d6a38081ab34689f298fa142cb0087e839f9ad399db92bfbf61a29310d456a SHA512 57dbd4b256bb8a4c50045c3096557da7afb638a9912fa7008106c6ef2f13b81375a187d9aef391dc1eab6694c081d6376f6d50a391fa1d2abe33c1f4e130094f
 MISC metadata.xml 330 BLAKE2B 9b2dd9925eec0680e98ae011358f7530aa05d1155883f3d97f2814bbbb30726c27a0f37a731f4ad379a8f2f34428f659373f93adf070ccc4dae6c168c6f0dba0 SHA512 ab5f1e51dec4ccf1f6d4d78282b5fe1ed115cabc124ca34ec0ab11246a76017ec60c1df83fedf4e88a6b35ab48a6d1f5e0b5dc8785c4031aba868c37d280b3a4
diff --git a/games-arcade/missile/files/missile-1.0.1-ldflags.patch b/games-arcade/missile/files/missile-1.0.1-ldflags.patch
deleted file mode 100644
index 744b8192c5b9..000000000000
--- a/games-arcade/missile/files/missile-1.0.1-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.old	2010-09-22 09:11:48.000000000 +0200
-+++ b/Makefile	2010-09-22 09:13:08.000000000 +0200
-@@ -125,10 +125,10 @@
- 	fi
- 
- $(PROGRAM):	$(OBJECTS)
--	$(CC) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(LIBS)
- 
- static : $(OBJECTS)
--	$(CC) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(STATIC_LIBS)
-+	$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(STATIC_LIBS)
- 
- 
- %.o : %.c %.h
diff --git a/games-arcade/missile/missile-1.0.1-r1.ebuild b/games-arcade/missile/missile-1.0.1-r1.ebuild
deleted file mode 100644
index 2e9d9e9874db..000000000000
--- a/games-arcade/missile/missile-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-DESCRIPTION="The game Missile Command for Linux"
-HOMEPAGE="http://missile.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e '/^CC/d' \
-		-e "s:\$(game_prefix)/\$(game_data):/usr/share/${PN}:" \
-		-e "s/-O2/${CFLAGS}/" \
-		-e 's/-lSDL_image $(SND_LIBS)/-lSDL_image -lm $(SND_LIBS)/g' \
-		Makefile || die
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r data/*
-	newicon -s 48 icons/${PN}_icon_black.png ${PN}.png
-	make_desktop_entry ${PN} "Missile Command"
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/missile/missile-1.0.1-r2.ebuild b/games-arcade/missile/missile-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..1c473e3b58ee
--- /dev/null
+++ b/games-arcade/missile/missile-1.0.1-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Port of the Atari Missile Command game for Linux"
+HOMEPAGE="http://missile.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE="+sound"
+
+RDEPEND="
+	media-libs/libsdl[sound?,video]
+	media-libs/sdl-image[png]
+	sound? ( media-libs/sdl-mixer )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	tc-export CC
+
+	local cppargs=(
+		-DDATA="'\"${EPREFIX}/usr/share/${PN}\"'"
+		-DVERSION=\\\"${PV}\\\"
+		$(usev sound -DUSE_SOUND)
+		$($(tc-getPKG_CONFIG) --cflags sdl SDL_image $(usev sound SDL_mixer))
+	)
+	append-cppflags "${cppargs[@]}"
+
+	LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl SDL_image $(usev sound SDL_mixer)) -lm" \
+		emake -f /dev/null ${PN}
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r data/{graphics,missile_icon.png,sound}
+
+	einstalldocs
+
+	newicon icons/${PN}_icon_red.png ${PN}.png
+	make_desktop_entry ${PN} "Missile Command"
+}
diff --git a/games-arcade/pengupop/Manifest b/games-arcade/pengupop/Manifest
index aa5d8149a56b..527d11765ce4 100644
--- a/games-arcade/pengupop/Manifest
+++ b/games-arcade/pengupop/Manifest
@@ -1,4 +1,3 @@
-AUX pengupop-2.2.5-underlink.patch 569 BLAKE2B c0f08dbd63f97f58cba1bac6553863250c35036452be487c19e4294dcc5df8a9816acc68087a1f02db3e56c718f95c5da17bc47bc2ab4dd95d2fc77bab95cd48 SHA512 c7dac9f94d99b0ef2e42f8d6e409afaeddb29ef6d85e9b01d3a8b4b6a3e4d73808c909e2dbb7f7d0c30dbcc06ed6d72e304b3dc9ada71aedc782982fa49cc444
 DIST pengupop-2.2.5.tar.gz 1676224 BLAKE2B 5527d956a9ae0d3a2c4a31e2bb5f4059bd79c8c6ab2ccc81b2ec35c698f8e40bbdf7a68b6799bd202f39b2e5d39e690de6e71aa97c6ff307d03679f8aae8f755 SHA512 1886898288cb9b2be949a031bf2baae80332c5ca93bead91ed8c50d0aaea81715cf0eaeb09a63af298e82e1409f9f39527742707839526283e57809484be4abf
-EBUILD pengupop-2.2.5-r1.ebuild 956 BLAKE2B d3db85dbf59876d8a40c5a26e530210262118bca9ea5a5aa55a9416870134662af7d3ac98b47ddfe18fa969a11a2e37600627de52e1c12fe0528c5e5981a6caa SHA512 f4bc51a6a69351b62f5903215446384e29048697cdd84346838bb817016566912948c8799e32f973ff33bd64696982a21963a9f33b5ed4ef3ddca3628ee9e366
+EBUILD pengupop-2.2.5-r1.ebuild 521 BLAKE2B 27986dfe2574a8bd6da2111111464fe7dbfaa32dabbe2c7f144e8debf6dfcb9a323e1c17395bc5dafe620490651bf3a7f0a4d7f99f3acd944e65ed130e6de6df SHA512 a43a599e248334631b23531ea6b8a952b067659fe26d345adce9834eb897a855fce78486614d8a65882692c958e8db5b6e1a443b4c9a25dc84271bcd5f9e42f9
 MISC metadata.xml 329 BLAKE2B 12f9759170dea648244936ee92bb4c3f3777382ff1bfb6866de215b068e79a3d4c20386c6c98af482c711627fc1c068fef9034c46b4fe2b254d5d220897eb90b SHA512 68b5c8588a25954a6f833ada9d10ddaeb9296618fbb84355d6242f41e5a2ea859b8a677f0cefcaafe10a1465012de6f578c0d794e31dd97fa1f9917451240243
diff --git a/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch b/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch
deleted file mode 100644
index fbbb704a6a30..000000000000
--- a/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.am.old	2011-06-14 21:44:40.242317771 +0200
-+++ b/Makefile.am	2011-06-14 21:44:49.216882568 +0200
-@@ -17,7 +17,7 @@
- nodist_pengupop_SOURCES = images.h
- 
- if LINUX
--pengupop_LDADD = -lSDL -lz
-+pengupop_LDADD = -lSDL -lz -lm
- 
- endif
- if WIN32
-@@ -25,7 +25,7 @@
- endif
- if DARWIN
- pengupop_LDFLAGS = -framework Carbon -framework CoreServices -framework AudioUnit -framework QuickTime -framework Cocoa -framework IOKit -framework OpenGL -framework SDL SDLMain.m
--pengupop_LDADD = -lz -lstdc++
-+pengupop_LDADD = -lz -lstdc++ -lm
- 
- all-local: Pengupop.dmg
- 
diff --git a/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild b/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild
index 6938c534c5c9..c10d3f82d4a8 100644
--- a/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild
+++ b/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild
@@ -1,55 +1,30 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools desktop gnome2-utils
+EAPI=8
 
-DESCRIPTION="Networked multiplayer-only Puzzle Bubble clone"
+inherit desktop
+
+DESCRIPTION="Networked Puzzle Bubble clone"
 HOMEPAGE="http://freshmeat.net/projects/pengupop"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-underlink.patch
-
-	sed -i \
-		-e '/Icon/s/\.png//' \
-		-e '/^Encoding/d' \
-		-e '/Categories/s/Application;//' \
-		pengupop.desktop || die
 
-	sed -i \
-		-e 's/-g -Wall -O2/-Wall/' \
-		Makefile.am || die
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
 
-	mv configure.in configure.ac || die
-	eautoreconf
+src_compile() {
+	emake LIBS=-lm #497196
 }
 
 src_install() {
 	default
-	domenu pengupop.desktop
-	doicon -s 48 pengupop.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
 
-pkg_postrm() {
-	gnome2_icon_cache_update
+	doicon pengupop.png
+	make_desktop_entry ${PN} Pengupop
 }
diff --git a/games-arcade/vor/Manifest b/games-arcade/vor/Manifest
index 23ea190aad8a..a16e963a34b9 100644
--- a/games-arcade/vor/Manifest
+++ b/games-arcade/vor/Manifest
@@ -1,3 +1,3 @@
-DIST vor-0.5.7.tgz 358032 BLAKE2B 96813207a8529d6a7ae5863811fa02666d51b4108afd96cf5b4aed0405d6cc32668f0a7abfbc571141877803a15678c46c8664fe3599cd12e0c6fe95ab5d880f SHA512 32dbfe95971298f9f0191cc95fdb5e9ec34c5f6771df1566554b128644770bfba618df3aac7242e647c8af2f41fc59c9e5620a4c56932d3af72197f6a19f0bce
-EBUILD vor-0.5.7-r1.ebuild 741 BLAKE2B 08b073336e2a6d55669dd7b25e85c62cf9b7afd2e357e06eab103cff99d2bb100d46c7d66dbf6c6ac7e55002ac8da507fc34f4730793498170220efa9dbb1d03 SHA512 529ee50340b4119f8a90c423cc374ede439165c3b02f27dd0cf29318186e45b90fde2c56d7673d45930b0656b6b6210bbe7f1840c95ea69b4fd6478b914b9934
+DIST vor-0.5.8.tgz 361789 BLAKE2B b6391a03d175520ef97db7c4b80425f6f15193614f5e582b4d96019ce426b9ea21b93e9f503e5e22d5f976fe938cc883e4810803b2942ee3e373025397045c2a SHA512 95633e54c09f947c3e256fc07b1d7c061e98f69b89ce459b7736174410b7f021f4384afe65ec58eb6b89933cb6c8fe166b4491078b98671ae12640c6fc7019f5
+EBUILD vor-0.5.8.ebuild 569 BLAKE2B ebaff2efa7c5ecef10db5584d845c72a82c7f397769c1337ef7a72b6c18e3422f96578718166c2c81f5fd48d69bf2a1002b5a14889ff1180a900ddb9fe91664b SHA512 9a6479effb32a34ab7ae97b5945c746b6cb176c525f4f9c95a1a7ebf4c8bb1868df553431cf8c1baeec92071091251742aae067ac050a65f3d85934f5f7c8905
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/vor/vor-0.5.7-r1.ebuild b/games-arcade/vor/vor-0.5.8.ebuild
index 3e8d444e5b97..2bc45bd9b394 100644
--- a/games-arcade/vor/vor-0.5.7-r1.ebuild
+++ b/games-arcade/vor/vor-0.5.8.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 desktop gnome2-utils
+EAPI=8
+
+inherit desktop
 
 DESCRIPTION="Variations on Rockdodger: Dodge the rocks until you die"
 HOMEPAGE="https://jasonwoof.org/vor"
@@ -11,28 +12,18 @@ SRC_URI="https://jasonwoof.com/downloads/vor/${P}.tgz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl[sound,video]
+RDEPEND="
+	media-libs/libsdl[sound,video]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 src_install() {
 	dodir /usr/bin
-	DOCS="README* todo" default
-	newicon -s 48 data/icon.png ${PN}.png
-	make_desktop_entry ${PN} VoR
-}
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
+	default
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	newicon data/icon.png ${PN}.png
+	make_desktop_entry ${PN} VoR
 }
diff --git a/games-arcade/xscavenger/Manifest b/games-arcade/xscavenger/Manifest
index 32528c761b6a..fed63d8698c4 100644
--- a/games-arcade/xscavenger/Manifest
+++ b/games-arcade/xscavenger/Manifest
@@ -1,4 +1,7 @@
 AUX 1.4.4-gentoo.patch 5528 BLAKE2B 9812d8fa63b449dc207804452566a2afe1360843a9866203f7c065c60eeb5bc13c42c80af0224d073ecdf65085c813d040551d5acf43f26381481c8d0dbc682f SHA512 105c3cf3cf2e02ca3350901716b268e35dbb414c5d5eb233b6fef897fab3f969ab8eec67cfc9080df75d9372a4955be7212bfc2cfe8efd592709a460a164e5bd
+AUX xscavenger-1.4.5-misc-fixes.patch 3559 BLAKE2B 80a0718ff21af3f9d9fc9b94848b89f257dcbd0ec67452f9e0c3edb6f0b980ada6005b98637658623afcda4ed8160b233c667c1b59d552868183041baf228926 SHA512 faa216eed0c8a247c0cb0f35885bc90a5f21379925ea27e1be985fbf076be9c24eed8ae912adc37310f75ef16daeadf0035bdf399966d0975918446cc5858343
 DIST xscavenger-1.4.4.tgz 193346 BLAKE2B eb86b97fad8a9d261935579d298f43e7063fbd0624e8fd654c72b4130e98db38541d54c59938375c8d6df4b50193436f86826c49b8bafe123b4be5c80d3f75d8 SHA512 5f200912b9114ea0c09f0bfcc3f06be2e7c2e1700a744319081f5f3a22c8b93663477076af27837326acf9830af6f597cf8f8fb44562db7d00128321487841ec
+DIST xscavenger-1.4.5.tgz 192990 BLAKE2B 5df2ca8b7b331d9c17ef8f287a8967f4f95a8737660fb42e4f5012f00ab24698d555e3f76bd82f3ba7b55423244e9d0a4392ccce99c84bed6cf80dee15ab3bf6 SHA512 ebdde5c74409dc881503ee6eeecb7194218141c6e7c169c2febd1a4339625e1532a654fc1ac2ce7b3256e8a721f656dfb7bddc4394e0513a5130e3cc8795dfe7
 EBUILD xscavenger-1.4.4-r2.ebuild 983 BLAKE2B 6cfad2cb4b77412a3f72e1db4fa5e422b6771fa8bb0c6707c10b9920cb611cfea47dc0f1442f12d2f8d4027d74e17e0da5d8bbf6d68e5c28c95142458ca6d364 SHA512 ffdc80b3163fc43f0e6380718a2bd0d0aa7e9ecc0597ff132526c86b21495227283463467bd303d98b5869dce1f777a9dd20e5d2ed56bf207beb5ef8f2852807
+EBUILD xscavenger-1.4.5.ebuild 1093 BLAKE2B cd5503298a74fa4921ddfee1b1c79fd7fa8e54f28ccd4fa829424c6557dc01619693836d25e7a0681f490700ac81cbb978f33e59d20fb09243e65ae4160df45a SHA512 aa72bc6c601af5cedf42c16675fe6011ef1ec788b899de185f6439fabf0dd99548b5d8da31695c36d7c62dd8b1d3755b196cadc56cade784513d6e55debd1892
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xscavenger/files/xscavenger-1.4.5-misc-fixes.patch b/games-arcade/xscavenger/files/xscavenger-1.4.5-misc-fixes.patch
new file mode 100644
index 000000000000..be45c6c4083b
--- /dev/null
+++ b/games-arcade/xscavenger/files/xscavenger-1.4.5-misc-fixes.patch
@@ -0,0 +1,130 @@
+* Missing return value (needed by clang)
+* Implicit declarations (string.h and doall)
+* Datafile loading broken on architectures where sizeof(long)>4
+  https://bugs.debian.org/56139
+* Scavenger leaks file descriptors
+  https://bugs.debian.org/175128
+* Font mapping with clang or gcc-7+
+  https://svnweb.freebsd.org/ports?view=revision&revision=444423
+--- a/src/edit.c
++++ b/src/edit.c
+@@ -3,2 +3,3 @@
+ #include <stdio.h>
++#include <string.h>
+ #include <unistd.h>
+--- a/src/scav.c
++++ b/src/scav.c
+@@ -246,7 +246,9 @@
+ 
+-	val1=myci()<<24L;
+-	val1|=myci()<<16L;
+-	val1|=myci()<<8;
+-	val1|=myci();
++	int i,j;
+ 
++	for (i=0; i<4; i++) {
++		j = myci();
++		if (j==-1) return -1L;
++		val1 = (val1<<8) + j;
++	}
+ 	return val1;
+@@ -404,6 +406,6 @@
+ 	got=read(input,buff,8);
+-	if(got!=8) return -2;
+-	if (strncmp(buff,"SCAV",4)) return -3;
++	if(got!=8) {close(input);return -2;}
++	if (strncmp(buff,"SCAV",4)) {close(input);return -3;}
+ 	max=(buff[4]<<24) | (buff[5]<<16) | (buff[6]<<8) | buff[7];
+-	if(num>=max) return 0;
++	if(num>=max) {close(input);return 0;}
+ 	lseek(input,(num+1)<<3,SEEK_SET);
+@@ -413,3 +415,3 @@
+ 	if(len>length) len=length;
+-	if(!offset || !len) return 0;
++	if(!offset || !len) {close(input);return 0;}
+ 	lseek(input,offset,SEEK_SET);
+@@ -450,4 +452,4 @@
+ 	got=read(input,buff,8);
+-	if(got!=8) return -2;
+-	if(strncmp(buff,"SCAV",4)) return -3;
++	if(got!=8) {close(input);return -2;}
++	if(strncmp(buff,"SCAV",4)) {close(input);return -3;}
+ 	output=creat(bakname,00600);
+@@ -475,4 +477,4 @@
+ 				headers[i+i]+=delta;
+-	if (write(output,"SCAV",4) != 4) return -200;
+-	if (!rlout(output,max))	return -200;
++	if (write(output,"SCAV",4) != 4) {close(input);close(output);return -200;}
++	if (!rlout(output,max))	{close(input);close(output);return -200;}
+ 	headers[num+num]=0;
+@@ -480,3 +482,3 @@
+ 	for(i=0;i<max+max;i++)
+-		if (!rlout(output,headers[i])) return -200;
++	    if (!rlout(output,headers[i])) {close(input);close(output);return -200;}
+ 
+@@ -489,4 +491,4 @@
+ 			got=count>1024 ? 1024 : count;
+-			if (read(input,copybuff,got) != got) return -200;
+-			if (write(output,copybuff,got) != got) return -200;
++			if (read(input,copybuff,got) != got) {close(input);close(output);return -200;}
++			if (write(output,copybuff,got) != got) {close(input);close(output);return -200;}
+ 			count-=got;
+@@ -500,3 +502,3 @@
+ 		if (!got) break;
+-		if (write (output, copybuff, got) != got) return -200;
++		if (write (output, copybuff, got) != got) {close(input);close(output);return -200;}
+ 		offset += got;
+@@ -505,8 +507,8 @@
+ 	{
+-		if (write (output, take, len) != len) return -200;
++	    if (write (output, take, len) != len) {close(input);close(output);return -200;}
+ 		lseek (output, (num+1) << 3, SEEK_SET);
+-		if (!rlout (output, offset)) return -200;
++		if (!rlout (output, offset)) {close(input);close(output);return -200;}
+ 	}
+ 	close (input);
+-	if (fsync(output)) return -200;
++	if (fsync(output)) {close(output);return -200;}
+ 	if (close(output)) return -200;
+@@ -1384,2 +1386,3 @@
+ 	}
++	close(file);
+ }
+@@ -1418,2 +1421,4 @@
+ 	} while(len);
++	close(input);
++	close(output);
+ 	return 0;
+@@ -1450,3 +1455,3 @@
+ 		}
+-	}
++	} else close(file);
+ 
+@@ -1487,3 +1492,3 @@
+ 		}
+-	}
++	} else close(file);
+ }
+@@ -1574,3 +1579,3 @@
+ 			puts(err);
+-			return;
++			return 1;
+ 		}
+--- a/src/sound.c
++++ b/src/sound.c
+@@ -50,2 +50,3 @@
+ 
++void doall();
+ void opendsp(int samplerate)
+@@ -201,3 +202,3 @@
+ 
+-doall()
++void doall()
+ {
+--- a/src/x.c
++++ b/src/x.c
+@@ -447,3 +447,3 @@
+ 	{
+-		fmap[tolower(*p)]=fmap[*p++]=i++;
++		fmap[tolower(*p)]=fmap[*p]=i++; p++;
+ 	}
diff --git a/games-arcade/xscavenger/xscavenger-1.4.5.ebuild b/games-arcade/xscavenger/xscavenger-1.4.5.ebuild
new file mode 100644
index 000000000000..bb62ad68f021
--- /dev/null
+++ b/games-arcade/xscavenger/xscavenger-1.4.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Lode-Runner-like arcade game"
+HOMEPAGE="https://www.linuxmotors.com/linux/scavenger/index.html"
+SRC_URI="https://www.linuxmotors.com/linux/scavenger/downloads/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/alsa-lib
+	x11-libs/libX11"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-misc-fixes.patch
+)
+
+src_compile() {
+	tc-export CC
+
+	# skip using imake for simplicity
+	local cppargs=(
+		-DLIBNAME="'\"${EPREFIX}/usr/share/${PN}\"'"
+		$($(tc-getPKG_CONFIG) --cflags alsa x11)
+	)
+	append-cppflags "${cppargs[@]}"
+
+	LDLIBS="$($(tc-getPKG_CONFIG) --libs alsa x11)" \
+		emake -C src -E "scav: anim.o edit.o x.o sound.o"
+}
+
+src_install() {
+	newbin src/scav scavenger
+	doman src/scavenger.6
+
+	dodoc CREDITS DOC README TODO changelog
+
+	insinto /usr/share/${PN}
+	doins -r data/.
+
+	make_desktop_entry scavenger XScavenger applications-games
+}