dev-libs/glib-2.58.1: actually fix build without dev-util/gtk-doc

Our empty gtk-doc.make has to actually be near-empty and still declare
EXTRA_DIST and CLEANFILES, as that's what autogen.sh does to have it
working and it fails otherwise. Not sure how I managed to not notice
this during testing, as I'm pretty sure I tried without gtk-doc - maybe
a failure to delete workdir inbetween different tries.
Add note that we exceptionally do NOT need gtk-doc-am during build for
this package with USE=-gtk-doc

Bug: https://bugs.gentoo.org/673336
Closes: https://bugs.gentoo.org/673346
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11

diff --git a/dev-libs/glib/glib-2.58.1.ebuild b/dev-libs/glib/glib-2.58.1.ebuild
index 20eae2bd2ebbbdac4bdcd52fb0a452f456e4aa53..c9d5bdbbe0ff55257c0010f21b360d6a20833a07 100644 (file)
--- a/dev-libs/glib/glib-2.58.1.ebuild
+++ b/dev-libs/glib/glib-2.58.1.ebuild
@@ -56,8 +56,9 @@ DEPEND="${RDEPEND}
                sys-devel/gdb
                >=dev-util/gdbus-codegen-${PV}
                >=sys-apps/dbus-1.2.14 )
-       !<dev-util/gtk-doc-1.15-r2
 "
+# configure.ac has gtk-doc-am stuff behind m4_ifdef, so we don't need a gtk-doc-am build dep
+
 # Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate
 # python depending package, which can be buildtime depended in packages that
 # need these tools, without pulling in python at runtime.
@@ -129,10 +130,13 @@ src_prepare() {
        eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch
 
        # Tarball doesn't come with gtk-doc.make and we can't unconditionally depend on dev-util/gtk-doc due
-       # to circular deps during bootstramp. If actually not building gtk-doc, an empty file will do fine as
-       # well - this is also what upstream autogen.sh does if gtkdocize is not found. If gtk-doc is installed,
-       # eautoreconf will call gtkdocize, which overwrites the empty gtk-doc.make with a full copy.
-       touch gtk-doc.make
+       # to circular deps during bootstramp. If actually not building gtk-doc, an almost empty file will do
+       # fine as well - this is also what upstream autogen.sh does if gtkdocize is not found. If gtk-doc is
+       # installed, eautoreconf will call gtkdocize, which overwrites the empty gtk-doc.make with a full copy.
+       cat > gtk-doc.make << EOF
+EXTRA_DIST =
+CLEANFILES =
+EOF
 
        gnome2_src_prepare
        epunt_cxx