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

[Maciej Barć]

commit:     b85c9fc44e30d8abd63cb0787861a06236311307
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  4 01:16:47 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Fri Nov  4 01:16:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b85c9fc4

games-emulation/melonds: sync live

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 games-emulation/melonds/melonds-9999.ebuild | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/games-emulation/melonds/melonds-9999.ebuild 
b/games-emulation/melonds/melonds-9999.ebuild
index b3dda3e20a91..c5383c9da154 100644
--- a/games-emulation/melonds/melonds-9999.ebuild
+++ b/games-emulation/melonds/melonds-9999.ebuild
@@ -9,27 +9,28 @@ MY_P="${MY_PN}-${PV}"
 inherit cmake flag-o-matic readme.gentoo-r1 toolchain-funcs xdg
 
 DESCRIPTION="Nintendo DS emulator, sorta"
-HOMEPAGE="
-       http://melonds.kuribo64.net
-       https://github.com/Arisotura/melonDS
-"
+HOMEPAGE="http://melonds.kuribo64.net
+       https://github.com/Arisotura/melonDS";
 
-if [[ "${PV}" == *9999* ]]; then
+if [[ ${PV} == *9999* ]] ; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/Arisotura/${MY_PN}.git";
 else
-       SRC_URI="https://github.com/Arisotura/${MY_PN}/archive/${PV}.tar.gz -> 
${MY_P}.tar.gz"
+       SRC_URI="https://github.com/Arisotura/${MY_PN}/archive/${PV}.tar.gz
+               -> ${MY_P}.tar.gz"
+       S="${WORKDIR}"/${MY_P}
        KEYWORDS="~amd64"
-       S="${WORKDIR}/${MY_P}"
 fi
 
 IUSE="+jit +opengl"
 LICENSE="BSD-2 GPL-2 GPL-3 Unlicense"
 SLOT="0"
 
-DEPEND="
+# MelonDS bundles libteakra with many changes,
+# for now we have to block dev-libs/teakra
+RDEPEND="
+       !dev-libs/teakra
        app-arch/libarchive
-       dev-libs/teakra
        dev-qt/qtcore:5
        dev-qt/qtgui:5
        dev-qt/qtnetwork:5
@@ -39,7 +40,7 @@ DEPEND="
        net-libs/libslirp
        opengl? ( media-libs/libepoxy )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 # used for JIT recompiler
 QA_EXECSTACK="usr/bin/melonDS"
@@ -74,8 +75,10 @@ src_compile() {
 }
 
 src_install() {
-       cmake_src_install
        readme.gentoo_create_doc
+       cmake_src_install
+
+       dolib.so "${BUILD_DIR}"/src/teakra/src/libteakra.so
 }
 
 pkg_postinst() {