From 94ce2cab54aacbe0381377f680be1eaa42b0532a Mon Sep 17 00:00:00 2001 From: Tomas Mozes Date: Wed, 9 Jan 2019 16:27:23 +0100 Subject: dev-libs/mongo-c-driver: disable automagic on dev-libs/icu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/666592 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Tomáš Mózes Closes: https://github.com/gentoo/gentoo/pull/10788 Signed-off-by: Thomas Deutschmann --- .../mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild | 91 ++++++++++++++++++++++ .../mongo-c-driver/mongo-c-driver-1.13.0.ebuild | 89 --------------------- 2 files changed, 91 insertions(+), 89 deletions(-) create mode 100644 dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild delete mode 100644 dev-libs/mongo-c-driver/mongo-c-driver-1.13.0.ebuild diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild new file mode 100644 index 000000000000..33fa57718039 --- /dev/null +++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +DESCRIPTION="Client library written in C for MongoDB" +HOMEPAGE="https://github.com/mongodb/mongo-c-driver" +SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~hppa x86" +IUSE="debug examples icu libressl sasl ssl static-libs test" +REQUIRED_USE="test? ( static-libs )" + +RDEPEND="app-arch/snappy:= + >=dev-libs/libbson-${PV} + dev-python/sphinx + sys-libs/zlib:= + icu? ( dev-libs/icu:= ) + sasl? ( dev-libs/cyrus-sasl:= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + )" +DEPEND="${RDEPEND} + test? ( + dev-db/mongodb + dev-libs/libbson[static-libs] + )" + +# No tests on x86 because tests require dev-db/mongodb which don't support +# x86 anymore (bug #645994) +RESTRICT="x86? ( test )" + +PATCHES=( + "${FILESDIR}/${P}-no-uninstall.patch" + "${FILESDIR}/${P}-enable-tests.patch" # enable tests with system libbson +) + +src_prepare() { + cmake-utils_src_prepare + + # copy private headers for tests since we don't build libbson + if use test; then + mkdir -p src/libbson/tests/bson || die + for f in bson-fnv-private.h bson-iso8601-private.h bson-private.h bson-thread-private.h; do + cp -v src/libbson/src/bson/${f} src/libbson/tests/bson/ || die + done + fi +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath + -DENABLE_BSON=SYSTEM + -DENABLE_EXAMPLES=OFF + -DENABLE_ICU="$(usex icu ON OFF)" + -DENABLE_MAN_PAGES=ON + -DENABLE_MONGOC=ON + -DENABLE_SNAPPY=SYSTEM + -DENABLE_ZLIB=SYSTEM + -DENABLE_SASL="$(usex sasl CYRUS OFF)" + -DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)" + -DENABLE_STATIC="$(usex static-libs ON OFF)" + -DENABLE_TESTS="$(usex test ON OFF)" + -DENABLE_TRACING="$(usex debug ON OFF)" + ) + + cmake-utils_src_configure +} + +# FEATURES="test" USE="static-libs" emerge dev-libs/mongo-c-driver +src_test() { + local PORT=27099 + mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \ + --dbpath="${T}" --logpath="${T}/mongod.log" || die + MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die + kill $(<"${T}/mongod.lock") +} + +src_install() { + if use examples; then + docinto examples + dodoc src/libmongoc/examples/*.c + fi + + cmake-utils_src_install +} diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0.ebuild deleted file mode 100644 index 5eeca7c911d3..000000000000 --- a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -DESCRIPTION="Client library written in C for MongoDB" -HOMEPAGE="https://github.com/mongodb/mongo-c-driver" -SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~hppa x86" -IUSE="debug examples libressl sasl ssl static-libs test" -REQUIRED_USE="test? ( static-libs )" - -RDEPEND="app-arch/snappy:= - >=dev-libs/libbson-${PV} - dev-python/sphinx - sys-libs/zlib:= - sasl? ( dev-libs/cyrus-sasl:= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" -DEPEND="${RDEPEND} - test? ( - dev-db/mongodb - dev-libs/libbson[static-libs] - )" - -# No tests on x86 because tests require dev-db/mongodb which don't support -# x86 anymore (bug #645994) -RESTRICT="x86? ( test )" - -PATCHES=( - "${FILESDIR}/${P}-no-uninstall.patch" - "${FILESDIR}/${P}-enable-tests.patch" # enable tests with system libbson -) - -src_prepare() { - cmake-utils_src_prepare - - # copy private headers for tests since we don't build libbson - if use test; then - mkdir -p src/libbson/tests/bson || die - for f in bson-fnv-private.h bson-iso8601-private.h bson-private.h bson-thread-private.h; do - cp -v src/libbson/src/bson/${f} src/libbson/tests/bson/ || die - done - fi -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath - -DENABLE_BSON=SYSTEM - -DENABLE_EXAMPLES=OFF - -DENABLE_MAN_PAGES=ON - -DENABLE_MONGOC=ON - -DENABLE_SNAPPY=SYSTEM - -DENABLE_ZLIB=SYSTEM - -DENABLE_SASL="$(usex sasl CYRUS OFF)" - -DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)" - -DENABLE_STATIC="$(usex static-libs ON OFF)" - -DENABLE_TESTS="$(usex test ON OFF)" - -DENABLE_TRACING="$(usex debug ON OFF)" - ) - - cmake-utils_src_configure -} - -# FEATURES="test" USE="static-libs" emerge dev-libs/mongo-c-driver -src_test() { - local PORT=27099 - mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \ - --dbpath="${T}" --logpath="${T}/mongod.log" || die - MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die - kill $(<"${T}/mongod.lock") -} - -src_install() { - if use examples; then - docinto examples - dodoc src/libmongoc/examples/*.c - fi - - cmake-utils_src_install -} -- cgit v1.2.3-65-gdbad