games-puzzle/wizznic: Bump to 400, fix prefix, make OpenGL optional, EAPI 8

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

3 files changed, 49 insertions, 50 deletions

diff --git a/games-puzzle/wizznic/Manifest b/games-puzzle/wizznic/Manifest
index 4c6d2ef908ab..9af9e7111b55 100644
--- a/games-puzzle/wizznic/Manifest
+++ b/games-puzzle/wizznic/Manifest
@@ -1 +1 @@
-DIST Wizznic_src_build_369.tar.bz2 38118227 BLAKE2B 2d48a53ab715a25b7f1b2c4e8c01935084cd44a99e1a6ded6c421f507f55961e8ebe5df6ea2b912c1be8ee8a82285376673114f3af0c1df9ec0ae1042e2f6145 SHA512 61c6ced873403bbd14e8c376321ae0c92a7333bb59409615de1e1305da3e4b3cb023af36e002d732877fd1371a322796df3e4050e5afe699e03f01039d7f7ead
+DIST Wizznic_src_build_400.tar.bz2 38064791 BLAKE2B b80f1c3b49618b05a274ed8c29306d7e2ecaac599c5bcef881f10fcb5844e542b0125380fd359e25def195cca29b24aa4550fb48999b797171bcc65038a7ef43 SHA512 bdbfabebf9aedcb81b5e01e9580c27e644a652351de1384839e5013598202e7c74c7a72e571a99193184a0689e89a1170dc18ca70e1e4107a83a5572992ca73a
diff --git a/games-puzzle/wizznic/wizznic-369-r1.ebuild b/games-puzzle/wizznic/wizznic-369-r1.ebuild
deleted file mode 100644
index e1446c75a01f..000000000000
--- a/games-puzzle/wizznic/wizznic-369-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Block-clearing puzzle game"
-HOMEPAGE="http://wizznic.org/"
-SRC_URI="https://downloads.sourceforge.net/wizznic/Wizznic_src_build_${PV}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,joystick,opengl,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/Wizznic_src_build_${PV}"
-
-src_prepare() {
-	default
-	sed \
-		-e '/^\(CC\|LD\|STRIP\)/d' \
-		-e 's/(LD)/(CC)/g' \
-		-e '/CFLAGS.*=/d' \
-		Makefile.linux > Makefile || die
-}
-
-src_compile() {
-	emake \
-		DATADIR="/usr/share/${PN}/" \
-		BINDIR="/usr/bin" \
-		STRIP=true
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		DATADIR="/usr/share/${PN}/" \
-		BINDIR="/usr/bin" \
-		install
-	dodoc doc/{changelog.txt,credits.txt,media-licenses.txt,ports.txt,readme.txt}
-	newicon data/wmicon.png ${PN}.png
-	make_desktop_entry wizznic "Wizznic!"
-}
diff --git a/games-puzzle/wizznic/wizznic-400.ebuild b/games-puzzle/wizznic/wizznic-400.ebuild
new file mode 100644
index 000000000000..9e5e1d49a3c8
--- /dev/null
+++ b/games-puzzle/wizznic/wizznic-400.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 xdg
+
+DESCRIPTION="Block-clearing puzzle game"
+HOMEPAGE="http://wizznic.org/"
+SRC_URI="https://downloads.sourceforge.net/wizznic/Wizznic_src_build_${PV}.tar.bz2"
+S="${WORKDIR}/Wizznic_src_build_${PV}"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl"
+
+DEPEND="
+	media-libs/libsdl[sound,joystick,opengl?,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	opengl? ( media-libs/libglvnd[X] )
+"
+
+RDEPEND="
+	${DEPEND}
+"
+
+src_compile() {
+	emake -f Makefile.linux \
+		DATADIR="${EPREFIX}/usr/share/${PN}/" \
+		WITH_OPENGL=$(usex opengl true false) \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -Wall -std=c99" \
+		LDFLAGS="${LDFLAGS}" \
+		STRIP=true
+}
+
+src_install() {
+	emake -f Makefile.linux \
+		DESTDIR="${ED}" \
+		DATADIR="/usr/share/${PN}/" \
+		BINDIR="/usr/bin" \
+		install
+
+	dodoc doc/{changelog,credits,media-licenses,ports,readme}.txt
+	newicon -s 32 data/wmicon.png ${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+}