From b8325835c82367d22428eb41afa0f2d375338d3c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 28 Jun 2024 07:59:59 +0100
Subject: gentoo auto-resync : 28:06:2024 - 07:59:59

---
 sci-mathematics/cadical/Manifest                   |  5 ++-
 sci-mathematics/cadical/cadical-1.9.4.ebuild       | 47 ---------------------
 sci-mathematics/cadical/cadical-2.0.0.ebuild       | 49 ++++++++++++++++++++++
 .../cadical-makefile-in-respect-ar-2.0.0.patch     | 11 +++++
 4 files changed, 63 insertions(+), 49 deletions(-)
 delete mode 100644 sci-mathematics/cadical/cadical-1.9.4.ebuild
 create mode 100644 sci-mathematics/cadical/cadical-2.0.0.ebuild
 create mode 100644 sci-mathematics/cadical/files/cadical-makefile-in-respect-ar-2.0.0.patch

(limited to 'sci-mathematics/cadical')

diff --git a/sci-mathematics/cadical/Manifest b/sci-mathematics/cadical/Manifest
index ce86db1a0608..ef1b6ae5df21 100644
--- a/sci-mathematics/cadical/Manifest
+++ b/sci-mathematics/cadical/Manifest
@@ -1,7 +1,8 @@
 AUX cadical-configure.patch 380 BLAKE2B e9fd63e663811a2a067b9bb8bb05604dc5b0fb02068a04ed1f80ad7b40e3aa8981c47ad7b80475e758e6c2e44b17b175c3a793e256185d28e0029a78473837b9 SHA512 9b82cd65257253ea423df6fb711bef0d5a8fbca48dd86fde5433b0dd377bfa9778ba3141b36560d13ceb61a4df305b818f11f3a72a483a02b3b3859299d6d830
+AUX cadical-makefile-in-respect-ar-2.0.0.patch 363 BLAKE2B 75e3af23e2122f638f7d8064517c8f4d20bddc3663c9d985fa6509df49cd0c3904ac05ecff779800e3b63c413c92e95a15618c713531492e32c845e2a1160097 SHA512 33650ff548f77aa83a613211d3a810313ab347dff4b17f0c9ca274ec31d94c54ac9ae1fd96f581d0683a0c6f84adee3d275aabd9c805738c99f7b197029f3108
 AUX cadical-makefile.in-ar.patch 323 BLAKE2B 226618745824824d8d7ccea53a3435abed9f829ca8462994fcdf805b7e5ba18a571214a16fbb2fcaeb0c91683424402e0a3c8dd05cd8f8dbdec19ed30aa023eb SHA512 30427fb87ef6aef56b9aebc3b2e0981e79c680c73dba20d371364d1b3668b51f1cbba4b6c7467ffb979245488b8ca1f2251a6321db4991221051f0c4b8e6a4d7
-DIST cadical-1.9.4.tar.gz 691203 BLAKE2B 40fcb86e60b2c6e4f24d43976e12ae063aa00ccfc8cad78d27e85b863b0faee23213d210886fd2f374aa93b575b741fd079351d3655ee1ed5bb17f96cd0005b6 SHA512 a3477ac3a4ddcb8bb797653efa9afe992a84db94900394d401667a55630932a91e847fc943bf5509d6672523818233c247db0be4268b9d8aae1636bad1877bc3
 DIST cadical-1.9.5.tar.gz 691268 BLAKE2B 68c7fcc35ef0ad5082d5bbc828363ee45c2e637f281f1829ffb34047fff73775d34615e0ac37b8b49ff20b941db85b72c0dd6de0ab5ec5a690fd80fb5489b212 SHA512 b40727847ba0217f8d24e5468874264065c5ec9cbf0600d2e2395b8396a9d5f892127018ab9d1b930599a16a0817de5b0d29136c5dc74f2a72fb0f726e825271
-EBUILD cadical-1.9.4.ebuild 923 BLAKE2B 654e146a46b3ab80d4f718bab69f5c930146f15dfeb9bcf47ec5d59e64b422064443e2ec964a8077e9818c12cae0412324f43ca8f97c0c81ff1164af529a7280 SHA512 694c7c5ab8c8b69ad9bd0d962382377900658e2da4f53563c3ffb52ec1dd2ad24ce1676f33a58bae4136a41ebb5f0a4306b2dfe3a3c9756765a11f86fd2220ea
+DIST cadical-2.0.0.tar.gz 709136 BLAKE2B 76b738aef8063b96b11098be132bd9921cc6e4f39efe4c14916e1b9fb9517f464771a8f4fcc116a1a37fcd44b71513bb94516b3c81699f4d5417dde0e69ddb0c SHA512 5ec4d43751e36844afcfc9102e71a2fc1e5b1112506eb654e3aef7f2ba425738264b73b88b0400ec15222c8a9d2f4d37a1f60da69a0c061303904b7ad0a93885
 EBUILD cadical-1.9.5.ebuild 923 BLAKE2B 654e146a46b3ab80d4f718bab69f5c930146f15dfeb9bcf47ec5d59e64b422064443e2ec964a8077e9818c12cae0412324f43ca8f97c0c81ff1164af529a7280 SHA512 694c7c5ab8c8b69ad9bd0d962382377900658e2da4f53563c3ffb52ec1dd2ad24ce1676f33a58bae4136a41ebb5f0a4306b2dfe3a3c9756765a11f86fd2220ea
+EBUILD cadical-2.0.0.ebuild 978 BLAKE2B 9c9846b75db3e01737ef024a276b4960f304f5feaf9e6bd14cd03c3d378ce93dcae164e046175af42eace5baddaaa69f60716b302dfc93cf7ef725ed234773cf SHA512 565058dbd8dac6b62071b581fbc95ec579df9c399e579d428786b80ea58a0b71308e366ea69cf4e305b89cba4ad10d1726863aaab374d5d2342de37512bfcd0f
 MISC metadata.xml 613 BLAKE2B 6d7e0c1b5eae3803aa0981b195457cdcc6d2ffa2af655837e615da6ed6914ac5bec7a831ced6703ff67476561cf67139ea5519d98cdc2bd8d5781108496046e2 SHA512 b04ad6ae6e2626cea18049e3e20eb227b5580853b8ad77179ea693ed61f12d042b7ea505eb8cfafaa0121564ab0a4b6c7dcdf84f78fa2f47c465e6f61fb1a3f0
diff --git a/sci-mathematics/cadical/cadical-1.9.4.ebuild b/sci-mathematics/cadical/cadical-1.9.4.ebuild
deleted file mode 100644
index 4c087365b45b..000000000000
--- a/sci-mathematics/cadical/cadical-1.9.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simplified Satisfiability Solver"
-HOMEPAGE="http://fmv.jku.at/cadical/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/arminbiere/${PN}.git"
-else
-	SRC_URI="https://github.com/arminbiere/${PN}/archive/rel-${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-rel-${PV}"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-configure.patch"
-	"${FILESDIR}/${PN}-makefile.in-ar.patch"
-)
-
-DOCS=( CONTRIBUTING.md NEWS.md README.md )
-
-src_configure() {
-	tc-export AR
-	CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}" ./configure || die
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe build/{cadical,mobical}
-
-	dolib.a build/libcadical.a
-	doheader src/cadical.hpp
-	doheader src/ccadical.h
-
-	einstalldocs
-}
diff --git a/sci-mathematics/cadical/cadical-2.0.0.ebuild b/sci-mathematics/cadical/cadical-2.0.0.ebuild
new file mode 100644
index 000000000000..0d4bf08a816c
--- /dev/null
+++ b/sci-mathematics/cadical/cadical-2.0.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simplified Satisfiability Solver"
+HOMEPAGE="http://fmv.jku.at/cadical/
+	https://github.com/arminbiere/cadical/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/arminbiere/${PN}.git"
+else
+	SRC_URI="https://github.com/arminbiere/${PN}/archive/rel-${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-rel-${PV}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-configure.patch"
+	"${FILESDIR}/${PN}-makefile-in-respect-ar-2.0.0.patch"
+)
+
+DOCS=( CONTRIBUTING.md NEWS.md README.md )
+
+src_configure() {
+	tc-export AR
+
+	CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}" ./configure || die
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe build/{cadical,mobical}
+
+	dolib.a build/libcadical.a
+	doheader src/cadical.hpp
+	doheader src/ccadical.h
+
+	einstalldocs
+}
diff --git a/sci-mathematics/cadical/files/cadical-makefile-in-respect-ar-2.0.0.patch b/sci-mathematics/cadical/files/cadical-makefile-in-respect-ar-2.0.0.patch
new file mode 100644
index 000000000000..61787b76f29e
--- /dev/null
+++ b/sci-mathematics/cadical/files/cadical-makefile-in-respect-ar-2.0.0.patch
@@ -0,0 +1,11 @@
+--- a/makefile.in
++++ b/makefile.in
+@@ -60,7 +60,7 @@ mobical: src/mobical.o libcadical.a makefile $(LIBS)
+ 	$(COMPILE) -o $@ $< -L. -lcadical
+ 
+ libcadical.a: $(OBJ_SOLVER) $(OBJ_CONTRIB) makefile
+-	ar rc $@ $(OBJ_SOLVER) $(OBJ_CONTRIB)
++	${AR} rc $@ $(OBJ_SOLVER) $(OBJ_CONTRIB)
+ 
+ #--------------------------------------------------------------------------#
+ 
-- 
cgit v1.2.3