Gentoo Archives: gentoo-commits

From: Quentin Retornaz <gentoo@××××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-libs/mongo-c-driver/files/, dev-libs/mongo-c-driver/
Date: Sun, 03 Jul 2022 17:47:35
Message-Id: 1656870420.b8191e4decc5b9c54df3d8b9c9e2d036fe7ce8e0.quentin@gentoo
1 commit: b8191e4decc5b9c54df3d8b9c9e2d036fe7ce8e0
2 Author: orbea <orbea <AT> riseup <DOT> net>
3 AuthorDate: Sat Jul 2 23:52:58 2022 +0000
4 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
5 CommitDate: Sun Jul 3 17:47:00 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=b8191e4d
7
8 dev-libs/mongo-c-driver: Remove package
9
10 Works with libressl-3.5.x and mongo-c-driver-1.18.0::gentoo.
11
12 Signed-off-by: orbea <orbea <AT> riseup.net>
13 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
14
15 dev-libs/mongo-c-driver/Manifest | 1 -
16 .../files/mongo-c-driver-1.11.0-enable-tests.patch | 25 -------
17 .../files/mongo-c-driver-1.12.0-libressl.patch | 15 ----
18 dev-libs/mongo-c-driver/metadata.xml | 11 ---
19 .../mongo-c-driver/mongo-c-driver-1.12.0.ebuild | 85 ----------------------
20 5 files changed, 137 deletions(-)
21
22 diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
23 deleted file mode 100644
24 index d9468d1..0000000
25 --- a/dev-libs/mongo-c-driver/Manifest
26 +++ /dev/null
27 @@ -1 +0,0 @@
28 -DIST mongo-c-driver-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
29
30 diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.11.0-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.11.0-enable-tests.patch
31 deleted file mode 100644
32 index 67fafaf..0000000
33 --- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.11.0-enable-tests.patch
34 +++ /dev/null
35 @@ -1,25 +0,0 @@
36 -diff --git a/CMakeLists.txt b/CMakeLists.txt
37 -index 860e4ea..7d646b1 100644
38 ---- a/CMakeLists.txt
39 -+++ b/CMakeLists.txt
40 -@@ -110,7 +110,6 @@ if (ENABLE_BSON STREQUAL SYSTEM)
41 - message ("-- libbson include path \"${BSON_INCLUDE_DIRS}\"")
42 - message ("-- libbson libraries \"${BSON_LIBRARIES}\"")
43 - message ("-- disabling test-libmongoc since using system libbson")
44 -- SET (ENABLE_TESTS OFF)
45 -
46 - if (ENABLE_STATIC MATCHES "ON|AUTO")
47 - find_package (libbson-static-1.0
48 -diff --git a/src/libbson/tests/test-bson.c b/src/libbson/tests/test-bson.c
49 -index 51514ed..accb251 100644
50 ---- a/src/libbson/tests/test-bson.c
51 -+++ b/src/libbson/tests/test-bson.c
52 -@@ -18,7 +18,7 @@
53 - #include <bson.h>
54 - #include <bcon.h>
55 - #define BSON_INSIDE
56 --#include <bson-private.h>
57 -+#include "bson-private.h"
58 - #undef BSON_INSIDE
59 - #include <fcntl.h>
60 - #include <time.h>
61
62 diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.12.0-libressl.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.12.0-libressl.patch
63 deleted file mode 100644
64 index e61bffa..0000000
65 --- a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.12.0-libressl.patch
66 +++ /dev/null
67 @@ -1,15 +0,0 @@
68 -diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt
69 -index d09d706..5d84225 100644
70 ---- a/src/libmongoc/CMakeLists.txt
71 -+++ b/src/libmongoc/CMakeLists.txt
72 -@@ -109,7 +109,9 @@ if (NOT ENABLE_SSL STREQUAL OFF)
73 - if (LIBRESSL_FOUND)
74 - message ("-- Found ${LIBRESSL_LIBRARIES}")
75 - set (SSL_LIBRARIES ${LIBRESSL_LIBRARIES})
76 -- include_directories ("${LIBRESSL_INCLUDE_DIRS}")
77 -+ if (${LIBRESSL_INCLUDE_DIRS})
78 -+ include_directories ("${LIBRESSL_INCLUDE_DIRS}")
79 -+ endif ()
80 - link_directories ("${LIBRESSL_LIBRARY_DIRS}")
81 - set (LIBRESSL 1)
82 - else ()
83
84 diff --git a/dev-libs/mongo-c-driver/metadata.xml b/dev-libs/mongo-c-driver/metadata.xml
85 deleted file mode 100644
86 index a833260..0000000
87 --- a/dev-libs/mongo-c-driver/metadata.xml
88 +++ /dev/null
89 @@ -1,11 +0,0 @@
90 -<?xml version="1.0" encoding="UTF-8"?>
91 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
92 -<pkgmetadata>
93 - <maintainer type="person">
94 - <email>ultrabug@g.o</email>
95 - <name>Alexys Jacob</name>
96 - </maintainer>
97 - <upstream>
98 - <remote-id type="github">mongodb/mongo-c-driver</remote-id>
99 - </upstream>
100 -</pkgmetadata>
101
102 diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild
103 deleted file mode 100644
104 index 79e2754..0000000
105 --- a/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild
106 +++ /dev/null
107 @@ -1,85 +0,0 @@
108 -# Copyright 1999-2021 Gentoo Authors
109 -# Distributed under the terms of the GNU General Public License v2
110 -
111 -EAPI=6
112 -
113 -inherit cmake-utils
114 -
115 -DESCRIPTION="Client library written in C for MongoDB"
116 -HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
117 -SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
118 -
119 -LICENSE="Apache-2.0"
120 -SLOT="0"
121 -KEYWORDS="~amd64 ~hppa ~s390 ~x86"
122 -IUSE="debug examples sasl ssl static-libs test"
123 -REQUIRED_USE="test? ( static-libs )"
124 -
125 -RDEPEND="app-arch/snappy:=
126 - >=dev-libs/libbson-${PV}
127 - dev-python/sphinx
128 - sys-libs/zlib:=
129 - sasl? ( dev-libs/cyrus-sasl:= )
130 - ssl? ( dev-libs/openssl:0= )"
131 -DEPEND="${RDEPEND}
132 - test? (
133 - dev-db/mongodb
134 - dev-libs/libbson[static-libs]
135 - )"
136 -
137 -# No tests on x86 because tests require dev-db/mongodb which don't support
138 -# x86 anymore (bug #645994)
139 -RESTRICT="!test? ( test ) x86? ( test )"
140 -
141 -PATCHES=(
142 - "${FILESDIR}/${PN}-1.11.0-enable-tests.patch" # enable tests without libbson
143 - "${FILESDIR}/${PN}-1.12.0-libressl.patch" # Bug 662654
144 -)
145 -
146 -src_prepare() {
147 - cmake-utils_src_prepare
148 -
149 - # copy private headers for tests since we don't build libbson
150 - if use test; then
151 - for f in bson-fnv-private.h bson-iso8601-private.h bson-private.h bson-thread-private.h; do
152 - cp -v src/libbson/src/bson/${f} src/libbson/tests/ || die
153 - done
154 - fi
155 -}
156 -
157 -src_configure() {
158 - local mycmakeargs=(
159 - -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
160 - -DENABLE_BSON=SYSTEM
161 - -DENABLE_EXAMPLES=OFF
162 - -DENABLE_MAN_PAGES=ON
163 - -DENABLE_MONGOC=ON
164 - -DENABLE_SNAPPY=SYSTEM
165 - -DENABLE_ZLIB=SYSTEM
166 - -DENABLE_SASL="$(usex sasl CYRUS OFF)"
167 - -DENABLE_SSL="$(usex ssl LIBRESSL OFF)"
168 - -DENABLE_STATIC="$(usex static-libs ON OFF)"
169 - -DENABLE_TESTS="$(usex test ON OFF)"
170 - -DENABLE_TRACING="$(usex debug ON OFF)"
171 - )
172 -
173 - cmake-utils_src_configure
174 -}
175 -
176 -# FEATURES="test" USE="static-libs" emerge dev-libs/mongo-c-driver
177 -src_test() {
178 - local PORT=27099
179 - mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
180 - --dbpath="${T}" --logpath="${T}/mongod.log" || die
181 - MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
182 - kill $(<"${T}/mongod.lock")
183 -}
184 -
185 -src_install() {
186 - if use examples; then
187 - docinto examples
188 - dodoc src/libmongoc/examples/*.c
189 - fi
190 -
191 - cmake-utils_src_install
192 -}