gentoo resync : 11.05.2021

10 files changed, 51 insertions, 29 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index a5b0c8a0d985..9fc21fe49bca 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/alglib/Manifest b/sci-libs/alglib/Manifest
index 3cd8bf30d28b..d98139a5111a 100644
--- a/sci-libs/alglib/Manifest
+++ b/sci-libs/alglib/Manifest
@@ -3,5 +3,5 @@ AUX alglib-3.10.0-disable-minlm-test.patch 709 BLAKE2B 160bd6a598eb9c822b16da645
 DIST alglib-3.10.0.cpp.gpl.tgz 1991101 BLAKE2B 884b80becce676285b7bc1f26ed8917c4c82f53b41c0350dfc8bff6573e2e6f12183e82fc317b54a8021b1f931eb7d5b55944902d0816f7097fdc05632128bdc SHA512 f02b3db5ab8dee841f27186b6693997c4e6876e75310b0a31a04593dbcb41d300920404e32e7aecb39c8dd15e54cfee05b725caa27397a67b453f6e64cd1ef5e
 DIST alglib-3.17.0.cpp.gpl.tgz 3065026 BLAKE2B bc939568a6bfb5e2717995e31b9d7cb485885217ff8d15c2bea3185b1ef62536766f80e02d43999c016e24b10181bddd4ad4ff27611ab19ebcc778a5cb15d55e SHA512 0e4b943b03707950813aea707ae3569ce75a22216c9a4b256b646db16609995b3b63a958b0b8fbe3d7d623d5ac03efbe7c4b1589961f2ca9cdefbd7e1cc0c721
 EBUILD alglib-3.10.0-r1.ebuild 747 BLAKE2B d308644af5f0d8cd54e3b9d97d0cfd7bb5904a6994509a2d1316710833d6f59433a021b44e01e5aa58048622f5dabcf20c2e4aa5ab5f1c1120273b45d2feeed7 SHA512 cb9cf3f23a1b13377eb15db1e6c37835eaa5ad9957cdcedaf6391725061bc0e233b8e6924edc7c0a63a3bbc3477f03a780c206538816625dcd32148424993270
-EBUILD alglib-3.17.0.ebuild 670 BLAKE2B 77d22786af5b1ebac75439c13264e494632151ee3d6333dc158c154c1f751bb6d4a10734175af90c88061644fa4d529ba3ea50531b81e0257ea42e0b00a2620f SHA512 a957a3cece3cde5d3913f68e79228408ca56c4b9ada48f57515ec0db972027eb5636a54af268dc82d6fbe0aa4771f8559a247ee93c85174478f682c26fc8ab69
+EBUILD alglib-3.17.0.ebuild 669 BLAKE2B 73f4442d08a0f61f9a79763f0a726fbae38ef533c26b910c88a3c83f4c08b5cee9a36458d032935028dcedb024f354241e97ba2916508afb1d2cfc41c465271c SHA512 52c79e2a3267305f8188a63a3b77cd6636531631ce661ce129e1ae135eae0d414e6e31f84ec85215b8ae1e616f0924c3afa2674d3f3b8ef1a001d4ab5aca2c05
 MISC metadata.xml 1592 BLAKE2B 96df655b24fc1e27a90f6a31388135e9ec14965eef850c14468797dbb19670ef4695219459b2af337613a92cc25a7eb12a1b07f95a3e1e4b058d9f9c38ded770 SHA512 e16165304d85c3201c428b46bb85006281a2faac170f6b7f2966bc683f57387a0d4b68eddd6ad2d4ed9d26af992f4f9b2616c761f0bf1102c6749a8025478844
diff --git a/sci-libs/alglib/alglib-3.17.0.ebuild b/sci-libs/alglib/alglib-3.17.0.ebuild
index 6f520c619d21..f4f6adc9051a 100644
--- a/sci-libs/alglib/alglib-3.17.0.ebuild
+++ b/sci-libs/alglib/alglib-3.17.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/cpp
 
 LICENSE="GPL-2+"
 SLOT="0/3.8"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/primegen/Manifest b/sci-libs/primegen/Manifest
index 26996834ac26..fe1cb1d75746 100644
--- a/sci-libs/primegen/Manifest
+++ b/sci-libs/primegen/Manifest
@@ -1,5 +1,6 @@
-AUX primegen-0.97-man.patch 738 BLAKE2B cd89d5156fca4a060cb59a6d9878998ac3c2f52d52891db56daf5f30986f12d20cd6d58f3cd62687f74dc44616b21c12f943c79717c72bd07d41fb925441979e SHA512 42b3748fe77eea9af4ffd531c9dabe28a6be49e05afbf705a47f7111c936fb7cb31517df475c04dc4a3157be9b7890bff64e5ae73a49d8c3517ab756d954f0e8
-AUX primegen-0.97-missing-headers.patch 1282 BLAKE2B 2863d18462642f91c8e7e29a6dfef1b570793ca468eb1bef714f311d0115c1e9019439b913f30d0a0c350dc31b19b1a623a871a74e54bce7aa28c2f110215034 SHA512 4933f7fd107f8272ae863f4b5ccf976ea29a0f1a7eab7f93160ed8dc188fef3520e2cea62513eb802e51db46190d0199c4e440b770abfed4d39b0dc6cef582c1
+AUX primegen-0.97-man.patch 714 BLAKE2B 3fc121138c95e14b0c418dce18d96843ec337a8fe3a9b4be9f962f928352a4e20a179cefa0fe6b424af956fa3f8470ede8d8b1bb5d6e42517b71214d135651ac SHA512 246569896e1e6fa7295ed8319445d869c54f36e5ce4c3c0037f94eafb7d0cc5efb4ee4395fb0c5d237f11e4eac1212a1228fc797660df65fa1b217cdaf9594a7
+AUX primegen-0.97-missing-headers.patch 777 BLAKE2B 613d33c795e70e66cb198e64dd77dfda439ef44db50994cb9888ac9d2bee10705ac14b59ed5454f606ea7195fb4a4f4552b96695d252f2873eea1da8fa1be63c SHA512 561dad1e31bb229367955e719040ae77b50b56f37a4232815d31173468faa9cd31257774005e1f986e340b72db16666cfd4557bf88b8af0914d271955728d8f6
+AUX primegen-0.97-respect-ar-ranlib.patch 315 BLAKE2B fc6bdb8292a2d15f409b762828293ed1efb03706d8994090b50353fbc271a7f5ddd132361f0dc2d0f698d43c30ba3ef403f84f5707da2740c3e387f633d059ea SHA512 c9b68905b6073711fe8e13f8684108cbc06986da2f266355dba2a0f4bc7c6c8b6e7d4cdabf6776549481cac346e8bf223fcc95f3e6d7031f20f163203f543de5
 DIST primegen-0.97.tar.gz 31491 BLAKE2B d9e48075a38456da30a23aa95dcf98143f5ad59e8ec56469ea06b6f33b8b2376261fd254fdb9c40ca55f76fae58b89c82329194dd99be3a6bbb356416f294337 SHA512 d6d8de4d9866dbbec20afd4d4b563e3383528138cd3ec849f706211045d735c28bbf7aa6931b8aa54163664e87c2e7ad028c68f407040ac88efce7856bc8b6f4
-EBUILD primegen-0.97-r2.ebuild 1380 BLAKE2B 717488da736d893dfdc889250fa45183cf90102d4e8cf85be70b84bb83581504a24e2508a5c000026136af4a33a3e54d676009b0eec6eb7a23f2b55f880c110d SHA512 471d3008fcaef1d65ba91cc75395a8f2ebeff1538cc3bc148c2ed73d9995e09f78bc2e94c6e70fd070b2106ef4002c9610603f273554b3e5b3981be4f3ee704d
+EBUILD primegen-0.97-r2.ebuild 1445 BLAKE2B c8a911a8e519b4e1b0cf6779da60bce3075fb131faf02f6113a180e222e6c2acc976acab7fc8f455a8b169dc8c1b0e4d4557a1d0af1c5449d8ba7335813e0561 SHA512 d559b3913f372e25dec264eefa039870cfe9c91d687fe2216c9870366d365ebb6f3697903dbe1f26bb7d168452d85b4ba633ae031cfb7411afc00105f0081faa
 MISC metadata.xml 722 BLAKE2B 2200f436b6abff92d1ea37cc45bd5485b2ad2e8c3d8ab0745a98ed5099a7ed136bc898be524d1469e6c5412665776f20bc230ae0a063fd1cee29e5b704428e71 SHA512 343b3b0a267710506ae692987fa40a0197f1d50140bb14c5bb276ea44efb36691182bf52f2f71a8ad50072eee6258180d3215741ce2ff37b206d4ff2cbaac3c3
diff --git a/sci-libs/primegen/files/primegen-0.97-man.patch b/sci-libs/primegen/files/primegen-0.97-man.patch
index 069409f1df76..f57c4dfce42b 100644
--- a/sci-libs/primegen/files/primegen-0.97-man.patch
+++ b/sci-libs/primegen/files/primegen-0.97-man.patch
@@ -2,8 +2,8 @@ Fix incorrect man page and include mention of the possibility
 of linking to a static libary only.
 https://bugs.gentoo.org/show_bug.cgi?id=562570
 
---- primegen-0.97/primegen.3
-+++ primegen-0.97/primegen.3
+--- a/primegen.3
++++ b/primegen.3
 @@ -14,13 +14,16 @@
  .br
  void \fBprimegen_skipto\fP(&\fIpg\fR,\fIbound\fR);
diff --git a/sci-libs/primegen/files/primegen-0.97-missing-headers.patch b/sci-libs/primegen/files/primegen-0.97-missing-headers.patch
index 51f1aaac3823..2b15756c8d1b 100644
--- a/sci-libs/primegen/files/primegen-0.97-missing-headers.patch
+++ b/sci-libs/primegen/files/primegen-0.97-missing-headers.patch
@@ -1,5 +1,5 @@
---- primegen-0.97/eratspeed.c.orig	2009-03-27 09:16:52.000000000 -0300
-+++ primegen-0.97/eratspeed.c	2009-03-27 09:18:29.000000000 -0300
+--- a/eratspeed.c
++++ b/eratspeed.c
 @@ -1,6 +1,8 @@
  #define B32 1001
  #define B (B32 * 32)
@@ -9,32 +9,32 @@
  #include "timing.h"
  #include "uint32.h"
  
---- primegen-0.97/primegaps.c.orig	2009-03-27 09:17:07.000000000 -0300
-+++ primegen-0.97/primegaps.c	2009-03-27 09:17:19.000000000 -0300
+--- a/primegaps.c
++++ b/primegaps.c
 @@ -1,4 +1,5 @@
  #include <math.h>
 +#include <stdio.h>
  #include "primegen.h"
  
  primegen pg;
---- primegen-0.97/primes.c.orig	2009-03-27 09:19:08.000000000 -0300
-+++ primegen-0.97/primes.c	2009-03-27 09:19:14.000000000 -0300
+--- a/primes.c
++++ b/primes.c
 @@ -1,4 +1,5 @@
  #include <stdio.h>
 +#include <stdlib.h>
  #include "primegen.h"
  #include "fs64.h"
  
---- primegen-0.97/primespeed.c.orig	2009-03-27 09:17:41.000000000 -0300
-+++ primegen-0.97/primespeed.c	2009-03-27 09:18:54.000000000 -0300
+--- a/primespeed.c
++++ b/primespeed.c
 @@ -1,3 +1,5 @@
 +#include <stdio.h>
 +#include <stdlib.h>
  #include "timing.h"
  #include "primegen.h"
  #include "primegen_impl.h"
---- primegen-0.97/error.h.orig	2009-09-11 19:40:53.000000000 +0100
-+++ primegen-0.97/error.h	2009-09-11 19:41:02.000000000 +0100
+--- a/error.h
++++ b/error.h
 @@ -1,7 +1,7 @@
  #ifndef ERROR_H
  #define ERROR_H
diff --git a/sci-libs/primegen/files/primegen-0.97-respect-ar-ranlib.patch b/sci-libs/primegen/files/primegen-0.97-respect-ar-ranlib.patch
new file mode 100644
index 000000000000..967c005b08be
--- /dev/null
+++ b/sci-libs/primegen/files/primegen-0.97-respect-ar-ranlib.patch
@@ -0,0 +1,18 @@
+--- a/make-makelib.sh
++++ b/make-makelib.sh
+@@ -1,6 +1,6 @@
+ echo 'main="$1"; shift'
+ echo 'rm -f "$main"'
+-echo 'ar cr "$main" ${1+"$@"}'
++echo '${AR} cr "$main" ${1+"$@"}'
+ 
+ case "$1" in
+ sunos-5.*) ;;
+@@ -11,6 +11,6 @@
+ hp-ux-*) ;;
+ sco*) ;;
+ *)
+-  echo 'ranlib "$main"'
++  echo '${RANLIB} "$main"'
+   ;;
+ esac
diff --git a/sci-libs/primegen/primegen-0.97-r2.ebuild b/sci-libs/primegen/primegen-0.97-r2.ebuild
index 72285f5925f0..0f2528bcf5d3 100644
--- a/sci-libs/primegen/primegen-0.97-r2.ebuild
+++ b/sci-libs/primegen/primegen-0.97-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Small, fast library to generate primes in order"
@@ -11,17 +12,18 @@ SRC_URI="http://cr.yp.to/primegen/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 PATCHES=(
-	"${FILESDIR}/${P}-man.patch"
-	"${FILESDIR}/${P}-missing-headers.patch"
+	"${FILESDIR}"/${P}-man.patch
+	"${FILESDIR}"/${P}-missing-headers.patch
+	"${FILESDIR}"/${P}-respect-ar-ranlib.patch
 )
 
 src_prepare() {
 	default
-	while IFS="" read -d $'\0' -r file
-	do
+
+	local file
+	while IFS="" read -d $'\0' -r file; do
 		sed -i -e 's:\(primegen.a\):lib\1:' "${file}" || die
 	done < <(find . -type f -print0)
 	mkdir usr || die
@@ -30,9 +32,10 @@ src_prepare() {
 src_configure() {
 	# Fixes bug #161015
 	append-flags -fsigned-char
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc || die
 	echo "${S}/usr" > conf-home || die
 	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+	tc-export AR RANLIB
 }
 
 src_test() {
@@ -48,7 +51,7 @@ src_install() {
 		-e "s/#include \"uint32.h\"/$(grep typedef uint32.h)/" \
 		-e "s/#include \"uint64.h\"/$(grep typedef uint64.h)/" \
 		primegen.h || die
-	insinto /usr/include
-	doins primegen.h
+
+	doheader primegen.h
 	dodoc BLURB CHANGES README TODO
 }
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 49517aa5637b..0467f6be678e 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,7 +1,7 @@
 DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
-DIST proj-8.0.0.tar.gz 5722153 BLAKE2B a79626b62f5a9bdfb5395b32fee889e9ed003679926d499c169f896c5a8cd9495173cf156f4c780522dd31f79b71928d1c2add790176fb452c7267210c380816 SHA512 4195fd26075787465e578f86398e224957cddba743e2b090b65c877a6bfbc91b3b36d5acf9883bd2fc215a5aebd0b9f3188ee0e0926aa86d37f9753042fb3d75
+DIST proj-8.0.1.tar.gz 5731452 BLAKE2B d2235f87bead1ec35f62b99e5236d1b6dc1a8f924555d21dec7f5e07b3d341b4b4e797dd5a3843e87d12db392716ec9bb5acae871fa2bb7a78c3404fa9487875 SHA512 cb5550a9fbccfc680bebb3b8c5ad347d53c38cb526edf4dcaa3af0eff57410b4d4d028e246954c4202a1d637e1e6f4e7a6a33e8741e8aa0a58bdfc8a5dbc68c9
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
 EBUILD proj-7.2.1.ebuild 1209 BLAKE2B ac70d263aab2b700dcfc7f8564b81607a31c3387ed6f39770fb7583c063428680a8ef5d0dcba6e786fbce847d2791bb8285b983f662a161b171a6755b2e72a16 SHA512 ce8e0b02dad6ce6de1620328fd6e65c478eafcc81dd55b3551a4452425840d4226fa43c02f7310a3ed9779ddf1d14e00f83a35a459869dcb18eae45c29cffa94
-EBUILD proj-8.0.0.ebuild 1432 BLAKE2B 575e8654d3d429d2a52b2c47aec7ed086367aaaf5f0b2f1898997b0ba43a6badd8a37092105cc1fa22bdd4744ec8ddc5c8e9ad2475b3df2a51a12b13000b8bdd SHA512 e82e8453b99c349caec34eb2e474cc433af88f35fb47ee451561d757b86361e509bfd84879472f7b7b8eb628440cf8bb4b3c559d9201d9b85b99d85fd8c069e0
+EBUILD proj-8.0.1.ebuild 1432 BLAKE2B 575e8654d3d429d2a52b2c47aec7ed086367aaaf5f0b2f1898997b0ba43a6badd8a37092105cc1fa22bdd4744ec8ddc5c8e9ad2475b3df2a51a12b13000b8bdd SHA512 e82e8453b99c349caec34eb2e474cc433af88f35fb47ee451561d757b86361e509bfd84879472f7b7b8eb628440cf8bb4b3c559d9201d9b85b99d85fd8c069e0
 MISC metadata.xml 449 BLAKE2B e29aeb78ff28d336ffbe19913702d656299183b1657c09deaf12f3f8c263867e9facbef4ee626f78e667f3f6ad5cebb0c490e84247fe784bc3fbf68c5418692e SHA512 a1b14653a4388d42e3e08ddabd3734e5987bf41092dd699788ed1a4b8819da831f602b48dd3ad64dbb9fc1bbc0005623456744a6b5a3fcd3313d844bf3bc6886
diff --git a/sci-libs/proj/proj-8.0.0.ebuild b/sci-libs/proj/proj-8.0.1.ebuild
index c6a3966a2684..c6a3966a2684 100644
--- a/sci-libs/proj/proj-8.0.0.ebuild
+++ b/sci-libs/proj/proj-8.0.1.ebuild