gentoo resync : 25.11.2020

5 files changed, 264 insertions, 204 deletions

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 35844cca6181..7c9944170a6a 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,6 +1,7 @@
-AUX botan-2.14.0-bindist-test-fix.patch 3167 BLAKE2B bb94b4081469c8cfcfff5a187151eacbb5dc1be0bf0ce87ee434da40cefb8e898bae478940c3410c873b1f58c75cf915d7ebe2b90a713a0428db8842fac1be33 SHA512 c60bbe81a007b8f8a5cb197542ae3a2fc1c94c76f10d1ff6ca18576fee84106aca29c158b1c9a967f047c3ca9b527255772bd66ad859f9d49c6e94c86b61b71c
-DIST Botan-2.14.0.tar.xz 5958948 BLAKE2B 90e73945b22f6e4e8d6163bfb45eca153eb1495448f8bf35514b780fd12bb1b81c822314e1f598c7625277f1e9cf7a6265387cca80ffd4c2664c681b9d4807fd SHA512 ee15928ecdb0127720b444b0207d46fd68fe3007125b0deb8bdd32f96e9befb684ad54009354da4f6a3c48b9698693b46223710a47fd644da8760dda53d40d34
 DIST Botan-2.15.0.tar.xz 5920688 BLAKE2B 1bbb9cadb0f754194851bddf8b14dbcd291285c5f3fbaad35920277a11c3d9e1b1e5cc484c0d37b1c7999b3084a1c90da56631df0b07e788372b95aff5197031 SHA512 0965a0a6141df44e38bd7da038b89dd2b3808ed9a4ebaafbf089abf60718e62cba78d7b64eaf272b5df8c5a489222e4cad4fb511cde38e76cdaed87f35896c18
-EBUILD botan-2.14.0-r1.ebuild 2708 BLAKE2B 5ef16c8ccbb43488a9e06641f9aff6d9b7ab6f8265c2c4a007325181a6a01c1ad9553ecc70b646273bcbf7680640013e692ccbfcb80d037d3b52d2a9d2ed8f24 SHA512 0b57b3c3550c02ee0d4c3deb8ef70f68e202c04811235de8a8ab92d55eee2d548d041f0b1971d68e039a2dfab3c49273d545e0a42a7203121b48856d53af6241
+DIST Botan-2.16.0.tar.xz 5938644 BLAKE2B a4b7bb48aee0dbf0f8b81a407b6a39707c3e6040a2bb93f9c34208ab87ea64879b2e56af66f090a73d66b64156e333c89e490d206e666e665a5eb4fbcd98d13e SHA512 12550425c695119d7f448a47b7956565de373e1bc86b8fdfa0a2a5b9fed1ef93a36101b6480e7a2f78e9262c988904c353fa021b681543691d09bf5b00495bd4
+DIST Botan-2.17.2.tar.xz 5940964 BLAKE2B 009df11c9d4379a15a48697554a82df3baffad0fff98af995f9a5b9b3223e4db42837650d41b7081170b07fb70d62ab347c5577ef2480a8f7011b40e1cf1764d SHA512 fa9bd30d02540c4544646971c7b82d3873f32362668d2496b4bc1a92f47d52f75ec9533d5848a7d8e9b9077c7ae2866b55d70d39101c705eec0edf9dbf01d6cf
 EBUILD botan-2.15.0.ebuild 3091 BLAKE2B 2da5cfb879e65537227b0a6d524c30f7ec186a41a3e71797c4a57dd3b85013c10ddb60d8f5ddcadc02418978292be393d71b8fd2bd8521f13578c0234964768d SHA512 6f1bf731cb1a704cf6e40d5bd7fe36ebeb7a3690303f10dde754ffcb3eb0ab47dd2ca04df8d114662df5e35a55cd2292f5d061463d707c38052d3db6e6ecb1ec
+EBUILD botan-2.16.0.ebuild 3089 BLAKE2B b75fc14404acbcc0d1e88278e47283ba0655c318c393deea9b4d26020e7ff45e892beb26d2fee90aec797c34a8c4caa4ca46acd920d434c3f7c89ad3476c6ea3 SHA512 5a8813e00f96d2201dea7bf5c1d10043180a59cca1217b7cdf291c65c1529069e38451b30569c4727af6e548ccdc103c2617d6e6275d703d0ad5835172383730
+EBUILD botan-2.17.2.ebuild 3094 BLAKE2B 155d33762a02cb0737058a8985d17da9428fb521d1f82b66469457475efb94915a45beffbd3f76eb8fbf074ed9ce70e9663eae7f462dd89739e59d8d64566680 SHA512 8569fa59f78203c877a0ac4dfb46e7af807348df2f6ad91b433df32d33e4c76d0fd0e1f50b61a6641bffde39269ed0d7fd0afd4bc64a51084ca86b63060f1f86
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.14.0-r1.ebuild b/dev-libs/botan/botan-2.14.0-r1.ebuild
deleted file mode 100644
index 366559333192..000000000000
--- a/dev-libs/botan/botan-2.14.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-MY_P="Botan-${PV}"
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
-IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}
-	boost? ( >=dev-libs/boost-1.48:= )
-	bzip2? ( >=app-arch/bzip2-1.0.5:= )
-	lzma? ( app-arch/xz-utils:= )
-	sqlite? ( dev-db/sqlite:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-BDEPEND="
-	dev-lang/python:*
-	doc? ( dev-python/sphinx )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-bindist-test-fix.patch"
-)
-
-src_configure() {
-	local disable_modules=()
-	use boost || disable_modules+=( "boost" )
-	use bindist && disable_modules+=( "ecdsa" )
-	elog "Disabling modules: ${disable_modules[@]}"
-
-	# Enable v9 instructions for sparc64
-	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
-		CHOSTARCH="sparc32-v9"
-	else
-		CHOSTARCH="${CHOST%%-*}"
-	fi
-
-	local myos=
-	case ${CHOST} in
-		*-darwin*) myos=darwin ;;
-		*) myos=linux  ;;
-	esac
-
-	case ${CHOST} in
-		hppa*) CHOSTARCH=parisc ;;
-	esac
-
-	local pythonvers=()
-	if use python; then
-		append() {
-			pythonvers+=( ${EPYTHON/python/} )
-		}
-		python_foreach_impl append
-	fi
-
-	# Don't install automatically, do it manually later in right place
-	# https://bugs.gentoo.org/723096
-	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
-		$(use_enable static-libs static-library) \
-		$(use_with boost) \
-		$(use_with bzip2) \
-		$(use_with doc documentation) \
-		$(use_with doc sphinx) \
-		$(use_with lzma) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssl openssl) \
-		$(use_with zlib) \
-		$(usex hppa --without-stack-protector '') \
-		--cc=gcc \
-		--cpu=${CHOSTARCH} \
-		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
-		--docdir=share/doc \
-		--libdir=$(get_libdir) \
-		--os=${myos} \
-		--distribution-info="Gentoo ${PVR}" \
-		--prefix="${EPREFIX}/usr" \
-		--with-endian="$(tc-endian)" \
-		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
-		--without-doxygen \
-		--no-install-python-module \
-		|| die "configure.py failed"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
-	default
-	use python && python_foreach_impl python_domodule src/python/botan2.py
-}
diff --git a/dev-libs/botan/botan-2.16.0.ebuild b/dev-libs/botan/botan-2.16.0.ebuild
new file mode 100644
index 000000000000..4fb2d52c4d0f
--- /dev/null
+++ b/dev-libs/botan/botan-2.16.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit python-r1 toolchain-funcs
+
+MY_P="Botan-${PV}"
+
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
+IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	')
+"
+
+# NOTE: Boost is needed at runtime too for the CLI tool.
+DEPEND="
+	boost? ( >=dev-libs/boost-1.48:= )
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	lzma? ( app-arch/xz-utils:= )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sqlite? ( dev-db/sqlite:3= )
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+
+RDEPEND="${DEPEND}"
+
+# NOTE: Considering patching Botan?
+# Please see upstream's guidance:
+# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
+
+python_check_deps() {
+	if use doc ; then
+		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+src_configure() {
+	local disable_modules=()
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	elog "Disabling module(s): ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	local chostarch="${CHOST%%-*}"
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]] ; then
+		chostarch="sparc32-v9"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*) myos=darwin ;;
+		*) myos=linux  ;;
+	esac
+
+	case ${CHOST} in
+		hppa*) chostarch=parisc ;;
+	esac
+
+	local pythonvers=()
+	if use python ; then
+		_append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+
+		python_foreach_impl _append
+	fi
+
+	# Don't install Python bindings automatically
+	# (do it manually later in the right place)
+	# https://bugs.gentoo.org/723096
+	local myargs=(
+		$(use_enable static-libs static-library)
+		$(use_with boost)
+		$(use_with bzip2)
+		$(use_with doc documentation)
+		$(use_with doc sphinx)
+		$(use_with lzma)
+		$(use_with sqlite sqlite3)
+		$(use_with ssl openssl)
+		$(use_with zlib)
+		$(usex hppa --without-stack-protector '')
+		--cpu=${chostarch}
+		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
+		--docdir=share/doc
+		--libdir=$(get_libdir)
+		--os=${myos}
+		--distribution-info="Gentoo ${PVR}"
+		--prefix="${EPREFIX}/usr"
+		--with-endian="$(tc-endian)"
+		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
+		--without-doxygen
+		--no-install-python-module
+	)
+
+	tc-export CC CXX AR
+
+	./configure.py "${myargs[@]}" || die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+
+	# Manually install the Python bindings (bug #723096)
+	if use python ; then
+		python_foreach_impl python_domodule src/python/botan2.py
+	fi
+}
diff --git a/dev-libs/botan/botan-2.17.2.ebuild b/dev-libs/botan/botan-2.17.2.ebuild
new file mode 100644
index 000000000000..17cef74104b9
--- /dev/null
+++ b/dev-libs/botan/botan-2.17.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit python-r1 toolchain-funcs
+
+MY_P="Botan-${PV}"
+
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	')
+"
+
+# NOTE: Boost is needed at runtime too for the CLI tool.
+DEPEND="
+	boost? ( >=dev-libs/boost-1.48:= )
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	lzma? ( app-arch/xz-utils:= )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sqlite? ( dev-db/sqlite:3= )
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+
+RDEPEND="${DEPEND}"
+
+# NOTE: Considering patching Botan?
+# Please see upstream's guidance:
+# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
+
+python_check_deps() {
+	if use doc ; then
+		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+src_configure() {
+	local disable_modules=()
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	elog "Disabling module(s): ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	local chostarch="${CHOST%%-*}"
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]] ; then
+		chostarch="sparc32-v9"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*) myos=darwin ;;
+		*) myos=linux  ;;
+	esac
+
+	case ${CHOST} in
+		hppa*) chostarch=parisc ;;
+	esac
+
+	local pythonvers=()
+	if use python ; then
+		_append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+
+		python_foreach_impl _append
+	fi
+
+	# Don't install Python bindings automatically
+	# (do it manually later in the right place)
+	# https://bugs.gentoo.org/723096
+	local myargs=(
+		$(use_enable static-libs static-library)
+		$(use_with boost)
+		$(use_with bzip2)
+		$(use_with doc documentation)
+		$(use_with doc sphinx)
+		$(use_with lzma)
+		$(use_with sqlite sqlite3)
+		$(use_with ssl openssl)
+		$(use_with zlib)
+		$(usex hppa --without-stack-protector '')
+		--cpu=${chostarch}
+		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
+		--docdir=share/doc
+		--libdir=$(get_libdir)
+		--os=${myos}
+		--distribution-info="Gentoo ${PVR}"
+		--prefix="${EPREFIX}/usr"
+		--with-endian="$(tc-endian)"
+		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
+		--without-doxygen
+		--no-install-python-module
+	)
+
+	tc-export CC CXX AR
+
+	./configure.py "${myargs[@]}" || die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+
+	# Manually install the Python bindings (bug #723096)
+	if use python ; then
+		python_foreach_impl python_domodule src/python/botan2.py
+	fi
+}
diff --git a/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch b/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch
deleted file mode 100644
index 35b17976dbd5..000000000000
--- a/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-https://github.com/randombit/botan/commit/df73ee690c5795be586cd4df3e33253113a0dcdf
-https://github.com/randombit/botan/commit/d9d6d7a593da135d2046aeb8a9e05e967d90f538
-
-diff --git a/src/tests/test_pkcs11_high_level.cpp b/src/tests/test_pkcs11_high_level.cpp
-index 47a5bf5e56..07dc86ef21 100644
---- a/src/tests/test_pkcs11_high_level.cpp
-+++ b/src/tests/test_pkcs11_high_level.cpp
-@@ -909,6 +909,15 @@ BOTAN_REGISTER_TEST("pkcs11-rsa", PKCS11_RSA_Tests);
- 
- /***************************** PKCS11 ECDSA *****************************/
- 
-+#if defined(BOTAN_HAS_ECC_GROUP)
-+std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp& point)
-+   {
-+   std::vector<uint8_t> enc;
-+   DER_Encoder(enc).encode(point.encode(PointGFp::UNCOMPRESSED), OCTET_STRING);
-+   return enc;
-+   }
-+#endif
-+
- #if defined(BOTAN_HAS_ECDSA)
- 
- Test::Result test_ecdsa_privkey_import()
-@@ -976,13 +985,6 @@ Test::Result test_ecdsa_privkey_export()
-    return result;
-    }
- 
--std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp& point)
--   {
--   std::vector<uint8_t> enc;
--   DER_Encoder(enc).encode(point.encode(PointGFp::UNCOMPRESSED), OCTET_STRING);
--   return enc;
--   }
--
- Test::Result test_ecdsa_pubkey_import()
-    {
-    Test::Result result("PKCS11 import ECDSA public key");
-diff --git a/src/tests/test_pkcs11_high_level.cpp b/src/tests/test_pkcs11_high_level.cpp
-index 07dc86ef21..c77e8ea42e 100644
---- a/src/tests/test_pkcs11_high_level.cpp
-+++ b/src/tests/test_pkcs11_high_level.cpp
-@@ -28,10 +28,14 @@
-    #include <botan/der_enc.h>
- #endif
- 
--#if defined (BOTAN_HAS_PUBLIC_KEY_CRYPTO)
-+#if defined(BOTAN_HAS_PUBLIC_KEY_CRYPTO)
-    #include <botan/pubkey.h>
- #endif
- 
-+#if defined(BOTAN_HAS_ECC_GROUP)
-+   #include <botan/ec_group.h>
-+#endif
-+
- #if defined(BOTAN_HAS_RSA) && defined(BOTAN_HAS_PKCS11)
-    #include <botan/rsa.h>
-    #include <botan/p11_rsa.h>
-@@ -909,7 +913,7 @@ BOTAN_REGISTER_TEST("pkcs11-rsa", PKCS11_RSA_Tests);
- 
- /***************************** PKCS11 ECDSA *****************************/
- 
--#if defined(BOTAN_HAS_ECC_GROUP)
-+#if defined(BOTAN_HAS_ECC_GROUP) && (defined(BOTAN_HAS_ECDSA) || defined(BOTAN_HAS_ECDH))
- std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp& point)
-    {
-    std::vector<uint8_t> enc;
-diff --git a/src/tests/unit_x509.cpp b/src/tests/unit_x509.cpp
-index eaae358420..d9b7858898 100644
---- a/src/tests/unit_x509.cpp
-+++ b/src/tests/unit_x509.cpp
-@@ -603,7 +603,7 @@ Test::Result test_verify_gost2012_cert()
-    {
-    Test::Result result("X509 GOST-2012 certificates");
- 
--#if defined(BOTAN_HAS_GOST_34_10_2012) && defined(BOTAN_HAS_STREEBOG)
-+#if defined(BOTAN_HAS_GOST_34_10_2012) && defined(BOTAN_HAS_STREEBOG) && defined(BOTAN_HAS_EMSA1)
-    try
-       {
-       Botan::X509_Certificate root_cert(Test::data_file("x509/gost/gost_root.pem"));
-@@ -1600,6 +1600,11 @@ class X509_Cert_Unit_Tests final : public Test
-                continue;
- #endif
- 
-+#if !defined(BOTAN_HAS_EMSA1)
-+            if(algo != "RSA" && algo != "Ed25519")
-+               continue;
-+#endif
-+
-             std::unique_ptr<Botan::Private_Key> key = make_a_private_key(algo);
- 
-             if(key == nullptr)