net-misc/ntpsec: remove crufty/unsupported clock

* neoclock is no longer in the list of supported clocks

Closes: https://bugs.gentoo.org/828039
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Steve Arnold <nerdboy@gentoo.org>

3 files changed, 21 insertions, 11 deletions

diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml
index 9d4b63729b27..69f78f92c02d 100644
--- a/net-misc/ntpsec/metadata.xml
+++ b/net-misc/ntpsec/metadata.xml
@@ -28,7 +28,6 @@ NTPsec project - a secure, hardened, and improved implementation of Network Time
 		<flag name="rclock_zyfer">Zyfer driver</flag>
 		<flag name="rclock_arbiter">Arbiter 1088A/B GPS driver</flag>
 		<flag name="rclock_nmea">NMEA GPS driver</flag>
-		<flag name="rclock_neoclock">NeoClock4X DCF77/TDF driver</flag>
 		<flag name="rclock_modem">NIST/USNO/PTB Modem Time Services</flag>
 		<flag name="rclock_local">Support for undisciplined local clock (not recommended)</flag>
 		<flag name="smear">Specify the interval over which a leap second is applied (experimental)</flag>
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild
index 8835c7ccfcfb..379a375aacd1 100644
--- a/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild
@@ -23,8 +23,8 @@ HOMEPAGE="https://www.ntpsec.org/"
 
 NTPSEC_REFCLOCK=(
 	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea neoclock modem
-	local)
+	shm pps hpgps zyfer arbiter nmea modem local
+	)
 
 IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 4d520e72c5a9..2065ee52d6a6 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -3,10 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE='threads(+)'
+DISTUTILS_USE_SETUPTOOLS=no
 
-inherit flag-o-matic python-r1 waf-utils systemd
+inherit distutils-r1 flag-o-matic waf-utils systemd
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -14,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~riscv ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
@@ -22,8 +23,8 @@ HOMEPAGE="https://www.ntpsec.org/"
 
 NTPSEC_REFCLOCK=(
 	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea neoclock modem
-	local)
+	shm pps hpgps zyfer arbiter nmea modem local
+	)
 
 IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
@@ -48,7 +49,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,15 +57,23 @@ DEPEND="${CDEPEND}
 	rclock_pps? ( net-misc/pps-tools )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
+)
+
 WAF_BINARY="${S}/waf"
 
 src_prepare() {
 	default
+
 	# Remove autostripping of binaries
 	sed -i -e '/Strip binaries/d' wscript || die
 	if ! use libbsd ; then
 		eapply "${FILESDIR}/${PN}-no-bsd.patch"
 	fi
+	# remove extra default pool servers
+	sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
+
 	python_copy_sources
 }
 
@@ -85,9 +94,10 @@ src_configure() {
 	local myconf=(
 		--nopyc
 		--nopyo
+		--enable-pylib ext
 		--refclock="${CLOCKSTRING}"
-		--build-epoch="$(date +%s)"
-		$(use doc	&& echo "--enable-doc")
+		#--build-epoch="$(date +%s)"
+		$(use doc	|| echo "--disable-doc")
 		$(use early	&& echo "--enable-early-droproot")
 		$(use gdb	&& echo "--enable-debug-gdb")
 		$(use samba	&& echo "--enable-mssntp")
@@ -114,6 +124,7 @@ src_compile() {
 src_install() {
 	python_install() {
 		waf-utils_src_install
+		python_fix_shebang "${ED}"
 	}
 	python_foreach_impl run_in_build_dir python_install
 	python_foreach_impl python_optimize