summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <nerdboy@gentoo.org>2020-10-07 15:47:07 -0700
committerSteve Arnold <nerdboy@gentoo.org>2020-10-07 15:48:44 -0700
commit7f1e7fafe1ce27758f59f65282b93b1b70f3badd (patch)
treea1148d00738b8519f2b3f52e4842239a0e68f07c /net-misc/ntpsec
parentapp-misc/go-jira: 1.0.27 bump (diff)
downloadgentoo-7f1e7fafe1ce27758f59f65282b93b1b70f3badd.tar.gz
gentoo-7f1e7fafe1ce27758f59f65282b93b1b70f3badd.tar.bz2
gentoo-7f1e7fafe1ce27758f59f65282b93b1b70f3badd.zip
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@gentoo.org>
Diffstat (limited to 'net-misc/ntpsec')
-rw-r--r--net-misc/ntpsec/files/ntpsec-1.1.9-remove-asciidoctor-from-config.patch14
-rw-r--r--net-misc/ntpsec/ntpsec-1.1.9.ebuild9
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 000000000000..1f483ce33fbd
--- /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 1af747e2e914..51381f4b16be 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")