gentoo auto-resync : 09:04:2024 - 12:31:21

4 files changed, 7 insertions, 86 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index b14e308f3bc4..6e2e97eb21f2 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/boolector/Manifest b/sci-mathematics/boolector/Manifest
index 434335e9b6a9..95ae96a2b6dc 100644
--- a/sci-mathematics/boolector/Manifest
+++ b/sci-mathematics/boolector/Manifest
@@ -1,6 +1,4 @@
 AUX boolector-3.2.3-cmake-std.patch 350 BLAKE2B bcdc394f1f1c9ef17605f0c12c2279d7842a4c106d70132760ed7c3fe215d41ba25551ae18e9d29f5697fb2c7546cef96b3a1c3ebb5b79da6c6ed4ada98d1dbb SHA512 6345feda413d4959cd95af0708f522d3569bea66ceab524b6f2378e473f1a64417b5fbcfbd865c10c14c0dfb0cd11c585db6ffa7c79d930b90aaf47693d47aa8
-DIST boolector-3.2.2_p20220110.tar.gz 1567668 BLAKE2B 6816f0434d88c790a27b9afe4c3b63c18a55b14f9f13b092f2940309e34842fe4868bf8d378bad130c4561d25e7d79b356fc27d9422bd42ba1b74ff98be36f72 SHA512 b1b964c155c8227e631025cf6bff69cf54728b1d875c2bd44a5a1ddb2857de2ab8fefc96d194faa5f98015e730b417d46a415ea601740e890df07ad5e50ad656
 DIST boolector-3.2.3.tar.gz 1566566 BLAKE2B 1c9adb1272c2289af6afce0149b11ce36a42aef47f1b3353f5f9dbaf12287718f29e45415b82b723bd37fb0438517c48d64a12f0c038105edeb6036f49189ac7 SHA512 a85c10edf05455e2911614f9d8f2b214a136470852b31a631c96247416dab822efcc6d9047f3a85c85aff499e8eb62fb36e52f2633511c5b42d287c4962c4239
-EBUILD boolector-3.2.2_p20220110.ebuild 1900 BLAKE2B 2a99565257a782a5c198ef8661f8c51aa734ef3987213db1c4010ebe5f083a5f9f71525d66217ec32cb1edd4ef34d89bc386a1d21b91c277336493368ffdd3d7 SHA512 c588c5c8e821d6dd62c77c1f9c291761d9c8d30d415e7634a8fb64460e40a2abe9eb03e873c309218fc34e4105c6b597f7e09c77f0faa51afc10b68b9f754d46
-EBUILD boolector-3.2.3.ebuild 1853 BLAKE2B 05e5a5f5db0b4e5feb28bf988db1cce1f3e0f9c1bff7f54da15726ce866ed7aa450d73ae28ad451fa66aa933935f3bc39a49b6105ba33a88e086aa2d089691f1 SHA512 1e607523c31111a5e9db0588d44b64b4a3a9cbadb6bfd6879f655bce25d19c74ad7e4d07f7c8f7d2c03747e5b6c034bdd8347dee0eaaa07239bd8bb7c735f53d
+EBUILD boolector-3.2.3.ebuild 1899 BLAKE2B 0856b67a9ce86a78b00b556d087c8d2ccfecddf25899e57da146d3698233c8edd773d8d553d77741afa3488fa8669bc042ee787e7d0a89c2b889238b4d9b0982 SHA512 642e7323639f49f97a613ed9f15ebabcd51969b0b5b75fc2530fe73cb36000b5baf7adb30a000d143de14d8957f78cce506d9f0bd92d50b3ff4da4a401b08839
 MISC metadata.xml 1245 BLAKE2B a04e1e5a6af857100b8b569f57f4d2610593e9eb741513e4e6405a8fa9828471b92aaa1ad57a3163dc2f251b5664493692f92477b7191621ff8fd76eed9f57e7 SHA512 81257f7be3b21bf10caad654d5747ef2d978c0df5a05049b890420e2d170b7a4fa06151da0604a8b1b6e7daf2fb01344003c9243205a94b4040c580beb414836
diff --git a/sci-mathematics/boolector/boolector-3.2.2_p20220110.ebuild b/sci-mathematics/boolector/boolector-3.2.2_p20220110.ebuild
deleted file mode 100644
index 0e4ea8d6d1b5..000000000000
--- a/sci-mathematics/boolector/boolector-3.2.2_p20220110.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-[[ ${PV} == *_p20220110 ]] && COMMIT=13a8a06d561041cafcaf5458e404c1ec354b2841
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-single-r1 cmake
-
-DESCRIPTION="Fast SMT solver for bit-vectors, arrays and uninterpreted functions"
-HOMEPAGE="https://boolector.github.io/
-	https://github.com/Boolector/boolector/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Boolector/${PN}.git"
-else
-	SRC_URI="https://github.com/Boolector/${PN}/archive/${COMMIT}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${COMMIT}
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="cryptominisat examples +gmp minisat +picosat python test"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	|| ( cryptominisat minisat picosat )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-mathematics/btor2tools:=
-	cryptominisat? ( sci-mathematics/cryptominisat:= )
-	gmp? ( dev-libs/gmp:= )
-	minisat? ( sci-mathematics/minisat:= )
-	picosat? ( sci-mathematics/picosat:= )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBtor2Tools_LIBRARIES=/usr/$(get_libdir)/libbtor2parser.so
-		-DUSE_PYTHON2=OFF
-		-DPYTHON=$(usex python)
-		-DTESTING=$(usex test)
-		-DUSE_GMP=$(usex gmp)
-		-DUSE_PYTHON3=$(usex python)
-
-		# Integration with other SMT solvers
-		-DUSE_LINGELING=OFF  # Not packaged yet.
-		-DUSE_CADICAL=OFF  # Fails to link.
-		-DUSE_CMS=$(usex cryptominisat)
-		-DUSE_MINISAT=$(usex minisat)
-		-DUSE_PICOSAT=$(usex picosat)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dodir /usr/$(get_libdir)
-	mv "${ED}"/usr/lib/*.so "${ED}"/usr/$(get_libdir)/ || die
-
-	if use examples ; then
-		dodoc -r examples
-	fi
-}
diff --git a/sci-mathematics/boolector/boolector-3.2.3.ebuild b/sci-mathematics/boolector/boolector-3.2.3.ebuild
index 1497adc7c225..6b8f8f0d0d56 100644
--- a/sci-mathematics/boolector/boolector-3.2.3.ebuild
+++ b/sci-mathematics/boolector/boolector-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -75,10 +75,12 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	dodir "/usr/$(get_libdir)"
-	mv "${ED}/usr/lib"/*.so "${ED}/usr/$(get_libdir)/" || die
-
 	if use examples ; then
 		dodoc -r examples
 	fi
+
+	if [[ "$(get_libdir)" != lib ]] ; then
+		dodir "/usr/$(get_libdir)"
+		mv "${ED}/usr/lib"/*.so "${ED}/usr/$(get_libdir)/" || die
+	fi
 }