--- /var/db/repos/gentoo/dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild   2020-08-06 16:39:16.000000000 +0200
+++ dev-libs/mongo-c-driver/mongo-c-driver-1.17.0.ebuild        2020-08-22 19:00:44.000000000 +0200
@@ -3,7 +3,7 @@

 EAPI=7

-inherit cmake-utils
+inherit cmake

 DESCRIPTION="Client library written in C for MongoDB"
 HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
@@ -12,13 +12,13 @@
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~s390 ~x86"
-IUSE="debug examples icu libressl sasl ssl static-libs test"
+IUSE="debug doc examples icu libressl sasl ssl static-libs test"
 REQUIRED_USE="test? ( static-libs )"

 RDEPEND="app-arch/snappy:=
        app-arch/zstd:=
        >=dev-libs/libbson-${PV}[static-libs?]
-       dev-python/sphinx
+       doc? ( dev-python/sphinx:= )
        sys-libs/zlib:=
        icu? ( dev-libs/icu:= )
        sasl? ( dev-libs/cyrus-sasl:= )
@@ -38,13 +38,13 @@
        !test? ( test )"

 PATCHES=(
-       "${FILESDIR}/${PN}-1.14.0-no-docs.patch"
+#      "${FILESDIR}/${PN}-1.14.0-no-docs.patch"
        "${FILESDIR}/${PN}-1.16.2-enable-tests.patch" # enable tests with system libbson
-       "${FILESDIR}/${PN}-1.16.2-sphinx.patch"
+#      "${FILESDIR}/${PN}-1.16.2-sphinx.patch"
 )

 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare

        # copy private headers for tests since we don't build libbson
        if use test; then
@@ -57,9 +57,10 @@
        local mycmakeargs=(
                -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
                -DENABLE_BSON=SYSTEM
-               -DENABLE_EXAMPLES=OFF
+               -DENABLE_EXAMPLES="$(usex examples ON OFF)"
+               -DENABLE_HTML_DOCS="$(usex doc ON OFF)"
                -DENABLE_ICU="$(usex icu ON OFF)"
-               -DENABLE_MAN_PAGES=ON
+               -DENABLE_MAN_PAGES="$(usex doc ON OFF)"
                -DENABLE_MONGOC=ON
                -DENABLE_SNAPPY=SYSTEM
                -DENABLE_ZLIB=SYSTEM
@@ -72,7 +73,7 @@
                -DENABLE_ZSTD=ON
        )

-       cmake-utils_src_configure
+       cmake_src_configure
 }

 # FEATURES="test -network-sandbox" USE="static-libs" emerge dev-libs/mongo-c-driver
@@ -90,5 +91,5 @@
                dodoc src/libmongoc/examples/*.c
        fi

-       cmake-utils_src_install
+       cmake_src_install
 }