gentoo resync : 30.06.2018

3 files changed, 0 insertions, 101 deletions

diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index aa51a379074b..5bc03215e1f3 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,6 +1,3 @@
-AUX nettle-3.3-ecc-add-eh.patch 977 BLAKE2B c33cfc4c8903d92a98ef853f72772f7ad2e5a48c0405647169bbc8fdda2d439f3ca373c6d48b536b72426c07a3b7bec10c0dad5edf189b750cf134d9023bc50a SHA512 8a5e991fa87c8e12ff812d570bc3ff6e397cc95cd2011a0dadda15371efc7215a8df067a427e62f707e1bb19078595230fe45f1ec85a2f8c8e09bf95ddc82dc8
-DIST nettle-3.3.tar.gz 1887927 BLAKE2B 4bcf3c4bfb9f9dae97ea6780d146f3313e8b51182d9942e69581428d9f602d16467d37f993700a4e94e2e0dee17bdf354694c94d0383164c3de6e57e7e24de4e SHA512 271981d89766f151af3cdc4e5fc43c438222f0f6f44475bad114f4209955b5235fced6526c7abca001cca223e8cfcd2a6bf389b160b305a499e7acf52425ec70
 DIST nettle-3.4.tar.gz 1935069 BLAKE2B b73c88236c8233360607a6ed65cd4f6d19bfbbf683b46149326ce3440bf0a42b8add69de5c64145720163b1095fdab3cb8bf410c2ef727d0ea4fb58391ff0f14 SHA512 3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b
-EBUILD nettle-3.3-r2.ebuild 1776 BLAKE2B d95d5f8d9fcc9574bef63f41678ad8b86ce03dad9d1aae27fd3a8129aa59431f9ed3842b72cd330c1aad44ab159bce5c5bd6df9709f6342bebc4242df6d1874f SHA512 299663b4f58b51e66488fef27c78e0db0164e7bcfc3f990e811ee920dc9b09b952d1a69799cd5112fc97a911ba3c6f74962b9063e26a6cdbe5500556b27119e6
 EBUILD nettle-3.4.ebuild 1763 BLAKE2B dff04a774b1698987c57710cfa329fc2ac1ecc7f4ecf5b646137c4b9ca3ff4c3a3a57b95f7bceac60d72c348785d7bdcd85a7b7b31daf998c9dad8469b5a6bee SHA512 0b241e5b35c78540ebcea244b41c4fc5c38e1436c8491d23000b6b5cc0cc56808eda0361349cba925374024f239d405361368bd5f0f5cbcb94469fde972e126d
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/nettle/files/nettle-3.3-ecc-add-eh.patch b/dev-libs/nettle/files/nettle-3.3-ecc-add-eh.patch
deleted file mode 100644
index 5492997f336e..000000000000
--- a/dev-libs/nettle/files/nettle-3.3-ecc-add-eh.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dcda81d796de2f4a16fd7e9e7a5d07baa288f147 Mon Sep 17 00:00:00 2001
-From: Niels Möller <nisse@lysator.liu.se>
-Date: Tue, 18 Jul 2017 20:52:30 +0200
-Subject: [PATCH] Fix for in-place ecc_add_eh.
-
-* ecc-add-eh.c (ecc_add_eh): Fix in-place operation by reordering
-two multiplies. Previously, in-place operation resulted in an
-invalid call to mpn_mul with overlapping operands. Reported by
-Sergei Trofimovich.
----
- ChangeLog    | 7 +++++++
- ecc-add-eh.c | 4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/ecc-add-eh.c b/ecc-add-eh.c
-index a16be4c..c07ff49 100644
---- a/ecc-add-eh.c
-+++ b/ecc-add-eh.c
-@@ -98,8 +98,8 @@ ecc_add_eh (const struct ecc_curve *ecc,
-   ecc_modp_mul (ecc, x3, B, z1);
- 
-   /* y3 */
--  ecc_modp_mul (ecc, B, F, C); /* ! */
--  ecc_modp_mul (ecc, y3, B, z1);
-+  ecc_modp_mul (ecc, B, F, z1); /* ! */
-+  ecc_modp_mul (ecc, y3, B, C); /* Clobbers z1 in case r == p. */
- 
-   /* z3 */
-   ecc_modp_mul (ecc, B, F, G);
---
-libgit2 0.25.0
-
diff --git a/dev-libs/nettle/nettle-3.3-r2.ebuild b/dev-libs/nettle/nettle-3.3-r2.ebuild
deleted file mode 100644
index 678fb2445ce8..000000000000
--- a/dev-libs/nettle/nettle-3.3-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.1" # subslot = libnettle soname version, .1 as broke ABI bug#601512
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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"
-
-DEPEND="gmp? ( >=dev-libs/gmp-5.0:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/nettle/nettle-stdint.h
-	/usr/include/nettle/version.h
-)
-
-DOCS=()
-HTML_DOCS=()
-
-PATCHES=(
-	"${FILESDIR}/${P}-ecc-add-eh.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)
-}