gentoo resync : 03.07.2021

13 files changed, 37 insertions, 272 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 5b26a8f00e37..73812cf048f1 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/abe/Manifest b/games-arcade/abe/Manifest
index 9b16e885abcd..4f30c9bc6257 100644
--- a/games-arcade/abe/Manifest
+++ b/games-arcade/abe/Manifest
@@ -3,5 +3,6 @@ AUX abe-1.1-format-security.patch 2571 BLAKE2B b8c4ffb1db42b6f5fcf0881d3b1ebac4d
 AUX abe-1.1-format.patch 539 BLAKE2B 21ca61c24861ed4daace9fa9b87eba30154e5287f0798141f3edafb0db1b5a3014c825aab225a9c146dcbbebb34baa89c660f8e11b3db4d8bdebd1d45953cfd3 SHA512 3a366be92a54b5727bae3783be38550d77efb289f39bc0bb9b6be0a8516f0e28db6b0c7aac84c9a96c3115f2d350681abab26514f9bea434a2b1d9446d1069ba
 AUX abe-1.1-settings.patch 289 BLAKE2B e4500e3a13b9f9e73f6dc27c7eae887d922dc71124bf12f934ed576a2d21cd73eb876e144f944d974a8a0422c902e0962fb58eefd71c0e388fa9fa768e109eb6 SHA512 f6feb687ab7c658dd5a084b75ff300f3ff755959cf0aee8d0859a008d37d90a82715b405fba45b5c5d8538f4df2fd0ea52c77cd2b9c7cd3b1c3774cb3b2e7aa6
 DIST abe-1.1.tar.gz 3321075 BLAKE2B 2ab51bd9103e8954bbc27eceb81b4bb845ec84ee249f21aaefdc59df87689f865d3b62a8c2db9584b8361303028174b1a96b60e0caf88ee857f8ad0d3cd3d920 SHA512 6106fce9c72554596ac3f94551326381e98c0d40f7a5aa8ae7aeadaa234c113733e8df717bd1b18d2ba835f689982e859607c9d88ab2d59790ec00833a4e48c7
-EBUILD abe-1.1-r1.ebuild 994 BLAKE2B 7f96af52d6c9348d46e0959d83b118c6e246bf28cd12775c0716cb0acc2f5a9c874f1034cf213a2146eac24376cd77ff8b3a4b37a6ff037b03a59705566167be SHA512 53de8b68aca883f63aa756bfb4dcb87e8cdae302c7daf32ddfcc06521c2c53d58bc5185da9a2deae7bec3b75a930e68f61be499cbd647070b35f0661277a38f8
+DIST abe.png 3303 BLAKE2B a99f8a1c31b9f8704b201ca9edd7ab67b685bde4bd43f675e62f1ba3a5554a63dba009634cdc63a2855a51f82de8ea2818bfe5f390b2f9e176d55cd4476547b6 SHA512 421d87248d91bb315d9d02955271cad096c842857819fc7a91ad77571047770eb9487722cb1b2e43d602ad61e3c7eca4fd834e955724905b8b870a5dd66d2e2b
+EBUILD abe-1.1-r1.ebuild 1063 BLAKE2B a096364a6e53360a950751a3ccff1b4686be66144b58e6b78466b97e80d2f085b6d7b2effc33c07ed95f36137c9782708437982a78b0228a8765106738897a34 SHA512 0d9d85da000b580871ffa0c3b27b0fcaa97eab1ad6e061677f78a39ac740e4a89f8dfff4ce5e8d68395245401b1ad241ee9aeebaae34179fc84378154c749fa9
 MISC metadata.xml 326 BLAKE2B a19b06620dabc908c6b71603bf229a0bbfb5fc8cd604580394c13ddd522ef52261985942321a18b8ce643fee8ad5ff15c915aac3861264111f4dcbefe8406d56 SHA512 85695bf3253d22818b913db2dad61277afe8062258c1b5b80ab9604261304b9f5dd39a50a9565ee4361ea793eff0fa23562c4a20bb9ea63a3296514c33ec1788
diff --git a/games-arcade/abe/abe-1.1-r1.ebuild b/games-arcade/abe/abe-1.1-r1.ebuild
index db902811eb95..d930d182e00d 100644
--- a/games-arcade/abe/abe-1.1-r1.ebuild
+++ b/games-arcade/abe/abe-1.1-r1.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop toolchain-funcs
 
 DESCRIPTION="Scrolling, platform-jumping, key-collecting, ancient pyramid exploring game"
 HOMEPAGE="http://abe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/abe/${P}.tar.gz"
+SRC_URI="
+	mirror://sourceforge/abe/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -39,12 +41,13 @@ src_configure() {
 }
 
 src_install() {
-	dobin src/abe
+	dobin src/${PN}
 
 	insinto /usr/share/${PN}
 	doins -r images maps sounds
 
-	make_desktop_entry abe "Abe's Amazing Adventure" applications-games
-
 	einstalldocs
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} "Abe's Amazing Adventure"
 }
diff --git a/games-arcade/excido/Manifest b/games-arcade/excido/Manifest
index 5edad57565e8..001fa57dd621 100644
--- a/games-arcade/excido/Manifest
+++ b/games-arcade/excido/Manifest
@@ -1,5 +1,6 @@
 AUX excido-0.1.5c-build.patch 1033 BLAKE2B 171f87f9c08d51969af8e9171bbae2b177192afb9dad0dcf975fdc4a50ccfc961d5caa055830b929beadc3120f0a627c638371125ca93b4b8b642d4b3b1321d2 SHA512 9cd1b44ae83e9cf1171869124866df78f6d9bc2d18d80968937b7edf7d60dedef3cd0451fd3f81406e5b3b36960b3ac8f77032625e1c545f04d70998da8701ab
 AUX excido-0.1.5c-freealut.patch 1204 BLAKE2B 1aa65ee8e91f01be2ed6af6e45d945d81b1d6b5714072701a8b189b30668a7ef430bb08d54c322c487f0748c0112499c32b52273bc94e2746b687acdd9ea6134 SHA512 11c41ba18f2b698fa4eedfb93d670a09ddd6d954d9504903f51f6df23096e3f72f2836193ca35a5aeb6e3524ad887e1cbf0eb879583988dd99b0b4c439997a1c
 DIST excido-0.1.5c-src.tar.bz2 2981629 BLAKE2B 504c21861a4d966400a94ef6733794f72edbf950a84dcd935213244252b771e168f0bb5e21780c90d2cd1a1799cac821a502dbb558ffe6204d4b552e5af465d4 SHA512 9e1b98ed31eac735087f451c466d0e0d1b885ad5336f7994abf8f844b1c27cc24e90048306ffd62864fa5ab2bada6744b4b54991c6eb9b22624af20c645e02d7
-EBUILD excido-0.1.5c-r4.ebuild 906 BLAKE2B 918a06cb089e1e0d50c68c40c5c0eb1d4b8daf1852cac4b4fce4c53059f747d16ee901bb6614e814121ac1e5c3230e55320015546401b45d0597fe878acbdf21 SHA512 729f8b95782e67a809913f8556a218c0718797c437c80d90aef0f7ec082152030bbae910aa85a3385fccbd44998ea4769ee7d5293141df08ba698ff5db892d4a
+DIST excido.png 965 BLAKE2B 2f2cb7091d0256c158c801b668e252a555b2c8976fc7af0c73f71457771e33f5e5f46109081431dc8e10a6f7748075ca60e0fe8f3fbf81bc5bb1a6079748ef27 SHA512 8248e652bd148c13e4b896eabd9360281c0c296ecfd28cf5d25593505bba94c1cac5a5dc9e89925dbd851670d917fa8949370cc797bb2eed7fb7c0fc72d14f3c
+EBUILD excido-0.1.5c-r4.ebuild 953 BLAKE2B 31fdc60180edbdda1563b933b7c770beb31038da7d677e9be63a9627aa44f3200d8fd189aff957f43b84e510d7f7741986bd8545acff445ffd948d3bcac3ef17 SHA512 5b96b5981402c675ffdc27e2fcbc33cb32de0219bd5ca5c0b9be82c862038379e3599e0a991c0ab0df2a90d26ff707016b34bce8d2c6c264858c09e2a0bb0371
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/excido/excido-0.1.5c-r4.ebuild b/games-arcade/excido/excido-0.1.5c-r4.ebuild
index 6dd286165633..dc58b8086e42 100644
--- a/games-arcade/excido/excido-0.1.5c-r4.ebuild
+++ b/games-arcade/excido/excido-0.1.5c-r4.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop toolchain-funcs
 
 DESCRIPTION="Fast paced action game"
 HOMEPAGE="https://icculus.org/excido/"
-SRC_URI="https://icculus.org/excido/${P}-src.tar.bz2"
+SRC_URI="
+	https://icculus.org/excido/${P}-src.tar.bz2
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -43,5 +45,6 @@ src_install() {
 	dodoc BUGS CHANGELOG HACKING README TODO \
 		data/{CREDITS,readme-jf-nebula_sky.txt} keyguide.txt
 
-	make_desktop_entry ${PN} Excido applications-games "Game;ArcadeGame"
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Excido
 }
diff --git a/games-arcade/kajaani-kombat/Manifest b/games-arcade/kajaani-kombat/Manifest
index de047f54ec2b..5a2fa947c635 100644
--- a/games-arcade/kajaani-kombat/Manifest
+++ b/games-arcade/kajaani-kombat/Manifest
@@ -2,5 +2,5 @@ AUX 0.7-makefile.patch 551 BLAKE2B 4b301ca00a4643f00654e81f3a4396d43106bc2f0f5bb
 AUX kajaani-kombat-0.7-gcc11.patch 778 BLAKE2B 95e3b7482729aa7cae0c58e795ebf72b6eb08970eea3151c8480eefbd6dcf7e2c13acccc83cf7737aa66b8652d801038a1f32d721a71cdfc80e4539fbbb4e162 SHA512 d55d1e88165ef35b97a29645e4cdf393c76bf93cebf12446e01578934cfbb7dc79672610469240d0e62562ce7ac8aa7646c0d47baccaa95de8870bfd9765c371
 AUX kajaani-kombat-0.7-ldflags.patch 440 BLAKE2B f63321ed06c0ed26cfe28a1a62650ce9b9b37b29898961fb08b58b5119b023c3335798e36130ad144569c2996e7c4f188caf9cadc3d4a37c01a3bb03bd39d11d SHA512 30a8e6293349a30f6dbcc469fb14377d9461df60227e01d18dfc267f254be62b7cee89bcb6df0b24ec5bcb9cb198701e5b9e0d465f699be4880432a0402b2c71
 DIST kajaani-kombat-0.7.tar.gz 1805504 BLAKE2B 664210a44e5dd5b27ca7b47ca9cb9445373d1243c01fcfb227251c6b48fb8b9e2ebd608eec2244f1b12f47bf5c886482bf70a0700538bbf415d93df41c34fcfe SHA512 84f6923b73c9529fa600c533b5a3de9ea9411f81060c5ad9fb85346fa17c9cb70bf6ba8222319e123372b01286a11b40bb355e8ef8c9bec95cd98f4d0e0460cb
-EBUILD kajaani-kombat-0.7-r2.ebuild 998 BLAKE2B 98ab5fe720ddb1cc29ea11a53f673e8ebc4844a7f77236331ad891e184c2e9ceb37551f95e6b5feabe072e4787af260dbd920f86e209bbaecbdf8f4f1ae6172b SHA512 9e8c82324ba87c79a6a7cfe78a6d187214a5333451236e5b850830988efcbedf651f4d754531e8276738831920ea4b8000a29489d609c8a6efc9bb22f9c6e556
+EBUILD kajaani-kombat-0.7-r2.ebuild 1008 BLAKE2B 26dbd6c0bb6b293b3241fd7961b0cc18805cb2cc7def3a7ce8e04fdf908815e5512bc8b3f1a594dadbbbe49de75027601aa6d5b855db84cb1fa90ef8cda05bdc SHA512 4a4851cb0a3783919e952b05ef8ff0abf754b8312df76ba04ba407fcf97941ed49d29f15a31d740063e6a63cf0902c46355096180400e491e3d1ca65e6d97b25
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild
index 6c34c9d2c9d8..72fc100bce3c 100644
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild
+++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop flag-o-matic toolchain-funcs
 
@@ -45,7 +45,8 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins *.{ogg,png,ttf}
 
-	make_desktop_entry ${PN} "Kajaani Kombat" applications-games
-
 	einstalldocs
+
+	newicon 1face.png ${PN}.png
+	make_desktop_entry ${PN} "Kajaani Kombat"
 }
diff --git a/games-arcade/lbreakout/Manifest b/games-arcade/lbreakout/Manifest
index 6a5012c5f9d1..cf62104c8bb6 100644
--- a/games-arcade/lbreakout/Manifest
+++ b/games-arcade/lbreakout/Manifest
@@ -1,3 +1,4 @@
 DIST lbreakout-010315.tar.gz 655418 BLAKE2B f8d893c16de045f172e2ece3158420a880fff4775e81f714d390cc92cfbc6296cc968442388097d6be7fd23e19be614d872fe4b9e730284dcb7044d06bf9d72f SHA512 92421ceb4e643df2123d084b0d2c5edfd311e39dd8da85c01da5cfd872f787a6969e514efab2c5f110979434e773fce211e755e4c45438c4469ab9095cb595b7
-EBUILD lbreakout-010315-r1.ebuild 923 BLAKE2B a710e785f619bc30a3c1ed32a40b8a09948f0115135809747bc1f6bd6b06b31ca9d2a7053248da45a1725349741beb87391548b50e7589b08251f1143267cc4a SHA512 d12f7b8fbf4c4026879371831e24c873b57ba32f6f3f28b2f1f520083a6f94a8085f7340e842b3c809dd6651ea814ca2331cbb7b6bab3fd4db97eae5107cd437
+DIST lbreakout.png 8673 BLAKE2B ce4f7e35617729063ad80507f8d85127195d217e82dcadbdb409dcb1710fd297f19619e038881ed769778265caef19db39879a45cb28ddc7c1242744b2858c2e SHA512 47eb104ebb9bb103a370986af7a4663f0b9b24afc013c4f78eb7f023a64d51c7dc353e2f2a2729bdeb80ca5894bf1acf2fb5f4257cd67a93f9088c692bdcaf72
+EBUILD lbreakout-010315-r1.ebuild 988 BLAKE2B e11071b8d4b0556cc9a389d80b247e51ebd80097d0d588a472ae8aae5b697e754909b25afcc60775d2c7fb4fb51788ca7758a608bbcc1d33d66c5792390bb25d SHA512 49352f874a5bf6c265e69186ee3193d58d822b4ce72eff6eb198e42a6c46178ebf9e5469107d5c7d184edcd2bfb0413301129cb0e075f8b3f8826e35412b2624
 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 a00036389b17..cd7d50cc9b40 100644
--- a/games-arcade/lbreakout/lbreakout-010315-r1.ebuild
+++ b/games-arcade/lbreakout/lbreakout-010315-r1.ebuild
@@ -7,7 +7,9 @@ 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"
+SRC_URI="
+	mirror://sourceforge/lgames/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -40,5 +42,6 @@ src_install() {
 	fperms g+s /usr/bin/${PN}
 	fperms 660 /var/games/${PN}.hscr
 
-	make_desktop_entry ${PN} LBreakout applications-games
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} LBreakout
 }
diff --git a/games-arcade/xscavenger/Manifest b/games-arcade/xscavenger/Manifest
index fed63d8698c4..ba4ab8b6aa88 100644
--- a/games-arcade/xscavenger/Manifest
+++ b/games-arcade/xscavenger/Manifest
@@ -1,7 +1,5 @@
-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
+DIST xscavenger.png 3096 BLAKE2B c1e346a2950affdd41bf89358d9138196af7a5c422e64a863f9480b9876320ff381cbd301be644d02013754552303e2141a0962b2dcc16bddc6d0a2c646405d7 SHA512 9a9a8f70baac35d0818c6d34d6af0420db27e5f44cd0072e14d520d4f142ad41f5234868cda4cd0a03157987e2fc030df552ac37b02d07934c4de0c7c8b46947
+EBUILD xscavenger-1.4.5.ebuild 1158 BLAKE2B b12c1c8703f4648f4cb25a39d0fd7c56ffa085e9ac8d72d8656c4fc636bca010280c75a085031b274694f7e3aec9a22185ece9392ec7a45da9fa5a9040770caa SHA512 a2770a6a0e5cb8195638c01b2ccac7a2e599e8ab6cccd521bec6d92bf4de15c926dfa5ea0a52818f324b458b0a9e3434435acf464416cadbb09810a4101d505e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xscavenger/files/1.4.4-gentoo.patch b/games-arcade/xscavenger/files/1.4.4-gentoo.patch
deleted file mode 100644
index 4c51b37d2157..000000000000
--- a/games-arcade/xscavenger/files/1.4.4-gentoo.patch
+++ /dev/null
@@ -1,198 +0,0 @@
---- a/Imakefile
-+++ b/Imakefile
-@@ -1,20 +1,36 @@
- # set this to the path where data files should be stored.  LIBDIR
- # is automatically defined by imake, usually to /usr/X11R6/lib/X11, so
- # this should be a good default.
--LIBNAME = $(LIBDIR)/scavenger
-+LIBNAME = GENTOO_DATADIR/scavenger
- 
- SRCS = anim.c edit.c scav.c x.c sound.c
- OBJS = $(SRCS:.c=.o)
- 
-+# the "subst" hack below is because imake uses the C preprocessor, which
-+# will interpret an unquoted "/*" as a comment beginning.
-+#LIB_DATA = $(subst S,/,..SdataS*)
- LIB_DATA = \
--	../data/badguy.lbm   ../data/brownblue.lbm ../data/death.raw \
--	../data/dig.raw      ../data/fall.raw      ../data/levels.scl \
--        ../data/microman.lbm ../data/pop.raw       ../data/redbrick.lbm \
--	../data/reddevil.lbm ../data/regularguy.lbm ../data/spiralthing.lbm \
-+	../data/badguy.lbm	\
-+	../data/brownblue.lbm	\
-+	../data/death.raw	\
-+	../data/dig.raw		\
-+	../data/fall.raw	\
-+	../data/flashspiral.lbm	\
-+	../data/gems.lbm	\
-+	../data/jungle.lbm	\
-+	../data/levels.scl	\
-+	../data/microman.lbm	\
-+	../data/pop.raw		\
-+	../data/redbrick.lbm	\
-+	../data/reddevil.lbm	\
-+	../data/regularguy.lbm	\
-+	../data/spiralthing.lbm	\
- 	../data/victory.raw
- 
- LOCAL_LIBRARIES = $(XLIB)
- EXTRA_DEFINES = -DLIBNAME=\"$(LIBNAME)\"
- 
--ComplexProgramTarget(scavenger)
-+AllTarget(scavenger)
-+NormalProgramTarget(scavenger,$(OBJS),,,$(XLIB))
-+InstallProgram(scavenger,GENTOO_BINDIR)
- InstallMultipleFlags($(LIB_DATA),$(LIBNAME),-m 644)
---- a/scav.c
-+++ b/scav.c
-@@ -240,15 +240,19 @@
- 
- 
- 
-+/* 14 Dec 2002: re-wrote to be more portable - don't assume two's-complement
-+ * representation for integers, and fix bug when sizeof(long) > 4.
-+ */
- long readlong()
- {
--long val1=0;
--
--	val1=myci()<<24L;
--	val1|=myci()<<16L;
--	val1|=myci()<<8;
--	val1|=myci();
-+	long val1=0;
-+	int i,j;
- 
-+	for (i=0; i<4; i++) {
-+		j = myci();
-+		if (j==-1) return -1L;
-+		val1 = (val1<<8) + j;
-+	}
- 	return val1;
- }
- int rbs()
-@@ -309,7 +313,7 @@
- 	bmw=bmh=byteswide=0;
- 	while( (type=readlong()) )
- 	{
--		if(type==0xffffffffL) break;
-+		if(type==-1L) break;
- 		size=readlong();
- 		if(size&1) size++;
- 		if(type==BMHD)
-@@ -402,16 +406,16 @@
- 	input=open(resourcename,O_RDONLY);
- 	if(input<0) return -1;
- 	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);
- 	got=read(input,buff,8);
- 	offset=(buff[0]<<24) | (buff[1]<<16) | (buff[2]<<8) | buff[3];
- 	length=(buff[4]<<24) | (buff[5]<<16) | (buff[6]<<8) | buff[7];
- 	if(len>length) len=length;
--	if(!offset || !len) return 0;
-+	if(!offset || !len) {close(input);return 0;}
- 	lseek(input,offset,SEEK_SET);
- 	got=read(input,put,len);
- 	close(input);
-@@ -448,8 +452,8 @@
- 	input=open(resourcename,O_RDONLY);
- 	if(input==-1) return -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);
- 	if(output==-1) {close(input);return -6;}
- 
-@@ -473,12 +477,12 @@
- 		for(i=0;i<max;i++)
- 			if(headers[i+i])
- 				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;
- 	headers[num+num+1]=len;
- 	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;}
- 
- 	if(offset)
- 	{
-@@ -487,8 +491,8 @@
- 		while(count)
- 		{
- 			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;
- 		}
- 		lseek(input,length,SEEK_CUR);
-@@ -498,17 +502,17 @@
- 	{
- 		got=read(input, copybuff, 1024);
- 		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;
- 	}
- 	if(len)
- 	{
--		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;
- 	err=rename(bakname,resourcename);
- 	if(err) return -1;
-@@ -1382,6 +1386,7 @@
- 			break;
- 		}
- 	}
-+	close(file);
- }
- 
- void remslash(char *str)
-@@ -1416,6 +1421,8 @@
- 			return -3;
- 		}
- 	} while(len);
-+	close(input);
-+	close(output);
- 	return 0;
- }
- 
-@@ -1448,7 +1455,7 @@
- 			printf("Failed to create directory %s, exiting\n",temp);
- 			exit(1);
- 		}
--	}
-+	} else close(file);
- 
- 	sprintf(resourcename,"%s/%s/%s",localname,localdirname,LEVELSNAME);
- 	file=open(resourcename,O_RDONLY);
-@@ -1485,7 +1492,7 @@
- 			printf("Couldn't create %s\n",temp);
- 			exit(1);
- 		}
--	}
-+	} else close(file);
- }
- 
- void makercname(char *str)
diff --git a/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild b/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild
deleted file mode 100644
index 26f6aeae2f8d..000000000000
--- a/games-arcade/xscavenger/xscavenger-1.4.4-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Lode-Runner-like arcade game"
-HOMEPAGE="http://www.xdr.com/dash/scavenger.html"
-SRC_URI="http://www.xdr.com/dash/${P}.tgz"
-S="${WORKDIR}/${P}/src"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND=">=x11-misc/imake-1.0.8-r1"
-RDEPEND="x11-libs/libXext"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-gentoo.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:GENTOO_DATADIR:/usr/share:" \
-		-e "s:GENTOO_BINDIR:/usr/bin:" \
-		Imakefile \
-		|| die
-}
-
-src_configure() {
-	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ../{CREDITS,DOC,README,TODO,changelog}
-	make_desktop_entry scavenger "XScavenger"
-}
diff --git a/games-arcade/xscavenger/xscavenger-1.4.5.ebuild b/games-arcade/xscavenger/xscavenger-1.4.5.ebuild
index bb62ad68f021..3564676ebb08 100644
--- a/games-arcade/xscavenger/xscavenger-1.4.5.ebuild
+++ b/games-arcade/xscavenger/xscavenger-1.4.5.ebuild
@@ -7,7 +7,9 @@ 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"
+SRC_URI="
+	https://www.linuxmotors.com/linux/scavenger/downloads/${P}.tgz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -48,5 +50,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r data/.
 
-	make_desktop_entry scavenger XScavenger applications-games
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry scavenger XScavenger
 }