[gentoo-commits] repo/gentoo:master commit in: games-puzzle/xpired/

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/xpired/

[Michael Sterrett]

commit:     2ee6d7cd9363b774760ede1f47e2dd294f3d944d
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 02:26:57 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 02:27:14 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee6d7cd

use epatch to apply patch

Package-Manager: portage-2.2.20.1

 games-puzzle/xpired/xpired-1.22.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/games-puzzle/xpired/xpired-1.22.ebuild b/games-puzzle/xpired/xpired-1.22.ebuild
index 1db2245..856283b 100644
--- a/games-puzzle/xpired/xpired-1.22.ebuild
+++ b/games-puzzle/xpired/xpired-1.22.ebuild
@@ -17,11 +17,13 @@ IUSE=""
 DEPEND="media-libs/sdl-gfx
 	media-libs/sdl-image[jpeg]
 	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
 
 S=${WORKDIR}/src
 
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
 
 src_compile() {
 	emake \

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/xpired/

[James Le Cuirot]

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