gentoo resync : 08.06.2019

3 files changed, 23 insertions, 12 deletions

diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index b805e21396f3..445ca1e3a491 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,5 +1,5 @@
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
 DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
-EBUILD libb2-0.98.1.ebuild 1311 BLAKE2B 3627d6fe7a4ce4bb84af4e2f39e3e06110c8a1677d2972a2a04d44aa6d8ec478009c1d2be6c994b42ad592f1e04151a54c237189f2058069758fb1908e68c9a1 SHA512 dcc298e5edf90c4557ff5eb6a0dd55d6307115a99aa7f498de86b54ee685097c12fd7b61e58077a6b8c38fbe0ce22c8499af4b413e8fc01960424366513c9dff
-EBUILD libb2-0.98.ebuild 983 BLAKE2B ef56ce606348776f1bf24a3e275c95ae40e0569e46dad425c5e47b30b6df4ea512477f41bf117b4e4b0562d4ffbbc2de9ef2d9e4e6b897bc25859ee5f6c63816 SHA512 8e69f8cee42a75680d4aa616127482c36f986cf32f5c2612e0c1af7418b8b62cbd0cb73163ba93190b9359389a13eb31fd75528110391318dc3d14d0d78447a4
+EBUILD libb2-0.98.1-r1.ebuild 1692 BLAKE2B 6c089a1c06d14c51c3c745da19416975d1ade0590fe11642a9d4bc02ec54bb77b7cc7c73319e45d2e7ba917b2cd229f14373d8bbafd09f0e9b46fcfb11261c77 SHA512 0e343e4e348bb19e1256f6d8ee9b2df52a950ad6c81ce606d59b2c2779cf061e876cded2f0b9e7a50c8e9ee927b9e0a17a2886817c62be2a19ca87a35fbe3a49
+EBUILD libb2-0.98.ebuild 1015 BLAKE2B 8f6fc70a953aea90fa5dbecd894dd5b1335fe9bf737547f8c2c42ab46cc8b718f0bf1ad941b54820b36ce62829a3d2d4d0de1d6e8c34c90c839d4019781a0765 SHA512 7d1a55ff33988e20ab4588f17dc0a1d982c02ea785e1d9535ff740b923129c5491282191e77d6a8dddcb500bce22626face82b40354fcb4da207a2bdcbbdab2b
 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.1.ebuild b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
index 2664bc570e7a..9224a54ad537 100644
--- a/app-crypt/libb2/libb2-0.98.1.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools ltprune toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
 HOMEPAGE="https://github.com/BLAKE2/libb2"
@@ -12,8 +12,8 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="static +native-cflags openmp"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs native-cflags openmp"
 
 DEPEND="
 	openmp? (
@@ -35,22 +35,33 @@ src_prepare() {
 	default
 	# fix bashism
 	sed -i -e 's/ == / = /' configure.ac || die
+	# https://github.com/BLAKE2/libb2/pull/28
+	echo 'libb2_la_LDFLAGS = -no-undefined' >> src/Makefile.am || die
 	eautoreconf  # upstream doesn't make releases
 }
 
 src_configure() {
 	econf \
-		$(use_enable static) \
+		$(use_enable static-libs static) \
 		$(use_enable native-cflags native) \
 		$(use_enable openmp)
 }
 
-src_compile() {
+do_make() {
 	# respect our CFLAGS when native-cflags is not in effect
-	emake $(use native-cflags && echo no)CFLAGS="${CFLAGS}"
+	local openmp=$(use openmp && echo -fopenmp)
+	emake $(use native-cflags && echo no)CFLAGS="${CFLAGS} ${openmp}" "$@"
+}
+
+src_compile() {
+	do_make
+}
+
+src_test() {
+	do_make check
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	use static-libs || find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/app-crypt/libb2/libb2-0.98.ebuild b/app-crypt/libb2/libb2-0.98.ebuild
index 3ca37501441b..64ec18c1de9e 100644
--- a/app-crypt/libb2/libb2-0.98.ebuild
+++ b/app-crypt/libb2/libb2-0.98.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools ltprune
+inherit autotools
 
 DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
 HOMEPAGE="https://github.com/BLAKE2/libb2"
@@ -40,5 +40,5 @@ src_compile() {
 
 src_install() {
 	default
-	prune_libtool_files
+	use static || find "${ED}" -name '*.la' -type f -delete || die
 }