summaryrefslogtreecommitdiff
path: root/net-misc/chrony
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
commitd934827bf44b7cfcf6711964418148fa60877668 (patch)
tree0625f358789b5e015e49db139cc1dbc9be00428f /net-misc/chrony
parent2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
gentoo resync : 25.11.2020
Diffstat (limited to 'net-misc/chrony')
-rw-r--r--net-misc/chrony/Manifest12
-rw-r--r--net-misc/chrony/chrony-3.5.1-r1.ebuild2
-rw-r--r--net-misc/chrony/chrony-4.0.ebuild (renamed from net-misc/chrony/chrony-4.0_pre3.ebuild)66
-rw-r--r--net-misc/chrony/chrony-4.0_pre4.ebuild196
-rw-r--r--net-misc/chrony/chrony-9999.ebuild64
-rw-r--r--net-misc/chrony/metadata.xml65
6 files changed, 92 insertions, 313 deletions
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index a47b1b15a9a4..177734f91ed4 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -5,10 +5,8 @@ AUX chronyd.conf 390 BLAKE2B a0058c72ae04371aa273d71f01349a00dfc0d66c016e6c2d977
AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be98b7d1d40b259fde5313dcb840c86a7d409ac811a5d854178af66ab82d851b66d27a2acf5f7575 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872
AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
DIST chrony-3.5.1.tar.gz 459902 BLAKE2B 503402c0dd68a340eb5ecd8b57dcb83d90124f31e8deb6e20bd1e9ed19b5dc952fa7f40a697d0d0cb77c349c9f3297dcd32265d77670a71836ba8709dcc83053 SHA512 489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984
-DIST chrony-4.0-pre3.tar.gz 539117 BLAKE2B f26fcac8e29322151251e60b385a815c53155f163d7ed1e1269f90f3418c59ec8f4952b1bba1203549607c63bb373cbaab17af933e02e659eced91827519bc6b SHA512 e52f2454b0cbe60ab7c8975deba499f1ff2e84cd1c3d0a0fb208f11f12ca762f2d0cd74af7aacc8022e628cdeaa4ac388fdd134715cc3e274b3818d5c12da460
-DIST chrony-4.0-pre4.tar.gz 544660 BLAKE2B d7f25a980a8cfd9c56fdf4f8ab3dc63594a428e0a18a5bb3b93488ea4db16201e67589ac8a0d966dea4a06c7ff9c4dfa5a1adc3a77849f69d594305e5961a1c8 SHA512 81471682b091851f79dfe08315a016c01199b850a1cc6289a3f3d6f56df2ab415266e156900f2e9d60804197097ff8bb89bf7c8072a90a05d6f257b5368e5939
-EBUILD chrony-3.5.1-r1.ebuild 4761 BLAKE2B d0bf0aa6403b9f4d691d41a4fd77de3b2de15783ebb445c403ffd3777e3888ecc659e05f131a2b0465e20c5f64c4f6e9084680ed01bc75f410b93caf13b84f49 SHA512 b2cfbab377cc697cd8903708dd870b7bda141a32b9a5f4f4a155efa93dd6ccd5af815c98005a074e039b3645938c3c684ee9d0afb418de6236ddf8db903394df
-EBUILD chrony-4.0_pre3.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335
-EBUILD chrony-4.0_pre4.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335
-EBUILD chrony-9999.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335
-MISC metadata.xml 1744 BLAKE2B a30c56ac26aca1450ed5654e496132b47eb498694a2c5da6bcdd55f974f9379835aca68dc4293cf07a13aae0d1507b3b1db473bbb5fe32e02f82f403ae069420 SHA512 4bf5ef57e61ac80f7c45662125a6b5000072edf698be5c48333ce2a286950627381afad062df12268eb4e628a00d48f37e401aa79bd6e43a7e87a74c605a7176
+DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9
+EBUILD chrony-3.5.1-r1.ebuild 4760 BLAKE2B 9764ff19b0a5740e4d535c713fceeecfe8ae11b9f694cb3b736d392a50df46480fea7ad511d39e8719dd4a8311bb101e8ca62940b26bb5b7218dc4d9d5c57bb4 SHA512 b56d4b1362f4b0c6ec71c9690aec2d7106e488cf8af65f04b0c3ab49267a2a1123c178430f1528a91f27f488f9f295d79c0fb3d42e3f247e1e44ca26f84d7796
+EBUILD chrony-4.0.ebuild 4280 BLAKE2B 1d5b51c22d9a321172021ba50ac7129a53c119b7e7027c28489596f15b0365422545d9613c001feee05ae1bdc9e5898e334a787ac91aa9d257986e38bf4146b5 SHA512 09ad193ad9f0504137f9d471557354582c093d65ce1b56468f16192d72da3f17c7e5744d893e8e3cdd7ef68a54e4deaa1d36f06421c996cd9c39b2c56a09cfee
+EBUILD chrony-9999.ebuild 4287 BLAKE2B d682d68657aab4b753b21963d0276688a16a84ad37dbafff885a7983cf0eb48bb8493251649feabe493be6393eb48fb68a8140b6459f3d224e078f80ae4ee0dd SHA512 044a352a2afa9e875244e9bfbb7b197bb2693c0ddc52e6d88296536fa6c15fa8811f45684ca8c594f2d1150f46e0ef6178e5e7dbedab4c602f56f7bc5cbd2bca
+MISC metadata.xml 1936 BLAKE2B 46778f29ab04904ff6aa5212e989d1384f40d1923a04323837845af7563cffcc652047dae4ab8c535dcf1d2986e851c96aad4160cd4910934b3ffc347f473a21 SHA512 1094233e25ad5630cf537888304bbfd16fb8c1da36873025b0b937070733d0adbeebedc4c04383f806f2dc825013f53133fb81cef597afad16874510fa45c10f
diff --git a/net-misc/chrony/chrony-3.5.1-r1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild
index 9a2af1bd3eab..ca404b746fd1 100644
--- a/net-misc/chrony/chrony-3.5.1-r1.ebuild
+++ b/net-misc/chrony/chrony-3.5.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
fi
LICENSE="GPL-2"
diff --git a/net-misc/chrony/chrony-4.0_pre3.ebuild b/net-misc/chrony/chrony-4.0.ebuild
index b5c97cbbd863..efa9bc015ed1 100644
--- a/net-misc/chrony/chrony-4.0_pre3.ebuild
+++ b/net-misc/chrony/chrony-4.0.ebuild
@@ -2,59 +2,57 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit systemd tmpfiles toolchain-funcs
DESCRIPTION="NTP client and server programs"
HOMEPAGE="https://chrony.tuxfamily.org/"
if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
-
inherit git-r3
+ EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
else
SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
fi
+S="${WORKDIR}/${P/_/-}"
+
LICENSE="GPL-2"
SLOT="0"
-IUSE="
- +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
- +rtc samba +seccomp +sechash selinux
-"
-REQUIRED_USE="
- ?? ( libedit readline )
- sechash? ( nettle )
-"
-RESTRICT=test
-CDEPEND="
- caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
+IUSE="+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux"
+REQUIRED_USE="sechash? ( nettle )"
+RESTRICT="test"
+
+BDEPEND="nettle? ( virtual/pkgconfig )"
+
+if [[ ${PV} == "9999" ]]; then
+ # Needed for doc generation in 9999
+ BDEPEND+=" virtual/w3m"
+ REQUIRED_USE+=" html"
+fi
+
+DEPEND="
+ caps? (
+ acct-group/ntp
+ acct-user/ntp
+ sys-libs/libcap
+ )
libedit? ( dev-libs/libedit )
nettle? ( dev-libs/nettle:= )
- readline? ( >=sys-libs/readline-4.1-r4:= )
seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="
- ${CDEPEND}
html? ( dev-ruby/asciidoctor )
pps? ( net-misc/pps-tools )
"
RDEPEND="
- ${CDEPEND}
+ ${DEPEND}
selinux? ( sec-policy/selinux-chronyd )
"
-BDEPEND="
- nettle? ( virtual/pkgconfig )
-"
+
PATCHES=(
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
)
-S="${WORKDIR}/${P/_/-}"
-
-if [[ ${PV} == "9999" ]]; then
- BDEPEND+=" virtual/w3m"
-fi
src_prepare() {
default
@@ -86,18 +84,6 @@ src_configure() {
tc-export CC PKG_CONFIG
- local CHRONY_EDITLINE
- # ./configure legend:
- # --disable-readline : disable line editing entirely
- # --without-readline : do not use sys-libs/readline (enabled by default)
- # --without-editline : do not use dev-libs/libedit (enabled by default)
- if ! use readline && ! use libedit; then
- CHRONY_EDITLINE='--disable-readline'
- else
- CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
- CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
- fi
-
# Note: ncurses and nss switches are mentioned in the configure script but
# do nothing
# not an autotools generated script
@@ -106,6 +92,7 @@ src_configure() {
$(usex caps '' --disable-linuxcaps)
$(usex cmdmon '' --disable-cmdmon)
$(usex ipv6 '' --disable-ipv6)
+ $(usex libedit '' --without-editline)
$(usex nettle '' --without-nettle)
$(usex ntp '' --disable-ntp)
$(usex phc '' --disable-phc)
@@ -114,7 +101,6 @@ src_configure() {
$(usex rtc '' --disable-rtc)
$(usex samba --enable-ntp-signd '')
$(usex sechash '' --disable-sechash)
- ${CHRONY_EDITLINE}
${EXTRA_ECONF}
--chronysockdir="${EPREFIX}/run/chrony"
--docdir="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/net-misc/chrony/chrony-4.0_pre4.ebuild b/net-misc/chrony/chrony-4.0_pre4.ebuild
deleted file mode 100644
index b5c97cbbd863..000000000000
--- a/net-misc/chrony/chrony-4.0_pre4.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="https://chrony.tuxfamily.org/"
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
-
- inherit git-r3
-else
- SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="
- +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
- +rtc samba +seccomp +sechash selinux
-"
-REQUIRED_USE="
- ?? ( libedit readline )
- sechash? ( nettle )
-"
-RESTRICT=test
-CDEPEND="
- caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
- libedit? ( dev-libs/libedit )
- nettle? ( dev-libs/nettle:= )
- readline? ( >=sys-libs/readline-4.1-r4:= )
- seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="
- ${CDEPEND}
- html? ( dev-ruby/asciidoctor )
- pps? ( net-misc/pps-tools )
-"
-RDEPEND="
- ${CDEPEND}
- selinux? ( sec-policy/selinux-chronyd )
-"
-BDEPEND="
- nettle? ( virtual/pkgconfig )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
- "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
-)
-S="${WORKDIR}/${P/_/-}"
-
-if [[ ${PV} == "9999" ]]; then
- BDEPEND+=" virtual/w3m"
-fi
-
-src_prepare() {
- default
-
- sed -i \
- -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
- doc/* examples/* || die
-
- sed -i \
- -e 's|RELOADDNS||g' \
- -e 's|pkg-config|${PKG_CONFIG}|g' \
- configure || die
-
- cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die
-}
-
-src_configure() {
- if ! use caps; then
- sed -i \
- -e 's/ -u ntp//' \
- "${T}"/chronyd.conf examples/chronyd.service || die
- fi
-
- if ! use seccomp; then
- sed -i \
- -e 's/ -F 0//' \
- "${T}"/chronyd.conf examples/chronyd.service || die
- fi
-
- tc-export CC PKG_CONFIG
-
- local CHRONY_EDITLINE
- # ./configure legend:
- # --disable-readline : disable line editing entirely
- # --without-readline : do not use sys-libs/readline (enabled by default)
- # --without-editline : do not use dev-libs/libedit (enabled by default)
- if ! use readline && ! use libedit; then
- CHRONY_EDITLINE='--disable-readline'
- else
- CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
- CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
- fi
-
- # Note: ncurses and nss switches are mentioned in the configure script but
- # do nothing
- # not an autotools generated script
- local myconf=(
- $(use_enable seccomp scfilter)
- $(usex caps '' --disable-linuxcaps)
- $(usex cmdmon '' --disable-cmdmon)
- $(usex ipv6 '' --disable-ipv6)
- $(usex nettle '' --without-nettle)
- $(usex ntp '' --disable-ntp)
- $(usex phc '' --disable-phc)
- $(usex pps '' --disable-pps)
- $(usex refclock '' --disable-refclock)
- $(usex rtc '' --disable-rtc)
- $(usex samba --enable-ntp-signd '')
- $(usex sechash '' --disable-sechash)
- ${CHRONY_EDITLINE}
- ${EXTRA_ECONF}
- --chronysockdir="${EPREFIX}/run/chrony"
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
- --mandir="${EPREFIX}/usr/share/man"
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc/chrony"
- --with-hwclockfile="${EPREFIX}/etc/adjtime"
- --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
- --without-nss
- --without-tomcrypt
- )
-
- # print the ./configure call
- echo sh ./configure "${myconf[@]}" >&2
- sh ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
- if [[ ${PV} == "9999" ]]; then
- # uses w3m
- emake -C doc man txt
- fi
-
- emake all docs $(usex html '' 'ADOC=true')
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
- newconfd "${T}"/chronyd.conf chronyd
-
- insinto /etc/${PN}
- newins examples/chrony.conf.example1 chrony.conf
-
- docinto examples
- dodoc examples/*.example*
-
- newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
-
- if use html; then
- docinto html
- dodoc doc/*.html
- fi
-
- keepdir /var/{lib,log}/chrony
-
- if use caps; then
- # Prepare a directory for the chrony.drift file (a la ntpsec)
- # Ensures the environment is sane on new installs
- fowners ntp:ntp /var/{lib,log}/chrony
- fperms 770 /var/lib/chrony
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
-
- systemd_dounit examples/chronyd.service
- systemd_dounit examples/chrony-wait.service
- systemd_enable_ntpunit 50-chrony chronyd.service
-}
-
-pkg_preinst() {
- HAD_CAPS=false
-
- if has_version 'net-misc/chrony[caps]'; then
- HAD_CAPS=true
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process chronyd.conf
-
- if [[ -n ${REPLACING_VERSIONS} ]] && use caps && ! ${HAD_CAPS}; then
- ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
- ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
- ewarn "This is necessary for chrony to drop privileges"
- fi
-}
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index b5c97cbbd863..9bee3f3276df 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -2,59 +2,57 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit systemd tmpfiles toolchain-funcs
DESCRIPTION="NTP client and server programs"
HOMEPAGE="https://chrony.tuxfamily.org/"
if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
-
inherit git-r3
+ EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
else
SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
+S="${WORKDIR}/${P/_/-}"
+
LICENSE="GPL-2"
SLOT="0"
-IUSE="
- +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
- +rtc samba +seccomp +sechash selinux
-"
-REQUIRED_USE="
- ?? ( libedit readline )
- sechash? ( nettle )
-"
-RESTRICT=test
-CDEPEND="
- caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
+IUSE="+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux"
+REQUIRED_USE="sechash? ( nettle )"
+RESTRICT="test"
+
+BDEPEND="nettle? ( virtual/pkgconfig )"
+
+if [[ ${PV} == "9999" ]]; then
+ # Needed for doc generation in 9999
+ BDEPEND+=" virtual/w3m"
+ REQUIRED_USE+=" html"
+fi
+
+DEPEND="
+ caps? (
+ acct-group/ntp
+ acct-user/ntp
+ sys-libs/libcap
+ )
libedit? ( dev-libs/libedit )
nettle? ( dev-libs/nettle:= )
- readline? ( >=sys-libs/readline-4.1-r4:= )
seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="
- ${CDEPEND}
html? ( dev-ruby/asciidoctor )
pps? ( net-misc/pps-tools )
"
RDEPEND="
- ${CDEPEND}
+ ${DEPEND}
selinux? ( sec-policy/selinux-chronyd )
"
-BDEPEND="
- nettle? ( virtual/pkgconfig )
-"
+
PATCHES=(
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
)
-S="${WORKDIR}/${P/_/-}"
-
-if [[ ${PV} == "9999" ]]; then
- BDEPEND+=" virtual/w3m"
-fi
src_prepare() {
default
@@ -86,18 +84,6 @@ src_configure() {
tc-export CC PKG_CONFIG
- local CHRONY_EDITLINE
- # ./configure legend:
- # --disable-readline : disable line editing entirely
- # --without-readline : do not use sys-libs/readline (enabled by default)
- # --without-editline : do not use dev-libs/libedit (enabled by default)
- if ! use readline && ! use libedit; then
- CHRONY_EDITLINE='--disable-readline'
- else
- CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
- CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
- fi
-
# Note: ncurses and nss switches are mentioned in the configure script but
# do nothing
# not an autotools generated script
@@ -106,6 +92,7 @@ src_configure() {
$(usex caps '' --disable-linuxcaps)
$(usex cmdmon '' --disable-cmdmon)
$(usex ipv6 '' --disable-ipv6)
+ $(usex libedit '' --without-editline)
$(usex nettle '' --without-nettle)
$(usex ntp '' --disable-ntp)
$(usex phc '' --disable-phc)
@@ -114,7 +101,6 @@ src_configure() {
$(usex rtc '' --disable-rtc)
$(usex samba --enable-ntp-signd '')
$(usex sechash '' --disable-sechash)
- ${CHRONY_EDITLINE}
${EXTRA_ECONF}
--chronysockdir="${EPREFIX}/run/chrony"
--docdir="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml
index 9b7e225c3ada..6d7a44f2f91e 100644
--- a/net-misc/chrony/metadata.xml
+++ b/net-misc/chrony/metadata.xml
@@ -1,34 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>jer@gentoo.org</email>
-</maintainer>
-<longdescription>
-Chrony is a pair of programs (chronyd and chronyc) which are used to maintain
-the accuracy of the system clock on a computer. chronyd has been specifically
-written to work well for systems which have only an intermittent (e.g. dial-up)
-connection to the network where the NTP servers are. It still works well
-in a "permanently connected" mode.
-</longdescription>
-<longdescription lang="ja">
-Chrony はコンピュータのシステム・クロックの精度を保つために使われるプログラムの
-ペア(chronyd と chronyc)です。chronyd は NTP サーバがあるネットワークと断続的な
-接続(e.g. dial-up)しか持たないシステムで機能するよう書かれています。ですが永続的
-な接続でも機能します。
-</longdescription>
-<use>
-<flag name="cmdmon">Support for command and monitoring</flag>
-<flag name="html">Install HTML documentation</flag>
-<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for hash functions</flag>
-<flag name="ntp">Support for the Network Time Protocol (NTP)</flag>
-<flag name="phc">Support for the PTP (Precision Time Protocol) Hardware Clock (PHC) interface</flag>
-<flag name="pps">Support for the Linux Pulse Per Second (PPS) interface</flag>
-<flag name="refclock">Support for reference clocks</flag>
-<flag name="rtc">Support for the Linux Real Time Clock interface</flag>
-<flag name="sechash">Enable support for hashes other than MD5</flag>
-</use>
-<upstream>
-<remote-id type="cpe">cpe:/a:chrony_project:chrony</remote-id>
-</upstream>
+ <maintainer type="person">
+ <email>sam@gentoo.org</email>
+ <name>Sam James</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <longdescription>
+ Chrony is a pair of programs (chronyd and chronyc) which are used to maintain
+ the accuracy of the system clock on a computer. chronyd has been specifically
+ written to work well for systems which have only an intermittent (e.g. dial-up)
+ connection to the network where the NTP servers are. It still works well
+ in a "permanently connected" mode.
+ </longdescription>
+ <longdescription lang="ja">
+ Chrony はコンピュータのシステム・クロックの精度を保つために使われるプログラムの
+ ペア(chronyd と chronyc)です。chronyd は NTP サーバがあるネットワークと断続的な
+ 接続(e.g. dial-up)しか持たないシステムで機能するよう書かれています。ですが永続的
+ な接続でも機能します。
+ </longdescription>
+ <use>
+ <flag name="cmdmon">Support for command and monitoring</flag>
+ <flag name="html">Install HTML documentation</flag>
+ <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for hash functions</flag>
+ <flag name="ntp">Support for the Network Time Protocol (NTP)</flag>
+ <flag name="phc">Support for the PTP (Precision Time Protocol) Hardware Clock (PHC) interface</flag>
+ <flag name="pps">Support for the Linux Pulse Per Second (PPS) interface</flag>
+ <flag name="refclock">Support for reference clocks</flag>
+ <flag name="rtc">Support for the Linux Real Time Clock interface</flag>
+ <flag name="sechash">Enable support for hashes other than MD5</flag>
+ </use>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:chrony_project:chrony</remote-id>
+ </upstream>
</pkgmetadata>