6 files changed, 77 insertions, 62 deletions
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 76bb0fa5312c..a7bf1948d816 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/amphetamine/Manifest b/games-arcade/amphetamine/Manifest
index d9f72d01fc00..cf9a78b13d02 100644
--- a/games-arcade/amphetamine/Manifest
+++ b/games-arcade/amphetamine/Manifest
@@ -3,6 +3,7 @@ AUX amphetamine-0.8.10-SDL-conversions.patch 926 BLAKE2B ac8bf1d9f5af967e08d5952
 AUX amphetamine-0.8.10-bugs.patch 1821 BLAKE2B 3b0870cecaa55879da3d5107e2c23d7c972e49b1289519b2107fa0da48376c562364b8d4c632812dd20a80e4e6a02fc9ddd157aa8e104a3a8e097f238c422ae9 SHA512 30cc93031152e3f244a30cb56430b451ddfb8ccfddde0fc6cd681cbc6bf0ffb4d4801df642b5330fc1462d68cb0fc3e8d8f97f7e4dc87925b5335f5b1707ff8e
 AUX amphetamine-0.8.10-build.patch 700 BLAKE2B d63c5a73f065f181a6673feb3d90e852e85befb51446ac003eca6ea6076caa36cbd911ac0e33064b5aa549c9ffee8264c5a31a34bfa7ecc659f8c07687d12130 SHA512 c79c133bb6acfc666e557e09b0ca3b556203331d167b5266217a19880b5af2101776b651a420a81b53fc4fbf790de221d0b758979955632230226581dfa30ced
 AUX amphetamine-0.8.10-clang.patch 485 BLAKE2B 2831c1c9b04fc86c17a2625c03f4d674690532c138d9c7bc076fb19c901b5ea5ea0ff635984fd94323fb072d465dd3e4b7b5125012abb50f836a91bd3a8a102e SHA512 8f12fe93fc14332eb5da4e0d85cba2a879e40a9d72ed6294300cdc58add4167acbba8e28bd68b179e7b8beda9cdaa58e1d9a35d9426a9ca7b8b4270e74a471d9
+AUX amphetamine-0.8.10-drop-register-keyword.patch 396 BLAKE2B 1bfa129e79d89ae37a8fd41649ece4030cdbb3c083ff835a86787f58d6de46cdd5b4b3e896e586e4dc793fd6be54ec17a26ab553ea34cd54ff0b02fb3b582508 SHA512 607b3551c4ed454435b38c695cd2ad54c5d6bc85863fbc748060dda314d3310164f34202f1c28c7427cb0a70f4e3f495cc8105cf942c4c42d99796ea466a8abd
 AUX amphetamine-0.8.10-format-string.patch 462 BLAKE2B 2ffe4d83cc27511f61379e4e27fb76ac4ccc93d72f8d2b3fae5e6d35eac1392f988ab120977ebd895b7a169db9634dc91233b975110be61acc0fbe8500ac488b SHA512 b240ad18befbfaa03a449718f2327c3f428ddb46b93aed592ab004d842db692f22d1ddc95e1895a8d4268367c8d78d5564fd8e11514f9482de80787e9529c327
 AUX amphetamine-0.8.10-missing-headers.patch 457 BLAKE2B 00c50c928487ff0e8fc4bf1c707d77b6ab28b064a9682e1d7f086e6b0555868c662dd68d5b474dca6346a23eb9bc91620b3f92ce18a6e7f0be597c14b41e0c5d SHA512 1f95ac463f600b0e3812afba10682657cdd8b95dd1e77f6a2fb93af7dab60fcb85c85e60613ee4c93421faf7492ca4663d2c94bc96172c52913effe63d259523
 AUX amphetamine-0.8.10-newline.patch 11906 BLAKE2B bf505f9f51d800b6b99b4a80d9c8cd30a91c97262e7984f371be16044328475ba5905145297019bc411c5c1394a81ee2c3cc3f753af46254cf4269f8e21449fe SHA512 9bb6e300f5c17a4ae2502162c3a7940a9574fcd6c09274454a6170c5b0cfdfdf3e4668d9c6e7876f7ea48119c94e098aef605836c866f8a475d81a15129d28b1
@@ -11,4 +12,5 @@ DIST amphetamine-0.8.10.tar.bz2 72324 BLAKE2B 39d8f56066e7fbad853198be28375dfe7e
 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-r2.ebuild 1236 BLAKE2B 38dd858e06b7261d05f872bca23f033a8e85dbb8dcb4b7663f28bad6fdea672a8256c57ffa1c38d5bf50914aa7de98b1892690bd2d8d145bb65848b27a1ca168 SHA512 156c108bb2d5f7a9202b8ceead2405115dd1bec1a5c8d4df20860caef3ec7e6d9e955040266372f4c6a45dc3eb4597f8c1ce67c4328fe7b3acd84ad645a1f262
+EBUILD amphetamine-0.8.10-r3.ebuild 1266 BLAKE2B 812409e95e2643bb2a82ef69d9c73391f7f51256756ad5581e03137712f18c863cbf7ffe5c5224ab5d015d887922f4c3bb7cdbc3a3b5c67919cb53ed32d7882f SHA512 7e988172467fc24d6778c8d4b22ea898858682212b6a5bb5e5e45fa9fd1d06029474d36cc02eada85e06294ec7639e1047399e3c8d4ef579d52ecb26cc5622a9
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/amphetamine/amphetamine-0.8.10-r3.ebuild b/games-arcade/amphetamine/amphetamine-0.8.10-r3.ebuild
new file mode 100644
index 000000000000..073cf4fa74e1
--- /dev/null
+++ b/games-arcade/amphetamine/amphetamine-0.8.10-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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://debian/pool/main/a/amphetamine-data/amphetamine-data_0.8.7.orig.tar.gz
+	https://dev.gentoo.org/~pacho/${PN}/${PN}.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+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
+	"${FILESDIR}"/${P}-format-string.patch
+
+	# From OpenBSD:
+	"${FILESDIR}"/${P}-SDL-conversions.patch
+	"${FILESDIR}"/${P}-clang.patch
+
+	"${FILESDIR}"/${P}-drop-register-keyword.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/*
+	doicon "${DISTDIR}/${PN}.png"
+	make_desktop_entry ${PN} Amphetamine ${PN}
+	einstalldocs
+}
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-drop-register-keyword.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-drop-register-keyword.patch
new file mode 100644
index 000000000000..1556f27850f6
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-drop-register-keyword.patch
@@ -0,0 +1,16 @@
+Bug: https://bugs.gentoo.org/895878
+--- a/src/Gifload.cpp
++++ b/src/Gifload.cpp
+@@ -149,9 +149,9 @@ Graphic_file *LoadGIF(FILE *fp, char *fname )
+ {
+ 	Graphic_file	*gfile;
+ 	int                filesize, numcols;
+-	register unsigned  char ch, ch1;
+-	register byte	*ptr, *ptr1;
+-	register int	i;
++	unsigned  char ch, ch1;
++	byte	*ptr, *ptr1;
++	int	i;
+ 	short transparency = -1;
+ 
+   BitOffset = 0;
diff --git a/games-arcade/blobwars/Manifest b/games-arcade/blobwars/Manifest
index 1f2605831a2d..a3337f94b79c 100644
--- a/games-arcade/blobwars/Manifest
+++ b/games-arcade/blobwars/Manifest
@@ -3,6 +3,5 @@ AUX blobwars-2.00-generic-name.patch 384 BLAKE2B 0f92ee3bc72ee41253eb0a0dfbb8b9b
 AUX blobwars-2.00-time_t.patch 505 BLAKE2B 930f8a7f113a362a71e3f866fd8ec60f0d241c6a1f3ca62da7ccccb581375d5bbf4ec0affb9a91cb23353eb90d496998581f7ed2a299d44c4aafd288001c1586 SHA512 98d67a91d9c4a69cbb76485e3a54ddbfbcb5d96d39cd542d2d84f6ec24d3f782fce9ce28c6c374d6b52d6d75f61c2f01a93fb792ad5bb845c093fb9da063d410
 AUX blobwars.appdata.xml 1309 BLAKE2B e7e895ceb16fde8f906c607bc3c92e4370bb130e2dfa4901d0545e9b000697e481c875f565933510a954386bd7a62447454d98aee0cb5abf556f394fcd61b78b SHA512 842aeb4a0582586eee556d900088cc0a4d71e673eb6be1d04e53dd1283e085b2865133e2ee178a9f93896bf303a8b8fbd9e91cd3f2be1e74d3d2469f253d7f03
 DIST blobwars-2.00.tar.gz 66982603 BLAKE2B 273b5eab5a569f7f4b78982499a85daf63e6fdfb7d4348290d64bbcbeb9be830bb7cf81a0a387df0daa176e7a2a82d62404e88c95f02d6af485bae054170ad38 SHA512 412afd029554e59e7947466f36b51ef863faf1712898397498d5497e9a38dced92777b7684c1fb231998d893a6ce2c435b8f4278429df41168385de8fa18725b
-EBUILD blobwars-2.00-r1.ebuild 1623 BLAKE2B 3a371f9fdf92e74ce16a1015539cce3d54d9d04f101730f60955ea9ac969c3c9082d81a6c8fdb20971e191b770ea1c999487ae3cdfefbb34496cd0da53a8a7e9 SHA512 3583e0bf45ad89bf6d0daac4184d56f8faf01ea215a0d135cc03b62de52ba9be1ab5b9e798405415ab8b0b62e6df063eb0db2e0dd29bc3e63ae0e982945d233a
 EBUILD blobwars-2.00-r2.ebuild 1886 BLAKE2B f46aca7268a31a3c8e40dd14cc8283418d71c66d7215aa68a9a984216e29d023140863b36b50b68862bbf5ee8e99cbfc181b58c31be6007921f9bbb9c48d0eac SHA512 2a92e005d059535ad9241e96f4ccd2aa0127208049b3b4fb850afa1e413570cab7de59c182e370446d12570856724532a8d7042b93acc5e09ae31cccf6daccc2
 MISC metadata.xml 395 BLAKE2B e917b2ded38274b75b636586c23153b55501bc70ceeb66b0aea6d70bd8304d9f7ac12fbe3a4ba3d918b4178d0b4a0562e5cebd1588b021c3e08ae7c159f6a23b SHA512 e126781d4c4f2a42882691105c350194092e2786accf9a3d7d3d3222704d544e78258891802210826dea41e68824d1a2f351035b7de45ec2f3d0bb9a473f60a7
diff --git a/games-arcade/blobwars/blobwars-2.00-r1.ebuild b/games-arcade/blobwars/blobwars-2.00-r1.ebuild
deleted file mode 100644
index 25c336a9794f..000000000000
--- a/games-arcade/blobwars/blobwars-2.00-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit xdg
-
-DESCRIPTION="Platform game about a blob and his quest to rescue MIAs from an alien invader"
-HOMEPAGE="https://sourceforge.net/projects/blobwars/ https://www.parallelrealities.co.uk/games/metalBlobSolid/ https://github.com/perpendicular-dimensions/blobwars"
-SRC_URI="https://downloads.sourceforge.net/blobwars/${P}.tar.gz"
-
-LICENSE="BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl2
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-	media-libs/sdl2-image
-	media-libs/sdl2-net
-	sys-libs/zlib
-	virtual/libintl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
-
-src_prepare() {
-	default
-
-	# Fixes from Fedora and OpenSuSE
-	sed -i -e 's|$(PREFIX)/games|$(PREFIX)/bin|;
-		s|$(PREFIX)/share/games|$(PREFIX)/share|;
-		s| -Werror||;
-		s|$(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)|$(CXX) $(GAMEOBJS) $(LIBS) -o $(PROG)|;
-		s|$(CXX) $(LIBS) $(PAKOBJS) -o pak|$(CXX) $(PAKOBJS) $(LIBS) -o pak|;
-		s|$(CXX) $(LIBS) $(MAPOBJS) -o mapeditor|$(CXX) $(MAPOBJS) $(LIBS) -o mapeditor|' \
-		Makefile || die
-	sed -i -e 's|gzclose(pak)|gzclose((gzFile)pak)|;
-		s|gzclose(fp)|gzclose((gzFile)fp)|' src/pak.cpp || die
-}
-
-src_compile() {
-	# USEPAK=1 breaks music
-	emake \
-		RELEASE="1" \
-		USEPAK="0"
-}
-
-src_install() {
-	emake \
-		BINDIR="/usr/bin/" \
-		USEPAK="0" \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}/html/" \
-		install
-
-	mv -vf \
-		"${D}"/usr/share/doc/${PF}/html/{changes,hacking,porting,readme} \
-		"${D}"/usr/share/doc/${PF}/
-}