1 |
commit: a70ce4a9334e2da254e5110d25382553e57f1365 |
2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
3 |
AuthorDate: Wed Dec 1 11:48:02 2021 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 1 11:48:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a70ce4a9 |
7 |
|
8 |
dev-cpp/drogon: revbump (add slot operators) |
9 |
|
10 |
* EAPI 7 -> 8 |
11 |
* replace sed calls by cmake_use_find_package |
12 |
* add libuuid dependency |
13 |
|
14 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
15 |
|
16 |
...{drogon-1.7.3.ebuild => drogon-1.7.3-r1.ebuild} | 49 +++++++++++++--------- |
17 |
dev-cpp/drogon/metadata.xml | 27 ++++++------ |
18 |
2 files changed, 42 insertions(+), 34 deletions(-) |
19 |
|
20 |
diff --git a/dev-cpp/drogon/drogon-1.7.3.ebuild b/dev-cpp/drogon/drogon-1.7.3-r1.ebuild |
21 |
similarity index 56% |
22 |
rename from dev-cpp/drogon/drogon-1.7.3.ebuild |
23 |
rename to dev-cpp/drogon/drogon-1.7.3-r1.ebuild |
24 |
index 9d585e902..2455c3b57 100644 |
25 |
--- a/dev-cpp/drogon/drogon-1.7.3.ebuild |
26 |
+++ b/dev-cpp/drogon/drogon-1.7.3-r1.ebuild |
27 |
@@ -1,7 +1,7 @@ |
28 |
# Copyright 2021 Gentoo Authors |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
|
31 |
-EAPI=7 |
32 |
+EAPI=8 |
33 |
|
34 |
inherit cmake |
35 |
|
36 |
@@ -17,17 +17,21 @@ RESTRICT="!test? ( test )" |
37 |
|
38 |
RDEPEND=" |
39 |
>=dev-cpp/trantor-1.5.2 |
40 |
- dev-libs/jsoncpp |
41 |
+ dev-libs/jsoncpp:= |
42 |
sys-libs/zlib |
43 |
- brotli? ( app-arch/brotli ) |
44 |
+ brotli? ( app-arch/brotli:= ) |
45 |
mariadb? ( dev-db/mariadb:= ) |
46 |
postgres? ( dev-db/postgresql:= ) |
47 |
- redis? ( dev-libs/hiredis ) |
48 |
- sqlite? ( dev-db/sqlite ) |
49 |
- ssl? ( dev-libs/openssl ) |
50 |
+ redis? ( dev-libs/hiredis:= ) |
51 |
+ sqlite? ( dev-db/sqlite:3 ) |
52 |
+ ssl? ( dev-libs/openssl:= ) |
53 |
+ elibc_Darwin? ( sys-libs/native-uuid ) |
54 |
+ elibc_SunOS? ( sys-libs/libuuid ) |
55 |
+ !elibc_Darwin? ( !elibc_SunOS? ( |
56 |
+ sys-apps/util-linux |
57 |
+ ) ) |
58 |
" |
59 |
-DEPEND=" |
60 |
- ${RDEPEND} |
61 |
+DEPEND="${RDEPEND} |
62 |
test? ( dev-cpp/gtest ) |
63 |
" |
64 |
BDEPEND="doc? ( app-doc/doxygen )" |
65 |
@@ -38,8 +42,6 @@ src_prepare() { |
66 |
cmake_comment_add_subdirectory "trantor" |
67 |
sed -i '/${PROJECT_SOURCE_DIR}\/trantor\/trantor\/tests\/server.pem/d' \ |
68 |
lib/tests/CMakeLists.txt || die |
69 |
- use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die |
70 |
- use doc || sed -i '/find_package(Doxygen/d' CMakeLists.txt || die |
71 |
|
72 |
use examples && DOCS+=( "${S}/examples" ) |
73 |
|
74 |
@@ -48,17 +50,24 @@ src_prepare() { |
75 |
|
76 |
src_configure() { |
77 |
local -a mycmakeargs=( |
78 |
- "-DBUILD_DOC=$(usex doc)" |
79 |
- "-DBUILD_EXAMPLES=NO" |
80 |
- "-DBUILD_DROGON_SHARED=YES" |
81 |
- "-DBUILD_POSTGRESQL=$(usex postgres)" |
82 |
- "-DBUILD_MYSQL=$(usex mariadb)" |
83 |
- "-DBUILD_SQLITE=$(usex sqlite)" |
84 |
- "-DBUILD_REDIS=$(usex redis)" |
85 |
- "-DBUILD_TESTING=$(usex test)" |
86 |
- "-DBUILD_BROTLI=$(usex brotli)" |
87 |
+ -DBUILD_DOC=$(usex doc) |
88 |
+ -DBUILD_EXAMPLES=NO |
89 |
+ -DBUILD_DROGON_SHARED=YES |
90 |
+ -DBUILD_POSTGRESQL=$(usex postgres) |
91 |
+ -DBUILD_MYSQL=$(usex mariadb) |
92 |
+ -DBUILD_SQLITE=$(usex sqlite) |
93 |
+ -DBUILD_REDIS=$(usex redis) |
94 |
+ -DBUILD_TESTING=$(usex test) |
95 |
+ -DBUILD_BROTLI=$(usex brotli) |
96 |
+ $(cmake_use_find_package ssl OpenSSL) |
97 |
+ $(cmake_use_find_package doc Doxygen) |
98 |
) |
99 |
- use doc && HTML_DOCS="${BUILD_DIR}/docs/drogon/html/*" |
100 |
+ use doc && HTML_DOCS=( "${BUILD_DIR}/docs/drogon/html/." ) |
101 |
|
102 |
cmake_src_configure |
103 |
} |
104 |
+ |
105 |
+src_install() { |
106 |
+ docompress -x /usr/share/doc/${PF}/examples |
107 |
+ cmake_src_install |
108 |
+} |
109 |
|
110 |
diff --git a/dev-cpp/drogon/metadata.xml b/dev-cpp/drogon/metadata.xml |
111 |
index 80e637052..782288ff9 100644 |
112 |
--- a/dev-cpp/drogon/metadata.xml |
113 |
+++ b/dev-cpp/drogon/metadata.xml |
114 |
@@ -1,17 +1,16 @@ |
115 |
<?xml version="1.0" encoding="UTF-8"?> |
116 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
117 |
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
118 |
<pkgmetadata> |
119 |
- <maintainer type="person"> |
120 |
- <email>gentoo@××××××××.de</email> |
121 |
- <name>Ronny (tastytea) Gutbrod</name> |
122 |
- </maintainer> |
123 |
- <upstream> |
124 |
- <doc>https://drogon.docsforge.com/</doc> |
125 |
- </upstream> |
126 |
- <use> |
127 |
- <flag name="brotli">Enable support for brotli compression</flag> |
128 |
- <flag name="mariadb">Add support for the mariadb database</flag> |
129 |
- <flag name="redis">Add support for the Redis database via |
130 |
- dev-libs/hiredis</flag> |
131 |
- </use> |
132 |
+<maintainer type="person"> |
133 |
+ <email>gentoo@××××××××.de</email> |
134 |
+ <name>Ronny (tastytea) Gutbrod</name> |
135 |
+</maintainer> |
136 |
+<upstream> |
137 |
+ <doc>https://drogon.docsforge.com/</doc> |
138 |
+</upstream> |
139 |
+<use> |
140 |
+ <flag name="brotli">Enable support for brotli compression</flag> |
141 |
+ <flag name="mariadb">Add support for the mariadb database</flag> |
142 |
+ <flag name="redis">Add support for the Redis database via <pkg>dev-libs/hiredis</pkg></flag> |
143 |
+</use> |
144 |
</pkgmetadata> |