gentoo resync : 25.11.2020

3 files changed, 23 insertions, 3 deletions

diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index c2c262e5084f..9ea8ad5fb105 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -7,12 +7,13 @@ AUX ntpsec-1.1.7-make-sure-logrotate-config-has-missingok.patch 736 BLAKE2B 6318
 AUX ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch 854 BLAKE2B dc063775eee0248e24c174056581979582dd1dbc4e4fd0901add3f26b63cbb342469598f1fd2be8af8c1da561c1f225349cec258fcfb4af9355d47e33bcf77eb SHA512 a5c6d652c4d696af126f199df7ec1e8a9c33f55b3a0d02b5576898d34016780f51e06aa4e0e84a1d2862f57d08fd4285dd0888bac5aac9fec94c26a2e9b99043
 AUX ntpsec-1.1.8-fix-asciidoc-version-detect.patch 14369 BLAKE2B 5f2152463b0a551202f07b535bcd14ef8a94a599643ab5e6dedf481eacc97ba7f8e7491ead10473b2988b07cef41a65c6c3612b564a155df4a01fb6df7bdb0db SHA512 b171e5b0f3f493db6a2d10b0e9ecacf3cd8b6ed49f363d431c8d4a5fc3314acdbc4c82882967f4ef72193c6e3851a3aed5d667820175f75e43b413a277f31a19
 AUX ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch 536 BLAKE2B cac17041a05d0ec22b8d95dbb16118d7603c74a7d4c873422de65451f5ddd74b7d9aceb51714d842ef7c4a37ea638212487d6db99ebfa201b01b9654b732538c SHA512 c54b3304ca467e8434e29d312e5839c788becd8ae9068737ec9725a42f22073ea0e86355999dc6d606c12f4c733497cbe48bd49b6e150c39e6540e581df6087e
+AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0dba7f268febd10fa7599ef6b9bee30199ce10529d2d326719f5b376d301aabfef3beacecd4af813bcef1d6a65d61ab00996d72f1240f83ef8e3 SHA512 3e012ad70507f440ed3a4aca4886a96e40d49a0dd7c14572f664633a56139cb7767e07ee1bb5e8295fc32052914364660c928d11369b6f80193ae7e190e5a48e
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
 DIST ntpsec-1.1.7.tar.gz 2534524 BLAKE2B 5777ecca4ceb988632fadc0e7124530993a7758cdf335e8cd90f0ec1a8b643be89b67c0e2bf49d6d7193bf92ded138af0df4b5856c0d113f552ef22dd8a6cadf SHA512 734b12820539e655e504dd5071a58b9d1f80c0b0c3c7458c797ba7ada23d8e446751fbcbddd9832d9151a3ba9464749878db9e77e23cdd5f6215ab9e1d908ae9
 DIST ntpsec-1.1.8.tar.gz 2589363 BLAKE2B e7e11a7d980599ac598f084608160d3f6f6cf8e2aab5fb45cc15cabca30462bd03db7b9ecc140826c5d7b5e26f49b48f7f2b6043bdc2ffa1d73167347fb8123f SHA512 0920f25adf68f1b8ccd1734c5d61ba1c858cd86b342db7b5155dd9b58e538aa96aad3fd4058597f079ec3df63cb51d2900ac8e6d9c84d6f2bd4a3a22cc0c967c
 DIST ntpsec-1.1.9.tar.gz 2606066 BLAKE2B bbc482333c7f86936fa20751df1b427bc24be159969050caf5751e26724714bbf6491b120986563497f015c96ac9cdbdf0e999c6446a68798aff23076f631ecc SHA512 e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b
 EBUILD ntpsec-1.1.7-r1.ebuild 4157 BLAKE2B 9c992edfdb1ce011c07190c1f91da6eae3f8dada516587a94ea9a5aa2feedfc904583b63bca288df2301d8b2ae58d7353a822ee9ece4c34c99243076f776b0a2 SHA512 8afda370b45d2048f10c7f3122d67af4c45204b021a5ad62e686c35c79c59fed627cedb6d39653560354b692614222bbafd46938a2620a423defa6816f170f13
 EBUILD ntpsec-1.1.8.ebuild 4345 BLAKE2B 5912cebcb1f7315538293b3c0c332abaa43525b2d78c89d8d1bdda102bdfbcfb2c01a48ce599911952708ffac64a25607844d198d0f2bd43175f749fcf96a3bb SHA512 239de4704281175438c76099ecb03726ce467c811077e2d11b11671ebde6d102ecdf50838eaeae94484daa4af48bee5b2e336df440888f64fc4e599d8da69702
-EBUILD ntpsec-1.1.9.ebuild 4053 BLAKE2B f5b5015d72999c7f30053bd20a3bea86ccc7190d55a435b77d6b3dc6832843ee2e502251987c3a6aab527fb79b0fe56f6ee41ea9c3f3d789c98e27a2703ff62e SHA512 a655d1b47f0225bef39bd15d1b1501caf7e26e5232a606fbf18bfb81625a0877ac618f1bb2dd2a5be2cb52e9122bddcbae8a868ee9c829ed30f23d03b6371764
+EBUILD ntpsec-1.1.9.ebuild 4197 BLAKE2B 956af55af711b07390c1d600a6b3ad6b4ddd3effdd0f295c85e4b7a1c0ec3b9fd70286a772140afb4cb94fd292ae5be2fc843dad6e7fd34cc2dfc2b92eae4be8 SHA512 ed39608122eb5d414ddabc35e63676d40e0b1d0375247442a9a19383c0069f37530c1985d6cd3589a05468e16418464d5e53a6c6482998ea28f968e77730a2a6
 EBUILD ntpsec-9999.ebuild 4056 BLAKE2B c47d9c0fe4c01f1d66f1dc115f801cf95a6d8a7646f621c6e127b898581eb211520ea63e2eef43999039c32d6cc2eafd15fe8721ef4a5484e3528658ab11385f SHA512 c64b7cac7418191e75aa827e800f535a193165f5395215ffa3aca99a6ed0675d5a5c060eb5a3ed662882f2b3911977b918fe9366b49c7a7053f2f186ec60c1d5
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
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")