7 files changed, 83 insertions, 82 deletions
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index f54bd0a94abf..ad3558a3067a 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/wakkabox/Manifest b/games-puzzle/wakkabox/Manifest
index 07fbd246c03b..9df660369f62 100644
--- a/games-puzzle/wakkabox/Manifest
+++ b/games-puzzle/wakkabox/Manifest
@@ -1,4 +1,4 @@
 AUX wakkabox-1.1.0-gentoo.patch 1768 BLAKE2B 57fc63581b1fecaf579fc70cee8a693c4c55a27c19afe85442e3a36b5d7fcf693dba91ff4cf52ab5f21813f15250abc3352930c333636780f0ff9c478b255c32 SHA512 28c261d77372ffad9815dc6d40118595d7896bafb352237ce708f028ac50ae0530d5a61f75ece36c35ec7f041da9979c9cfa37c19dae1e83ef9ddb34ffa4bf94
 DIST wakkabox-1.1.0.tar.gz 158231 BLAKE2B f756cf98135591dbae60f00a4e85f4286204f0206196b032c2ac547ae5f1259a4b228f673aed047a8848a6500abaccc0ea69f8eb47e1950309fadc9738e684da SHA512 a97fcf382c3703fa59d6c2159397cb795b698d2a28253a7e60690b24b3d72b4950b9a7c569600bac0dc637b9d9a52577a45944036518cf5e79c601b377a092be
-EBUILD wakkabox-1.1.0-r1.ebuild 613 BLAKE2B ac2beb4615cbb105771f47ad5a719acb72dab76cf9a440422fb2aa86392c1c745f7e3476050055b3234e283feef0daa5a718b4c9235adffbf8a78bfbc8307c21 SHA512 98d132cf9f39b470f20accdaa35fefb3b558776bc362e923b350cfa78c82b7914876b877e64f9b72bfccd4f35be507d3f01ab944a3274dd5557ab6e6c49bd800
+EBUILD wakkabox-1.1.0-r2.ebuild 610 BLAKE2B 848fecad9695103de14b71af60a77d275823f578acda4762fdd70577b0676034c4df57a0043a18b02e1e5a9fd0d65cccccca3342db7b247523b008c29b0cf085 SHA512 16c09203c208b19f9220b2a46e18bd7be98503d592d99145221ade9d07323739a43fd7e65f93c3aa1ab873f70f6fbec253f72560e7ba0c4906cfde813481d296
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild b/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild
deleted file mode 100644
index a04dd8404b70..000000000000
--- a/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="A simple block-pushing game"
-HOMEPAGE="http://kenn.frap.net/wakkabox/"
-SRC_URI="http://kenn.frap.net/wakkabox/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.0.1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-	rm aclocal.m4
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon bigblock.bmp ${PN}.bmp
-	make_desktop_entry ${PN} "Wakkabox" /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-puzzle/wakkabox/wakkabox-1.1.0-r2.ebuild b/games-puzzle/wakkabox/wakkabox-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..ea075d716b7c
--- /dev/null
+++ b/games-puzzle/wakkabox/wakkabox-1.1.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg
+
+DESCRIPTION="A simple block-pushing game"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-libs/libsdl[video]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	rm aclocal.m4 || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	newicon bigblock.bmp ${PN}.bmp
+	make_desktop_entry ${PN} ${PN^} /usr/share/pixmaps/${PN}.bmp
+}
diff --git a/games-puzzle/wizznic/Manifest b/games-puzzle/wizznic/Manifest
index bdcc4c472bc5..0c589cef158b 100644
--- a/games-puzzle/wizznic/Manifest
+++ b/games-puzzle/wizznic/Manifest
@@ -1,3 +1,3 @@
-DIST Wizznic_src_build_369.tar.bz2 38118227 BLAKE2B 2d48a53ab715a25b7f1b2c4e8c01935084cd44a99e1a6ded6c421f507f55961e8ebe5df6ea2b912c1be8ee8a82285376673114f3af0c1df9ec0ae1042e2f6145 SHA512 61c6ced873403bbd14e8c376321ae0c92a7333bb59409615de1e1305da3e4b3cb023af36e002d732877fd1371a322796df3e4050e5afe699e03f01039d7f7ead
-EBUILD wizznic-369-r1.ebuild 1038 BLAKE2B 86d7af3d7eeca6327276da05e4eaee8510601c4561c849274993496df7cfa3400798696c5338145ecfa90b86c7ec44a332b39dbf0a4a29a035dc0ae88068614e SHA512 79aed3706239ff120e5031666d8875912e78a7dc145ed1a553e5b8f67ade2bc15fa8c6bc4eb1630d69aa89608fae964c8ffc9676ba587d595a3237ae41857b7a
+DIST Wizznic_src_build_400.tar.bz2 38064791 BLAKE2B b80f1c3b49618b05a274ed8c29306d7e2ecaac599c5bcef881f10fcb5844e542b0125380fd359e25def195cca29b24aa4550fb48999b797171bcc65038a7ef43 SHA512 bdbfabebf9aedcb81b5e01e9580c27e644a652351de1384839e5013598202e7c74c7a72e571a99193184a0689e89a1170dc18ca70e1e4107a83a5572992ca73a
+EBUILD wizznic-400.ebuild 1081 BLAKE2B f773b6862b92632fa76034292d3ad9d8df9ead6d2746e3d78eef9b6b174432f9a5df1fb47700c3df856895129578ea7404192cd95d99a7f3731eb081a3534177 SHA512 ac6f6302d56e24bfc5d3d0a4769215230f0dc23d7d2e7b84281412cd102a453b04b0633bcb5914e686397826a0b369a98fd6c251a331dbe01fbfee57e75a67cf
 MISC metadata.xml 331 BLAKE2B 3209331853c901fb5adef2d3cc667b7bed0e22c4f8963e8e9961038e5566cb9126a06d60c4ae54c4396a284ab333e8d6f5156b75089fd7540aee5409c80f2274 SHA512 ef00f84e659ee51d028292846b5f66d68a72ad96d380517ef1f895269e15fbd2e962f30bed53bfd4b30482055d4785225d79a621b9d31c06ad8683a4f6f50bc2
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^}
+}