gentoo resync : 04.05.2021

5 files changed, 15 insertions, 24 deletions

diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 575433db1856..1036672faa78 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-r2.ebuild 1877 BLAKE2B e77f154de5b7d0bab501e3cd21ed1f99d27d6e569ca6c58275768d4773de7c6dfe5e15047a64d6a8b34f45e558bd00025ea292810f9c89f265a66c060d19659e SHA512 e22eadc00edfbfdf8a5b6ea81cbe21b06284cb1d967f0d5f91cd40928f8b5da2197d4493a8b245fa2731565942fc8820c1e639f5102df735aa165ec1ef1dacd8
-EBUILD openntpd-6.8_p1-r1.ebuild 1763 BLAKE2B 9225ea51bb5ebaf34d3456b474d61fc29ebcaff153d3ef8d0f1945391580b312cd260aed404cc23f0b17a5c5509d0068c335dcfb08e9a6ce6e315bec7b09db6a SHA512 8bc095b4a4ba25ed0c4cde951f4d8c47693e61a0fe982627d9db8b8d865bc1a0ec660ee0c1ea99ff2d6bbc217951538a1b06e2daf8624590163ad4ca1c8115ef
-EBUILD openntpd-6.8_p1.ebuild 1749 BLAKE2B eabbbaa5d63fd9cd7f54da01bc71dea295172b57830d7a367eca13d10a22ad547ffe35e0517959a3ea866483cdf35fda8a1267b84dbb4648677d5e002784300d SHA512 d4405468d57a9f255ae3428bf292ad5689dba8621bd96cb2e8ab2824a7c736cc59cd1759173aa6dd5afe7a0a775d84932472a9ec0cde8b9262cd4d29ad622b67
-MISC metadata.xml 858 BLAKE2B 230d4a788c80e5fb8b0708563dfaa867965667958eaa71e83f8ead831cab11869967fee05a81f9584b3b8f095fe8e22743e25f3ba6f6fb059a2ae654a29f19de SHA512 3257f9e2f2636ce09307052c8aca002d87b771ec4981fc111128e9a04a54e74e79b306a2dfdb52cdb9a6c3278fc820be16ae62478def533288df05600496c145
+EBUILD openntpd-6.2_p3-r2.ebuild 1750 BLAKE2B 198722e198470a7894d97c8625e0c953b6badb96f8da1d53cabe1fa71676ebeeebb39c7102bae9cbaadc766ebd87942a0f2e242f2bc87f765384a584890cc0b2 SHA512 490e5bb79254e050a719d75acf55f01cb9c4195e704d78841fc6925261ba4f4efed1af53035a0631172cef75acea2ae201b45e096422071964082f47e4b8297e
+EBUILD openntpd-6.8_p1-r1.ebuild 1700 BLAKE2B 1560e5d4589b96f9c07e2609f9cb7577234c587fc56b34f17d3a442bdfc78ecebf07c07c9177c1063829998854e85f9194b4b0f651668de063ee91663710f7b2 SHA512 d49c3d134531e01b3b2cb8d7e7696add56c4bfe7415fb979dc1cad118a119eb296e0dd27096700d83e6e37eea018bdb5780587a413d95f550dd8b0c6b0721e1f
+EBUILD openntpd-6.8_p1.ebuild 1621 BLAKE2B 685e978d396f9306453d5f7a66c0727039b0084252d347995d94c45128fcd6af636b954f93e7dffe07acca4518a4fec3b2c3554b1b53d729975920cfa4654cb3 SHA512 2c9fc6b72fe8e690f43cf7b3e77803325b1b021fab58f403b59f83ec86e5cde135ad1ed45279c75f458c95ec42c58f1804e7a7827d381b4d2d4b67918cf2c673
+MISC metadata.xml 751 BLAKE2B 54941fc2ff24d2e3908660b1489fb0d9145661f7525929204bd7036576e7636591ed69ac4892a6ab4a6a0007f77d6614f5c6cd7f34ba7c6ce4563050390479f5 SHA512 b3c316a1bfd478a6da8d4a5c333f50c9f6b09550cab3cb35e9acc593a3714d8e6df2390409e259b55a6b7f158bfe1a22ee53f94ace06afb28ca5268bc6562254
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index 8cf4c9d357c8..b87fa42aa955 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/metadata.xml
@@ -17,6 +17,5 @@
 	</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-r2.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
index 8f65c14883e6..4d7fc203e169 100644
--- a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
+++ b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
@@ -14,11 +14,10 @@ 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"
+IUSE="selinux"
 
 DEPEND="
-	!net-misc/ntp[-openntpd]
-	libressl? ( dev-libs/libressl:0= )"
+	!net-misc/ntp[-openntpd]"
 
 RDEPEND="
 	${DEPEND}
@@ -47,15 +46,14 @@ src_prepare() {
 	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' 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
+	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)
+		--disable-https-constraint
 }
 
 src_install() {
diff --git a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
index 49bc5ddd4cc9..a600e51c8b82 100644
--- a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
+++ b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
@@ -14,14 +14,11 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="constraints libressl selinux"
+IUSE="constraints selinux"
 
 DEPEND="
 	!net-misc/ntp[-openntpd]
-	constraints? (
-		libressl? ( dev-libs/libressl:= )
-		!libressl? ( dev-libs/libretls:= )
-	)"
+	constraints? ( dev-libs/libretls:= )"
 
 RDEPEND="
 	${DEPEND}
diff --git a/net-misc/openntpd/openntpd-6.8_p1.ebuild b/net-misc/openntpd/openntpd-6.8_p1.ebuild
index ce6e6c788913..ee0f69ce5392 100644
--- a/net-misc/openntpd/openntpd-6.8_p1.ebuild
+++ b/net-misc/openntpd/openntpd-6.8_p1.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
@@ -14,12 +14,10 @@ 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"
+IUSE="selinux"
 
 DEPEND="
-	!net-misc/ntp[-openntpd]
-	libressl? ( dev-libs/libressl:0= )"
-
+	!net-misc/ntp[-openntpd]"
 RDEPEND="
 	${DEPEND}
 	acct-group/openntpd
@@ -43,14 +41,13 @@ src_prepare() {
 	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
+	sed -ie 's/^constraints/#constraints/g' ntpd.conf || die
 }
 
 src_configure() {
 	econf \
 		--with-privsep-user=openntpd \
-		$(use_enable libressl https-constraint)
+		--disable-https-constraint
 }
 
 src_install() {