gentoo resync : 06.04.2022

5 files changed, 121 insertions, 9 deletions

diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index d94f5ead2d32..a9be18d61b3e 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -1,6 +1,10 @@
 DIST ngtcp2-0.1.0.tar.xz 540132 BLAKE2B df59b4632110f118e0ae27c709fee24be65216d5461ad73901fb7f7450afe17a255acda10473a39ac45a34c2810728c50e39dcde9a71c48eb843d5d628b70b8c SHA512 935c37fe08bb625b39d4355322df54cedc180584c46b7816a84b2715f777a49590cd0434ed062fabec55df1a2c5332e7edf6335bd071599b053d6f404ce260b8
+DIST ngtcp2-0.2.1.tar.xz 554280 BLAKE2B 243599cde08eeb5833d4836cfe3a1b1ea3b9cd339d6f424899fe5bf10599c1e34a8002130c6b5b6378e99bd9c6ec87e2d8eebd6a439ed4f0df59238504ea6eb6 SHA512 8570f84eaa21190c2abd8140bbaa5495e06331cbc60efb42466eab218d3ac42f51810e0cf2a15bf81d16139de26728ee5009db66930e23bf6732252b7bf38737
+DIST ngtcp2-0.3.0.tar.xz 570876 BLAKE2B 645d09b2b33076d93bfffb79eba347cda5d0d782e1321138f436fe776808b3a51a0a2fc5599ecfe67b4db87b3e653b3e37293f746dabe7ae50cc32cd929c08f7 SHA512 3e37c269fba0261dc1514095104725064c078cc0dc66c0cfb8b536a8e3fe474888ca6a88b02c176689d94ddabf7acad14e1e8dea121da93f18bbe261169b0ee9
 DIST ngtcp2-0_pre20190912.tar.gz 302984 BLAKE2B 906b248b0c19395288ed2c5ad55c8d42a9df9d76458104785c1013b9ebfaf1b92a4b87ced8755377fcb627018cf8854be0e4687e4c8a23ae994e5a21f466f739 SHA512 91b93575143960af421e8bd37d686602905fa3093750cfbbe3af1b20d743318281d22162676dc451562768ca08b6d0767b1dc28f3f8f6733235ebd76015a05bb
 EBUILD ngtcp2-0.1.0.ebuild 985 BLAKE2B e83228de5823731072be11d4de5aa10e007d671d8bfd6eff5861c451ccc47f5709d4cbb155a69ed66e9adcbf7d19fc0a63b7fe13d59ab7a3898854215d46e654 SHA512 80965c2cd89c9bff4d7c430cabd5854fc12a2e3ac8f1e7400e980508bae649dae6f8d0ece7c6d2100b17b86509c4986aa3d7a3248587d25a634056be331513b5
+EBUILD ngtcp2-0.2.1.ebuild 1087 BLAKE2B 2c9e433049923ad552a678568335776d9dc5e209b6e0b601197590d9c34f014b16856e5ae41998876e7825b9dd34e6dbdfdb1bdda933e47ad9396037bfab2bb0 SHA512 3d97c6f5b6603e0b273338ed94097c8a782a9c52be16c02f8caa7145b961eb12bc0d2423623e5de835e66e16d283fe916317c7ac9aa468df951d93956cf79e49
+EBUILD ngtcp2-0.3.0.ebuild 1087 BLAKE2B 2c9e433049923ad552a678568335776d9dc5e209b6e0b601197590d9c34f014b16856e5ae41998876e7825b9dd34e6dbdfdb1bdda933e47ad9396037bfab2bb0 SHA512 3d97c6f5b6603e0b273338ed94097c8a782a9c52be16c02f8caa7145b961eb12bc0d2423623e5de835e66e16d283fe916317c7ac9aa468df951d93956cf79e49
 EBUILD ngtcp2-0_pre20190912.ebuild 1083 BLAKE2B 285f80c7ebf4cb3fa9ab7b74a39894f09ce0a54f89463082b2923858ed1b2c41fb6a35bf4cd0cce78e793acd28d8a46ae8d4e71c36a2ebdab76f57870129c717 SHA512 de01dfbf633ff6ee98407924c27ec4d655d3549305978faa4b22fbe5028bd08ea354489679decf12c75c2188559b8eab21e04166c42865a881c79a9fb807fe59
-EBUILD ngtcp2-9999.ebuild 985 BLAKE2B e17250a0c0c02ad53500ec3e73420e878530f37b6f5364a260da37ffa7f3fcaa2f45ca820971c2c71075e40247350efd3d57a55556a876810ef4c9100c34a3a3 SHA512 13dac2bda9f4eb281f50bdf008c095f6b3de6e5fa0772bc553993525259ddac9909ff15e7080b7ab1d0a7162e2569a6862a80bc2b0f761259e7a622f3c85aa25
-MISC metadata.xml 327 BLAKE2B 57c198cb15bb8a8982d7c93149b595e0fd03fb0b63cde2d49349dc3dcefa7873f310a4c6accf7089320c6a38376aef8bf6d98afe689d743c96636eebc53a2365 SHA512 580f5c33715cac0b138070349342d4d2e62c179e05aa1e66fc801001fa8dbb064d1291f8c38ff3b0e68cb392bc2f339c28afeab1d9a77d786497968fae2505a8
+EBUILD ngtcp2-9999.ebuild 1087 BLAKE2B 2c9e433049923ad552a678568335776d9dc5e209b6e0b601197590d9c34f014b16856e5ae41998876e7825b9dd34e6dbdfdb1bdda933e47ad9396037bfab2bb0 SHA512 3d97c6f5b6603e0b273338ed94097c8a782a9c52be16c02f8caa7145b961eb12bc0d2423623e5de835e66e16d283fe916317c7ac9aa468df951d93956cf79e49
+MISC metadata.xml 445 BLAKE2B d27a34331ff5bd772b6228ff26ca20440a3bf932ccc88720a33409f329d41165d5fad6750221bae1fed3386d6e8244458c1c5073df8b36251156598e599bb15e SHA512 c09f5ac61f3c3b16bda0f12c2f31188aaaba469fbfde31e71d4f9834609b4c8d0cb7152a688934ba0b90c491da4e8b707e6ad5e54d5965b4109cbdc29ee0a4a2
diff --git a/net-libs/ngtcp2/metadata.xml b/net-libs/ngtcp2/metadata.xml
index 71f915056b8c..4b6987e8ad53 100644
--- a/net-libs/ngtcp2/metadata.xml
+++ b/net-libs/ngtcp2/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="github">ngtcp2/ngtcp2</remote-id>
 	</upstream>
+	<use>
+		<flag name="openssl">Provide SSL support using OpenSSL (requires <pkg>dev-libs/openssl</pkg>)</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/ngtcp2/ngtcp2-0.2.1.ebuild b/net-libs/ngtcp2/ngtcp2-0.2.1.ebuild
new file mode 100644
index 000000000000..a828f15d1ad2
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-0.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~hppa"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+		openssl? (
+			>=dev-libs/openssl-1.1.1:0=
+		)
+	)"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_OPENSSL=$(usex openssl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build check
+}
diff --git a/net-libs/ngtcp2/ngtcp2-0.3.0.ebuild b/net-libs/ngtcp2/ngtcp2-0.3.0.ebuild
new file mode 100644
index 000000000000..a828f15d1ad2
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-0.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~hppa"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+		openssl? (
+			>=dev-libs/openssl-1.1.1:0=
+		)
+	)"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_OPENSSL=$(usex openssl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build check
+}
diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild b/net-libs/ngtcp2/ngtcp2-9999.ebuild
index e1fef793bf0f..a828f15d1ad2 100644
--- a/net-libs/ngtcp2/ngtcp2-9999.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_ECLASS=cmake
 inherit cmake-multilib
@@ -19,20 +19,27 @@ HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
 
 LICENSE="MIT"
 SLOT="0/0"
-IUSE="ssl test"
+IUSE="+gnutls openssl +ssl test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
 
 BDEPEND="virtual/pkgconfig"
-DEPEND="ssl? ( >=dev-libs/openssl-1.1.1:0= )
+RDEPEND="
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+		openssl? (
+			>=dev-libs/openssl-1.1.1:0=
+		)
+	)"
+DEPEND="${RDEPEND}
 	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-RDEPEND=""
 RESTRICT="!test? ( test )"
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=$(usex !ssl)
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_OPENSSL=$(usex openssl)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
 	)
 	cmake_src_configure
 }