7 files changed, 101 insertions, 87 deletions
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index ad3558a3067a..fb2bc7ade20e 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/sdl-jewels/Manifest b/games-puzzle/sdl-jewels/Manifest
index e8469563db72..2c55a599bfa9 100644
--- a/games-puzzle/sdl-jewels/Manifest
+++ b/games-puzzle/sdl-jewels/Manifest
@@ -1,4 +1,4 @@
 AUX sdl-jewels-1.1.1-Makefile.patch 488 BLAKE2B 95eceefb92d28c8968790c7b2b3954d957bc2f59a0764efb66aea618b6db0f01272a2bf7a56a6789b601e2e76a6f96497074a8c4689e924c5f08a7bd7ebb2317 SHA512 9d83dea588f699ef09f89ed320bece1bb001ee0a1bfa4d3e4d4b8c679af9b2028d535469c078f387564b37a16ee0e76f3e9cf20a4248784bf322ac902aa03f26
 DIST SDL_jewels-1.1.1.tgz 195366 BLAKE2B 4f8e3c85b8d6cc6388846fe3783cc3fed3cf1901a57788c8ebd62473ac3f0635eaf0f3f1017a06961706ec3143f8807b8170dc0a715b570e44c66a578eb7dae3 SHA512 720f1d89384bf267e8f5441efd70fcf94bfc89ddbd0ff90b1dafc6381e83e005281fcde256ee4cd0645f2832cf9c22aed487c105d7d9cf39711c5752e12763c4
-EBUILD sdl-jewels-1.1.1-r1.ebuild 968 BLAKE2B b2377f0968329902e5397f91d65978a933d6c8df57498165f6aca1c535907b1bb7d5faef0952232c6d71ef2c4dd099330a4fdb856a138e5dd0a7a6832d1c240e SHA512 50381f1020f1b8037ecfc9ac099e44c8850ecde13ce9aae6f5f45fe758d23b4399865dd7ea8a9470b5262d5f6b786c79463e8a6bdebfc8b5a27d52b9494545ae
+EBUILD sdl-jewels-1.1.1-r2.ebuild 1057 BLAKE2B ba938386280809e606f21a5ea7b523a734914af83d7a893ae4dd7943d0b203d7262cc202716b62127a1b2ee6229e9369994e7789104582f4ef174f5cef59cd38 SHA512 df5c399c9e1cc347bece6368b7c0b9adfa94c93f37117073078473087d9e5a28d6e24c423e34f8ea496b5cf2579b11988eb5bcaaae8759cf509fc20c40b00ba5
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild
deleted file mode 100644
index e9f6f0422ae1..000000000000
--- a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop vcs-clean
-
-DESCRIPTION="Swap and match 3 or more jewels in a line in order to score points"
-HOMEPAGE="http://www.linuxmotors.com/gljewel/"
-SRC_URI="http://www.linuxmotors.com/gljewel/downloads/SDL_jewels-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="
-	media-libs/libsdl[opengl,video]
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/SDL_jewels-${PV}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${P}-Makefile.patch"
-
-	# fix the data dir locations as it looks to be intended to run from src dir
-	sed -i -e "s|\"data\"|\"/usr/share/${PN}\"|" sound.c || die
-	sed -i -e "s|data/bigfont.ppm|/usr/share/${PN}/bigfont.ppm|" gljewel.c || die
-	ecvs_clean
-}
-
-src_install() {
-	dobin gljewel
-
-	insinto "/usr/share/${PN}"
-	doins -r data/*
-
-	einstalldocs
-	make_desktop_entry gljewel SDL_jewels
-}
diff --git a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r2.ebuild b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..f2b8a57c8bd5
--- /dev/null
+++ b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs vcs-clean
+
+DESCRIPTION="Swap and match 3 or more jewels in a line in order to score points"
+HOMEPAGE="https://www.linuxmotors.com/linux/gljewel/"
+SRC_URI="https://www.linuxmotors.com/linux/gljewel/downloads/SDL_jewels-${PV}.tgz"
+S="${WORKDIR}/SDL_jewels-${PV}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	media-libs/libsdl[opengl,video]
+	media-libs/libglvnd[X]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+)
+
+src_prepare() {
+	default
+
+	# fix the data dir locations as it looks to be intended to run from src dir
+	sed -i -e "s|\"data\"|\"${EPREFIX}/usr/share/${PN}\"|" sound.c || die
+	sed -i -e "s|data/bigfont.ppm|${EPREFIX}/usr/share/${PN}/bigfont.ppm|" gljewel.c || die
+	ecvs_clean
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin gljewel
+
+	insinto /usr/share/${PN}
+	doins -r data/*
+
+	einstalldocs
+	make_desktop_entry gljewel SDL_jewels
+}
diff --git a/games-puzzle/xpired/Manifest b/games-puzzle/xpired/Manifest
index f927b5ffce5e..beab2370b04a 100644
--- a/games-puzzle/xpired/Manifest
+++ b/games-puzzle/xpired/Manifest
@@ -1,4 +1,4 @@
 AUX xpired-1.22-ldflags.patch 868 BLAKE2B 8230de4bfae81985ed37abb2c3810df680c64957411c0fa77c83d60581a373f2c85674bcbb5d4fd6070108981d76f6f2802fc5b191cdd8aa606f3f21df48d791 SHA512 81987d60466c459a98ac03b8f4bdf8da7c6004a716a83051b58ec35657ab3a93672305ff9a8edcf9e056784919c9ea235f81c71176bf6d4b75d5dabc72b1b7f9
 DIST xpired-1.22-linux_source.tar.gz 478593 BLAKE2B 54ee871017e39bd599a1e5e13df282d309d4ef9c91c7bf1e6eab31cd83d5f2bb4d31d9c08df091796d9f61f55eb0d54e9745b8162f9e9116eeac98d7c49b0f9d SHA512 08e506e6206be9346bde083a9cdd25a890c0100826a7fb2b515b60180cfd0b885712261db2e7a5d589078c0b74f2b9ad659b39d9378cb3dc92af111ab499ee10
-EBUILD xpired-1.22-r1.ebuild 876 BLAKE2B 409642f3a3b40b992ef80c265a9e64ed49c296fdbb193bf2644bf766a3d95847ea00d3651dac3c7bab2e7cba10dbaea9b0f7f0b17df3443799de75cb1cf30e92 SHA512 57ddc6d8e5a605bdd410107d5dc2f8253d0dd7203802463b985d3d5eccd84af38227f7281e1be97c49562cb5173ae1d045fd0b58cb17b05d9f244349c0b527d2
+EBUILD xpired-1.22-r2.ebuild 1001 BLAKE2B debea5ecb77294ccb59e0b645ff07b3b62944e756929451879665dfe15c71e4ec6af09a09d7c6367decf74707564f5530f157d7ee2386f32c4cd4fb66f866032 SHA512 fda9f1ed08ef284be762595fd7f3186c84f5711f37c9500f26490bef419ee819804e0c587d5cff39dc5bf7c96a8c197339bce70298377624f133072ec69471f5
 MISC metadata.xml 330 BLAKE2B f71e4ff9b7904fb681900d015703e5332f708644c1d1620b47f6357761b933c1864936039c8fdbbc8e6034387fee5cb87fc61c3559f1244238db3806a0db5696 SHA512 9e442b200bd6e64c372097344c228d30ebe3fa2ba74d71c64793dedb0271b9a47f4cdd48e1b13365093de82efbc784f913183b57d13a287c14c8ce71fbfe924d
diff --git a/games-puzzle/xpired/xpired-1.22-r1.ebuild b/games-puzzle/xpired/xpired-1.22-r1.ebuild
deleted file mode 100644
index 8fb097ba0442..000000000000
--- a/games-puzzle/xpired/xpired-1.22-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Sokoban-styled puzzle game with lots more action"
-HOMEPAGE="https://xpired.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/xpired/${P}-linux_source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/sdl-gfx
-	media-libs/sdl-image[jpeg]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/src"
-
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		SHARE_PREFIX=/usr/share/xpired
-}
-
-src_install() {
-	emake \
-		PREFIX="${D}/usr" \
-		SHARE_PREFIX="${D}/usr/share/${PN}" \
-		install
-
-	newicon img/icon.bmp ${PN}.bmp
-	make_desktop_entry xpired Xpired /usr/share/pixmaps/${PN}.bmp
-	make_desktop_entry xpiredit "Xpired Level Editor"
-
-	einstalldocs
-}
diff --git a/games-puzzle/xpired/xpired-1.22-r2.ebuild b/games-puzzle/xpired/xpired-1.22-r2.ebuild
new file mode 100644
index 000000000000..c5ac92ffb8aa
--- /dev/null
+++ b/games-puzzle/xpired/xpired-1.22-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Sokoban-styled puzzle game with lots more action"
+HOMEPAGE="https://www.online-siesta.com/game/x-pired/"
+SRC_URI="https://downloads.sourceforge.net/xpired/${P}-linux_source.tar.gz"
+S="${WORKDIR}/src"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	media-libs/libsdl[video]
+	media-libs/sdl-gfx
+	media-libs/sdl-image[jpeg]
+	media-libs/sdl-mixer[mod]
+"
+
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		SHARE_PREFIX="${EPREFIX}/usr/share/${PN}" \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install \
+		PREFIX="${ED}/usr" \
+		SHARE_PREFIX="${ED}/usr/share/${PN}"
+
+	newicon img/icon.bmp ${PN}.bmp
+	make_desktop_entry ${PN} X-pired /usr/share/pixmaps/${PN}.bmp
+	make_desktop_entry ${PN}it "X-pired Level Editor" /usr/share/pixmaps/${PN}.bmp
+
+	einstalldocs
+}