gentoo auto-resync : 21:06:2024 - 00:11:18

3 files changed, 49 insertions, 43 deletions

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
+}