7 files changed, 252 insertions, 0 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 6bcc35397fdf..31998e8052ca 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/coinor-utils/Manifest b/sci-libs/coinor-utils/Manifest
index 54b2d400530f..b45fadc03383 100644
--- a/sci-libs/coinor-utils/Manifest
+++ b/sci-libs/coinor-utils/Manifest
@@ -1,3 +1,6 @@
+AUX coinor-utils-2.11.9-drop-register.patch 2317 BLAKE2B 76ae19c49f0119853adbb7c75968c8d8ae20b1d07f9e198d6d9d298923bef47289fe2220dbbfa0975248d52011b2530d792a9e428e6ea2a122fe5840b1d50163 SHA512 896cec23021ccd10b63eb08a1ba5ca37af083ac5eee5654045be86d788ffe6443c9ecc0ea18e4efc0b03bebad52f166cd23b77a17cdb14ae2beb03eb775a16fe
 DIST coinor-utils-2.11.4.tar.gz 1225148 BLAKE2B d55f9b3efbb3ce1c04fb9193ec70f62d8f130cd2f7ddf033c0df35f37006c542bd39e345662c271b4466b00c4bb1ec3cc14965bfe35f5b89370071d675113f4d SHA512 a7ac337b0f0bb11d578c44fd12d292ba8e77568362eaaaecbed8f4bc22ed85aaee911e2dd3153a2197b0165df082821969336d73fe1c5f0374a4636755d9a4ad
+DIST coinor-utils-2.11.9.tar.gz 1234195 BLAKE2B 5fb097c9c0fc0e76f9b3c269357d70320a1386ea5850ea1f4520da44ef9337ed3540e9a3624676c6094f5571ef62bb3f4fd89d8b49643fb2901850597ad7195b SHA512 c9343edd0ce2dac5a7f025cc8d4a06e48cf966d9b9581d97e787ec801ceda9fbb7ab54c32618304573fed873ba7e291c2562f015fe0446a959b347d32365c2bb
 EBUILD coinor-utils-2.11.4.ebuild 2482 BLAKE2B 118e2cecde2f7ab928e71cf16178c0b116f42d9017238f44f07357b1325be8842e1adac7c64c728ba13b32c8e07ddd17c3331774a59e705e1dbdbf24b20d3b07 SHA512 e2f228016581ff3134dd0a8af32a0c305267a59c4ecd9a9a134d8f2ddb8c77a559ebb58015fa02ebf3881a7279cd72f78a85341834b27996acf385f333f60c8e
+EBUILD coinor-utils-2.11.9.ebuild 2544 BLAKE2B ed0aa6b28a3119b169653d52f43ed5ff7b0bf0324ae8b7c99f865bd4b989f5ea08fefc5deae68389d3fc209989fe9a471ac754cc07f3b7c02bee35bd33451e90 SHA512 8cd85631525219eab63d3a6da2522f748a7bbce108dcb3653b36270264e1d8d5c681796011ff98bc7c47b223dd653f54070428556f9609872b6af50d11f1fc2c
 MISC metadata.xml 766 BLAKE2B d6a1c111f6c332880b528748d8793af7643adb9f8ffef2ef89fd802b0c0ef5345282cb9a2c7a42a29e7ee92ba7915f94cf3d58b91758414f4d986f36c3a9f82b SHA512 14cc8e197d4cd5bef31203ebe4e5176b20e3ef4c91b1d617bf1cf76ebf55a5bd262b078ff61669ac8d3e7d4aeaa0ba7def83379830b248ba3bcf04716dc45e0b
diff --git a/sci-libs/coinor-utils/coinor-utils-2.11.9.ebuild b/sci-libs/coinor-utils/coinor-utils-2.11.9.ebuild
new file mode 100644
index 000000000000..894f4b5605b5
--- /dev/null
+++ b/sci-libs/coinor-utils/coinor-utils-2.11.9.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=CoinUtils
+
+DESCRIPTION="COIN-OR Matrix, Vector and other utility classes"
+HOMEPAGE="https://github.com/coin-or/CoinUtils/"
+SRC_URI="https://github.com/coin-or/${MY_PN}/archive/releases/${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="EPL-1.0"
+
+# major soname component
+SLOT="0/3"
+
+KEYWORDS="~amd64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc glpk blas lapack static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+# Fortran is NOT needed, but the ./configure scripts for all of the CoinOR
+# packages contain a check for it. Gentoo bug 601648 and upstream issue,
+#
+#   https://github.com/coin-or/CoinUtils/issues/132
+#
+BDEPEND="virtual/fortran
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	test? ( sci-libs/coinor-sample )"
+DEPEND="sys-libs/readline:0=
+	blas? ( virtual/blas )
+	bzip2? ( app-arch/bzip2 )
+	glpk? ( sci-mathematics/glpk:= )
+	lapack? ( virtual/lapack )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-releases-${PV}/${MY_PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.11.9-drop-register.patch
+)
+
+src_prepare() {
+	# Needed to make the --with-coin-instdir in src_configure happy.
+	dodir /usr
+
+	# They don't need to guess at this, but they do, and get it wrong...
+	sed -e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
+		-i configure \
+		|| die "failed to fix the pkgconfig path in ${S}/configure"
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-dependency-linking
+		--with-coin-instdir="${ED}/usr"
+		$(use_enable zlib)
+		$(use_enable bzip2 bzlib)
+		$(use_with doc dot)
+	)
+	if use blas; then
+		myeconfargs+=( --with-blas-lib="$($(tc-getPKG_CONFIG) --libs blas)" )
+	else
+		myeconfargs+=( --without-blas )
+	fi
+	if use glpk; then
+		myeconfargs+=(
+			--with-glpk-incdir="${EPREFIX}"/usr/include
+			--with-glpk-lib=-lglpk
+		)
+	else
+		myeconfargs+=( --without-glpk )
+	fi
+	if use lapack; then
+		myeconfargs+=( --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" )
+	else
+		myeconfargs+=( --without-lapack )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake all $(usex doc doxydoc "")
+}
+
+src_test() {
+	# NOT redundant! The build system has a "make check" target that does
+	# nothing, so if you don't specify "test" here, you'll get a no-op.
+	emake test
+}
+
+src_install() {
+	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/")
+
+	emake DESTDIR="${ED}" install
+
+	# Duplicate junk, and in the wrong location.
+	rm -r "${ED}/usr/share/coin/doc/${MY_PN}" || die
+}
diff --git a/sci-libs/coinor-utils/files/coinor-utils-2.11.9-drop-register.patch b/sci-libs/coinor-utils/files/coinor-utils-2.11.9-drop-register.patch
new file mode 100644
index 000000000000..f8ade78207d5
--- /dev/null
+++ b/sci-libs/coinor-utils/files/coinor-utils-2.11.9-drop-register.patch
@@ -0,0 +1,71 @@
+https://github.com/coin-or/CoinUtils/commit/1700ed92c2bc1562aabe65dee3b4885bd5c87fb9
+From: Stefan Vigerske <svigerske@gams.com>
+Date: Wed, 18 Aug 2021 15:09:53 +0200
+Subject: [PATCH] remove use of register storage class specifier
+
+- removed in C++17
+---
+ src/CoinOslC.h                | 16 ++++++++--------
+ src/CoinOslFactorization2.cpp |  4 ++--
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/CoinOslC.h b/src/CoinOslC.h
+index 2f6d10aae..d8103f86b 100644
+--- a/src/CoinOslC.h
++++ b/src/CoinOslC.h
+@@ -33,30 +33,30 @@
+ extern "C" {
+ #endif
+ 
+-int c_ekkbtrn(register const EKKfactinfo *fact,
++int c_ekkbtrn(const EKKfactinfo *fact,
+   double *dwork1,
+   int *mpt, int first_nonzero);
+-int c_ekkbtrn_ipivrw(register const EKKfactinfo *fact,
++int c_ekkbtrn_ipivrw(const EKKfactinfo *fact,
+   double *dwork1,
+   int *mpt, int ipivrw, int *spare);
+ 
+-int c_ekketsj(register /*const*/ EKKfactinfo *fact,
++int c_ekketsj(/*const*/ EKKfactinfo *fact,
+   double *dwork1,
+   int *mpt2, double dalpha, int orig_nincol,
+   int npivot, int *nuspikp,
+   const int ipivrw, int *spare);
+-int c_ekkftrn(register const EKKfactinfo *fact,
++int c_ekkftrn(const EKKfactinfo *fact,
+   double *dwork1,
+   double *dpermu, int *mpt, int numberNonZero);
+ 
+-int c_ekkftrn_ft(register EKKfactinfo *fact,
++int c_ekkftrn_ft(EKKfactinfo *fact,
+   double *dwork1, int *mpt, int *nincolp);
+-void c_ekkftrn2(register EKKfactinfo *fact, double *dwork1,
++void c_ekkftrn2(EKKfactinfo *fact, double *dwork1,
+   double *dpermu1, int *mpt1, int *nincolp,
+   double *dwork1_ft, int *mpt_ft, int *nincolp_ft);
+ 
+-int c_ekklfct(register EKKfactinfo *fact);
+-int c_ekkslcf(register const EKKfactinfo *fact);
++int c_ekklfct(EKKfactinfo *fact);
++int c_ekkslcf(const EKKfactinfo *fact);
+ inline void c_ekkscpy(int n, const int *marr1, int *marr2)
+ {
+   CoinMemcpyN(marr1, n, marr2);
+diff --git a/src/CoinOslFactorization2.cpp b/src/CoinOslFactorization2.cpp
+index ab3225923..177ac437b 100644
+--- a/src/CoinOslFactorization2.cpp
++++ b/src/CoinOslFactorization2.cpp
+@@ -19,9 +19,9 @@
+ extern int ets_count;
+ extern int ets_check;
+ #endif
+-#define COIN_REGISTER register
++#define COIN_REGISTER
+ #define COIN_REGISTER2
+-#define COIN_REGISTER3 register
++#define COIN_REGISTER3
+ #ifdef COIN_USE_RESTRICT
+ #define COIN_RESTRICT2 __restrict
+ #else
+
diff --git a/sci-libs/primegen/Manifest b/sci-libs/primegen/Manifest
index ec2e511989b1..051a9a8aba72 100644
--- a/sci-libs/primegen/Manifest
+++ b/sci-libs/primegen/Manifest
@@ -1,6 +1,8 @@
+AUX primegen-0.97-main-rettype.patch 209 BLAKE2B 13f1268a64d5a549e140dc2aecc3a818259639b69053f64123bf792899ba991e0774cebc0014b6f507fcb12e44e70af7a17319a249cbd35150c81ab52485a491 SHA512 71fbd287b1cf8e4c0b554b66679d05ed60149b6bc92af266768431741f6c4f040cce81f42f05e8650ab1ee8a09cb4d11a620318bdfdca3d1132ffd3b997a4b00
 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 1446 BLAKE2B 36b52f422b643af74f88622e77bd691ee8a6483e835251bd3fd8a94320ad94fd46ebf3d742ae92139dad57f4ef5d88d6acd35db26ae0fe3ecff0dc12ab242726 SHA512 3916596b8c9c81ea7c486e7f4767ca321f97c7724b4157b2a62717087ed5fa91efcea0be870d317eb59788b5b3518976cb3c315fa50654f721821d6234a67648
+EBUILD primegen-0.97-r3.ebuild 1494 BLAKE2B 089f02ab700ad1085056e58d0cb9a56c57c809810246bd9eca5649efcc6c43a31f99e7eb1e9703db635167bb132c3e3784c7171a2aef319133c6b3f744b2e34c SHA512 67bbc9be40ed30b4105d620bc89d8803ccf0b754ecc59d4d91114660f26443e406b07b414c593f0db03ba0d8f58db92a52fa1555af3960ee4c802914b051bc75
 MISC metadata.xml 723 BLAKE2B 8fc21f26c55b232c88771380451cfb0b5aa179587d57f49c56c9dd3b33a65f89527b8f306e434713487c455fc8b2d452f9071ed4ff2fb8d38d4f31e886132d4a SHA512 e2dc892db1fc31d86eec69b2d2d81907dff143f343929971380e784d778a1be659d160b41dd7eeb0e4f5e41f6f55e3544cf50abf664f15f56b9cebe8c2bf7c65
diff --git a/sci-libs/primegen/files/primegen-0.97-main-rettype.patch b/sci-libs/primegen/files/primegen-0.97-main-rettype.patch
new file mode 100644
index 000000000000..660dc193ab2b
--- /dev/null
+++ b/sci-libs/primegen/files/primegen-0.97-main-rettype.patch
@@ -0,0 +1,13 @@
+Adding return type to main function
+Bug: https://bugs.gentoo.org/898288
+--- a/eratspeed.c
++++ b/eratspeed.c
+@@ -402,7 +402,7 @@ void countit()
+ timing t;
+ timing told;
+ 
+-main()
++int main()
+ {
+   int L = 1;
+ 
diff --git a/sci-libs/primegen/primegen-0.97-r3.ebuild b/sci-libs/primegen/primegen-0.97-r3.ebuild
new file mode 100644
index 000000000000..5ee9dfed93fb
--- /dev/null
+++ b/sci-libs/primegen/primegen-0.97-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Small, fast library to generate primes in order"
+HOMEPAGE="https://cr.yp.to/primegen.html"
+SRC_URI="https://cr.yp.to/primegen/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-man.patch
+	"${FILESDIR}"/${P}-missing-headers.patch
+	"${FILESDIR}"/${P}-respect-ar-ranlib.patch
+	"${FILESDIR}"/${PN}-0.97-main-rettype.patch
+)
+
+src_prepare() {
+	default
+
+	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
+}
+
+src_configure() {
+	# Fixes bug #161015
+	append-flags -fsigned-char
+	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() {
+	[[ $(./primes 1 100000000 | md5sum ) == "4e2b0027288a27e9c99699364877c9db "* ]] || die "test failed"
+}
+
+src_install() {
+	dobin primegaps primes primespeed
+	doman primegaps.1 primes.1 primespeed.1 primegen.3
+	dolib.a libprimegen.a
+	# include the 2 typedefs to avoid collision (bug #248327)
+	sed -i \
+		-e "s/#include \"uint32.h\"/$(grep typedef uint32.h)/" \
+		-e "s/#include \"uint64.h\"/$(grep typedef uint64.h)/" \
+		primegen.h || die
+
+	doheader primegen.h
+	dodoc BLURB CHANGES README TODO
+}