Gentoo Archives: gentoo-commits

From: Steve Arnold <nerdboy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntpsec/, net-misc/ntpsec/files/
Date: Wed, 07 Oct 2020 22:49:16
Message-Id: 1602110924.7f1e7fafe1ce27758f59f65282b93b1b70f3badd.nerdboy@gentoo
1 commit: 7f1e7fafe1ce27758f59f65282b93b1b70f3badd
2 Author: Steve Arnold <nerdboy <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 7 22:47:07 2020 +0000
4 Commit: Steve Arnold <nerdboy <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 7 22:48:44 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f1e7faf
7
8 net-misc/ntpsec: short-circuit broken asciidoctor version parsing
9
10 * update doc use flag for new upstream default
11
12 Closes: https://bugs.gentoo.org/746872
13 Package-Manager: Portage-3.0.8, Repoman-3.0.1
14 Signed-off-by: Steve Arnold <nerdboy <AT> gentoo.org>
15
16 .../ntpsec-1.1.9-remove-asciidoctor-from-config.patch | 14 ++++++++++++++
17 net-misc/ntpsec/ntpsec-1.1.9.ebuild | 9 +++++++--
18 2 files changed, 21 insertions(+), 2 deletions(-)
19
20 diff --git a/net-misc/ntpsec/files/ntpsec-1.1.9-remove-asciidoctor-from-config.patch b/net-misc/ntpsec/files/ntpsec-1.1.9-remove-asciidoctor-from-config.patch
21 new file mode 100644
22 index 00000000000..1f483ce33fb
23 --- /dev/null
24 +++ b/net-misc/ntpsec/files/ntpsec-1.1.9-remove-asciidoctor-from-config.patch
25 @@ -0,0 +1,14 @@
26 +--- a/wafhelpers/asciidoc.py 2020-10-06 20:14:47.040245129 -0700
27 ++++ b/wafhelpers/asciidoc.py 2020-10-06 20:17:48.100394117 -0700
28 +@@ -37,9 +37,9 @@
29 + # asciidoc versions 8.6.5-8.6.7 throw warnings for warp.adoc and versions
30 + # < 8.6.4 have no HTML5 backend.
31 + # asciidoc3 versions < 3.0.2 throw errors.
32 +- adoc_list = [['asciidoctor', (1, 5, 8)],
33 +- ['asciidoc', (8, 6, 8)],
34 ++ adoc_list = [['asciidoc', (8, 6, 8)],
35 + ['asciidoc3', (3, 0, 2)],
36 ++ ['asciidoctor-bad', (1, 5, 8)],
37 + ]
38 + for progname, asciidocminver in adoc_list:
39 + if 'BIN_ASCIIDOC' not in ctx.env or ctx.env.BIN_ASCIIDOC == []:
40
41 diff --git a/net-misc/ntpsec/ntpsec-1.1.9.ebuild b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
42 index 1af747e2e91..51381f4b16b 100644
43 --- a/net-misc/ntpsec/ntpsec-1.1.9.ebuild
44 +++ b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
45 @@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
46 acct-user/ntp
47 "
48 DEPEND="${CDEPEND}
49 - app-text/asciidoc
50 + >=app-text/asciidoc-8.6.8
51 dev-libs/libxslt
52 app-text/docbook-xsl-stylesheets
53 sys-devel/bison
54 @@ -56,6 +56,11 @@ DEPEND="${CDEPEND}
55 rclock_pps? ( net-misc/pps-tools )
56 "
57
58 +PATCHES=(
59 + "${FILESDIR}/${PN}-1.1.8-fix-missing-scmp_sys-on-aarch64.patch"
60 + "${FILESDIR}/${P}-remove-asciidoctor-from-config.patch"
61 +)
62 +
63 WAF_BINARY="${S}/waf"
64
65 src_prepare() {
66 @@ -87,7 +92,7 @@ src_configure() {
67 --nopyo
68 --refclock="${CLOCKSTRING}"
69 --build-epoch="$(date +%s)"
70 - $(use doc && echo "--enable-doc")
71 + $(use doc || echo "--disable-doc")
72 $(use early && echo "--enable-early-droproot")
73 $(use gdb && echo "--enable-debug-gdb")
74 $(use samba && echo "--enable-mssntp")