gentoo auto-resync : 15:10:2024 - 04:04:09

9 files changed, 88 insertions, 14 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 5e962abf533e..05bef0585a7f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/coinasl/Manifest b/sci-libs/coinasl/Manifest
new file mode 100644
index 000000000000..381cb0d308b1
--- /dev/null
+++ b/sci-libs/coinasl/Manifest
@@ -0,0 +1,6 @@
+AUX coinasl-2.0.1-dtoa.patch 289 BLAKE2B 1fc1542d28b7085c8b75df21f7dceb3a4695f21b201db81d896b7bca1979e17187e4712902db69baf667b217bf78ab447fccf3a1bdcf73493582c980faa78905 SHA512 44dcb668607775e3b37f0077b4b7a53a12eed9019219be12a32af347098b72d6525126e7fd67024d1a84ed21db82696c0edfce691dea293d783f43df168355a1
+AUX coinasl-2.0.1-getrusage.patch 508 BLAKE2B 468ce0c3f94675b8101d3fd551ca6dbc6c0317e2c1ee6a07fe2c18a7ed79a582bf979191cff79ad166c821f98fea0844bdc754c40b85663c5d997a0b72e45710 SHA512 48d0d1dffd3ddcd87b92b9b0529c0b38bb3f965de22aba2d2043207a764c6f236fb91616f00856f27f1d27bb76b14d19971ad5569ff91976c8091f6a91c22407
+DIST coinasl-2.0.1.tar.gz 252385 BLAKE2B 7276c9e4325542817a49c61b0d08b5d3bd60a4d9beb981fdd164fdad80d6695c6ba83c4c0cbddeac119be4572c1fe4f0534b0adcc45541324b23e7bc2d60a303 SHA512 37c05677ebc82d56228cd80382c37ae44546fd5681063488bd2cd3c35c2155c2f85e6e8fbcbe41913eeafeb3ac12d2972919893de75affade3016e64f75e034b
+DIST solvers-64919f75f.tgz 360043 BLAKE2B 08b81c638bc9154e3089a87409585dd8e6f64be48ef0e431e5d5e907f5fa7c21c755890baf480924c17e25e8da6220d90f9d3ad1aa3146f40134f4bde0ca9f06 SHA512 dfb001d1feb4218b3122f4d6fe7a101f03bbb8277e8af0adda6a1ae9295b6eb7fc1ef62550bc6cc724a54754c713e36f526555c66d9f0bcb9a08ed61414bbe26
+EBUILD coinasl-2.0.1.ebuild 797 BLAKE2B e9cda59b6f14c073aacbc5aba0f46b0f7fd6cf28d696064710b58defe48d52381648b604f6b52aa4d13768a5b63dd010f8d771dee559fb2c61d3ff252ee9b86d SHA512 bbe12d0fa20426f95c99385ab5dda74fb98b7761a7bcb09a661c36e1a03e3f37cbebdc54ea1846d954f429b48c1309efdde481b04188f390d29330bdb414e09d
+MISC metadata.xml 486 BLAKE2B 607a8fd460ce5cf30bb673ff065ed02c6a4c7ac4face9256d92c086cb9b2ada7c73c4aab31ff525afa99ab510b8f2de70a09e8c11e90512c304d838c27023a95 SHA512 438851e71d2bfe92f87e0d5c76778124035ea5ff796139d31c8de0530ef123db298d895ddfa053a112e743530b89773ba430498fd13e8e3f1bdbb451a1f101a2
diff --git a/sci-libs/coinasl/coinasl-2.0.1.ebuild b/sci-libs/coinasl/coinasl-2.0.1.ebuild
new file mode 100644
index 000000000000..633b07582ddf
--- /dev/null
+++ b/sci-libs/coinasl/coinasl-2.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Ampl Solver Library (ASL)"
+HOMEPAGE="https://github.com/coin-or-tools/ThirdParty-ASL"
+SOLVERS_SHA="64919f75f"
+SRC_URI="https://coin-or-tools.github.io/ThirdParty-ASL/solvers-${SOLVERS_SHA}.tgz
+	https://github.com/coin-or-tools/ThirdParty-ASL/archive/refs/tags/releases/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ThirdParty-ASL-releases-${PV}"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}/${P}-getrusage.patch"
+	"${FILESDIR}/${P}-dtoa.patch"
+)
+
+src_unpack() {
+	default
+	mv solvers "${S}" || die
+}
+
+src_compile() {
+	econf --enable-shared
+}
+
+src_install() {
+	default
+	rm "${D}/usr/$(get_libdir)/libcoinasl.la" || die
+}
diff --git a/sci-libs/coinasl/files/coinasl-2.0.1-dtoa.patch b/sci-libs/coinasl/files/coinasl-2.0.1-dtoa.patch
new file mode 100644
index 000000000000..72efc195307a
--- /dev/null
+++ b/sci-libs/coinasl/files/coinasl-2.0.1-dtoa.patch
@@ -0,0 +1,11 @@
+--- a/solvers/dtoa1.c
++++ b/solvers/dtoa1.c
+@@ -16,6 +16,8 @@
+ of or in connection with the use or performance of this software.
+ *******************************************************************/
+ 
++#include <stddef.h>
++
+ #ifndef No_dtoa /*{{*/
+ #ifdef __cplusplus
+ #include "memory.h"
diff --git a/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch b/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch
new file mode 100644
index 000000000000..54e8807dffae
--- /dev/null
+++ b/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 59e033d..2544237 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,7 +51,7 @@ AM_CONDITIONAL([ASL_INT64],[test "$intsize" = 64])
+ # The critical function for NO_RUSAGE is getrusage(). Use a standard test.
+ AC_MSG_CHECKING([for getrusage])
+ AC_LINK_IFELSE(
+-  [AC_LANG_PROGRAM([[]],[[getrusage()]])],
++  [AC_LANG_PROGRAM(["#include <sys/resource.h>"],[[getrusage()]])],
+   [AC_MSG_RESULT([yes])],
+   [CPPFLAGS="$CPPFLAGS -DNO_RUSAGE"
+    AC_MSG_RESULT([no])])
diff --git a/sci-libs/coinasl/metadata.xml b/sci-libs/coinasl/metadata.xml
new file mode 100644
index 000000000000..c7297bcf168c
--- /dev/null
+++ b/sci-libs/coinasl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>audvare@gmail.com</email>
+		<name>Andrew Udvare</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">coin-or-tools/ThirdParty-ASL</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/ipopt/Manifest b/sci-libs/ipopt/Manifest
index 33108d3f8679..2b0f691831e9 100644
--- a/sci-libs/ipopt/Manifest
+++ b/sci-libs/ipopt/Manifest
@@ -1,3 +1,3 @@
 DIST ipopt-3.14.4.tar.gz 1843885 BLAKE2B 83f6a983db282ced6e52237ff326c860a92df2c92dbd53db7581110d3003fd7b557a68453c74e48d780832d2c9c55d9eb4ea54e68f504c161952fce6bb81caaf SHA512 a27a08ae24c94da96efcfa236034cec79d79111d7dc9c028d808b412d5abb21495a0011f075a87db65b91ba69e191653552e7f99fe8da88c3b580d971eac3652
-EBUILD ipopt-3.14.4.ebuild 1739 BLAKE2B 34423fb9e7f814e03ddbefc5b4a69008f6de833e6826d98c21e8dd3ca89d018707f1cbf6d8eeb290a645cd6fcfc695990879e41f05eb4d563ab50075e627e4cb SHA512 defe9e435be58fd9b266bed01938dcfe54c8737b3e7a041b58eca30ca43a90638b014e4e3400a37434a7f4a4742dc5c140e62b7006b19a11bc24d50626e5735d
-MISC metadata.xml 967 BLAKE2B 8a3fc8addf0130148ddca1bcfb4732e1bf60b52d5de28e2ee6ce9b8e4352358424b39aa585ba177592b4a5744bf2f52e16ab393e2a80617333a48e385eb55a2d SHA512 aa538e824ce3cc926f28554dc268f6d109bebd382b35bb2db8aee75fa82cc81bf9171ace022aaf441602bf8b150fa7bf80ad04e4563d2c3b83e25d80d8780574
+EBUILD ipopt-3.14.4-r1.ebuild 1577 BLAKE2B bbac5ba69f715d051dd7ae8b5b970987a50cf65d83d54f884655683c600f4d85d539e21b3ada83447af3cdb203059584f2105a66b225234250d42eeda8afa224 SHA512 6605cf7c761c90447e257c39cb8bd66e732fa2342cbb99a9dbeb1f5f8b3a52ccd34bc89ddea3801087521030ca6550e144de4c1254a88ef3d5e520f05c448911
+MISC metadata.xml 1020 BLAKE2B f94f5ef3a89f359995a3299c9efff9cafe619f890f14933a963d451ac49aa7e841c466a38164950cb32651aae1a9ae492b3839698c2268272366b75d0979cb03 SHA512 1b180545de0a0156fd65f8fcb23f521a85cbfe8f03cc447dfcafd5cad1ffec3722c50760e7726b44e6c8a7f3caf2879b38bf42b63ee8a662dc482f878c4e7cdb
diff --git a/sci-libs/ipopt/ipopt-3.14.4.ebuild b/sci-libs/ipopt/ipopt-3.14.4-r1.ebuild
index 44a78114fdfa..9005696f3cee 100644
--- a/sci-libs/ipopt/ipopt-3.14.4.ebuild
+++ b/sci-libs/ipopt/ipopt-3.14.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,15 +15,15 @@ HOMEPAGE="https://github.com/coin-or/Ipopt"
 SRC_URI="https://github.com/coin-or/Ipopt/archive/refs/tags/releases/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/Ipopt-releases-${PV}"
 
-LICENSE="EPL-1.0 hsl? ( HSL )"
+LICENSE="EPL-1.0"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="hsl +lapack mpi mumps static-libs test"
+IUSE="+asl +lapack mpi mumps static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/blas
-	hsl? ( sci-libs/coinhsl:0= )
+	asl? ( sci-libs/coinasl:0= )
 	lapack? ( virtual/lapack )
 	mpi? ( virtual/mpi )
 	mumps? ( sci-libs/mumps:0=[mpi=] )"
@@ -41,6 +41,8 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		$(use_with doc dot)
+		$(use_with asl)
+		--without-hsl
 	)
 
 	if use lapack; then
@@ -55,13 +57,6 @@ src_configure() {
 	else
 		myeconfargs+=( --without-mumps )
 	fi
-	if use hsl; then
-		myeconfargs+=(
-			--with-hsl-incdir="${EPREFIX}"/usr/include
-			--with-hsl-lib="$($(tc-getPKG_CONFIG) --libs coinhsl)" )
-	else
-		myeconfargs+=( --without-hsl )
-	fi
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/sci-libs/ipopt/metadata.xml b/sci-libs/ipopt/metadata.xml
index f5b474167afc..1b9661483cd4 100644
--- a/sci-libs/ipopt/metadata.xml
+++ b/sci-libs/ipopt/metadata.xml
@@ -15,7 +15,7 @@
 	for Operations Research).
 </longdescription>
 <use>
-	<flag name="hsl">hsl</flag>
+	<flag name="asl">AMPL Solver Library support and build the 'ipopt' binary</flag>
 	<flag name="mumps">Enable <pkg>sci-libs/mumps</pkg> support</flag>
 </use>
 <upstream>