gentoo resync : 08.01.2021

6 files changed, 28 insertions, 147 deletions

diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 37f6f19d5ee1..fea76066d6c8 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,9 +1,6 @@
-AUX nettle-3.4.1-build.patch 1598 BLAKE2B ce10cb8a59bf8e2d1dea57ceff5bb2fcf2da1320034672abed770fcce54466704a6b3820a135d04d2d52881cb0d701bdd252d388bcc1ddd80b508fb3828cd237 SHA512 6b95ec112471895d3fb7c7c2c82517d113c0da604285f19b4d14ef3e4bfda6b5d32b869b97a0510c8a9f8c5828c410d99d67bba09f57a14115a6a7ed0d677b3a
-DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff70aed53c741e43c1b5373361e5cffb03df7b8e86ef103a3b7770b2b4fe39fbca00b128f2b7ec810b3a4d9fd0fd SHA512 26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f
-DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b043687d88c776ce9c58374538b111d282e0eea5424059260b0876c5cf01f97470c850e082c167b05a57e6c591a SHA512 f738121b9091cbe79435fb5d46b45cf6f10912320c233829356908127bab1cac6946ca56e022a832380c44f2c10f21d2feef64cb0f4f41e3da4a681dc0131784
 DIST nettle-3.6.tar.gz 2288173 BLAKE2B 45e08832e9c337f10d958956545c77f521b747b8abca56ce40c755adf352bdc2a79584b1e1c0e50f5ede0ac54794aabd6883601c53593b965aada744502789db SHA512 2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51
-EBUILD nettle-3.4.1.ebuild 1779 BLAKE2B 4688d97836813edce2738671f464f20821662cd00a93fbc501b5b301afda57cad4af7e1c2553dfb69360e622eeb3be3e0c520d00b8966b4effe25939eb13365a SHA512 a458a35d2de2cc28b94d37723841fe5efa993c88e40850ad519e43bb7b9ddc2f7f81e4a96f8d6379d12e3b02fce83c0be3c70ce48a37a047396f3e2cb57344a9
-EBUILD nettle-3.5.1-r1.ebuild 1740 BLAKE2B 6ecd449821e733b91ac36fe401a3cdc326c3e0f9c9e9f4501bc0d03965458296ed66719e43d4f594dce20d15aeb04d3bd262bfcedc31d403f3b4f5d3f6217f06 SHA512 e4f4536f8def163dfadb74c648226e691e38e7b8cfc30103c82248308f0e558122d8518bb18a701b8ad889d173bed796fbe11533dc087b0ab9fb40a031f2e28a
-EBUILD nettle-3.6-r2.ebuild 1792 BLAKE2B 999473f1d1d1220c2778d2f89f3e33242b3d01a5099d801bd7a64ac105bc155df05d86ba50256b7c087ce3b767f4421e9b3b2e3098f8b7494cf43a0c9ac796c5 SHA512 cb8575eab80fee6b3865e705efe014a250fcfc5b3e7c2e53481051c22abbbad9c99a2ca8c5bfd3af7443b1ecb191e5fed9875f119c7deab0f46ebc50abe4ca99
-EBUILD nettle-3.6-r3.ebuild 1842 BLAKE2B 9a4cc9b9f98eef21fc4e3d78acaf20a06c6b45b803b1672be412d50b548c6aec27f3d1561789412a7be534b03d0bb18fc2c6ac3696a826e7861f5bb52efe95b5 SHA512 0d80e95c6cfec4dbac2c9b39feb4f85277991def180093bcb4f8249f0a504e0e26b69dc9533ff9b2b0f3ed862511691c03f4fd33c4e4d772e8ba9a03d9f3101b
+DIST nettle-3.7.tar.gz 2375067 BLAKE2B 1e8a77db9b7e62dee9a01e3c3b476e206f36cc7235153b0a1a762276650c61d7c4c3be73b2ecae9313313e416e3c7a2bd999a3505c41b26e806f9b3eb486550f SHA512 be32eff0ea3c83abb8b6670d049a8ce21ea9c7cac3e1a5d41ae003d5160e2683572c7dd8930b869ac1db0b89f9423605e0a8ec0cff074c63e2a60c71996ef66c
+EBUILD nettle-3.6-r2.ebuild 1781 BLAKE2B e01bf5e416b31404c955406cc56094f192504a0a9f18e1de009af0376704279a24f7b61f4d6ab713690b81d97a4117ff67aa8f202c64f7dd3a13b736e0583329 SHA512 a34481eeaecaeb8928ec7185a14a747447ed6bccec1b275347a2f20c03c81fbf07dab3ea0b89d2d629234825ed9fc1c2f84997bc88121bb08b68b13064db46a2
+EBUILD nettle-3.6-r3.ebuild 1831 BLAKE2B 52f6b9858662beb73050485055be6eef7982d280bc8da67141a6077db7245c0162e176ebf722068dd6a3a711946070a233e6cb088740e8474eba055333da2bf5 SHA512 53de5e013ca2c84a211d694ff4495c22085a35698122f4b36b3a56444d69c5bb984a7e96d5ee91df0c091f473f864b3b19ba89fa20181ec759b67e4124c566b7
+EBUILD nettle-3.7.ebuild 1853 BLAKE2B 12bbc4ed864e017f48bb8d2d9891913bf1c29236e732ebc9172ce5abae31b5d29fd71a3a0ed879decff04a4e7827e3a7ef9474cf484d1cc170cd1086f3a2d299 SHA512 91dfb3da39d9fd8b7868ea89988af5469a287ce8adf7df2cb2d43c0563ccc4983f1884f5af720e75e6d12d2bb05294af892c4747c55825b72dd4ef3363ec900e
 MISC metadata.xml 460 BLAKE2B 66da3978fdcd6fb67c2d345578e78768795254f4bb9a8b1ea8236ce99a0516cb2206f77280b5bfc23b98acbbee92bd96c32be12776fd83faa1a670fd10b3f648 SHA512 6a08cf01475e5b46f05ec3fd7d2186b7210501769d2d06780b5d078e1db39c23fd564a8a1c671362eb359c1a88759fb5479cbe757e832507aff81296fd739972
diff --git a/dev-libs/nettle/files/nettle-3.4.1-build.patch b/dev-libs/nettle/files/nettle-3.4.1-build.patch
deleted file mode 100644
index 4351dfeb5bcb..000000000000
--- a/dev-libs/nettle/files/nettle-3.4.1-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From f5a3a224bf00bef5669366d2ae23c2b2b13b8016 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
-Date: Wed, 26 Dec 2018 11:04:31 +0100
-Subject: [PATCH] Fix accidental use of C99 for loop.
-
-* rsa-sign-tr.c (sec_equal): Fix accidental use of C99 for loop.
-Reported by Andreas Gustafsson.
-* testsuite/rsa-sec-decrypt-test.c (test_main): Likewise.
----
- ChangeLog                        | 6 ++++++
- rsa-sign-tr.c                    | 3 ++-
- testsuite/rsa-sec-decrypt-test.c | 3 ++-
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/rsa-sign-tr.c b/rsa-sign-tr.c
-index 59c9bd07..f824c4ca 100644
---- a/rsa-sign-tr.c
-+++ b/rsa-sign-tr.c
-@@ -239,8 +239,9 @@ static int
- sec_equal(const mp_limb_t *a, const mp_limb_t *b, size_t limbs)
- {
-   volatile mp_limb_t z = 0;
-+  size_t i;
- 
--  for (size_t i = 0; i < limbs; i++)
-+  for (i = 0; i < limbs; i++)
-     {
-       z |= (a[i] ^ b[i]);
-     }
-diff --git a/testsuite/rsa-sec-decrypt-test.c b/testsuite/rsa-sec-decrypt-test.c
-index 64f0b13c..fb0ed3a1 100644
---- a/testsuite/rsa-sec-decrypt-test.c
-+++ b/testsuite/rsa-sec-decrypt-test.c
-@@ -68,6 +68,7 @@ test_main(void)
-   unsigned n_size = 1024;
-   mpz_t gibberish;
-   mpz_t garbage;
-+  size_t size;
- 
-   rsa_private_key_init(&key);
-   rsa_public_key_init(&pub);
-@@ -78,7 +79,7 @@ test_main(void)
- 
-   memset(verifybad, 'A', PAYLOAD_SIZE);
- 
--  for (size_t size = 1; size < 51; size++)
-+  for (size = 1; size < 51; size++)
-     {
-       ASSERT (rsa_generate_keypair(&pub, &key, &random_ctx,
- 			           (nettle_random_func *) knuth_lfib_random,
--- 
-2.18.1
-
diff --git a/dev-libs/nettle/nettle-3.4.1.ebuild b/dev-libs/nettle/nettle-3.4.1.ebuild
deleted file mode 100644
index bb7dcdf6c2ad..000000000000
--- a/dev-libs/nettle/nettle-3.4.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
-
-DESCRIPTION="Low-level cryptographic library"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 LGPL-2.1 )"
-SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
-RESTRICT="!test? ( test )"
-
-DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/nettle/nettle-stdint.h
-	/usr/include/nettle/version.h
-)
-
-DOCS=()
-HTML_DOCS=()
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
-	use doc && DOCS+=(
-		nettle.pdf
-	)
-	use doc && HTML_DOCS+=(
-		nettle.html
-	)
-}
-
-src_prepare() {
-	default
-
-	sed -e '/CFLAGS=/s: -ggdb3::' \
-		-e 's/solaris\*)/sunldsolaris*)/' \
-		-i configure.ac || die
-
-	# conditionally build tests and examples required by tests
-	use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# --disable-openssl bug #427526
-	ECONF_SOURCE="${S}" econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-openssl \
-		--disable-fat \
-		$(use_enable gmp public-key) \
-		$(use_enable static-libs static) \
-		$(tc-is-static-only && echo --disable-shared) \
-		$(use_enable doc documentation) \
-		$(use_enable neon arm-neon) \
-		$(use_enable cpu_flags_x86_aes x86-aesni)
-}
diff --git a/dev-libs/nettle/nettle-3.6-r2.ebuild b/dev-libs/nettle/nettle-3.6-r2.ebuild
index 8a4d2ae81beb..9a9d30443dcd 100644
--- a/dev-libs/nettle/nettle-3.6-r2.ebuild
+++ b/dev-libs/nettle/nettle-3.6-r2.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/nettle/nettle-3.6-r3.ebuild b/dev-libs/nettle/nettle-3.6-r3.ebuild
index 6abf981738a5..2b02db1d06f0 100644
--- a/dev-libs/nettle/nettle-3.6-r3.ebuild
+++ b/dev-libs/nettle/nettle-3.6-r3.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris x86-solaris"
 IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/nettle/nettle-3.5.1-r1.ebuild b/dev-libs/nettle/nettle-3.7.ebuild
index acb10fbbe9af..c99897e5e98a 100644
--- a/dev-libs/nettle/nettle-3.5.1-r1.ebuild
+++ b/dev-libs/nettle/nettle-3.7.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
@@ -10,13 +10,14 @@ HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
-SLOT="0/7" # subslot = libnettle soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
 RESTRICT="!test? ( test )"
 
-DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,${MULTILIB_USEDEP}] )"
+DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
+BDEPEND="doc? ( sys-apps/texinfo )"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/nettle/version.h
@@ -47,17 +48,20 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# --disable-openssl bug #427526
-	ECONF_SOURCE="${S}" econf \
-		$(tc-is-static-only && echo --disable-shared) \
-		$(use_enable cpu_flags_x86_aes x86-aesni) \
-		$(use_enable cpu_flags_x86_sha x86-sha-ni) \
-		$(use_enable asm assembler) \
-		$(use_enable doc documentation) \
-		$(use_enable gmp public-key) \
-		$(use_enable cpu_flags_arm_neon arm-neon) \
-		$(use_enable static-libs static) \
-		--disable-fat \
-		--disable-openssl \
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		$(tc-is-static-only && echo --disable-shared)
+		$(use_enable cpu_flags_x86_aes x86-aesni)
+		$(use_enable cpu_flags_x86_sha x86-sha-ni)
+		$(use_enable asm assembler)
+		$(use_enable doc documentation)
+		$(use_enable gmp public-key)
+		$(use_enable cpu_flags_arm_neon arm-neon)
+		$(use_enable static-libs static)
+		--disable-fat
+		# --disable-openssl bug #427526
+		--disable-openssl
 		--libdir="${EPREFIX}"/usr/$(get_libdir)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }