From: "Sergey Popov" <pinkbyte@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
Date: Wed, 22 Jan 2020 11:57:37 +0000 (UTC) [thread overview]
Message-ID: <1579694211.badc3b9ce78ad3d67d43d217c1a328d71af82f26.pinkbyte@gentoo> (raw)
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() {
next reply other threads:[~2020-01-22 11:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 11:57 Sergey Popov [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-12-08 12:49 [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/ Sergey Popov
2020-03-09 12:48 Agostino Sarubbo
2020-03-09 12:42 Agostino Sarubbo
2020-03-09 12:39 Agostino Sarubbo
2020-03-09 11:17 Agostino Sarubbo
2020-03-08 16:58 Sergey Popov
2017-05-12 9:20 Sergey Popov
2016-07-05 15:27 Jeroen Roovers
2015-11-13 9:42 Agostino Sarubbo
2015-10-12 13:31 Sergey Popov
2015-10-12 13:31 Sergey Popov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1579694211.badc3b9ce78ad3d67d43d217c1a328d71af82f26.pinkbyte@gentoo \
--to=pinkbyte@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox