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 69B2D138350 for ; Wed, 22 Jan 2020 11:57:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42327E08EB; Wed, 22 Jan 2020 11:57:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 259CFE08EB for ; Wed, 22 Jan 2020 11:57:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 ADC0534E320 for ; Wed, 22 Jan 2020 11:57:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B64A35 for ; Wed, 22 Jan 2020 11:57:37 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1579694211.badc3b9ce78ad3d67d43d217c1a328d71af82f26.pinkbyte@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/squidguard/squidguard-1.6.0.ebuild X-VCS-Directories: net-proxy/squidguard/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: badc3b9ce78ad3d67d43d217c1a328d71af82f26 X-VCS-Branch: master Date: Wed, 22 Jan 2020 11:57:37 +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: bc69c414-48c8-44c1-a018-1308bbbb6fe8 X-Archives-Hash: feb49c6634644d60890e54d65f6d43cb commit: badc3b9ce78ad3d67d43d217c1a328d71af82f26 Author: Sergey Popov gentoo org> AuthorDate: Wed Jan 22 11:39:16 2020 +0000 Commit: Sergey Popov gentoo org> CommitDate: Wed Jan 22 11:56:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=badc3b9c net-proxy/squidguard: fix QA issue with automake call in src_prepare Closes: https://bugs.gentoo.org/705374 Reported-by: Toralf Förster gentoo.org> Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Sergey Popov gentoo.org> Package-Manager: Portage-2.3.84, Repoman-2.3.11 net-proxy/squidguard/squidguard-1.6.0.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild b/net-proxy/squidguard/squidguard-1.6.0.ebuild index b826299c377..30193a1ef08 100644 --- a/net-proxy/squidguard/squidguard-1.6.0.ebuild +++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild @@ -51,9 +51,11 @@ src_prepare() { eapply_user eautoreconf - # eautomake does not work because of borked source code of squidguard buildsystem - # only needed to create install-sh and other missing stuff - automake --no-force --add-missing --copy + + # Workaround for missing install-sh, bug #705374 + local amver=$(best_version sys-devel/automake) + amver=$(ver_cut 1-2 "${amver#sys-devel/automake-}") + cp -p "${BROOT}/usr/share/automake-${amver}/install-sh" . || die } src_configure() {