gentoo auto-resync : 21:12:2023 - 13:58:21

5 files changed, 2 insertions, 129 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index e0a2db45844e..91786f5cf12c 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index ac4761d89f4c..009a98eea9e7 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,8 +1,5 @@
-AUX z3-4.12.2-gcc-13.patch 317 BLAKE2B 2b8f6cc02b3a1d02b4266b483ef2a7ea108cb94c12a9cab76c304d039804df600547bfe6b72f22592d374d552d77b0c5b6c39069297f7c8f5cecf7be2ce6f584 SHA512 faa47330f0d9213127a05af0a23441ce60ae1a1535994ed627edacba9d5082550eeaeae3d88ad9066e6dc6b6a0078a340fb1adf1603cd51d786149e6b8c89f13
-DIST z3-4.12.2.tar.gz 5401038 BLAKE2B e83bc4067360888da1be20dffbbd4b060118080e1f8a1b0424c169ad1aaaccf5ab645960418db7ce544829c7831da90edb0e38003d7a0261df699c9bd69ab1f0 SHA512 375477cbbc9837b44e752c89916409d07bf6a73830b52878aab4f376f08b37dd5ab485da225744d394ab15f2a7e1014edc3be5eb9962934c440a8d55259317e2
 DIST z3-4.12.3.tar.gz 5471745 BLAKE2B ce14a13a0af651b414cd164658b5953d5ea398201fc299e5073690caa9625b23ffbdce33a2f220f1420570b1b21ace6be48486c2c333251325b7acb5ca6e0d43 SHA512 06d667b86e2d941e8cbcafe508392f5ef9307354a97428107e26ac7ef86246a86a0096fbf92034f2a3e47efe41f95ddc74460c2c4797aadec79e14020737afcb
 DIST z3-4.12.4.tar.gz 5471960 BLAKE2B 9c8a65a6632e673e9c7da2ee0e8c8f7d145b906a1c6bdd6df9826fabc31e1c773d3512317ae6278b8a5cb40c580eaff98c37512fb2a2ad17c1c5ada90e0f8026 SHA512 fcb778d2e3e0d13fc68afcd8724548279f9edbbb4aac1bbb93e00959c33330ab2fd84f2c2e4b0b78f767819725a90b845fc606a9adc931ae1f0a11f4deae433b
-EBUILD z3-4.12.2.ebuild 2727 BLAKE2B d12f07d771f728b1df2d4c705af570e4319c3bcfd9df44e19c760929578c0e758bec89f5ad8334c02fe9333c4e36b40e2e7ecfaef432a5976d25cfc01e2cfaa6 SHA512 395631c014e4c3d406f7cf712d766537f8aa86f3db337e0a8e9c0ee804c509076ff4f9192043ea8b1e183ebb983c059b1ee34ad77e01e03a17485c16e3b10c66
-EBUILD z3-4.12.3.ebuild 2734 BLAKE2B a097abf108938c35464d89dbf7bb6c7596086d5006fdd323253d071f1512c7cdf8555abfcc94a314a246e504b884395b7b2a7a8b9f96e33ff9fc73e5a3eabadc SHA512 b331175faafc5c0ee3e7ac9ad8cf2891dc21662019ed6c708731a74a098e97c39b5f4591cc2d9022460940b7bfa209de1a74f8f54b62f4d514536438d79e14cf
+EBUILD z3-4.12.3.ebuild 2733 BLAKE2B ea34db82a76463d37de447095da98558a6875b631012ac13f811685679a866127d636be2d6992600f8617a482b866c1d3f3148e359ce6296ddb506f87640a448 SHA512 c5a6fa5d3c6b26c0489dcf5268159d145e412c7a1b4821008cf19c65a693667577efc0384e41f2c42f8fb15efe04dc9be201c873121616932e95c683e91cca5c
 EBUILD z3-4.12.4.ebuild 2605 BLAKE2B 37812e4dd6e9cff9772224b5587d9acb2c1e5c53695749ca5b8903dff62f424481847e3e49c5ac3b5bd52c86ebbaecfa84a9d7682fe372315709c57e8dcdc2eb SHA512 33c073e6dbe3948336e92449ed9499ef70c2180914064d176710e801c5729cfa30050a93dabe41ea8c75f73bca0059dce98b2231c88896bcb381b9d257f29039
 MISC metadata.xml 1800 BLAKE2B 26b4fd829e8daf66cfb19f61afffe9535099260732b3856c400881e68dbc4c2ffe88ff57f3a23449a2259696f23969c6502d4f3432b9cafc2e89e99167c94b90 SHA512 92f05bb1617630c16801ae5ea4215436c4d5dde6890d1a9e90c81f8ce1cddf101b73e016d1ec67eb41ccb4b59753547e6d08ac6a70a5b2d3dc792dc9fba13166
diff --git a/sci-mathematics/z3/files/z3-4.12.2-gcc-13.patch b/sci-mathematics/z3/files/z3-4.12.2-gcc-13.patch
deleted file mode 100644
index 74f8abed1e3b..000000000000
--- a/sci-mathematics/z3/files/z3-4.12.2-gcc-13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/util/tptr.h b/src/util/tptr.h
-index 6213b2efa40..2a35af5353d 100644
---- a/src/util/tptr.h
-+++ b/src/util/tptr.h
-@@ -20,6 +20,7 @@ Revision History:
- #pragma once
- 
- #include "util/machine.h"
-+#include <cstdint>
- 
- #define TAG_SHIFT        PTR_ALIGNMENT
- #define ALIGNMENT_VALUE  (1 << PTR_ALIGNMENT)
diff --git a/sci-mathematics/z3/z3-4.12.2.ebuild b/sci-mathematics/z3/z3-4.12.2.ebuild
deleted file mode 100644
index 8be932dc18ab..000000000000
--- a/sci-mathematics/z3/z3-4.12.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake-multilib java-pkg-opt-2 python-single-r1
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="https://github.com/Z3Prover/z3/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-S=${WORKDIR}/z3-${P}
-
-SLOT="0/$(ver_cut 1-2)"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv sparc x86"
-IUSE="doc examples gmp isabelle java python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	java? ( >=virtual/jdk-1.8 )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-PATCHES=(
-	# https://github.com/Z3Prover/z3/commit/520e692a43c41e8981eb091494bef0297ecbe3c6
-	"${FILESDIR}/${P}-gcc-13.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DZ3_USE_LIB_GMP=$(usex gmp)
-		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
-		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
-		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
-		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
-		-DZ3_INCLUDE_GIT_HASH=OFF
-	)
-
-	multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	cmake_build test-z3
-	set -- "${BUILD_DIR}"/test-z3 /a
-	echo "${@}" >&2
-	"${@}" || die
-}
-
-multilib_src_install_all() {
-	dodoc README.md
-	use examples && dodoc -r examples
-	use python && python_optimize
-
-	if use isabelle; then
-		insinto /usr/share/Isabelle/contrib/${P}/etc
-		newins - settings <<-EOF
-			Z3_COMPONENT="\$COMPONENT"
-			Z3_HOME="${EPREFIX}/usr/bin"
-			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
-			Z3_REMOTE_SOLVER="z3"
-			Z3_VERSION="${PV}"
-			Z3_INSTALLED="yes"
-			Z3_NON_COMMERCIAL="yes"
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
-			sed -e "/contrib\/${PN}-[0-9.]*/d" \
-				-i "${ROOT}/etc/isabelle/components" || die
-			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
-				contrib/${P}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [[ ! ${REPLACING_VERSIONS} ]]; then
-			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new Isabelle component being installed during an upgrade.
-				sed -e "/contrib\/${P}/d" \
-					-i "${ROOT}/etc/isabelle/components" || die
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/z3/z3-4.12.3.ebuild b/sci-mathematics/z3/z3-4.12.3.ebuild
index 578fc1f057ef..370cea5f3867 100644
--- a/sci-mathematics/z3/z3-4.12.3.ebuild
+++ b/sci-mathematics/z3/z3-4.12.3.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/$(ver_cut 1-2)"
 LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv sparc x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"