commit:     badc3b9ce78ad3d67d43d217c1a328d71af82f26
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 11:39:16 2020 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> 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 <toralf <AT> gentoo.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Sergey Popov <pinkbyte <AT> 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() {

Reply via email to