[gentoo-commits] repo/proj/guru:master commit in: games-emulation/melonds/

["Andrew Ammerlaan" <andrewammerlaan@riseup.net>]

commit:     2d49a493401a1471868b5731983efd51ff8a73f5
Author:     Anna Vyalkova <cyber <AT> sysrq <DOT> in>
AuthorDate: Sun May 16 19:23:10 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun May 16 20:18:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2d49a493

games-emulation/melonds: add USE flags

Other changes:
* removed unneeded dependencies
* added licenses for bundled deps

Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in>

 games-emulation/melonds/melonds-0.9.2.ebuild | 23 +++++++++++++----------
 games-emulation/melonds/melonds-9999.ebuild  | 23 ++++++++++++-----------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/games-emulation/melonds/melonds-0.9.2.ebuild b/games-emulation/melonds/melonds-0.9.2.ebuild
index 46d1babd9..81582477d 100644
--- a/games-emulation/melonds/melonds-0.9.2.ebuild
+++ b/games-emulation/melonds/melonds-0.9.2.ebuild
@@ -23,26 +23,21 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-LICENSE="GPL-3"
+IUSE="+jit +opengl"
+LICENSE="BSD-2 GPL-2 GPL-3 Unlicense"
 SLOT="0"
 
 DEPEND="
 	app-arch/libarchive
 	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	media-libs/libepoxy
 	media-libs/libsdl2[sound,video]
-	net-libs/gnutls
-	net-libs/libpcap
 	net-libs/libslirp
-	net-misc/curl
-	x11-libs/cairo
-"
-RDEPEND="
-	${DEPEND}
+	net-libs/libpcap
+	opengl? ( media-libs/libepoxy )
 "
+RDEPEND="${DEPEND}"
 
 # used for JIT recompiler
 QA_EXECSTACK="usr/bin/melonDS"
@@ -51,6 +46,14 @@ src_prepare() {
 	cmake_src_prepare
 }
 
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_JIT=$(usex jit)
+		-DENABLE_OGLRENDERER=$(usex opengl)
+	)
+	cmake_src_configure
+}
+
 src_compile() {
 	tc-export AR
 	cmake_src_compile

diff --git a/games-emulation/melonds/melonds-9999.ebuild b/games-emulation/melonds/melonds-9999.ebuild
index 9113b2611..81582477d 100644
--- a/games-emulation/melonds/melonds-9999.ebuild
+++ b/games-emulation/melonds/melonds-9999.ebuild
@@ -23,33 +23,34 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-LICENSE="GPL-3"
+IUSE="+jit +opengl"
+LICENSE="BSD-2 GPL-2 GPL-3 Unlicense"
 SLOT="0"
 
 DEPEND="
 	app-arch/libarchive
 	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	media-libs/libepoxy
 	media-libs/libsdl2[sound,video]
-	net-libs/gnutls
-	net-libs/libpcap
 	net-libs/libslirp
-	net-misc/curl
-	x11-libs/cairo
-"
-RDEPEND="
-	${DEPEND}
+	net-libs/libpcap
+	opengl? ( media-libs/libepoxy )
 "
+RDEPEND="${DEPEND}"
+
+# used for JIT recompiler
+QA_EXECSTACK="usr/bin/melonDS"
 
 src_prepare() {
 	cmake_src_prepare
 }
 
 src_configure() {
-	append-ldflags -Wl,-z,noexecstack
+	local mycmakeargs=(
+		-DENABLE_JIT=$(usex jit)
+		-DENABLE_OGLRENDERER=$(usex opengl)
+	)
 	cmake_src_configure
 }