From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB6531382C5 for ; Mon, 7 Dec 2020 17:32:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF561E0BB7; Mon, 7 Dec 2020 17:32:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B0ABE0BB7 for ; Mon, 7 Dec 2020 17:32:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F3683412B4 for ; Mon, 7 Dec 2020 17:32:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2195A447 for ; Mon, 7 Dec 2020 17:32:11 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1607362320.0ae964088363becd2b3604d4ce3b87cd5752451b.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/gtk-doc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/gtk-doc/gtk-doc-1.33.1-r1.ebuild dev-util/gtk-doc/gtk-doc-1.33.1-r2.ebuild X-VCS-Directories: dev-util/gtk-doc/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 0ae964088363becd2b3604d4ce3b87cd5752451b X-VCS-Branch: master Date: Mon, 7 Dec 2020 17:32:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a90be352-efd2-411c-9cae-7f632d614422 X-Archives-Hash: dfccfb34d364fda7b03ef81811517820 commit: 0ae964088363becd2b3604d4ce3b87cd5752451b Author: Matt Turner gentoo org> AuthorDate: Mon Dec 7 17:31:38 2020 +0000 Commit: Matt Turner gentoo 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 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}"