| 1 |
commit: badc3b9ce78ad3d67d43d217c1a328d71af82f26 |
| 2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 22 11:39:16 2020 +0000 |
| 4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 22 11:56:51 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=badc3b9c |
| 7 |
|
| 8 |
net-proxy/squidguard: fix QA issue with automake call in src_prepare |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/705374 |
| 11 |
Reported-by: Toralf Förster <toralf <AT> gentoo.org> |
| 12 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 13 |
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org> |
| 14 |
Package-Manager: Portage-2.3.84, Repoman-2.3.11 |
| 15 |
|
| 16 |
net-proxy/squidguard/squidguard-1.6.0.ebuild | 8 +++++--- |
| 17 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild b/net-proxy/squidguard/squidguard-1.6.0.ebuild |
| 20 |
index b826299c377..30193a1ef08 100644 |
| 21 |
--- a/net-proxy/squidguard/squidguard-1.6.0.ebuild |
| 22 |
+++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild |
| 23 |
@@ -51,9 +51,11 @@ src_prepare() { |
| 24 |
|
| 25 |
eapply_user |
| 26 |
eautoreconf |
| 27 |
- # eautomake does not work because of borked source code of squidguard buildsystem |
| 28 |
- # only needed to create install-sh and other missing stuff |
| 29 |
- automake --no-force --add-missing --copy |
| 30 |
+ |
| 31 |
+ # Workaround for missing install-sh, bug #705374 |
| 32 |
+ local amver=$(best_version sys-devel/automake) |
| 33 |
+ amver=$(ver_cut 1-2 "${amver#sys-devel/automake-}") |
| 34 |
+ cp -p "${BROOT}/usr/share/automake-${amver}/install-sh" . || die |
| 35 |
} |
| 36 |
|
| 37 |
src_configure() { |
Archives