[gentoo-commits] repo/gentoo:master commit in: dev-util/gtk-doc/

["Matt Turner" <mattst88@gentoo.org>]

commit:     0ae964088363becd2b3604d4ce3b87cd5752451b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 17:31:38 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 17:32:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae96408

dev-util/gtk-doc: Install stray autotools components

Closes: https://bugs.gentoo.org/758893
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../gtk-doc/{gtk-doc-1.33.1-r1.ebuild => gtk-doc-1.33.1-r2.ebuild}   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-util/gtk-doc/gtk-doc-1.33.1-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.1-r2.ebuild
similarity index 93%
rename from dev-util/gtk-doc/gtk-doc-1.33.1-r1.ebuild
rename to dev-util/gtk-doc/gtk-doc-1.33.1-r2.ebuild
index c0e8bf251f9..6bf9e35bbd9 100644
--- a/dev-util/gtk-doc/gtk-doc-1.33.1-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.33.1-r2.ebuild
@@ -67,7 +67,6 @@ src_configure() {
 	local emesonargs=(
 		$(meson_use test tests)
 		$(meson_use doc yelp_manual)
-		-Dautotools_support=false
 	)
 	meson_src_configure
 }
@@ -85,6 +84,10 @@ src_install() {
 	sed -i -e 's:^#!.*:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die
 	python_fix_shebang "${ED}"/usr/bin/*
 
+	# Don't install this file, it's in gtk-doc-am now
+	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
+	rmdir "${ED}"/usr/share/aclocal || die
+
 	if use emacs; then
 		elisp-install ${PN} tools/gtk-doc.el*
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"