| 1 |
commit: 3237d7b791bd52013ef59465ce39f9e7bf396565 |
| 2 |
Author: Steve Arnold <nerdboy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 6 01:29:08 2021 +0000 |
| 4 |
Commit: Steve Arnold <nerdboy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 6 01:41:02 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3237d7b7 |
| 7 |
|
| 8 |
net-misc/ntpsec: remove crufty/unsupported clock |
| 9 |
|
| 10 |
* neoclock is no longer in the list of supported clocks |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/828039 |
| 13 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 14 |
Signed-off-by: Steve Arnold <nerdboy <AT> gentoo.org> |
| 15 |
|
| 16 |
net-misc/ntpsec/metadata.xml | 1 - |
| 17 |
net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild | 4 ++-- |
| 18 |
net-misc/ntpsec/ntpsec-9999.ebuild | 27 +++++++++++++++++++-------- |
| 19 |
3 files changed, 21 insertions(+), 11 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml |
| 22 |
index 9d4b63729b27..69f78f92c02d 100644 |
| 23 |
--- a/net-misc/ntpsec/metadata.xml |
| 24 |
+++ b/net-misc/ntpsec/metadata.xml |
| 25 |
@@ -28,7 +28,6 @@ NTPsec project - a secure, hardened, and improved implementation of Network Time |
| 26 |
<flag name="rclock_zyfer">Zyfer driver</flag> |
| 27 |
<flag name="rclock_arbiter">Arbiter 1088A/B GPS driver</flag> |
| 28 |
<flag name="rclock_nmea">NMEA GPS driver</flag> |
| 29 |
- <flag name="rclock_neoclock">NeoClock4X DCF77/TDF driver</flag> |
| 30 |
<flag name="rclock_modem">NIST/USNO/PTB Modem Time Services</flag> |
| 31 |
<flag name="rclock_local">Support for undisciplined local clock (not recommended)</flag> |
| 32 |
<flag name="smear">Specify the interval over which a leap second is applied (experimental)</flag> |
| 33 |
|
| 34 |
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild |
| 35 |
index 8835c7ccfcfb..379a375aacd1 100644 |
| 36 |
--- a/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild |
| 37 |
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild |
| 38 |
@@ -23,8 +23,8 @@ HOMEPAGE="https://www.ntpsec.org/" |
| 39 |
|
| 40 |
NTPSEC_REFCLOCK=( |
| 41 |
oncore trimble truetime gpsd jjy generic spectracom |
| 42 |
- shm pps hpgps zyfer arbiter nmea neoclock modem |
| 43 |
- local) |
| 44 |
+ shm pps hpgps zyfer arbiter nmea modem local |
| 45 |
+ ) |
| 46 |
|
| 47 |
IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} |
| 48 |
|
| 49 |
|
| 50 |
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild |
| 51 |
index 4d520e72c5a9..2065ee52d6a6 100644 |
| 52 |
--- a/net-misc/ntpsec/ntpsec-9999.ebuild |
| 53 |
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild |
| 54 |
@@ -3,10 +3,11 @@ |
| 55 |
|
| 56 |
EAPI=7 |
| 57 |
|
| 58 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
| 59 |
+PYTHON_COMPAT=( python3_{7..9} ) |
| 60 |
PYTHON_REQ_USE='threads(+)' |
| 61 |
+DISTUTILS_USE_SETUPTOOLS=no |
| 62 |
|
| 63 |
-inherit flag-o-matic python-r1 waf-utils systemd |
| 64 |
+inherit distutils-r1 flag-o-matic waf-utils systemd |
| 65 |
|
| 66 |
if [[ ${PV} == *9999* ]]; then |
| 67 |
inherit git-r3 |
| 68 |
@@ -14,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then |
| 69 |
else |
| 70 |
SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" |
| 71 |
RESTRICT="mirror" |
| 72 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 73 |
+ KEYWORDS="amd64 arm arm64 ~riscv ~x86" |
| 74 |
fi |
| 75 |
|
| 76 |
DESCRIPTION="The NTP reference implementation, refactored" |
| 77 |
@@ -22,8 +23,8 @@ HOMEPAGE="https://www.ntpsec.org/" |
| 78 |
|
| 79 |
NTPSEC_REFCLOCK=( |
| 80 |
oncore trimble truetime gpsd jjy generic spectracom |
| 81 |
- shm pps hpgps zyfer arbiter nmea neoclock modem |
| 82 |
- local) |
| 83 |
+ shm pps hpgps zyfer arbiter nmea modem local |
| 84 |
+ ) |
| 85 |
|
| 86 |
IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} |
| 87 |
|
| 88 |
@@ -48,7 +49,7 @@ RDEPEND="${CDEPEND} |
| 89 |
acct-user/ntp |
| 90 |
" |
| 91 |
DEPEND="${CDEPEND} |
| 92 |
- app-text/asciidoc |
| 93 |
+ >=app-text/asciidoc-8.6.8 |
| 94 |
dev-libs/libxslt |
| 95 |
app-text/docbook-xsl-stylesheets |
| 96 |
sys-devel/bison |
| 97 |
@@ -56,15 +57,23 @@ DEPEND="${CDEPEND} |
| 98 |
rclock_pps? ( net-misc/pps-tools ) |
| 99 |
" |
| 100 |
|
| 101 |
+PATCHES=( |
| 102 |
+ "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" |
| 103 |
+) |
| 104 |
+ |
| 105 |
WAF_BINARY="${S}/waf" |
| 106 |
|
| 107 |
src_prepare() { |
| 108 |
default |
| 109 |
+ |
| 110 |
# Remove autostripping of binaries |
| 111 |
sed -i -e '/Strip binaries/d' wscript || die |
| 112 |
if ! use libbsd ; then |
| 113 |
eapply "${FILESDIR}/${PN}-no-bsd.patch" |
| 114 |
fi |
| 115 |
+ # remove extra default pool servers |
| 116 |
+ sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die |
| 117 |
+ |
| 118 |
python_copy_sources |
| 119 |
} |
| 120 |
|
| 121 |
@@ -85,9 +94,10 @@ src_configure() { |
| 122 |
local myconf=( |
| 123 |
--nopyc |
| 124 |
--nopyo |
| 125 |
+ --enable-pylib ext |
| 126 |
--refclock="${CLOCKSTRING}" |
| 127 |
- --build-epoch="$(date +%s)" |
| 128 |
- $(use doc && echo "--enable-doc") |
| 129 |
+ #--build-epoch="$(date +%s)" |
| 130 |
+ $(use doc || echo "--disable-doc") |
| 131 |
$(use early && echo "--enable-early-droproot") |
| 132 |
$(use gdb && echo "--enable-debug-gdb") |
| 133 |
$(use samba && echo "--enable-mssntp") |
| 134 |
@@ -114,6 +124,7 @@ src_compile() { |
| 135 |
src_install() { |
| 136 |
python_install() { |
| 137 |
waf-utils_src_install |
| 138 |
+ python_fix_shebang "${ED}" |
| 139 |
} |
| 140 |
python_foreach_impl run_in_build_dir python_install |
| 141 |
python_foreach_impl python_optimize |
Archives