net-misc/networkmanager: fix gtk-doc USE flag and deps

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

diff --git a/net-misc/networkmanager/networkmanager-1.22.10-r10.ebuild b/net-misc/networkmanager/networkmanager-1.22.10-r10.ebuild
index 7b94991d6828be1994bedc77b8d6f19c10f08445..a6ae13c86a5dbb2acb8ef9eba5d08fa28772fbc9 100644 (file)
--- a/net-misc/networkmanager/networkmanager-1.22.10-r10.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.22.10-r10.ebuild
@@ -15,12 +15,12 @@ LICENSE="GPL-2+"
 SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="audit bluetooth +concheck connection-sharing consolekit +dhclient dhcpcd "
-IUSE+="debug doc elogind examples +gnutls introspection iwd json kernel_linux "
+IUSE+="debug elogind examples +gnutls gtk-doc introspection iwd json kernel_linux "
 IUSE+="libpsl lto modemmanager nss ofono ovs +policykit ppp resolvconf selinux "
 IUSE+="syslog systemd teamd test +tools vala wext +wifi"
 
 REQUIRED_USE="
-       doc? ( introspection )
+       gtk-doc? ( introspection )
        iwd? ( wifi )
        vala? ( introspection )
        ^^ ( gnutls nss )
@@ -46,7 +46,6 @@ DEPEND="
        consolekit? ( sys-auth/consolekit )
        dhclient? ( net-misc/dhcp[client] )
        dhcpcd? ( net-misc/dhcpcd )
-       doc? ( dev-util/gtk-doc )
        elogind? ( sys-auth/elogind )
        gnutls? (
                dev-libs/libgcrypt:0=
@@ -89,6 +88,8 @@ RDEPEND="${DEPEND}
        )
 "
 BDEPEND="dev-util/intltool
+       gtk-doc? ( dev-util/gtk-doc
+               app-text/docbook-xml-dtd:4.1.2 )
        sys-devel/gettext
        virtual/pkgconfig
        introspection? (
@@ -220,7 +221,7 @@ src_configure() {
 
                $(meson_use introspection)
                $(meson_use vala vapi)
-               $(meson_use doc docs)
+               $(meson_use gtk-doc docs)
                # $(meson_use debug more_asserts)
                -D more_asserts=0
                $(meson_use debug more_logging)