gentoo auto-resync : 04:11:2022 - 03:13:18

4 files changed, 104 insertions, 12 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index df0c9b985be1..55fa148d086d 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/melonds/Manifest b/games-emulation/melonds/Manifest
index 11951f1888cd..eaf5e26ad711 100644
--- a/games-emulation/melonds/Manifest
+++ b/games-emulation/melonds/Manifest
@@ -1,7 +1,9 @@
 AUX melonds-system-teakra.patch 492 BLAKE2B 56c7a55ee08c79b9468f62b676f0e97f443b065577cb6053167be04aaf03aa2a656d0c60a877a05500ec7a596368900806817d05dc2a1f652b8562fad8c8ae43 SHA512 7f2c1d8fdda5ac76a6b9311bb002a0544ef6d8863b62b77d9806fe73b64218353aaad5aa808a2de8d10870054f0eb968b05520dac22eb8d311711e7f65fbeced
 DIST melonDS-0.9.3.tar.gz 2241325 BLAKE2B 0ea7fbcce039a60a0553ae45d11f0b1550bfec2300faf1c99c3ee531bd5949c7293bec187fbf53e400bbb6280df29db141b2d1bcb294a8abf2eabb71993db686 SHA512 37f26f3a9784873ce1664645cea70049725367f5fe62f7c58842ebd5da2c73ffe423695dddb0ffd444bdf59df2a3fcd778cdf95b2bb083014b961fed282953f5
 DIST melonDS-0.9.4_p1.tar.gz 2330696 BLAKE2B f118d067505d740fef2c9f3a7761580981d43c6c63f9bfb34f48cbc5c6932e5410ee31259845787262412b040a66c85cdd4298645e2060fc6c8821a89b314711 SHA512 76886ecfbabd00ae9261c33fcd4074b20e989f4357575bf68139538136fb0ba728d7590310ce4ae9c45670ee01ec315046f03f54e7ca9a359be202709b030f6d
+DIST melonDS-0.9.5.tar.gz 2496704 BLAKE2B ac6b75a74df266c6220a15c8775969f19bd6ef19946c913d49b642aa797ca6dc4cd956e7a840fbdbf572a9178a214314549cfe3fc4617a4f0f3877850c6818cd SHA512 115cf04e4e22a20016ac4f2946aef917e5c9566b1a5f18599f7b7c47b0ac71e3645157a8a21622ab83683848c57ab25e6d6fcff0df559087b56642d99ffe40ec
 EBUILD melonds-0.9.3-r2.ebuild 1678 BLAKE2B af9e763020cb2838ffd5db22a8bfd47fcd7d07611c7c37faa39e117f15c8bbf49a9dd1571ee489dc4d906e1b26c7c8d4464cb1ad6d2dd1a784020ceccc73dd4e SHA512 3b556aa85dcbf19c1b8fa0aa2109a4ff1b2ac75964243ce71427dae8bf119c442b67efbe77d6915c32c2a08bdb1e47ecf287936eb0d1cc90515c549223a1a689
 EBUILD melonds-0.9.4_p1-r1.ebuild 1694 BLAKE2B 6e1e6c4f91f0deab914fac2f6f33cff76d3eff1c24b2630f1cb3289c989c597edf5b5691de68f8cac00c68b7a9f7015c0802b27d7dbe0adc311e54de1973cdf1 SHA512 433d14f08edf0724afb25a3ab90759a0b843ddb28f108c7aa5b709549e019318e9be3c648ccb9271bad17be04862ba6b9f7f5befbd88adf5ba72f717f9f82348
-EBUILD melonds-9999.ebuild 1595 BLAKE2B 06caca14e49f977037c752cc61ef344f03261246b393f5fbedcf6e9e56921087b65c094a42036da1590fccb2ad1a3ea7cb43023c5c0e77a34d33ea416bef9dbc SHA512 32f61f44b8fd0913440b59d066a892ecc53116e0db4a3c0496bc2c90db5a1d413ef5bd36c1e9a6b78ba991f0e816eb28b4f7a9a217c7505b496f3a6090f63bc6
+EBUILD melonds-0.9.5.ebuild 1739 BLAKE2B 6b01ba2bf06dfbd21dc4921439b96ce668e99888c84d0fa61c457ad765426fce1987cc14c2ff46a630085a188be85f140cf309dccf2ff687012b658fc6b97383 SHA512 271bedaf7793c56d2ef599c722de930a0bdcabe3e1e1ac1ef84f3ea8f1cb3f8a193aa86119215fa8dd1cc7fb6188f693bf40d2d0fc1a20901e1c887b938aa551
+EBUILD melonds-9999.ebuild 1739 BLAKE2B 6b01ba2bf06dfbd21dc4921439b96ce668e99888c84d0fa61c457ad765426fce1987cc14c2ff46a630085a188be85f140cf309dccf2ff687012b658fc6b97383 SHA512 271bedaf7793c56d2ef599c722de930a0bdcabe3e1e1ac1ef84f3ea8f1cb3f8a193aa86119215fa8dd1cc7fb6188f693bf40d2d0fc1a20901e1c887b938aa551
 MISC metadata.xml 404 BLAKE2B e9abe00b5ee8196030846be4e7a9e224c0fb7356f88a39949b219bb7355bcac50f6ca28b299a40f056e5a105903cb156aed77731fb3ed61d2ef88becf35d0dc3 SHA512 6e2926035441d9c93759ad92cb2c026a10d28b8354e90d56361b4afc1aa6e7f0e4bb49900ad9f6025f8f9b7070df5691583074f30620196f1305919bd7cfdbdb
diff --git a/games-emulation/melonds/melonds-0.9.5.ebuild b/games-emulation/melonds/melonds-0.9.5.ebuild
new file mode 100644
index 000000000000..c5383c9da154
--- /dev/null
+++ b/games-emulation/melonds/melonds-0.9.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="melonDS"
+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"
+
+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"
+	S="${WORKDIR}"/${MY_P}
+	KEYWORDS="~amd64"
+fi
+
+IUSE="+jit +opengl"
+LICENSE="BSD-2 GPL-2 GPL-3 Unlicense"
+SLOT="0"
+
+# MelonDS bundles libteakra with many changes,
+# for now we have to block dev-libs/teakra
+RDEPEND="
+	!dev-libs/teakra
+	app-arch/libarchive
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/libsdl2[sound,video]
+	net-libs/libpcap
+	net-libs/libslirp
+	opengl? ( media-libs/libepoxy )
+"
+DEPEND="${RDEPEND}"
+
+# used for JIT recompiler
+QA_EXECSTACK="usr/bin/melonDS"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You need the following files in order to run melonDS:
+- bios7.bin
+- bios9.bin
+- firmware.bin
+- romlist.bin
+Place them in ~/.config/melonDS
+Those files can be found somewhere on the Internet ;-)"
+
+src_prepare() {
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	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
+}
+
+src_install() {
+	readme.gentoo_create_doc
+	cmake_src_install
+
+	dolib.so "${BUILD_DIR}"/src/teakra/src/libteakra.so
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
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() {