[gentoo-commits] repo/gentoo:master commit in: dev-libs/nettle/

["Alon Bar-Lev" <alonbl@gentoo.org>]

commit:     eb0f66f5f0a89cc4123011df33bc68d242dbb43d
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 10:01:49 2019 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 10:08:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb0f66f5

dev-libs/nettle: version bump

Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-libs/nettle/Manifest                                   |  2 +-
 dev-libs/nettle/metadata.xml                               | 11 +++++++----
 dev-libs/nettle/{nettle-3.5.ebuild => nettle-3.5.1.ebuild} | 10 +++++-----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 744d6c2368c..580f010e062 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,2 +1,2 @@
 DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff70aed53c741e43c1b5373361e5cffb03df7b8e86ef103a3b7770b2b4fe39fbca00b128f2b7ec810b3a4d9fd0fd SHA512 26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f
-DIST nettle-3.5.tar.gz 1989543 BLAKE2B db2a4c8deed2e99e746c702cc686385fc1ae87aab67d94ca67a4d9dfea4e10990f2a3fed81010c78364271c8a08e2208e5a479298ab5e9bc10a5c676fe7a3cbc SHA512 0aaac4b678fede9f462e0c71e5926b02e82aa7a54b15ab34d159315a36b99bd8f17c3ad89a1ffae7bc8333668fe9793c041637ffe8000175bb20b14047bef907
+DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b043687d88c776ce9c58374538b111d282e0eea5424059260b0876c5cf01f97470c850e082c167b05a57e6c591a SHA512 f738121b9091cbe79435fb5d46b45cf6f10912320c233829356908127bab1cac6946ca56e022a832380c44f2c10f21d2feef64cb0f4f41e3da4a681dc0131784

diff --git a/dev-libs/nettle/metadata.xml b/dev-libs/nettle/metadata.xml
index f1c3d59fb21..2992d1b3df8 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.ebuild b/dev-libs/nettle/nettle-3.5.1.ebuild
similarity index 85%
rename from dev-libs/nettle/nettle-3.5.ebuild
rename to dev-libs/nettle/nettle-3.5.1.ebuild
index dd968d505c0..5bf45e8446d 100644
--- a/dev-libs/nettle/nettle-3.5.ebuild
+++ b/dev-libs/nettle/nettle-3.5.1.ebuild
@@ -12,7 +12,7 @@ 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"
+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}"
@@ -36,13 +36,12 @@ pkg_setup() {
 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::' \
-		-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
 }
 
@@ -51,6 +50,7 @@ multilib_src_configure() {
 	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) \