From fc8c98c39a25b2fa8aa1e3702ff757de6d8dfe67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Tue, 2 Jul 2024 19:25:09 +0200 Subject: [PATCH] [dev-db/mongodb] add back dep on curl, use mongo-c-driver as bdep --- dev-db/mongodb/mongodb-5.0.27.ebuild | 6 +++++- dev-db/mongodb/mongodb-6.0.16.ebuild | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dev-db/mongodb/mongodb-5.0.27.ebuild b/dev-db/mongodb/mongodb-5.0.27.ebuild index 4181d79..02431df 100644 --- a/dev-db/mongodb/mongodb-5.0.27.ebuild +++ b/dev-db/mongodb/mongodb-5.0.27.ebuild @@ -33,11 +33,12 @@ RESTRICT="test" RDEPEND="acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.7:= + app-arch/zstd:= >=dev-cpp/yaml-cpp-0.6.2:= dev-libs/boost:=[nls] >=dev-libs/libpcre-8.42[cxx] - app-arch/zstd:= dev-libs/snowball-stemmer:= + net-misc/curl >=sys-libs/zlib-1.2.12:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( @@ -55,6 +56,7 @@ BDEPEND=" dev-python/psutil[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] ') + >=dev-libs/mongo-c-driver-1.13.0 " PDEPEND=" mongosh? ( app-admin/mongosh-bin ) @@ -125,6 +127,7 @@ src_configure() { CC="$(tc-getCC)" CXX="$(tc-getCXX)" CCFLAGS="${CXXFLAGS}" + CPPPATH="${EPREFIX}/usr/include/libmongoc-1.0" VERBOSE=1 VARIANT_DIR=gentoo @@ -135,6 +138,7 @@ src_configure() { --force-jobs --jobs="$(makeopts_jobs)" --use-system-boost + --use-system-mongo-c --use-system-pcre --use-system-snappy --use-system-stemmer diff --git a/dev-db/mongodb/mongodb-6.0.16.ebuild b/dev-db/mongodb/mongodb-6.0.16.ebuild index f7a8163..7f2c5f8 100644 --- a/dev-db/mongodb/mongodb-6.0.16.ebuild +++ b/dev-db/mongodb/mongodb-6.0.16.ebuild @@ -33,11 +33,12 @@ RESTRICT="test" RDEPEND="acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.7:= + app-arch/zstd:= >=dev-cpp/yaml-cpp-0.6.2:= dev-libs/boost:=[nls] >=dev-libs/libpcre-8.42[cxx] - app-arch/zstd:= dev-libs/snowball-stemmer:= + net-misc/curl >=sys-libs/zlib-1.2.12:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( @@ -58,6 +59,7 @@ BDEPEND=" dev-python/regex[${PYTHON_USEDEP}] dev-python/typing-extensions[${PYTHON_USEDEP}] ') + >=dev-libs/mongo-c-driver-1.13.0 " PDEPEND=" mongosh? ( app-admin/mongosh-bin ) @@ -130,6 +132,7 @@ src_configure() { CC="$(tc-getCC)" CXX="$(tc-getCXX)" CCFLAGS="${CXXFLAGS}" + CPPPATH="${EPREFIX}/usr/include/libmongoc-1.0" VERBOSE=1 VARIANT_DIR=gentoo