gentoo resync : 11.05.2021

5 files changed, 47 insertions, 25 deletions

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
 }