games-emulation/melonds: use system teakra

Closes: https://bugs.gentoo.org/834984
Signed-off-by: Maciej Barć <[email protected]>

games-emulation/melonds/files/melonds-system-teakra.patch

@@ -0,0 +1,23 @@
+index 7288b54..6525f11 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -110,7 +110,6 @@ if (ENABLE_JIT)
+ endif()
+ endif()
+
+-add_subdirectory(teakra EXCLUDE_FROM_ALL)
+ target_link_libraries(core teakra)
+
+
+index c889aff..a6339d9 100644
+--- a/src/DSi_DSP.cpp
++++ b/src/DSi_DSP.cpp
+@@ -16,7 +16,7 @@
+ with melonDS. If not, see http://www.gnu.org/licenses/.
+ */
+
+-#include "teakra/include/teakra/teakra.h"
++#include "teakra/teakra.h"
+
+ #include "DSi.h"
+ #include "DSi_DSP.h"

games-emulation/melonds/melonds-0.9.3-r1.ebuild → games-emulation/melonds/melonds-0.9.3-r2.ebuild

@@ -1,9 +1,6 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# NOTICE:
-# melonds bundles teakra, its upstream haven't had a release since 2020
-
 EAPI=8
 
 MY_PN="melonDS"
@@ -32,6 +29,7 @@ SLOT="0"
 
 DEPEND="
  app-arch/libarchive
+ dev-libs/teakra
  dev-qt/qtcore:5
  dev-qt/qtgui:5
  dev-qt/qtnetwork:5
@@ -55,7 +53,11 @@ DOC_CONTENTS="You need the following files in order to run melonDS:
 Place them in ~/.config/melonDS
 Those files can be found somewhere on the Internet ;-)"
 
+PATCHES=( "${FILESDIR}"/melonds-system-teakra.patch )
+
 src_prepare() {
+ rm -r ./src/teakra || die
+
  cmake_src_prepare
 }
 
@@ -73,16 +75,11 @@ src_compile() {
 }
 
 src_install() {
- # install teakra
- dolib.so "${BUILD_DIR}/src/teakra/src/libteakra.so"
-
  cmake_src_install
-
  readme.gentoo_create_doc
 }
 
 pkg_postinst() {
  xdg_pkg_postinst
-
  readme.gentoo_print_elog
 }

games-emulation/melonds/melonds-0.9.4_p1.ebuild → games-emulation/melonds/melonds-0.9.4_p1-r1.ebuild

@@ -1,9 +1,6 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# NOTICE:
-# melonds bundles teakra, its upstream haven't had a release since 2020
-
 EAPI=8
 
 MY_PN="melonDS"
@@ -32,6 +29,7 @@ SLOT="0"
 
 DEPEND="
  app-arch/libarchive
+ dev-libs/teakra
  dev-qt/qtcore:5
  dev-qt/qtgui:5
  dev-qt/qtnetwork:5
@@ -55,7 +53,11 @@ DOC_CONTENTS="You need the following files in order to run melonDS:
 Place them in ~/.config/melonDS
 Those files can be found somewhere on the Internet ;-)"
 
+PATCHES=( "${FILESDIR}"/melonds-system-teakra.patch )
+
 src_prepare() {
+ rm -r ./src/teakra || die
+
  cmake_src_prepare
 }
 
@@ -73,16 +75,11 @@ src_compile() {
 }
 
 src_install() {
- # install teakra
- dolib.so "${BUILD_DIR}/src/teakra/src/libteakra.so"
-
  cmake_src_install
-
  readme.gentoo_create_doc
 }
 
 pkg_postinst() {
  xdg_pkg_postinst
-
  readme.gentoo_print_elog
 }

games-emulation/melonds/melonds-9999.ebuild

@@ -1,9 +1,6 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# NOTICE:
-# melonds bundles teakra, its upstream haven't had a release since 2020
-
 EAPI=8
 
 MY_PN="melonDS"
@@ -32,6 +29,7 @@ SLOT="0"
 
 DEPEND="
  app-arch/libarchive
+ dev-libs/teakra
  dev-qt/qtcore:5
  dev-qt/qtgui:5
  dev-qt/qtnetwork:5
@@ -55,7 +53,11 @@ DOC_CONTENTS="You need the following files in order to run melonDS:
 Place them in ~/.config/melonDS
 Those files can be found somewhere on the Internet ;-)"
 
+PATCHES=( "${FILESDIR}"/melonds-system-teakra.patch )
+
 src_prepare() {
+ rm -r ./src/teakra || die
+
  cmake_src_prepare
 }
 
@@ -73,16 +75,11 @@ src_compile() {
 }
 
 src_install() {
- # install teakra
- dolib.so "${BUILD_DIR}/src/teakra/src/libteakra.so"
-
  cmake_src_install
-
  readme.gentoo_create_doc
 }
 
 pkg_postinst() {
  xdg_pkg_postinst
-
  readme.gentoo_print_elog
 }