diff --git a/games-emulation/blastem/Manifest b/games-emulation/blastem/Manifest
index ab00b36..ac57596 100644
--- a/games-emulation/blastem/Manifest
+++ b/games-emulation/blastem/Manifest
@@ -1,4 +1 @@
-DIST blastem-0.6.3_pre20231207.tar.bz2 1303557 BLAKE2B faefa686eb5c0f3b81b3c563c251c372feac0744cbbd9b624c912a8d9dce7c8bdb9952c1922cbd2fba45179a327aba3e7eb5673caf8e32dc94b581580d5e4bcd SHA512 d67484a4434c208bf7a74de64103ab7f88b5e754c5a7c1b9ab2b24bccaa2e9c000c40c2f860e14e88c861d89cf4541fa924534d0bc80f87230536cd6ff5096a5
 DIST blastem-0.6.3_pre20240428.tar.bz2 1331422 BLAKE2B f3ead06183b9edb167f700c8d52483fb939e58cfef6de67e2d15ca35d0ec09fa08d410a2d762a07b648f6225eb4e707d5893b3c4c7a7de40588ff4324474886f SHA512 2660defc587209735da48fa1c234f2f53a8fe3124877e11df71b0241b1439ee93640bba1406c1db1ecbc97de40dcc9eb45318da78ae1770e4fb7e39ec696f22a
-EBUILD blastem-0.6.3_pre20231207.ebuild 1086 BLAKE2B 3a948d9ffe6a4a4c2e1230d248060c467f0463ffbccb5bf7a63bcd4cea37bbc5022cba73da5206c84211041937838f44a49b9dd85bb3f776072f4cef055c3413 SHA512 d80c46947ff6ffb02fc73a4b780a3f00e91b44a4cc70223aa209aaed48388f52d0b9bd1fd33895884c9d47980f1e2ead89673f34888f0789adc83230d4a8841a
-EBUILD blastem-0.6.3_pre20240428.ebuild 1086 BLAKE2B dfd26c6af1c1fa55ac0313763c455c838128d9df3eab2fa91d715d975d4210f3076dc3367aea5bb4271d63d6f7b7fffb96740bf3ceb97dd4c2210f50f23513b1 SHA512 0afa18d653469aba2f32bd18a2420242ef19fb1c5d67caf6506b70baf6db031efd0226fd9712427f978497928b4b76283e72773d68b2bc18e507867c66d38e75
diff --git a/games-emulation/blastem/blastem-0.6.3_pre20231207.ebuild b/games-emulation/blastem/blastem-0.6.3_pre20231207.ebuild
deleted file mode 100644
index ff98346..0000000
--- a/games-emulation/blastem/blastem-0.6.3_pre20231207.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop toolchain-funcs xdg-utils
-
-COMMIT_ID="340299a76db7"
-
-DESCRIPTION="The fast and accurate Genesis emulator"
-HOMEPAGE="https://www.retrodev.com/blastem/"
-SRC_URI="https://www.retrodev.com/repos/blastem/archive/${COMMIT_ID}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	media-libs/glew
-	media-libs/libsdl2
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${PN}-${COMMIT_ID}"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		OPT="${CFLAGS} ${LDFLAGS}" \
-		HOST_ZLIB=1 \
-		CONFIG_PATH="/usr/share/games/${PN}" \
-		DATA_PATH="/usr/share/games/${PN}"
-}
-
-src_install() {
-	dobin blastem
-
-	insinto "/usr/share/games/${PN}"
-	doins -r shaders images default.cfg rom.db gamecontrollerdb.txt
-
-	newicon "${S}/android/res/drawable-xxhdpi/ic_launcher.png" ${PN}.png
-	make_desktop_entry "${PN}" 'BlastEm' "${PN}" 'Game;Emulator'
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/games-emulation/blastem/blastem-0.6.3_pre20240428.ebuild b/games-emulation/blastem/blastem-0.6.3_pre20240428.ebuild
index 10bfc8d..e9671e7 100644
--- a/games-emulation/blastem/blastem-0.6.3_pre20240428.ebuild
+++ b/games-emulation/blastem/blastem-0.6.3_pre20240428.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,27 +11,38 @@ DESCRIPTION="The fast and accurate Genesis emulator"
 HOMEPAGE="https://www.retrodev.com/blastem/"
 SRC_URI="https://www.retrodev.com/repos/blastem/archive/${COMMIT_ID}.tar.bz2 -> ${P}.tar.bz2"
 
+S="${WORKDIR}/${PN}-${COMMIT_ID}"
+
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+IUSE="+opengl +system-zlib"
+
 DEPEND="
-	media-libs/glew
+	opengl? ( media-libs/glew )
 	media-libs/libsdl2
 	sys-libs/zlib
 "
 RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${PN}-${COMMIT_ID}"
 
 src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		OPT="${CFLAGS} ${LDFLAGS}" \
-		HOST_ZLIB=1 \
-		CONFIG_PATH="/usr/share/games/${PN}" \
+	local myemakeargs=(
+		CC="$(tc-getCC)"
+		OPT="${CFLAGS} ${LDFLAGS}"
+		CONFIG_PATH="/usr/share/games/${PN}"
 		DATA_PATH="/usr/share/games/${PN}"
+	)
+
+	if ! use opengl; then
+		myemakeargs+=("NOGL=1")
+	fi
+
+	if use system-zlib; then
+		myemakeargs+=("HOST_ZLIB=1")
+	fi
+
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
diff --git a/games-emulation/blastem/metadata.xml b/games-emulation/blastem/metadata.xml
new file mode 100644
index 0000000..5fbaaf1
--- /dev/null
+++ b/games-emulation/blastem/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>david.guglielmi@gmail.com</email>
+		<name>David GUGLIELMI</name>
+	</maintainer>
+	<use>
+		<flag name="system-zlib">Use system <pkg>sys-libs/zlib</pkg></flag>
+	</use>
+</pkgmetadata>