gentoo auto-resync : 19:12:2022 - 13:48:25

15 files changed, 14 insertions, 439 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 5dbb686a07c6..8e259691dd19 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/amphetamine/Manifest b/games-arcade/amphetamine/Manifest
index be56f7ca95ac..d9f72d01fc00 100644
--- a/games-arcade/amphetamine/Manifest
+++ b/games-arcade/amphetamine/Manifest
@@ -8,9 +8,7 @@ AUX amphetamine-0.8.10-missing-headers.patch 457 BLAKE2B 00c50c928487ff0e8fc4bf1
 AUX amphetamine-0.8.10-newline.patch 11906 BLAKE2B bf505f9f51d800b6b99b4a80d9c8cd30a91c97262e7984f371be16044328475ba5905145297019bc411c5c1394a81ee2c3cc3f753af46254cf4269f8e21449fe SHA512 9bb6e300f5c17a4ae2502162c3a7940a9574fcd6c09274454a6170c5b0cfdfdf3e4668d9c6e7876f7ea48119c94e098aef605836c866f8a475d81a15129d28b1
 AUX amphetamine-0.8.10-no-lxt.patch 504 BLAKE2B ab06ee2b2209b293d0a126127c5d0cbc0d51081295d9c53d4805cd386027cd77b94a8c8153c64da6bbf6d4bcf88c0cd79a4730d04d06be4785478ec5b39b8d7b SHA512 6c96aa314cc63de4b3472bfff6e0d0d25407f4f8e8a0974df5d20af9dc44fd95a70974cec3174c642ca01be70223c1a1eaea5d300d2026a35805e03e65028207
 DIST amphetamine-0.8.10.tar.bz2 72324 BLAKE2B 39d8f56066e7fbad853198be28375dfe7ee766d7c493a6faf0e2fa321ee2d2d757f5f294418208ac97a440d58bae03d40de2615e421bb8e9fad7a8ba5220d354 SHA512 eb3106df6070e207ffb3293ac4701bba8222603c0e399667505bad29b6f6433dc9ec008499b5180f713a724d3b686fead15536a20927195bc57780be16a860ef
-DIST amphetamine-data-0.8.6.tar.bz2 928775 BLAKE2B 078de623c719ebaedae3137fe3876ecd7ba02ad7ec44a64b7775fd173a42b399d137a3862d3fe426780a234638b0876a1f0fc5a06d6ab8f4b3c4ca66df367a49 SHA512 0feb86f420b4816064594756bb30bb6e02ae5062f03ef175b3262a8f30043340933f6f1b1894e2b2cfad70befc76d3ed1e0d2777c2dc2f7461459e8a93efeaf1
 DIST amphetamine-data_0.8.7.orig.tar.gz 955993 BLAKE2B ad14f36ac1d41b9c4ce7dccb9676a562b07400e2d3bf4303e6fbc18fa385453891da35bdcbbf73331989a65379a68329752b0d550951430c2777a3174db8df8f SHA512 623f5c4d02157f55188f4f7f0ea743b613ac846f56fa80c7b875488384341cb6737beecd2ea2322219ff2ff306e1588350e80bf3bcbd0891a3ce0fd514f142e7
 DIST amphetamine.png 95279 BLAKE2B 6403bb35883ce62f672ee3a3859eb580784c8fd5b068a116c6e3606be27893288205011cba5e9b83f2989d7471a65c13789e44acf5905fdf23402bf065f92c31 SHA512 c7698973e0d656187bebb070a1a76669d71d0025b5dc1e53adf221d934db5aac926897b52db257435168d74b622ed83d6fa6938984ec06682fbd9bd08f64521c
-EBUILD amphetamine-0.8.10-r1.ebuild 1004 BLAKE2B 11e7a7116ab5a30316a1257f83f4d61cfe972b588e796cb66fe17cdcd5f10a90bfa156dbadc640231813fdb18a1c88d981e2363b4e578806f15efcddee2fec19 SHA512 837a2dabcbfffee5014d88dc541909e44442ed63645b039974b91d19ba93d2c3e3824fb58219a0965753232be309064073601c3e810db85ce470f4f5b454848e
 EBUILD amphetamine-0.8.10-r2.ebuild 1236 BLAKE2B 38dd858e06b7261d05f872bca23f033a8e85dbb8dcb4b7663f28bad6fdea672a8256c57ffa1c38d5bf50914aa7de98b1892690bd2d8d145bb65848b27a1ca168 SHA512 156c108bb2d5f7a9202b8ceead2405115dd1bec1a5c8d4df20860caef3ec7e6d9e955040266372f4c6a45dc3eb4597f8c1ce67c4328fe7b3acd84ad645a1f262
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild b/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild
deleted file mode 100644
index 608047e72a0a..000000000000
--- a/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop
-
-DESCRIPTION="A cool Jump'n Run game offering some unique visual effects"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="
-	mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${PN}-data-0.8.6.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[sound,video]
-	x11-libs/libXpm
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-64bit.patch
-
-	# From Debian:
-	"${FILESDIR}"/${P}-no-lxt.patch
-	"${FILESDIR}"/${P}-bugs.patch
-	"${FILESDIR}"/${P}-missing-headers.patch
-	"${FILESDIR}"/${P}-newline.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e '55d' src/ObjInfo.cpp || die
-}
-
-src_compile() {
-	emake INSTALL_DIR=/usr/share/${PN}
-}
-
-src_install() {
-	newbin amph ${PN}
-	insinto /usr/share/${PN}
-	doins -r ../amph/*
-	newicon amph.xpm ${PN}.xpm
-	make_desktop_entry ${PN} Amphetamine ${PN}
-	einstalldocs
-}
diff --git a/games-arcade/kobodeluxe/Manifest b/games-arcade/kobodeluxe/Manifest
index b76d2dc01d1d..098c0666dccc 100644
--- a/games-arcade/kobodeluxe/Manifest
+++ b/games-arcade/kobodeluxe/Manifest
@@ -3,6 +3,5 @@ AUX kobodeluxe-0.5.1-glibc2.10.patch 219 BLAKE2B 78c45966711049c7715ae0efd18289b
 AUX kobodeluxe-0.5.1-glibc29.patch 2408 BLAKE2B c3abfe3594b2c43428d4e49a34285680a1ae2ac40106aac255aa2da846a67ecbcfcf8f5d8af48ca0adbf627d188f6a8941d6b4f75df3bdad39fff4d869b324e1 SHA512 de2014b9a0607ddb5853c63eb4c14daf4f14d2158697348d952305db09b4a8f84a3a918cd730085f01120b7cbcfae076afd73c559c1ddd46f5a9777c89e76897
 AUX kobodeluxe-0.5.1-midi-crash-fix.patch 482 BLAKE2B d58a2fb2e6fbf54d81b9493121b483dd03b88ebebb972665206f546f299fe767bd50e135780f593f3d3dd4db9c375f440db7fac83ed5fd1c5851f94e8e28ed09 SHA512 13802a7cbb0e6588e054ccc44581b25bd21e4d7461749e218416e80e5c010ad817bf47a73ca27a6b0ff6cf7a7b2909e0467d3460e64cf0c32fce448012538340
 DIST KoboDeluxe-0.5.1.tar.bz2 1781752 BLAKE2B d7f08ab9603b861f8992629bac9a65051a3c5fee6822f1951d57cbc5c31055a6cefeed098637dda84c0a1538645f47816848d767a4fa7916726b5784dfbc0414 SHA512 fc107e4367fd300574823aa40c68311d95de3a403d7c930963b8754aac14293f0624996fd77c4de0677921d11883047b68dd95df81eeb03078c37426ebd58afd
-EBUILD kobodeluxe-0.5.1-r3.ebuild 1287 BLAKE2B c9fa3c9613716f16c651528af844f4167a4c52ea76426b4c1b970a074871f054ba649ef3a0b97090ce600ee42bc544b9c968495faa9852d813b9827ab1b8c4ac SHA512 a6347dd89c4b5d72324340cb177d42e2efdd2374a81d820c6104e621a75186b6286cd051a87c52ad07fec0092e28bb9e129ee5f0906279eaed2fd1cf6fdb4885
 EBUILD kobodeluxe-0.5.1-r4.ebuild 1569 BLAKE2B b7a77871bc2f9ce1a79dd1c2015b5ff25bf886adc86bc162bee9f5304758d996762edecbf5e8d3d22f5233d03078e91e7f1d6ec64e5499ecdd5b40afcdb3d438 SHA512 ffd24c10068547d1bd25bb567055fd9614ae856e69b74e315c2788f8422d13c17ae43af659bb416947a541a78cdaddc1bdade7428affc3efa1c036b0853bff3d
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r3.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r3.ebuild
deleted file mode 100644
index 8f68045c4f6a..000000000000
--- a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop
-
-MY_P="KoboDeluxe-${PV/_/}"
-DESCRIPTION="An SDL port of xkobo, a addictive space shoot-em-up"
-HOMEPAGE="http://www.olofson.net/kobodl/"
-SRC_URI="http://www.olofson.net/kobodl/download/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
-IUSE="opengl"
-
-DEPEND="media-libs/libsdl[joystick]
-	media-libs/sdl-image[png]
-	opengl? ( virtual/opengl )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc29.patch
-	"${FILESDIR}"/${P}-glibc2.10.patch
-	"${FILESDIR}"/${P}-clang.patch
-)
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	unpack ./icons.tar.gz
-}
-
-src_prepare() {
-	default
-
-	# Fix paths
-	sed -i \
-		-e 's:\$(datadir)/kobo-deluxe:$(datadir)/kobodeluxe:' \
-		-e 's:\$(sharedstatedir)/kobo-deluxe/scores:$(localstatedir)/kobodeluxe:' \
-		configure || die "sed configure failed"
-
-	sed -i \
-		-e 's:kobo-deluxe:kobodeluxe:' \
-		data/gfx/Makefile.in \
-		data/sfx/Makefile.in || die "sed data/Makefile.in failed"
-}
-
-src_configure() {
-	econf $(use_enable opengl)
-}
-
-src_install() {
-	default
-
-	newicon icons/KDE/icons/32x32/kobodl.png ${PN}.png
-	make_desktop_entry kobodl "Kobo Deluxe"
-	keepdir /var/lib/${PN}
-}
diff --git a/games-arcade/rocksndiamonds/Manifest b/games-arcade/rocksndiamonds/Manifest
index 261b84bf69d9..070055dd15e0 100644
--- a/games-arcade/rocksndiamonds/Manifest
+++ b/games-arcade/rocksndiamonds/Manifest
@@ -1,13 +1,9 @@
 AUX rocksndiamonds-4.1.0.0-CVE-2011-4606.patch 961 BLAKE2B 10eae087eb32a90ae0f05df568aaaf9d9360badc056b77d2a1f00be4df24d7cfa884234860adb69aa4a21b8a6367c46b2d4b612c0205be10bfd1ba226c4e5f1e SHA512 5a76f0e16dd7e6bc7157050dae77f05b7b02130d2ee08051d6ef1574b201da0498d7bd14a480dd33a062ee323eb572291f9f20d44fc1bc48603980763f7763de
-AUX rocksndiamonds-4.1.0.0-YN.patch 700 BLAKE2B 92cdef21f6a301b37671fd2748b72f0b774861644fe75b480a99230ea0b4df6525207d09e661125e42aa20375ac4da0be96c5dc308a58ad237969a736f87bcb7 SHA512 3781a5ac8c43fdf6372c5e74b3ab3e57eeaff6adb814a590330a457b1ef8c37447d93e549745fa96fec3fc45e463d7669982aeda58fabd6ac8e20708746f6859
-AUX rocksndiamonds-4.1.0.0-music-info-url.patch 2598 BLAKE2B 9edde25c6306eebf10e365828b367fb090972e16aba53010c5ea1bba4628e4ec1cebcf13a80e5a68e19c00d84db0b0347e891411f3dc19a4b117b5c82b6c39bd SHA512 64a6908f7cf9e9d332634e8222c71b30fecbc550e49433d619a58f4a1a5c688e757c1c035bfc1a6d1c2a672921219e3390b87b8b96f0b4abefcc2048bec94038
-AUX rocksndiamonds-4.1.4.1-gcc10.patch 987 BLAKE2B 6cba0dccb2a41df79a6d19695619923de7b3b770511c8cf18781ce4ce250d163d8249ed56e9a71528c4f3f679bb2ad287e6b254d2f09e994ef220c870aaaf771 SHA512 0188f5558d1546bd162734f1028d32d56c1109604b2837ea3e5a815b06ef7951bc5e01f9bf13e47373b176e344975a4f4cdbfbaec400d6b0456f1f0d4c2d1ce1
 AUX rocksndiamonds-4.3.2.0-music-info-url.patch 2605 BLAKE2B 90bbd4b96ee834f9b56d04ec7e06571ff7be4ddac7293a65626ae0d26aa8a6604476bde0832834df4cb6f5f5b5c37b0666e2a53330403c8a122e5c2f7a4acb50 SHA512 9360c03acb38df1a70c27ebed47df4d624a89b7fdeb9a56e8c6845b7d5a8c6c91d02776e45c8cbb85e92f40870b2528e77d288b0aa243d45d09adafdf342a423
 DIST Andreas_Buschbeck-1.0.0.zip 18331338 BLAKE2B b6520ab10ce62d4bec804a2a7e1c4908a683f9f3833e5b1d4c64d376eb4225abc38c44a519bed8cbbd3fc928bfdddda17f292b0011805e45a30b84101dad9d1d SHA512 1b47914561aea5b07035cc70f8b1b6d35f0c829d89327713ad644d82225e778a7ffd27f9d421c40dd303f85c9fc0774244dd97d405f5db866ba3d1f8027151e4
 DIST BD2K3-1.0.0.zip 4715324 BLAKE2B 72e25038c41a7a1c29a896459db97954d18731d6980f5096c28ebddb09c0b6d7bdb68a8c56f17d26c71085e4ae883d2ceaad8e95b5525cbf532d18f32ecdd638 SHA512 80f172584d2077a3ade0749790802ef9cecde75283d6b889e7d2fedf9b55fd1fd7f1f1fd5596b17d5b2a542172699a929ea626086e77d28fde11487440c43622
 DIST Boulder_Dash_Dream-1.0.0.zip 10923437 BLAKE2B 976156c763281b993550a08361c5b6279a471e24568205c0369cc3f57d99e97db84d914a560c909b30fe92b8c8c10931cf6a8a8de4da181edac410a770d922b7 SHA512 f2765f52653b4f9d6c4a6548076281f6749d08c2dfd220345bdc0058b94d51c49ef81acdc87ff71bc1b3f337f3cc6a1d08b9e5a02d6aaeaeac5d894f97ba3d8e
 DIST Contributions-1.2.0.zip 9499312 BLAKE2B a90a84d230ab1032819bc3821871eb027ed83a8e289b01692f80185c42d50429ca8c6928b72b1ae5ea102ba2a0d25cd25391dc53b0cdb37ef4504233292dc2da SHA512 463e629bd4f592e24a82d20f1f249cea9e266a7c370bb5b079add8daa125d1af69a69746b696dd92f89b90e50972c6b2ba007aab87beed4cd980c0c7bdb81920
-DIST Emerald_Mine_Club-2.1.1.7z 20992125 BLAKE2B deb8e60058ead5e6b8df2c58f5c88da5fc9c1282a7f4a4c85c8e35f3f5c25fefe552d6440401093403cf2b0967c7a39cd1ec9c5926fa780aa6b224ed6bfe7804 SHA512 b45ca6c9163c28b0d000d783cd8a66fccd23a8c4ad2c7200366c6900fc31284d50a55171a12272d8bf117f135fb68810ac3f28e8708b9e47a98dbf0f53dd3d21
 DIST Emerald_Mine_Club-3.1.3.7z 45669526 BLAKE2B 8cc44ba75c67bf2b53b042b07b9cf160f42155559137a873676fff773757760c0d5084b6646e2a1127bd4454beb16e4d5a8ec263c7db36cb782cf0655bba3e8d SHA512 bb4eb28515d01b9bc8fd3a542a017091e7e27ab5a043c3fad128f8ea4deb0ec14edbc026cccc28a6c6d998a882e5bcfef9a7dcb59d478459f49b654f7ea6b9be
 DIST RS_MIX_01-needs_rnd_jue.zip 288339 BLAKE2B 08d08e934af95543d2027805d91f5c8b2806c2da74a8cdfed61afe26be5696a832cbac7e7aae30a314a2414b7d5a82b53b8556f7098c6570a54a26d751785347 SHA512 546fc50d089493a41f01895f16a7e96e664a472d61b1f92ebc391006c10142b493a55854d892019b0ff19fe318b4b67f78c137d7e1466c5fa4d49fbb521d7a48
 DIST RS_MIX_01-standalone.zip 17982550 BLAKE2B 829055ec48c5de31b8bb0edc3eb5dc8f60001e1cbfa7cd85706e635b2389fd800d22fbe657ceac64c0e3cc7725dbfef23d518d53df1cc35bf8a2aa25ece7cac6 SHA512 1ea070017f80c47c9eff29b644e30b0ae4d5eb78e11dfef10fd183aad7b8af981af74728883f9d223d63b24361a7c5449a68558d142a0f391d102f14f22ceaa5
@@ -23,13 +19,11 @@ DIST rnd_jue-v8.tar.bz2 17244645 BLAKE2B 92d0cf646296b065c9ebe54d8d5ecb831eeb497
 DIST rockslevels-dx-1.0.tar.gz 211151 BLAKE2B 637a600f9197925d82e7ef344c90f04e8508c6b114fd07ad00977d91a856ff85dc29207e5f22c659382ee0759f8607e9dc8ad0c0de3826d57b74d494320b57ad SHA512 2e1bc4484a76bf638e8ce285972b20b6377e0483abb2475e2343d48de1f84ee102f430049d685b89bc1087e0f20b9b6e29370f8e6cae66b480d3650be9991f44
 DIST rockslevels-emc-1.0.tar.gz 3824268 BLAKE2B 0feadd5d9c6225c8574576281d07e14ff98fc9a33c67d3fa5083219ce39daaa1902a5ed652b5379fa4e58ee2428a8a452d66520571206143fd0fcd54f71b977a SHA512 9abad888fa00bc305444367c5ab8ffdad95eaca22613573e44d5ecd93b1a9a1cbc931497c064002d90fd3174c4661d0b009ede7746b2fe8da0a00072303a1301
 DIST rockslevels-sp-1.0.tar.gz 373564 BLAKE2B 3f724ea55bbdaae80a35d6a9f5d8751a9228862fbe1ba45419343b1968510e10d3c82cc01844e35bc35561e65df3bc7e5ec2a0b807e1f56359dc7dccc16e3cb0 SHA512 2d44e9238a72846b9d4fbab90288aa3b23af4957ffe0d42d95c523fd22f3587572864b3fc0b277894d2f3f56d6eff52ea009e5b2d59aebc34163a1067662d729
-DIST rocksndiamonds-4.1.4.1.tar.gz 3982860 BLAKE2B c19baf38f77c9b9eaaf7c57e9b43d4862a0ff677d99753d6520b9e4746f6340d7f3a2cf8d3e6b692230bf49289cc2aef29d7a846d2d1e0ad162e55f6433634a2 SHA512 eb66dd0fcc162c522384b1c2fb7b380a6a460a4078dd0ffb5f16a63c3faa4a502d9a9a6e3505becd8ab4c188c0eb5edd32db45412c881ab90d6a9d05e5ed6d4b
 DIST rocksndiamonds-4.3.2.1.tar.gz 4415020 BLAKE2B 2886891dcc32b71a61b83717941d56348ae8a330d7a5e2dfde1675ebd2c6f44ebbd365d6396d0099a9f9f7968f280036c5735499a7e9d9b94796671f37561a93 SHA512 c0f53e9664895ba5e749d417843ba8e4a4b481e7ac8729e12f2714264e24b72dc5acba5019ca2bd30064406dd8d7d6a26505d35c1e5636898862d7c8df99808f
 DIST rocksndiamonds-distributable-music.tar.bz2 4957282 BLAKE2B e00ccc1a06977289ffe79c010512b4a9a5c79d5a0fdff750e17f888f09395dd8a20ce06c5f1f7cc034d22e9651bad54beff1fa4e3dac854e77bbc57353d98bdd SHA512 dd220e4506492e66742796d0c359bce24691f5ebfba092aa2c2b52c5582ae9d5a38aa558872c738eeb7619b8ca853d3affa6b0e4af0fda5621bf7e07441ff252
 DIST rocksndiamonds.png 2021 BLAKE2B 795be09e6d60aaa66dd457f6ce7dcb0069a82e395cb54578b83ad49ba70b669aa5bd52a4da34979d1e0ba95413a499c13355ce6816c4e364d9d88d1988c88060 SHA512 026abfef17bfc8621d036b83a8a4a878b1d68615e69975ea37589e8d29d864dc42dbabc5a381e579c66be1053175df02209f2c1c1feff3bd9e29db3e09c40346
 DIST wf_v1-3.zip 35570 BLAKE2B eded867101b316406cdf378ce8bf36d1dbd28d38ebc9f904df85753955ec2d8f5a87a528975c58ee81b60362bcc37efa766ad87ccf1a1e8a5b062c59c6cc69a2 SHA512 b1b3b2efe20e7d74a072a6289d1af5c22fccf1b9359700269a381d38bdf2458d7d365df7db616a93512428a05f58cf872ea70fcf87080df327e0c4fc231f0470
 DIST wg_v1-0.zip 821765 BLAKE2B 5bc69179e0429992a916e2287eb57bfa947e4bb08bc6e3d801f940bc73dc8fc8af93aa82a9b8a9f8535d0d22043f50414f09b9643ea9cfa081a92943b1c73273 SHA512 7e7605d258deccbe938fedc4651bdcc4b9a01478de66f793053bb4191429cf733ad317a315965597817dbaa03d5cb538a9ab36bee53cf6a2fd3457aeb06dac88
 DIST ww_v1-0.zip 199805 BLAKE2B 167a36cc33f157e11850a786f511fb5eb9043eb732c514c00e13a71bdce3f63a2406aec88ca25e1510b3d7aeea0434101c878fcdbc2806f89b45c75417a931f3 SHA512 5689663e7d0da797a8a4904d69a3d37cfb09826acf55cf93b41beabf2638b13c6c666f4f40c011018cd84b6c14681061d5efcae3cc09ac86054ec23e0253f6d5
-EBUILD rocksndiamonds-4.1.4.1.ebuild 3132 BLAKE2B d82abc8402502cd6149486afddd872f2b47c277c5184af45913a9b109d2c75a6bac7502ba0057fc7cf6b64cb47151beb800014a4f1ee4e6c0eca800ce2e9e026 SHA512 dfe7589d91e8f7037c87ee82a1dfd43775534b8044c67a443cf1acf61a529d7ca42d46a6a3905ab0102ca265a728b280b86067a93a9517b464e71871761efc3a
 EBUILD rocksndiamonds-4.3.2.1.ebuild 3957 BLAKE2B 33935b976aee35670774f2808ccf51647d7686ac4035c3cd04532c9eca8bfe55abaf396b1619009037104c883d315b45e87ec274eafb4fd713314a934b53c935 SHA512 fae94c233ed796957e9068306d096cca56eb47cb067ed7574338c7e4a1116fc6fd7fb28d812236abb8a20f698f4a1f5763b31f6479c4e6e6fbcf42949e8760db
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch
deleted file mode 100644
index 70c95bd076dc..000000000000
--- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up rocksndiamonds-4.0.0.1/src/tools.c.yesno rocksndiamonds-4.0.0.1/src/tools.c
---- rocksndiamonds-4.0.0.1/src/tools.c.yesno	2017-01-12 07:47:09.921343574 -0500
-+++ rocksndiamonds-4.0.0.1/src/tools.c	2017-01-12 07:51:45.059649653 -0500
-@@ -3901,6 +3901,18 @@ static int RequestHandleEvents(unsigned
- 		result = 0;
- 		break;
- 
-+              case KSYM_y:
-+              case KSYM_Y:
-+                if (req_state & REQ_ASK)
-+                  result = TRUE;
-+                break;
-+
-+              case KSYM_n:
-+              case KSYM_N:
-+                if (req_state & REQ_ASK)
-+                  result = FALSE;
-+                break;
-+
- 	      default:
- 		HandleKeysDebug(key);
- 		break;
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch
deleted file mode 100644
index f913be382e94..000000000000
--- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -up rocksndiamonds-4.1.0.0/src/files.c.url rocksndiamonds-4.1.0.0/src/files.c
---- rocksndiamonds-4.1.0.0/src/files.c.url	2018-04-10 15:44:08.000000000 -0400
-+++ rocksndiamonds-4.1.0.0/src/files.c	2018-04-17 16:30:19.726734512 -0400
-@@ -10127,11 +10127,13 @@ static struct MusicFileInfo *get_music_f
-     { "artist_header",	&tmp_music_file_info.artist_header	},
-     { "album_header",	&tmp_music_file_info.album_header	},
-     { "year_header",	&tmp_music_file_info.year_header	},
-+    { "url_header",	&tmp_music_file_info.url_header		},
- 
-     { "title",		&tmp_music_file_info.title		},
-     { "artist",		&tmp_music_file_info.artist		},
-     { "album",		&tmp_music_file_info.album		},
-     { "year",		&tmp_music_file_info.year		},
-+    { "url",		&tmp_music_file_info.url		},
- 
-     { NULL,		NULL					},
-   };
-@@ -10247,11 +10249,13 @@ void LoadMusicInfo()
-     checked_free(music_file_info->artist_header);
-     checked_free(music_file_info->album_header);
-     checked_free(music_file_info->year_header);
-+    checked_free(music_file_info->url_header);
- 
-     checked_free(music_file_info->title);
-     checked_free(music_file_info->artist);
-     checked_free(music_file_info->album);
-     checked_free(music_file_info->year);
-+    checked_free(music_file_info->url);
- 
-     free(music_file_info);
- 
-diff -up rocksndiamonds-4.1.0.0/src/main.h.url rocksndiamonds-4.1.0.0/src/main.h
---- rocksndiamonds-4.1.0.0/src/main.h.url	2018-04-10 15:44:08.000000000 -0400
-+++ rocksndiamonds-4.1.0.0/src/main.h	2018-04-17 16:30:19.727734490 -0400
-@@ -3463,11 +3463,13 @@ struct MusicFileInfo
-   char *artist_header;
-   char *album_header;
-   char *year_header;
-+  char *url_header;
- 
-   char *title;
-   char *artist;
-   char *album;
-   char *year;
-+  char *url;
- 
-   int music;
- 
-diff -up rocksndiamonds-4.1.0.0/src/screens.c.url rocksndiamonds-4.1.0.0/src/screens.c
---- rocksndiamonds-4.1.0.0/src/screens.c.url	2018-04-17 16:30:19.728734467 -0400
-+++ rocksndiamonds-4.1.0.0/src/screens.c	2018-04-17 16:34:00.653803869 -0400
-@@ -3060,6 +3060,19 @@ void HandleInfoScreen_Music(int button)
-       ystart += ystep_head;
-     }
- 
-+    if (!strEqual(list->url, UNKNOWN_NAME))
-+    {
-+      if (!strEqual(list->url_header, UNKNOWN_NAME))
-+        DrawTextSCentered(ystart, font_head, list->url_header);
-+      else
-+        DrawTextSCentered(ystart, font_head, "from the website");
-+
-+      ystart += ystep_head;
-+
-+      DrawTextFCentered(ystart, font_text, "%s", list->url);
-+      ystart += ystep_head;
-+    }
-+
-     DrawTextSCentered(ybottom, FONT_TEXT_4,
- 		      "Press any key or button for next page");
- 
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.4.1-gcc10.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.4.1-gcc10.patch
deleted file mode 100644
index 08edb4236e37..000000000000
--- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.4.1-gcc10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up rocksndiamonds-4.1.4.1/src/main.c.gcc10 rocksndiamonds-4.1.4.1/src/main.c
---- rocksndiamonds-4.1.4.1/src/main.c.gcc10	2019-05-20 15:24:46.000000000 -0400
-+++ rocksndiamonds-4.1.4.1/src/main.c	2020-01-31 05:56:37.154931291 -0500
-@@ -67,7 +67,7 @@ short			ExplodeDelay[MAX_LEV_FIELDX][MAX
- int			RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- int			PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- 
--int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-+// int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- int 			GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- int 			GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
- int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-@@ -132,7 +132,7 @@ struct LevelInfo	level, level_template;
- struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player = NULL;
- struct HiScore		highscore[MAX_SCORE_ENTRIES];
- struct TapeInfo		tape;
--struct SetupInfo	setup;
-+// struct SetupInfo	setup;
- struct GameInfo		game;
- struct GlobalInfo	global;
- struct BorderInfo	border;
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.4.1.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-4.1.4.1.ebuild
deleted file mode 100644
index 37f602b5fc75..000000000000
--- a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.4.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic
-
-DESCRIPTION="A Boulderdash clone"
-HOMEPAGE="https://www.artsoft.org/rocksndiamonds/"
-SRC_URI="https://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz
-	https://upload.wikimedia.org/wikipedia/commons/e/e2/Rocks%27n%27Diamonds.png -> ${PN}.png
-	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip
-	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip
-	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip
-	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz
-	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip
-	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip
-	https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz
-	https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz
-	https://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz
-	mirror://gentoo/rnd_jue-v8.tar.bz2
-	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Zelda-1.0.0.zip
-	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/ZeldaII-1.0.0.zip
-	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Emerald_Mine_Club-2.1.1.7z
-	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/RS_MIX_01-needs_rnd_jue.zip
-	https://www.artsoft.org/RELEASES/rocksndiamonds/levels/Supaplex-2.0.0.zip
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl2[joystick,video]
-	media-libs/sdl2-mixer[mod,mp3,timidity]
-	media-libs/sdl2-net
-	media-libs/sdl2-image[gif]
-	media-libs/smpeg
-"
-DEPEND="${RDEPEND}
-	app-arch/p7zip
-	app-arch/unzip
-"
-
-PATCHES=(
-	# From Fedora:
-	"${FILESDIR}"/${PN}-4.1.0.0-YN.patch
-	"${FILESDIR}"/${PN}-4.1.0.0-music-info-url.patch
-	"${FILESDIR}"/${PN}-4.1.0.0-CVE-2011-4606.patch
-	"${FILESDIR}"/${PN}-4.1.4.1-gcc10.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	unpack \
-		rockslevels-emc-1.0.tar.gz \
-		rockslevels-sp-1.0.tar.gz \
-		rockslevels-dx-1.0.tar.gz
-	cd levels
-	unpack \
-		rnd_jue-v8.tar.bz2 \
-		BD2K3-1.0.0.zip \
-		rnd-contrib-1.0.0.tar.gz \
-		Snake_Bite-1.0.0.zip \
-		Contributions-1.2.0.zip \
-		Boulder_Dash_Dream-1.0.0.zip \
-		Sokoban-1.0.0.zip \
-		Zelda-1.0.0.zip \
-		ZeldaII-1.0.0.zip \
-		Emerald_Mine_Club-2.1.1.7z \
-		RS_MIX_01-needs_rnd_jue.zip \
-		Supaplex-2.0.0.zip
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:\$(MAKE_CMD):$(MAKE) -C $(SRC_DIR):' \
-		-e '/^MAKE/d' \
-		-e '/^CC/d' \
-		Makefile || die
-
-	sed -i \
-		-e '/^LDFLAGS/s/=/+=/' \
-		src/Makefile || die
-}
-
-src_compile() {
-	replace-cpu-flags k6 k6-1 k6-2 i586
-
-	local makeopts="RO_GAME_DIR=/usr/share/${PN} RW_GAME_DIR=/usr/share/${PN}"
-	emake -j1 clean
-	emake ${makeopts} OPTIONS="${CFLAGS}" sdl2
-}
-
-src_install() {
-	dobin rocksndiamonds
-	insinto "/usr/share/${PN}"
-	doins -r docs graphics levels music sounds
-
-	einstalldocs
-	doicon "${DISTDIR}/${PN}.png"
-	make_desktop_entry rocksndiamonds "Rocks 'N' Diamonds" /usr/share/pixmaps/${PN}.png
-}
diff --git a/games-arcade/xbill/Manifest b/games-arcade/xbill/Manifest
index d7219128052c..c26658f2c075 100644
--- a/games-arcade/xbill/Manifest
+++ b/games-arcade/xbill/Manifest
@@ -1,8 +1,6 @@
-AUX xbill-2.1-clang16.patch 1226 BLAKE2B cd2a7d2d341dee132ac0628bf3f4cb8f18101eba0b2f719f35827529cfa867e292e0315d920ad2d219c88b926dfa0ca2a35b3d1adb35a06fbba6b21319903c71 SHA512 f6fe72bb933927b95efa9c45ebf46819c8aa4cc9c495b869fd48eba08e30218d90814fa3598e3ca1ede9d015def39ce8401c784ca82e834d0546e12069c8b36b
+AUX xbill-2.1-clang16.patch 539 BLAKE2B 4ebf521d807af14c1d3f64484eea237b9e2e46d19cc4bfc267439ead1e891983694b2611c6828438e91a668261d11b941a098d7f01c70de70ef83a510aaa568e SHA512 744aafb0ee88ba0cc96da189ea7e6f77f9908e54a107699cda51f13063e7c81e412ba2f1a2d5a7e684a488831b524a0544fbc0dedd546f9ade1ce2f6bbb4561f
 AUX xbill-2.1-gentoo.patch 9281 BLAKE2B 852ac415c5525daeb47f321c2e91d76a2af842b5e934a0082e481a940919cffff3c600cd373c76564741346d580db01eba8ce502ba7f47c627a3c66bf042aa5a SHA512 81bdcb950260b6d8b52b9857d1d09b351b422df5789319873ea6e6f2431559c6a0a5a963a87313ed23b2a496d570c6c02e50df2c22f4195c48506f7711a740b8
-AUX xbill-2.1-gtk2.patch 582 BLAKE2B d577b0ba7e6247594c616d0d439136d9e0a6378518085e5d29303dbdce065d21ab623d12a18716ce03c35bd00e2a73aa865553c3f541cfe48eacebf60116d467 SHA512 f25980493ccc86f42c0ac4d996b6ec1580011b7764e7b1ad80dd04698a094c0c1842512e544d62ffd527b9a08109f7389c1741f4837e5320accc128786dbc546
 DIST xbill-2.1.tar.gz 77610 BLAKE2B aeadc62fa01a3d37b1ae6388987e5d5e3a2d73b9c5afa99b9a2c61155eeb5fb2efc4a36dd2cbeb3fd2f677b385550146d75964afa5f7e83a27f6dc7a16db83c9 SHA512 127604d88258db0ec47084209c656f8817146d70b0fe16f5a1d79883415cf38200594834b39080d78c627104ae6d204f3c12caf127fa094108c4edfbfa98d966
 DIST xbill.png 49325 BLAKE2B a2b5cacee2f5aaf62bcea941dbde26c4cf17ef29c0018ecbd66aefb64e6d1240ac756a32b84d631e4675774b7a06d7c56756debe80df8252684181e0e638a9a0 SHA512 cb41e8603f400cf7b4f8fde2739e798872cefd6e45ff0ff17ddf1f02958f572195022adcdc7ac308cb4236fb79ff68433673cfbaefaf5ccdb426d6070f39e854
-EBUILD xbill-2.1-r5.ebuild 989 BLAKE2B 3b7ca5f87211d0d496f9e3eba719cf418dd012fe41a0388ddab1b8f2b4a2e09f5605cd8ef67e16af6b5f300c5effc286387be2b152378e164df3aaf2633020d8 SHA512 51f4a438867fab2b3f0f72520e73fbfbc171a088c166592644408d2cf5335a721f4da502abd3469a59782911468e69d8bc9caf4823fdc2c2f24d289ac38f941b
-EBUILD xbill-2.1-r6.ebuild 973 BLAKE2B 77dc37bc8c683e4f1c548ca6d9b18b0db9a94efd237faebb25ba8cd97429e62ca97eb907f4607157e7455153de92f46426b9f89620adf54ba593a51155b47bd1 SHA512 076f153fa5fc387cb149eb9c8b3e6bf3e62ea1aee67aeebec04e8a6963e3852aa5c92e98c6e9d479ccb3298ae4173872f1716347728fb746cf7776328c11f305
+EBUILD xbill-2.1-r6.ebuild 964 BLAKE2B 253819ff8492a9a434c5d6739bce0029f95f1285c809a65349f4d8f091ef3c8476582639133c87ec9ed93718c4b1bc8c6c4b020bcd24159ed8b7c55d03d58b89 SHA512 8d50f1fcd380c3f6748daf13fe0b31cf526080515491485b23039e1026a3df0fc1b7e14bcdc5fae71b8209040a6e1dd87ae0276951997192b2bbeeb710df5897
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/xbill/files/xbill-2.1-clang16.patch b/games-arcade/xbill/files/xbill-2.1-clang16.patch
index ee31ec657e4e..524fdde63ae4 100644
--- a/games-arcade/xbill/files/xbill-2.1-clang16.patch
+++ b/games-arcade/xbill/files/xbill-2.1-clang16.patch
@@ -25,20 +25,3 @@ https://bugs.gentoo.org/874624
  #include <string.h>
 +#include <strings.h>
  
---- a/gtk.c
-+++ b/gtk.c
-@@ -370,3 +370,3 @@
- 	gtk_signal_connect_object(GTK_OBJECT(menu_item), "activate",
--				  gtk_ui_popup_dialog, (gpointer) dialog);
-+				  GTK_SIGNAL_FUNC(gtk_ui_popup_dialog), (gpointer) dialog);
- 	return (menu_item);
-@@ -592,3 +592,3 @@
- 	CreateDialog(DIALOG_PAUSEGAME, 0, icon, "Continue", NULL);
--	CreateEnterText(DIALOG_WARPLEVEL, warp_apply);
-+	CreateEnterText(DIALOG_WARPLEVEL, GTK_SIGNAL_FUNC(warp_apply));
- 	CreateDialog(DIALOG_HIGHSCORE, 0, NULL, NULL, NULL);
-@@ -602,3 +602,3 @@
- 	CreateDialog(DIALOG_ENDGAME, 0, NULL, "Nuts!", NULL);
--	CreateEnterText(DIALOG_ENTERNAME, enter_name);
-+	CreateEnterText(DIALOG_ENTERNAME, GTK_SIGNAL_FUNC(enter_name));
- }
diff --git a/games-arcade/xbill/files/xbill-2.1-gtk2.patch b/games-arcade/xbill/files/xbill-2.1-gtk2.patch
deleted file mode 100644
index 829475badd72..000000000000
--- a/games-arcade/xbill/files/xbill-2.1-gtk2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure.in	2007-12-05 22:37:57.000000000 +0100
-+++ b/configure.in	2007-12-05 22:54:57.000000000 +0100
-@@ -88,12 +88,11 @@
- 	[  --enable-gtk            build with the GTK widget set])
- 
- if test "$enable_gtk" != "no"; then
--	AC_CHECK_PROG(GTKCONFIG, gtk-config, yes, no)
-+	PKG_CHECK_MODULES(GTK, gtk+-2.0)
- 
--	if test "X$GTKCONFIG" = X"yes"; then
-+	if test $pkg_failed = no; then
- 		AC_DEFINE(USE_GTK)
--		GTK_CFLAGS="`gtk-config --cflags`"
--		WIDGET_LIBS="$WIDGET_LIBS `gtk-config --libs`"
-+		WIDGET_LIBS="$WIDGET_LIBS $GTK_LIBS"
- 		WIDGET_OBJS="$WIDGET_OBJS gtk.o"
- 	fi
- fi
diff --git a/games-arcade/xbill/xbill-2.1-r5.ebuild b/games-arcade/xbill/xbill-2.1-r5.ebuild
deleted file mode 100644
index 2f21efed00bd..000000000000
--- a/games-arcade/xbill/xbill-2.1-r5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop
-
-DESCRIPTION="A game about an evil hacker called Bill!"
-HOMEPAGE="http://www.xbill.org/"
-SRC_URI="http://www.xbill.org/download/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="acct-group/gamestat
-	media-fonts/font-misc-misc
-	gtk? ( x11-libs/gtk+:2 )
-	!gtk? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gtk2.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-clang16.patch
-)
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-motif \
-		$(use_enable gtk) \
-		$(use_enable !gtk athena)
-}
-
-src_install() {
-	default
-	newicon pixmaps/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} XBill ${PN}
-
-	fowners :gamestat /var/lib/xbill/scores /usr/bin/${PN}
-	fperms 664 /var/lib/xbill/scores
-}
diff --git a/games-arcade/xbill/xbill-2.1-r6.ebuild b/games-arcade/xbill/xbill-2.1-r6.ebuild
index fdff9e03b315..edeebb7b82a1 100644
--- a/games-arcade/xbill/xbill-2.1-r6.ebuild
+++ b/games-arcade/xbill/xbill-2.1-r6.ebuild
@@ -5,21 +5,20 @@ EAPI=8
 
 inherit autotools desktop
 
-DESCRIPTION="A game about an evil hacker called Bill!"
+DESCRIPTION="Game about an evil hacker called Bill!"
 HOMEPAGE="http://www.xbill.org/"
-SRC_URI="http://www.xbill.org/download/${P}.tar.gz
+SRC_URI="
+	http://www.xbill.org/download/${P}.tar.gz
 	https://dashboard.snapcraft.io/site_media/appmedia/2018/04/xbill.png"
 
 LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	acct-group/gamestat
 	media-fonts/font-misc-misc
-	x11-libs/libXaw
-"
+	x11-libs/libXaw"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -30,19 +29,23 @@ PATCHES=(
 
 src_prepare() {
 	default
-	mv configure.in configure.ac || die
+
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-motif \
-		--disable-gtk \
+	local econfargs=(
+		--disable-motif
+		--disable-gtk
 		--enable-athena
+	)
+
+	econf "${econfargs[@]}"
 }
 
 src_install() {
 	default
+
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} XBill ${PN}