Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/mongo-c-driver/files/, dev-libs/mongo-c-driver/
Date: Mon, 29 Nov 2021 15:04:29
Message-Id: 1638198231.1b5fc1de3359cf9e15522286b0bc189ebcdb9347.asturm@gentoo
1 commit: 1b5fc1de3359cf9e15522286b0bc189ebcdb9347
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 26 09:21:56 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 29 15:03:51 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b5fc1de
7
8 dev-libs/mongo-c-driver: Drop 1.16.2, 1.17.0
9
10 Bug: https://bugs.gentoo.org/791508
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 dev-libs/mongo-c-driver/Manifest | 2 -
15 .../mongo-c-driver-1.16.2-single-doc-job.patch | 22 -----
16 .../files/mongo-c-driver-1.16.2-sphinx.patch | 19 -----
17 .../mongo-c-driver/mongo-c-driver-1.16.2.ebuild | 94 ----------------------
18 .../mongo-c-driver/mongo-c-driver-1.17.0.ebuild | 93 ---------------------
19 5 files changed, 230 deletions(-)
20
21 diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
22 index 51ab9f632e96..57f1300f64fd 100644
23 --- a/dev-libs/mongo-c-driver/Manifest
24 +++ b/dev-libs/mongo-c-driver/Manifest
25 @@ -1,3 +1 @@
26 -DIST mongo-c-driver-1.16.2.tar.gz 6888287 BLAKE2B 40d2b73f495a8c71ca8b3c39c1b3c85b4a01ea088428967ed49f4758ef749e3288b046bde767a83aad022933f30f7307a4be65141f477bb1dcf912b4099129d6 SHA512 0930a80692f08329cad558644c25c46da64a0c8b6a9fc7412db0f547dae63bf59e9d29ee774d329c63af186eea751670bf21ccee8cf255f8bc8d5bd78c0e736a
27 -DIST mongo-c-driver-1.17.0.tar.gz 7092911 BLAKE2B f93de6f3ded0f22ff8af65113ed207ca6dcc8ecbaedb24b33ddf7ada93b913eae33a802245f386d75fef01bf53c2d9630e68138a5715de001b7acea7dbde05f1 SHA512 49889b9d777dc3cb151b9cbef7bc2dd1785e327ae641569281efcc040d208cb034da3a74ae1115a033cc86e5b70079dab76c3478df8f171cc083d686f7568858
28 DIST mongo-c-driver-1.18.0.tar.gz 7246954 BLAKE2B 9418ab2e132f8a8c582bcbea8c7b090e9e45e34219845d8f6b7a99d4ebfb17ef2eec2223504e9a4ab7f51ca01e904a7f3bb04bf9f8bf20c010ab9f82894a728e SHA512 c970f347689916172a957fc431b307bab3cb63367d4b39c49745c75b9fa84f0035db934c551570a4141733fc1bc6b33b118911c3b69ecdea797f19312b213606
29
30 diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-single-doc-job.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-single-doc-job.patch
31 deleted file mode 100644
32 index 933081b32a31..000000000000
33 --- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-single-doc-job.patch
34 +++ /dev/null
35 @@ -1,22 +0,0 @@
36 -diff --git a/build/cmake/SphinxBuild.cmake b/build/cmake/SphinxBuild.cmake
37 -index a7f49d7..804ad44 100644
38 ---- a/build/cmake/SphinxBuild.cmake
39 -+++ b/build/cmake/SphinxBuild.cmake
40 -@@ -40,7 +40,7 @@ function (sphinx_build_html target_name doc_dir)
41 - ${CMAKE_COMMAND} -E env
42 - "PYTHONDONTWRITEBYTECODE=1"
43 - ${SPHINX_EXECUTABLE}
44 -- -j ${NPROCS} -qEW -b html
45 -+ -j 1 -qEW -b html
46 - -c "${CMAKE_CURRENT_SOURCE_DIR}"
47 - "${CMAKE_CURRENT_SOURCE_DIR}"
48 - "${SPHINX_HTML_DIR}"
49 -@@ -133,7 +133,7 @@ function (sphinx_build_man target_name)
50 - ${CMAKE_COMMAND} -E env
51 - "PYTHONDONTWRITEBYTECODE=1"
52 - ${SPHINX_EXECUTABLE}
53 -- -j ${NPROCS} -qEW -b man
54 -+ -j 1 -qEW -b man
55 - -c "${CMAKE_CURRENT_SOURCE_DIR}"
56 - "${CMAKE_CURRENT_SOURCE_DIR}"
57 - "${SPHINX_MAN_DIR}"
58
59 diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-sphinx.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-sphinx.patch
60 deleted file mode 100644
61 index 7a165b61c59a..000000000000
62 --- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-sphinx.patch
63 +++ /dev/null
64 @@ -1,19 +0,0 @@
65 -https://bugs.gentoo.org/716774
66 -
67 ---- a/build/sphinx/taglist.py
68 -+++ b/build/sphinx/taglist.py
69 -@@ -24,7 +24,12 @@ THE SOFTWARE.
70 - """
71 -
72 - from docutils import nodes, utils
73 --from sphinx.environment import NoUri
74 -+
75 -+try:
76 -+ from sphinx.environment import NoUri
77 -+except ImportError:
78 -+ from sphinx.errors import NoUri
79 -+
80 - try:
81 - from sphinx.util.compat import Directive
82 - except ImportError:
83 -
84
85 diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
86 deleted file mode 100644
87 index 71b6b95d3474..000000000000
88 --- a/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
89 +++ /dev/null
90 @@ -1,94 +0,0 @@
91 -# Copyright 1999-2021 Gentoo Authors
92 -# Distributed under the terms of the GNU General Public License v2
93 -
94 -EAPI=7
95 -
96 -inherit cmake-utils
97 -
98 -DESCRIPTION="Client library written in C for MongoDB"
99 -HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
100 -SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.tar.gz"
101 -
102 -LICENSE="Apache-2.0"
103 -SLOT="0"
104 -KEYWORDS="amd64 ~hppa ~s390 x86"
105 -IUSE="debug examples icu sasl ssl static-libs test"
106 -REQUIRED_USE="test? ( static-libs )"
107 -
108 -RDEPEND="app-arch/snappy:=
109 - app-arch/zstd:=
110 - >=dev-libs/libbson-${PV}[static-libs?]
111 - dev-python/sphinx
112 - sys-libs/zlib:=
113 - icu? ( dev-libs/icu:= )
114 - sasl? ( dev-libs/cyrus-sasl:= )
115 - ssl? (
116 - dev-libs/openssl:0=
117 - )"
118 -DEPEND="${RDEPEND}
119 - test? (
120 - dev-db/mongodb
121 - dev-libs/libbson[static-libs]
122 - )"
123 -
124 -# No tests on x86 because tests require dev-db/mongodb which don't support
125 -# x86 anymore (bug #645994)
126 -RESTRICT="x86? ( test )
127 - !test? ( test )"
128 -
129 -PATCHES=(
130 - "${FILESDIR}/${PN}-1.14.0-no-docs.patch"
131 - "${FILESDIR}/${PN}-1.16.2-enable-tests.patch" # enable tests with system libbson
132 - "${FILESDIR}/${PN}-1.16.2-single-doc-job.patch"
133 - "${FILESDIR}/${PN}-1.16.2-sphinx.patch"
134 -)
135 -
136 -src_prepare() {
137 - cmake-utils_src_prepare
138 -
139 - # copy private headers for tests since we don't build libbson
140 - if use test; then
141 - mkdir -p src/libbson/tests/bson || die
142 - cp src/libbson/src/bson/bson-*.h src/libbson/tests/bson/ || die
143 - fi
144 -}
145 -
146 -src_configure() {
147 - local mycmakeargs=(
148 - -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
149 - -DENABLE_BSON=SYSTEM
150 - -DENABLE_EXAMPLES=OFF
151 - -DENABLE_ICU="$(usex icu ON OFF)"
152 - -DENABLE_MAN_PAGES=ON
153 - -DENABLE_MONGOC=ON
154 - -DENABLE_SNAPPY=SYSTEM
155 - -DENABLE_ZLIB=SYSTEM
156 - -DENABLE_SASL="$(usex sasl CYRUS OFF)"
157 - -DENABLE_SSL="$(usex ssl OPENSSL OFF)"
158 - -DENABLE_STATIC="$(usex static-libs ON OFF)"
159 - -DENABLE_TESTS="$(usex test ON OFF)"
160 - -DENABLE_TRACING="$(usex debug ON OFF)"
161 - -DENABLE_UNINSTALL=OFF
162 - -DENABLE_ZSTD=ON
163 - )
164 -
165 - cmake-utils_src_configure
166 -}
167 -
168 -# FEATURES="test -network-sandbox" USE="static-libs" emerge dev-libs/mongo-c-driver
169 -src_test() {
170 - local PORT=27099
171 - mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
172 - --dbpath="${T}" --logpath="${T}/mongod.log" || die
173 - MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
174 - kill $(<"${T}/mongod.lock")
175 -}
176 -
177 -src_install() {
178 - if use examples; then
179 - docinto examples
180 - dodoc src/libmongoc/examples/*.c
181 - fi
182 -
183 - cmake-utils_src_install
184 -}
185
186 diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild
187 deleted file mode 100644
188 index d61656b6f84b..000000000000
189 --- a/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild
190 +++ /dev/null
191 @@ -1,93 +0,0 @@
192 -# Copyright 1999-2021 Gentoo Authors
193 -# Distributed under the terms of the GNU General Public License v2
194 -
195 -EAPI=7
196 -
197 -inherit cmake
198 -
199 -DESCRIPTION="Client library written in C for MongoDB"
200 -HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
201 -SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.tar.gz"
202 -
203 -LICENSE="Apache-2.0"
204 -SLOT="0"
205 -KEYWORDS="~amd64 ~hppa ~s390 ~x86"
206 -IUSE="debug examples icu sasl ssl static-libs test"
207 -REQUIRED_USE="test? ( static-libs )"
208 -
209 -# No tests on x86 because tests require dev-db/mongodb which don't support
210 -# x86 anymore (bug #645994)
211 -RESTRICT="x86? ( test )
212 - !test? ( test )"
213 -
214 -RDEPEND="app-arch/snappy:=
215 - app-arch/zstd:=
216 - >=dev-libs/libbson-${PV}[static-libs?]
217 - dev-python/sphinx
218 - sys-libs/zlib:=
219 - icu? ( dev-libs/icu:= )
220 - sasl? ( dev-libs/cyrus-sasl:= )
221 - ssl? (
222 - dev-libs/openssl:0=
223 - )"
224 -DEPEND="${RDEPEND}
225 - test? (
226 - dev-db/mongodb
227 - dev-libs/libbson[static-libs]
228 - )"
229 -
230 -PATCHES=(
231 - "${FILESDIR}/${PN}-1.14.0-no-docs.patch"
232 - "${FILESDIR}/${PN}-1.16.2-enable-tests.patch" # enable tests with system libbson
233 - "${FILESDIR}/${PN}-1.16.2-sphinx.patch"
234 -)
235 -
236 -src_prepare() {
237 - cmake_src_prepare
238 -
239 - # copy private headers for tests since we don't build libbson
240 - if use test; then
241 - mkdir -p src/libbson/tests/bson || die
242 - cp src/libbson/src/bson/bson-*.h src/libbson/tests/bson/ || die
243 - fi
244 -}
245 -
246 -src_configure() {
247 - local mycmakeargs=(
248 - -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
249 - -DENABLE_BSON=SYSTEM
250 - -DENABLE_EXAMPLES=OFF
251 - -DENABLE_ICU="$(usex icu ON OFF)"
252 - -DENABLE_MAN_PAGES=ON
253 - -DENABLE_MONGOC=ON
254 - -DENABLE_SNAPPY=SYSTEM
255 - -DENABLE_ZLIB=SYSTEM
256 - -DENABLE_SASL="$(usex sasl CYRUS OFF)"
257 - -DENABLE_SSL="$(usex ssl OPENSSL OFF )"
258 - -DENABLE_STATIC="$(usex static-libs ON OFF)"
259 - -DENABLE_TESTS="$(usex test ON OFF)"
260 - -DENABLE_TRACING="$(usex debug ON OFF)"
261 - -DENABLE_UNINSTALL=OFF
262 - -DENABLE_ZSTD=ON
263 - )
264 -
265 - cmake_src_configure
266 -}
267 -
268 -# FEATURES="test -network-sandbox" USE="static-libs" emerge dev-libs/mongo-c-driver
269 -src_test() {
270 - local PORT=27099
271 - mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
272 - --dbpath="${T}" --logpath="${T}/mongod.log" || die
273 - MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
274 - kill $(<"${T}/mongod.lock")
275 -}
276 -
277 -src_install() {
278 - if use examples; then
279 - docinto examples
280 - dodoc src/libmongoc/examples/*.c
281 - fi
282 -
283 - cmake_src_install
284 -}