From a15e8dc7444560123d7d4be1bccb19afd5b611d0 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 22 Oct 2024 04:04:46 +0100
Subject: gentoo auto-resync : 22:10:2024 - 04:04:46

---
 sci-libs/coinasl/Manifest                          |  5 ++-
 sci-libs/coinasl/coinasl-2.0.1-r1.ebuild           | 44 ++++++++++++++++++++++
 sci-libs/coinasl/coinasl-2.0.1.ebuild              | 34 -----------------
 .../coinasl/files/coinasl-2.0.1-getrusage.patch    |  2 +-
 4 files changed, 48 insertions(+), 37 deletions(-)
 create mode 100644 sci-libs/coinasl/coinasl-2.0.1-r1.ebuild
 delete mode 100644 sci-libs/coinasl/coinasl-2.0.1.ebuild

(limited to 'sci-libs/coinasl')

diff --git a/sci-libs/coinasl/Manifest b/sci-libs/coinasl/Manifest
index 381cb0d308b1..93a4eab87803 100644
--- a/sci-libs/coinasl/Manifest
+++ b/sci-libs/coinasl/Manifest
@@ -1,6 +1,7 @@
 AUX coinasl-2.0.1-dtoa.patch 289 BLAKE2B 1fc1542d28b7085c8b75df21f7dceb3a4695f21b201db81d896b7bca1979e17187e4712902db69baf667b217bf78ab447fccf3a1bdcf73493582c980faa78905 SHA512 44dcb668607775e3b37f0077b4b7a53a12eed9019219be12a32af347098b72d6525126e7fd67024d1a84ed21db82696c0edfce691dea293d783f43df168355a1
-AUX coinasl-2.0.1-getrusage.patch 508 BLAKE2B 468ce0c3f94675b8101d3fd551ca6dbc6c0317e2c1ee6a07fe2c18a7ed79a582bf979191cff79ad166c821f98fea0844bdc754c40b85663c5d997a0b72e45710 SHA512 48d0d1dffd3ddcd87b92b9b0529c0b38bb3f965de22aba2d2043207a764c6f236fb91616f00856f27f1d27bb76b14d19971ad5569ff91976c8091f6a91c22407
+AUX coinasl-2.0.1-getrusage.patch 536 BLAKE2B a622dab64987ff0b27bcb57b0ada8438cde4fbe9821032944901b2f5b7f4a6bdbdff0ca817a28b095d1f6335e6584c9a92d391679f8159e84581f31018bbf4ea SHA512 0a8c1909283b40e3353605a04c8b4a150b07263fff60c2343f404df9cc250ddffeedcc937ccdb264543ae2e257f4c5906e6c5dca9817a721fc752cd7da35eada
+DIST coin-or-tools-BuildTools-20208f47f7bbc0056a92adefdfd43fded969f674.tar.gz 110238 BLAKE2B dd1965fd0a3aca6a1d0116d38c1c30edda1d2f38976ea919a4dd6e06da70171ab4a768e34a1320e7c8487c259968566aa94a585f36d96964296b2b5a240250ae SHA512 82b7f14f2ae735001d41b05b592914f4c1c710536a4ec5ed4db3aefa0f0ce181b90f44d6a91e6216d3c8dc87f760df2571837a062bf6aa3f3444a0d70f8a7a19
 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
+EBUILD coinasl-2.0.1-r1.ebuild 1120 BLAKE2B 07e6d30725a920cdccf60abc65248c49b5699e3df66bd40f6d2f5a292f4247fbf095649da43b77ba5342283143adf324178958b24750e2eb67424a3cba70fe35 SHA512 c9345772cb1f13364b32f24b6d81b02846af6072f1a65248001df8b0bc4cd41cbd6945fbeecbb65c137f67944a12d3fad6d0603dccfd48b8d82fa9556cb85ce0
 MISC metadata.xml 486 BLAKE2B 607a8fd460ce5cf30bb673ff065ed02c6a4c7ac4face9256d92c086cb9b2ada7c73c4aab31ff525afa99ab510b8f2de70a09e8c11e90512c304d838c27023a95 SHA512 438851e71d2bfe92f87e0d5c76778124035ea5ff796139d31c8de0530ef123db298d895ddfa053a112e743530b89773ba430498fd13e8e3f1bdbb451a1f101a2
diff --git a/sci-libs/coinasl/coinasl-2.0.1-r1.ebuild b/sci-libs/coinasl/coinasl-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..3a7e7ae257e8
--- /dev/null
+++ b/sci-libs/coinasl/coinasl-2.0.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Ampl Solver Library (ASL)"
+HOMEPAGE="https://github.com/coin-or-tools/ThirdParty-ASL"
+BUILD_TOOLS_VERSION="20208f47f7bbc0056a92adefdfd43fded969f674"
+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
+	https://github.com/coin-or-tools/BuildTools/archive/${BUILD_TOOLS_VERSION}.tar.gz -> coin-or-tools-BuildTools-${BUILD_TOOLS_VERSION}.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_prepare() {
+	default
+	AT_M4DIR="${WORKDIR}/BuildTools-${BUILD_TOOLS_VERSION}"
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-shared
+}
+
+src_install() {
+	default
+	rm "${D}/usr/$(get_libdir)/libcoinasl.la" || die
+}
diff --git a/sci-libs/coinasl/coinasl-2.0.1.ebuild b/sci-libs/coinasl/coinasl-2.0.1.ebuild
deleted file mode 100644
index 633b07582ddf..000000000000
--- a/sci-libs/coinasl/coinasl-2.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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-getrusage.patch b/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch
index 54e8807dffae..9d6c193605bd 100644
--- a/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch
+++ b/sci-libs/coinasl/files/coinasl-2.0.1-getrusage.patch
@@ -7,7 +7,7 @@ index 59e033d..2544237 100644
  AC_MSG_CHECKING([for getrusage])
  AC_LINK_IFELSE(
 -  [AC_LANG_PROGRAM([[]],[[getrusage()]])],
-+  [AC_LANG_PROGRAM(["#include <sys/resource.h>"],[[getrusage()]])],
++  [AC_LANG_PROGRAM([#include <sys/resource.h>],[struct rusage r; getrusage(RUSAGE_SELF, &r)])],
    [AC_MSG_RESULT([yes])],
    [CPPFLAGS="$CPPFLAGS -DNO_RUSAGE"
     AC_MSG_RESULT([no])])
-- 
cgit v1.2.3