[gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra-canary/, games-emulation/citra/

[Florian Schmaus]

commit:     fcc7219a6ff9ca052d20c86afe50abff4724220a
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Mon Feb 13 15:00:38 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 15:01:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fcc7219a

games-emulation/citra*: use system dev-cpp/cpp-httplib

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/citra-canary/citra-canary-9999.ebuild | 4 ++++
 games-emulation/citra/citra-9999.ebuild               | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/games-emulation/citra-canary/citra-canary-9999.ebuild 
b/games-emulation/citra-canary/citra-canary-9999.ebuild
index 61b4e81ab..d008cee0b 100644
--- a/games-emulation/citra-canary/citra-canary-9999.ebuild
+++ b/games-emulation/citra-canary/citra-canary-9999.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+       dev-cpp/cpp-httplib
        dev-cpp/cpp-jwt
        dev-cpp/robin-map"
 REQUIRED_USE="|| ( qt5 sdl )"
@@ -144,6 +145,9 @@ src_prepare() {
                sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || 
die
        fi
 
+       # Unbundle cpp-httplib
+       sed -i -e '/# httplib/,/target_link_libraries(httplib/d' 
externals/CMakeLists.txt || die
+
        # Unbundle cpp-jwt
        sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' 
externals/CMakeLists.txt || die
        sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die

diff --git a/games-emulation/citra/citra-9999.ebuild 
b/games-emulation/citra/citra-9999.ebuild
index 02b932c58..3350fa698 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+       dev-cpp/cpp-httplib
        dev-cpp/cpp-jwt
        dev-cpp/robin-map"
 REQUIRED_USE="|| ( qt5 sdl )"
@@ -126,6 +127,9 @@ src_prepare() {
                sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || 
die
        fi
 
+       # Unbundle cpp-httplib
+       sed -i -e '/# httplib/,/target_link_libraries(httplib/d' 
externals/CMakeLists.txt || die
+
        # Unbundle cpp-jwt
        sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' 
externals/CMakeLists.txt || die
        sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die