[gentoo-commits] repo/gentoo:master commit in: net-misc/ntpsec/, net-misc/ntpsec/files/

["Steve Arnold" <nerdboy@gentoo.org>]

commit:     7f1e7fafe1ce27758f59f65282b93b1b70f3badd
Author:     Steve Arnold <nerdboy <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  7 22:47:07 2020 +0000
Commit:     Steve Arnold <nerdboy <AT> gentoo <DOT> org>
CommitDate: Wed Oct  7 22:48:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f1e7faf

net-misc/ntpsec: short-circuit broken asciidoctor version parsing

* update doc use flag for new upstream default

Closes: https://bugs.gentoo.org/746872
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Steve Arnold <nerdboy <AT> gentoo.org>

 .../ntpsec-1.1.9-remove-asciidoctor-from-config.patch      | 14 ++++++++++++++
 net-misc/ntpsec/ntpsec-1.1.9.ebuild                        |  9 +++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

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
new file mode 100644
index 00000000000..1f483ce33fb
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-1.1.9-remove-asciidoctor-from-config.patch
@@ -0,0 +1,14 @@
+--- a/wafhelpers/asciidoc.py	2020-10-06 20:14:47.040245129 -0700
++++ b/wafhelpers/asciidoc.py	2020-10-06 20:17:48.100394117 -0700
+@@ -37,9 +37,9 @@
+     # asciidoc versions 8.6.5-8.6.7 throw warnings for warp.adoc and versions
+     # < 8.6.4 have no HTML5 backend.
+     # asciidoc3 versions < 3.0.2 throw errors.
+-    adoc_list = [['asciidoctor', (1, 5, 8)],
+-                 ['asciidoc', (8, 6, 8)],
++    adoc_list = [['asciidoc', (8, 6, 8)],
+                  ['asciidoc3', (3, 0, 2)],
++                 ['asciidoctor-bad', (1, 5, 8)],
+                  ]
+     for progname, asciidocminver in adoc_list:
+         if 'BIN_ASCIIDOC' not in ctx.env or ctx.env.BIN_ASCIIDOC == []:

diff --git a/net-misc/ntpsec/ntpsec-1.1.9.ebuild b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
index 1af747e2e91..51381f4b16b 100644
--- a/net-misc/ntpsec/ntpsec-1.1.9.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 	acct-user/ntp
 "
 DEPEND="${CDEPEND}
-	app-text/asciidoc
+	>=app-text/asciidoc-8.6.8
 	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
 	sys-devel/bison
@@ -56,6 +56,11 @@ DEPEND="${CDEPEND}
 	rclock_pps? ( net-misc/pps-tools )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.8-fix-missing-scmp_sys-on-aarch64.patch"
+	"${FILESDIR}/${P}-remove-asciidoctor-from-config.patch"
+)
+
 WAF_BINARY="${S}/waf"
 
 src_prepare() {
@@ -87,7 +92,7 @@ src_configure() {
 		--nopyo
 		--refclock="${CLOCKSTRING}"
 		--build-epoch="$(date +%s)"
-		$(use doc	&& echo "--enable-doc")
+		$(use doc	|| echo "--disable-doc")
 		$(use early	&& echo "--enable-early-droproot")
 		$(use gdb	&& echo "--enable-debug-gdb")
 		$(use samba	&& echo "--enable-mssntp")