gentoo resync : 08.01.2021

3 files changed, 13 insertions, 11 deletions

diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index b7391d9c95c6..0c5d3033f7c4 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -4,7 +4,7 @@ AUX openntpd.init.d-20080406-r6 292 BLAKE2B fb5620bcb40b476796cf5242ebec17f4f7f0
 AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237ce8e12a47bf5c681a9274acab9bcd5ad0e97708aa99f8d2df92a0fa57828fb747f220c038f83c54f30084a154c7bb SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e
 DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
 DIST openntpd-6.8p1.tar.gz 443997 BLAKE2B 5b86c79ff2f822aba652da92325ad18803233c8b1548203c82603b99d2c41dce012dfb2be67828cc892559f323b764cc1711202fd85bc1d5d755b5e677406b98 SHA512 200056bedb9c757aae1ce5d3f6655175ec058cb479429fe4704955f3a3fa15e8a9cb578ae4898ddb4cfc08c9742bbab6a7c92b5e569f06a148e40c448360b58f
-EBUILD openntpd-6.2_p3-r1.ebuild 1816 BLAKE2B 3f24f30a87178680dac1680d7627167a4ae751bde60ddb742d6147d77c052554c26cc1f85f02e33e3bbf8bed2679c2ded0c3097348feac9ec4ee0dfe31bc5627 SHA512 15c0c8bca7a3c10d3328a899385e5b6cfa1d2356b192a07d0c4128ce64373accffcb5e4840a4b90cc2a7f798b3640628638c5bd083435c0fb7d84bddfca17be4
 EBUILD openntpd-6.2_p3-r2.ebuild 1876 BLAKE2B 19b8f6bfaed7a095ff3401fc487877ca0badaa069b37482805e8b50053b701fa1c747894d9fb4c0b6984241f430e6aca442cbf77a2f91ca8b1ff5b7be66ec36b SHA512 8aa659e9a7ebfbd917a7facf394afb552a4eef2c7ab1f248109cfad92d4931a91bc7c38b440721751c013ea5e391b5400464d519cdd16e57eff8bb65b87eafe7
+EBUILD openntpd-6.8_p1-r1.ebuild 1721 BLAKE2B 169c523fc994065c5cb1612e6f76419ce9640cb1c835794a52dcbc8d1c5869b39948791125e86bb9fd92a3c8cb3496ab94c02ec8c3a8e1eadb84259f21c7b947 SHA512 8148f7327a91e7649e798fe7185cfb3690c4e1b64406723654b20b1962e8fba76e12a6b79f41b0680719cf0a7eb4cc6487f8dc98089406bf4b5b4bb4c9b4f8b9
 EBUILD openntpd-6.8_p1.ebuild 1749 BLAKE2B eabbbaa5d63fd9cd7f54da01bc71dea295172b57830d7a367eca13d10a22ad547ffe35e0517959a3ea866483cdf35fda8a1267b84dbb4648677d5e002784300d SHA512 d4405468d57a9f255ae3428bf292ad5689dba8621bd96cb2e8ab2824a7c736cc59cd1759173aa6dd5afe7a0a775d84932472a9ec0cde8b9262cd4d29ad622b67
-MISC metadata.xml 753 BLAKE2B 7881f37b5fe2009a86939eee0c579be8db7ec7ad63a565318dff4a382ce09ebf47575de20112cae24d16e74b992fe7c70cf129c06ab69af514d0b3aa42b0c2da SHA512 34a656cccd278363c5e08c65d90dd4f36e41414e48fcf924ab41bdee826da358e48b70190a882e21b5eabba8c3ff733f75a384c69013d450fb3d9c0517883b72
+MISC metadata.xml 828 BLAKE2B 252026b498239d4105cf5a36f898f7587f046d6f533089d7b52116af656c85d340802f8d6e3b95ccb5263f7795e84248e1fbf2f644213c0fb54b7fdab33df79a SHA512 83fe295d82756146bc8b705e02564553079e0292601b2ef38ba46f05a2388bc77d13a0576de6b30937814a708570247c657f4605767fe93a7ca6c49e0c96cabe
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index f5534c78e2f8..20734983a2d0 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/metadata.xml
@@ -16,6 +16,7 @@
 		local clock.
 	</longdescription>
 	<use>
+		<flag name="constraints">Enable HTTPS TLS time constraint support</flag>
 		<flag name="libressl">Enable HTTPS TLS time constraint support using <pkg>dev-libs/libressl</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
index abfd5096bbdb..630ab20c6928 100644
--- a/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild
+++ b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,12 +13,15 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="libressl selinux"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="constraints libressl selinux"
 
 DEPEND="
 	!net-misc/ntp[-openntpd]
-	libressl? ( dev-libs/libressl:0= )"
+	constraints? (
+		libressl? ( dev-libs/libressl:= )
+		!libressl? ( dev-libs/libretls:= )
+	)"
 
 RDEPEND="
 	${DEPEND}
@@ -40,18 +43,16 @@ src_prepare() {
 	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die
 
 	# fix default config to use gentoo pool
-	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
+	sed -i 's:^server:#server:g' ntpd.conf || die
 	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
 
-	# disable constraint config if libressl not enabled
-	use libressl || sed -ie 's/^constraints/#constraints/g' ntpd.conf || die
+	use constraints || sed -ie 's/^constraints/#constraints/g' ntpd.conf || die
 }
 
 src_configure() {
 	econf \
 		--with-privsep-user=openntpd \
-		--with-privsep-path=/var/lib/openntpd/chroot \
-		$(use_enable libressl https-constraint)
+		$(use_enable constraints https-constraint)
 }
 
 src_install() {