commit:     b5417ad45a40bb48426c2d4201ca04c6b873f78b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 22:11:01 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 22:11:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5417ad4

games-puzzle/xpired: Fix prefix, fix deps, EAPI 8

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-puzzle/xpired/xpired-1.22-r1.ebuild | 42 ---------------------------
 games-puzzle/xpired/xpired-1.22-r2.ebuild | 48 +++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 42 deletions(-)

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

Reply via email to