1 |
commit: 38a6090ee31dc7234bbd9ce5b173861bafc5bb2a |
2 |
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> |
3 |
AuthorDate: Sat Feb 26 18:37:32 2022 +0000 |
4 |
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> |
5 |
CommitDate: Sat Feb 26 18:37:32 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=38a6090e |
7 |
|
8 |
dev-cpp/jwt-cpp: Add version 0.4.0. |
9 |
|
10 |
This older version is required by some dependencies. |
11 |
|
12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
13 |
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com> |
14 |
|
15 |
dev-cpp/jwt-cpp/Manifest | 1 + |
16 |
.../{jwt-cpp-0.6.0.ebuild => jwt-cpp-0.4.0.ebuild} | 18 +++++++----------- |
17 |
dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild | 2 +- |
18 |
3 files changed, 9 insertions(+), 12 deletions(-) |
19 |
|
20 |
diff --git a/dev-cpp/jwt-cpp/Manifest b/dev-cpp/jwt-cpp/Manifest |
21 |
index 056eade7e..7ed5fadf1 100644 |
22 |
--- a/dev-cpp/jwt-cpp/Manifest |
23 |
+++ b/dev-cpp/jwt-cpp/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
+DIST jwt-cpp-0.4.0.tar.gz 64383 BLAKE2B 48de501a1fff851ada5ffc0554309f6f05943d6b6a459c8f002f8bcebb9be40d878fc7f39c2f4da7031b784421dd0530d8e50d5eadbdb924c5485fdcd2f04b85 SHA512 8a82accb396db8fb2f1a32b14459f6ff3f5d4c6dcb54dfe1a10751da093381c2dcfb92c6e1f4f2ae42ca0f25c96c02ea35f37b723afaaf6b2d458c1a6f4e6b62 |
26 |
DIST jwt-cpp-0.6.0.tar.gz 275126 BLAKE2B 4bf9bed9b2aa9584b497b2ab4d1d2582d9b5e4ded402200ea3f70b0e6752338fd4e2ef9c5836c728a6907a0190209c7baeaecd26032ce64dc6bf12a23594f27b SHA512 b6d5ebb3a7eeb6fef9a1d41c707251d1ab05bf47920c280d5203f1b9ee5bf6f8e914cd2ffaed66550cfa6d78c34465d4cf86517a759d5f8739b429faf1c2c0ef |
27 |
|
28 |
diff --git a/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild b/dev-cpp/jwt-cpp/jwt-cpp-0.4.0.ebuild |
29 |
similarity index 73% |
30 |
copy from dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild |
31 |
copy to dev-cpp/jwt-cpp/jwt-cpp-0.4.0.ebuild |
32 |
index f877455f8..9b41ae22f 100644 |
33 |
--- a/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild |
34 |
+++ b/dev-cpp/jwt-cpp/jwt-cpp-0.4.0.ebuild |
35 |
@@ -22,34 +22,30 @@ SLOT="0" |
36 |
IUSE="doc +picojson test" |
37 |
|
38 |
DEPEND="${RDEPEND} |
39 |
- dev-cpp/nlohmann_json |
40 |
dev-libs/openssl |
41 |
picojson? ( dev-cpp/picojson )" |
42 |
BDEPEND="doc? ( app-doc/doxygen[dot] )" |
43 |
RESTRICT="!picojson? ( test )" |
44 |
-DOCS=( README.md docs/{faqs,ssl,traits}.md ) |
45 |
|
46 |
src_prepare() { |
47 |
- # Unbundle dev-cpp/nlohmann_json. |
48 |
- rm -vrf include/nhlomann || die |
49 |
# Unbundle dev-cpp/picojson and fix include paths. |
50 |
# See also: https://github.com/Thalhammer/jwt-cpp/issues/213 |
51 |
rm -vrf include/picojson || die |
52 |
find -name '*.h' -type f -print0 | xargs -0 sed -r -e "s:picojson/picojson\.h:picojson.h:g" -i || die |
53 |
# Prevent installation of bundled dev-cpp/picojson. |
54 |
- sed -i -e 's:^\s*install.*picojson/picojson\.h.*$::' CMakeLists.txt || die |
55 |
+ sed -i -e 's:^\s*install.*include/picojson.*$::' CMakeLists.txt || die |
56 |
+ # Fix installation paths for .cmake files. |
57 |
+ sed -i -e 's:DESTINATION ${CMAKE_INSTALL_PREFIX}/jwt-cpp:DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jwt-cpp:' CMakeLists.txt || die |
58 |
+ sed -i -e 's:DESTINATION jwt-cpp:DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jwt-cpp:' CMakeLists.txt || die |
59 |
cmake_src_prepare |
60 |
} |
61 |
|
62 |
src_configure() { |
63 |
local mycmakeargs=( |
64 |
- -DJWT_DISABLE_PICOJSON="$(usex picojson OFF ON)" |
65 |
- # Not useful for now, asks for non-existend CMake module. |
66 |
+ # Not useful for now, asks for non-existent CMake module. |
67 |
#-DJWT_EXTERNAL_PICOJSON="$(usex picojson)" |
68 |
# Examples are not installed and for development only. |
69 |
- -DJWT_BUILD_EXAMPLES=NO |
70 |
- -DJWT_BUILD_TESTS="$(usex test)" |
71 |
- -DJWT_CMAKE_FILES_INSTALL_DIR="${EPREFIX}"/usr/share/cmake |
72 |
+ -DBUILD_TESTS="$(usex test)" |
73 |
) |
74 |
cmake_src_configure |
75 |
} |
76 |
@@ -63,7 +59,7 @@ src_compile() { |
77 |
|
78 |
src_install() { |
79 |
cmake_src_install |
80 |
- use doc && local HTML_DOCS=(doxy/html/.) |
81 |
+ use doc && local HTML_DOCS=(docs/html/.) |
82 |
einstalldocs |
83 |
} |
84 |
|
85 |
|
86 |
diff --git a/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild b/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild |
87 |
index f877455f8..fe1a3e1ff 100644 |
88 |
--- a/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild |
89 |
+++ b/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild |
90 |
@@ -44,7 +44,7 @@ src_prepare() { |
91 |
src_configure() { |
92 |
local mycmakeargs=( |
93 |
-DJWT_DISABLE_PICOJSON="$(usex picojson OFF ON)" |
94 |
- # Not useful for now, asks for non-existend CMake module. |
95 |
+ # Not useful for now, asks for non-existent CMake module. |
96 |
#-DJWT_EXTERNAL_PICOJSON="$(usex picojson)" |
97 |
# Examples are not installed and for development only. |
98 |
-DJWT_BUILD_EXAMPLES=NO |