1 |
commit: e4a85804965c4b11fc6bf9fbbf7b5bae0f88a78f |
2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
3 |
AuthorDate: Tue Sep 21 20:00:31 2021 +0000 |
4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 21 20:09:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e4a85804 |
7 |
|
8 |
dev-cpp/cli11: add 2.1.0, drop 1.9.1 |
9 |
|
10 |
- add subslot |
11 |
- enable normal tests |
12 |
|
13 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
14 |
|
15 |
dev-cpp/cli11/Manifest | 3 ++- |
16 |
dev-cpp/cli11/cli11-1.9.1.ebuild | 36 ---------------------------- |
17 |
dev-cpp/cli11/cli11-2.1.0.ebuild | 51 ++++++++++++++++++++++++++++++++++++++++ |
18 |
dev-cpp/cli11/metadata.xml | 2 +- |
19 |
4 files changed, 54 insertions(+), 38 deletions(-) |
20 |
|
21 |
diff --git a/dev-cpp/cli11/Manifest b/dev-cpp/cli11/Manifest |
22 |
index d48ce376a..af94af0b0 100644 |
23 |
--- a/dev-cpp/cli11/Manifest |
24 |
+++ b/dev-cpp/cli11/Manifest |
25 |
@@ -1,2 +1,3 @@ |
26 |
-DIST cli11-1.9.1.tar.gz 262925 BLAKE2B 30c0c35827992ca8f1527ace9dda076a89666f1598be423bead85fff2006ca82f59937348b914a9b058878a7e68467501226c704b4ecaeefe09508657f346a14 SHA512 bcccfe88695ceddd73d87738e1d5ed4372f5cf43e3866e88053dd486ea8973804022029775de781e1dbdd2e1566b77e072de00202033983217276954a07c5718 |
27 |
+DIST catch-2.13.6.hpp 656886 BLAKE2B 590fabc7970b97f333457f409276688f69a66de7fa3c43d767994ed212a3b5bde6e6c113c36a0ff03dd95bbb0cdb38cc12b43a96d16644525ea7425e028485a6 SHA512 ca401efb224e87c4f9d9f3bd58102d3223ef3356149837be2474fa2dbae645272c1ecb17d7db96c2b43b97034aacb63f840f4ebec16f2f3d447c1cc80a500d40 |
28 |
DIST cli11-2.0.0.tar.gz 280797 BLAKE2B 5ce65d6c23f98d4128d1e7d4711f9dcd258b1705317b7e94b094d172c090c27a26b43580df16fee8d0a1a1cb993b763d7d43cc8fda7dad231f0ca018c816b9e7 SHA512 5ac06623383c003286b915e585e85ad419449735770e9a164665395f33d9e03ec6340445ab782200e2cfe5f40123b5843a7401211b6ece5b16342321e3e7a10a |
29 |
+DIST cli11-2.1.0.tar.gz 286192 BLAKE2B c88a57effedaa19a119a28f5ad6d63f3b1a43055359e6d7d74258a839e0846817593974460e3f51d44218bca2b6b227c9d893a919155b38b63cd6b0b37711073 SHA512 22c75e6b55d5320656ca2f65bf7c1dc82546fa65458f66a3d6401d002e83f12a0ee93a572637f5daa8daed9e0ce11fbf4aabf864caadc851f75bced63814ba10 |
30 |
|
31 |
diff --git a/dev-cpp/cli11/cli11-1.9.1.ebuild b/dev-cpp/cli11/cli11-1.9.1.ebuild |
32 |
deleted file mode 100644 |
33 |
index 31ec5a7f7..000000000 |
34 |
--- a/dev-cpp/cli11/cli11-1.9.1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,36 +0,0 @@ |
37 |
-# Copyright 2021 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=7 |
41 |
- |
42 |
-DOCS_BUILDER="doxygen" |
43 |
-DOCS_CONFIG_NAME="docs/Doxyfile" |
44 |
-inherit cmake docs |
45 |
- |
46 |
-MY_PN="CLI11" |
47 |
-DESCRIPTION="Command line parser for C++11" |
48 |
-HOMEPAGE="https://github.com/CLIUtils/CLI11 https://cliutils.github.io/CLI11/book" |
49 |
-SRC_URI="https://github.com/CLIUtils/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" |
50 |
-S="${WORKDIR}/${MY_PN}-${PV}" |
51 |
- |
52 |
-LICENSE="BSD" |
53 |
-SLOT="0" |
54 |
-KEYWORDS="~amd64 ~x86" |
55 |
-IUSE="test" |
56 |
-RESTRICT="!test? ( test )" |
57 |
- |
58 |
-src_configure() { |
59 |
- local mycmakeargs=( |
60 |
- -DCLI11_BUILD_DOCS=OFF |
61 |
- -DCLI11_BUILD_TESTS=OFF |
62 |
- -DCLI11_BUILD_EXAMPLES=$(usex test) |
63 |
- -DCLI11_BUILD_EXAMPLES_JSON=OFF |
64 |
- ) |
65 |
- |
66 |
- cmake_src_configure |
67 |
-} |
68 |
- |
69 |
-src_compile() { |
70 |
- cmake_src_compile |
71 |
- docs_compile |
72 |
-} |
73 |
|
74 |
diff --git a/dev-cpp/cli11/cli11-2.1.0.ebuild b/dev-cpp/cli11/cli11-2.1.0.ebuild |
75 |
new file mode 100644 |
76 |
index 000000000..4f578edbf |
77 |
--- /dev/null |
78 |
+++ b/dev-cpp/cli11/cli11-2.1.0.ebuild |
79 |
@@ -0,0 +1,51 @@ |
80 |
+# Copyright 2021 Gentoo Authors |
81 |
+# Distributed under the terms of the GNU General Public License v2 |
82 |
+ |
83 |
+EAPI=8 |
84 |
+ |
85 |
+DOCS_BUILDER="doxygen" |
86 |
+DOCS_DIR="docs" |
87 |
+inherit cmake docs |
88 |
+ |
89 |
+CATCH_PV=2.13.6 |
90 |
+DESCRIPTION="Command line parser for C++11" |
91 |
+HOMEPAGE="https://github.com/CLIUtils/CLI11 https://cliutils.github.io/CLI11/book" |
92 |
+SRC_URI=" |
93 |
+ https://github.com/CLIUtils/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz |
94 |
+ test? ( https://github.com/philsquared/Catch/releases/download/v${CATCH_PV}/catch.hpp -> catch-${CATCH_PV}.hpp ) |
95 |
+" |
96 |
+S="${WORKDIR}/CLI11-${PV}" |
97 |
+ |
98 |
+LICENSE="BSD" |
99 |
+SLOT="0/2" |
100 |
+KEYWORDS="~amd64 ~x86" |
101 |
+IUSE="test" |
102 |
+RESTRICT="!test? ( test )" |
103 |
+ |
104 |
+DOCS=( README.md CHANGELOG.md ) |
105 |
+ |
106 |
+src_unpack() { |
107 |
+ unpack ${P}.tar.gz |
108 |
+ |
109 |
+ # work around cmake's file(DOWNLOAD ...) |
110 |
+ cd "${S}" || die |
111 |
+ if use test; then |
112 |
+ _cmake_check_build_dir |
113 |
+ mkdir "${BUILD_DIR}"/tests || die |
114 |
+ cp "${DISTDIR}"/catch-${CATCH_PV}.hpp "${BUILD_DIR}"/tests/catch.hpp || die |
115 |
+ fi |
116 |
+} |
117 |
+ |
118 |
+src_configure() { |
119 |
+ local mycmakeargs=( |
120 |
+ -DCLI11_BUILD_DOCS=OFF # handled by docs.eclass |
121 |
+ -DCLI11_BUILD_TESTS=$(usex test) |
122 |
+ ) |
123 |
+ |
124 |
+ cmake_src_configure |
125 |
+} |
126 |
+ |
127 |
+src_compile() { |
128 |
+ cmake_src_compile |
129 |
+ docs_compile |
130 |
+} |
131 |
|
132 |
diff --git a/dev-cpp/cli11/metadata.xml b/dev-cpp/cli11/metadata.xml |
133 |
index 51cad842f..6985eff64 100644 |
134 |
--- a/dev-cpp/cli11/metadata.xml |
135 |
+++ b/dev-cpp/cli11/metadata.xml |
136 |
@@ -1,5 +1,5 @@ |
137 |
<?xml version="1.0" encoding="UTF-8"?> |
138 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
139 |
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
140 |
<pkgmetadata> |
141 |
<upstream> |
142 |
<remote-id type="github">CLIUtils/CLI11</remote-id> |