Gentoo Archives: gentoo-commits

From: Samuel Bauer <samuel.bauer@×××××.fr>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/citra/, games-emulation/citra-canary/
Date: Thu, 02 Feb 2023 00:02:29
Message-Id: 1675295998.7ca0947a0ac3c81aa95da1633423e3a855234ba5.samuel.bauer@gentoo
1 commit: 7ca0947a0ac3c81aa95da1633423e3a855234ba5
2 Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
3 AuthorDate: Wed Feb 1 23:59:58 2023 +0000
4 Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
5 CommitDate: Wed Feb 1 23:59:58 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7ca0947a
7
8 games-emulation/citra*: do not depend on dev-libs/cpp-httplib
9
10 Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
11
12 games-emulation/citra-canary/citra-canary-9999.ebuild | 6 +-----
13 games-emulation/citra/citra-9999.ebuild | 6 +-----
14 2 files changed, 2 insertions(+), 10 deletions(-)
15
16 diff --git a/games-emulation/citra-canary/citra-canary-9999.ebuild b/games-emulation/citra-canary/citra-canary-9999.ebuild
17 index f1859c3a5..61b4e81ab 100644
18 --- a/games-emulation/citra-canary/citra-canary-9999.ebuild
19 +++ b/games-emulation/citra-canary/citra-canary-9999.ebuild
20 @@ -43,7 +43,7 @@ RDEPEND="
21 virtual/libusb:1
22 "
23 DEPEND="${RDEPEND}"
24 -BDEPEND="dev-cpp/cpp-httplib
25 +BDEPEND="
26 dev-cpp/cpp-jwt
27 dev-cpp/robin-map"
28 REQUIRED_USE="|| ( qt5 sdl )"
29 @@ -144,10 +144,6 @@ src_prepare() {
30 sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die
31 fi
32
33 - # Unbundle cpp-httplib
34 - sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die
35 - sed -i -e 's/ httplib//' src/{web_service,network,core}/CMakeLists.txt || die
36 -
37 # Unbundle cpp-jwt
38 sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die
39 sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die
40
41 diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
42 index 2a6d8e781..02b932c58 100644
43 --- a/games-emulation/citra/citra-9999.ebuild
44 +++ b/games-emulation/citra/citra-9999.ebuild
45 @@ -43,7 +43,7 @@ RDEPEND="
46 virtual/libusb:1
47 "
48 DEPEND="${RDEPEND}"
49 -BDEPEND="dev-cpp/cpp-httplib
50 +BDEPEND="
51 dev-cpp/cpp-jwt
52 dev-cpp/robin-map"
53 REQUIRED_USE="|| ( qt5 sdl )"
54 @@ -126,10 +126,6 @@ src_prepare() {
55 sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die
56 fi
57
58 - # Unbundle cpp-httplib
59 - sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die
60 - sed -i -e 's/ httplib//' src/{web_service,network,core}/CMakeLists.txt || die
61 -
62 # Unbundle cpp-jwt
63 sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die
64 sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die