gentoo resync : 30.06.2019

3 files changed, 71 insertions, 5 deletions

diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index f1605715042c..8f151400abf9 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,4 +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
 EBUILD nettle-3.4.1.ebuild 1787 BLAKE2B 80b456defbf4e4c28bf9b0ed97b310d9993218964af3febb91649d25b69fa71fae0f2109b1b952e1a8c90f09311ef1f966d9d77f8af2f113630c64ef6821ec9d SHA512 9545879b7b41f3b4fb74a14cfa7b0c6c032bcf8228daf2d0e5265eec5ee32ad93a757d5dc54f7c5f7e76ba595328cf97eae0dc085e060a259f5bc00b74378c24
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
+EBUILD nettle-3.5.1.ebuild 1694 BLAKE2B 93fab2dcd60d5821297c3d577eaedf545ebd22c85d354a0b18eb13c93cca5c01d0103e959c096552a6b04a75a88658a9a6324ae6295223ce0e2a2826e4a38614 SHA512 93a3c4eaa29e1cce5916596df0cc62cf79b8f107527d21e6f12c2687b64a8187040658210ed72d240067b5a1ad72ee2ea71bc381b2cbe7e73d2999695f5b3c55
+MISC metadata.xml 351 BLAKE2B 72daad9a603f171d2a9df465705317fd5609f8a5ddbe464c45db1de5be1502edbf8a4bdaaa229e52d5b06af6f5884f8d84bde515f726d1292d44bebb22d50f1a SHA512 9b5fcbf997fbd4fcc238c20a4968adbb1c24c84ce9764360a21c2bb000fe891cc8293c7fb5a1d93c9c811791a6524f727b16befbe95f1d65f68c8a3916224f60
diff --git a/dev-libs/nettle/metadata.xml b/dev-libs/nettle/metadata.xml
index f1c3d59fb213..2992d1b3df8e 100644
--- a/dev-libs/nettle/metadata.xml
+++ b/dev-libs/nettle/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<maintainer type="project">
+		<email>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<use>
+		<flag name="cpu_flags_x86_sha">Enable support for Intel's SHA instruction set (SHA-NI)</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/nettle/nettle-3.5.1.ebuild b/dev-libs/nettle/nettle-3.5.1.ebuild
new file mode 100644
index 000000000000..5bf45e8446d6
--- /dev/null
+++ b/dev-libs/nettle/nettle-3.5.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 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/7" # subslot = libnettle soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes cpu_flags_x86_sha"
+
+DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/nettle/version.h
+)
+
+DOCS=()
+HTML_DOCS=()
+
+pkg_setup() {
+	use doc && DOCS+=(
+		nettle.pdf
+	)
+	use doc && HTML_DOCS+=(
+		nettle.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# I do not see in config.sub reference to sunldsolaris.
+	# if someone complains readd
+	# -e 's/solaris\*)/sunldsolaris*)/' \
+	sed -e '/CFLAGS=/s: -ggdb3::' \
+		-i configure.ac || die
+
+	eautoreconf
+}
+
+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 doc documentation) \
+		$(use_enable gmp public-key) \
+		$(use_enable neon arm-neon) \
+		$(use_enable static-libs static) \
+		--disable-fat \
+		--disable-openssl \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+}