gentoo resync : 12.05.2022

5 files changed, 126 insertions, 76 deletions

diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 13db113caa3e..b827628b71bd 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,6 +1,7 @@
-AUX z3-4.8.14-libatomic.patch 2063 BLAKE2B b2cb8232817ccbff2b1a26897b81e50bf3fc4110924642735858d854f57bf625c2463fa23285e1bf6f3f8cedf544adb580d0a64ee15f4810eb2f95451aecad7e SHA512 56864d3be7b891bfce49855d457b22c9ba9e047c710da1856cffacf3b2e88a6429d07e604c948210a983ab1bd1f785e7de906828eeaf534851ddfc63f36632b2
-DIST z3-4.8.14.tar.gz 5113598 BLAKE2B c6a82cec33e879123c33506897ac02be682d08a6432da0b11c6918f2664fd7249d8874ccb6f543907f789cc3b40b126465548abeabf4ac16d2ee791ce179742a SHA512 10170516ca472258d2f9df28cd036e43023a76a25f1e1670290c62f3890d935bf82770970054a5fd3a0f02559409e7ed4b18fb08347c040ff2f9e0918e152aab
 DIST z3-4.8.15.tar.gz 5213633 BLAKE2B 6ca07309370f891f6ca5fa114721cb5df96e726687bf3c2310ba4963b1d1dfeec6ede62fd7a960e17e824ab8ff1e17d2af2a90d8156245ba048b04045c8f0531 SHA512 7b08dec5b035a38edc90c4c491f508fd9ed227357de94400169db53d4c59382bd6a81ae6615771023a06534a3aa92668844f0ebfcc2a3b5ef4bba957426a0c6c
-EBUILD z3-4.8.14-r1.ebuild 2661 BLAKE2B db8be08d461a83b79fd81e424dfa22510d1d6aa0df6d01f6d07efb34c22c608f6fcb84e3f7d65dc6cae8778528bb820daa333caa03aa5ea4b30e45298a467c7a SHA512 555eaec25e7fa285d3916e56138d8d966b1b722e759d8da6e5151fa6d4bb89515a027bbd0e831d594d087cad333fda287b14c8691a678e8a215b216c6b5b2fdf
-EBUILD z3-4.8.15-r1.ebuild 2605 BLAKE2B a3fe5a3d3164c6233098836c9d0db48c76425783c45987836795b84ed4645f15c70fbbd3df0566eb6afdad3596595dff9a9f3a523b5dadb5db0b391adc8fd5e6 SHA512 b17422c6d03d33e5840215333180e3af4293f078eab93f6806ab11626f74bd5686620fd42b53c5c92f3fa85e99b46a5da39ad69b1833e71543e70c25cdf09930
+DIST z3-4.8.16.tar.gz 5223980 BLAKE2B 67bca86d48df51c9aa4fa3544fd77133c4cc429e6f77f89aa26a559e56e267b8c0891befc6a5e24be541011aac02cb0d51ef26a636c3b360a1fa4d445967da21 SHA512 385f6e1ee075b9eadb5aad338657a81f518eef382b99ce623448a630b79f5d414ebccfd1bb5e959626f0b82ef54a5f20326814ae988b5688d51578de6fb69615
+DIST z3-4.8.17.tar.gz 5232392 BLAKE2B 80dbb5d48811eb6022c0d0117d1e954bae7b27ff984f24cdfbc9158eb548349f817f30ea231d1119aadeedaec63765834bff6f6d21276d0bf61c30212444f224 SHA512 95517014ec1798c2552253dd5cde6f955896ab297a4f56294f4bc6f2c5428069015f513c6eb9a090a809cfcf4cb1cc38cc83818f19b5b1051e4e6c06f973747d
+EBUILD z3-4.8.15-r1.ebuild 2600 BLAKE2B d55c66f4e595b84127e8d5ad5e0895d9df003094a47a68329eb7664e69bfb4b04c2c476abd16caee95467b1537ebff6bcf038858b2d6cb97ccfec72795cd9064 SHA512 fbe4d7a3b271e5938990ddbb6ecafd7f5f725508c6ee741f71ee46322313a606c3b5058ac37c8b7054bffb8670593fe24006a5a84c193f5bda41d09420882145
+EBUILD z3-4.8.16.ebuild 2619 BLAKE2B 0fbf96c6aead6ec343cc08bcf6f60c378ac7b9976f504aac283b1f8745117bf10d761f8c5639b0381d451961e675c03d1869a83cf181d203b0b93f70b4e3c6c7 SHA512 b91a7f6b3822ea9c8c559f06c0e7241e46925f93e5842c780631edca89664cc3312ec8fea7831a6a3665fd70ee9af71a56b7bc35386fc7a8c0a32206939b5a88
+EBUILD z3-4.8.17.ebuild 2619 BLAKE2B 0fbf96c6aead6ec343cc08bcf6f60c378ac7b9976f504aac283b1f8745117bf10d761f8c5639b0381d451961e675c03d1869a83cf181d203b0b93f70b4e3c6c7 SHA512 b91a7f6b3822ea9c8c559f06c0e7241e46925f93e5842c780631edca89664cc3312ec8fea7831a6a3665fd70ee9af71a56b7bc35386fc7a8c0a32206939b5a88
 MISC metadata.xml 617 BLAKE2B f940ac3d7c159dadf4398164b749eaded84c12af5553a154d97fd9bfb939c72e3122e08e11c1c9764514f59a87695534daff6628bd15be4de834c7cfdb65d7f9 SHA512 758df481a60606de12c5a450162ee89fd2f68f842675b3bf280f024fcd61232228476ac889e60c09e42ebae01ad855b32ad77793ba7fa5714861ccc5ca52bfc7
diff --git a/sci-mathematics/z3/files/z3-4.8.14-libatomic.patch b/sci-mathematics/z3/files/z3-4.8.14-libatomic.patch
deleted file mode 100644
index 4b7503ef47fd..000000000000
--- a/sci-mathematics/z3/files/z3-4.8.14-libatomic.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://github.com/Z3Prover/z3/commit/3d87d86c2825437780167ae6ff8f5b203f15ee7f.patch
-https://bugs.gentoo.org/835003
-
-From b2b407cdedc586f8d11f9dd029e1c3016c80bba7 Mon Sep 17 00:00:00 2001
-From: Revy <rabenda.cn@gmail.com>
-Date: Tue, 15 Mar 2022 02:11:40 +0800
-Subject: [PATCH] fix: build on non-x86 platform
-
-Signed-off-by: Revy <rabenda.cn@gmail.com>
----
- CMakeLists.txt                |  5 +++++
- cmake/check_link_atomic.cmake | 23 +++++++++++++++++++++++
- 2 files changed, 28 insertions(+)
- create mode 100644 cmake/check_link_atomic.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index be300607dd..477410ba8d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -431,6 +431,11 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-   string(APPEND CMAKE_SHARED_LINKER_FLAGS " /RELEASE")
- endif()
- 
-+################################################################################
-+# Check atomic linking as needed
-+################################################################################
-+include(${PROJECT_SOURCE_DIR}/cmake/check_link_atomic.cmake)
-+
- ################################################################################
- # Report default CMake flags
- ################################################################################
-diff --git a/cmake/check_link_atomic.cmake b/cmake/check_link_atomic.cmake
-new file mode 100644
-index 0000000000..d462191a0b
---- /dev/null
-+++ b/cmake/check_link_atomic.cmake
-@@ -0,0 +1,23 @@
-+set(ATOMIC_TEST_SOURCE "
-+#include <atomic>
-+std::atomic<int> x;
-+std::atomic<short> y;
-+std::atomic<char> z;
-+std::atomic<long long> w;
-+int main() {
-+	++z;
-+	++y;
-+    ++w;
-+	return ++x;
-+}")
-+CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" BUILTIN_ATOMIC)
-+if (NOT BUILTIN_ATOMIC)
-+  set(CMAKE_REQUIRED_LIBRARIES atomic)
-+  CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" ATOMICS_REQUIRE_LIBATOMIC)
-+  unset(CMAKE_REQUIRED_LIBRARIES)
-+  if (ATOMICS_REQUIRE_LIBATOMIC)
-+    list(APPEND Z3_DEPENDENT_LIBS atomic)
-+  else()
-+    message(FATAL_ERROR "Host compiler must support std::atomic!")
-+  endif()
-+endif()
diff --git a/sci-mathematics/z3/z3-4.8.15-r1.ebuild b/sci-mathematics/z3/z3-4.8.15-r1.ebuild
index 04689aa94acc..31cec588863f 100644
--- a/sci-mathematics/z3/z3-4.8.15-r1.ebuild
+++ b/sci-mathematics/z3/z3-4.8.15-r1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sci-mathematics/z3/z3-4.8.14-r1.ebuild b/sci-mathematics/z3/z3-4.8.16.ebuild
index 9789ce8a98e1..7ebfae64d20b 100644
--- a/sci-mathematics/z3/z3-4.8.14-r1.ebuild
+++ b/sci-mathematics/z3/z3-4.8.16.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{8..10} )
@@ -15,20 +15,21 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~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 )"
+RDEPEND="
+	${PYTHON_DEPS}
+	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	java? ( >=virtual/jdk-1.8 )
+"
 BDEPEND="
-	doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libatomic.patch" #bug 835003
-)
+	doc? ( app-doc/doxygen[dot] )
+"
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
diff --git a/sci-mathematics/z3/z3-4.8.17.ebuild b/sci-mathematics/z3/z3-4.8.17.ebuild
new file mode 100644
index 000000000000..7ebfae64d20b
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.8.17.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+
+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/4.8"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~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
+
+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 RELEASE_NOTES
+	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
+}