From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 80C07158015 for ; Thu, 21 Dec 2023 10:47:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89C0C2BC03C; Thu, 21 Dec 2023 10:47:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 271882BC02F for ; Thu, 21 Dec 2023 10:47:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4476A340943 for ; Thu, 21 Dec 2023 10:47:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A693E1492 for ; Thu, 21 Dec 2023 10:47:53 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1703155668.d613e1c4dfeb3e1afdb462400b50ee086a04d6af.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/files/, sci-mathematics/z3/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/z3/Manifest sci-mathematics/z3/files/z3-4.12.2-gcc-13.patch sci-mathematics/z3/z3-4.12.2.ebuild X-VCS-Directories: sci-mathematics/z3/ sci-mathematics/z3/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: d613e1c4dfeb3e1afdb462400b50ee086a04d6af X-VCS-Branch: master Date: Thu, 21 Dec 2023 10:47:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ab0a23b1-37d9-4432-ba78-76980f8f50c5 X-Archives-Hash: 1db6cec671781b49cd0a8fe7ac0e01f2 commit: d613e1c4dfeb3e1afdb462400b50ee086a04d6af Author: Michał Górny gentoo org> AuthorDate: Thu Dec 21 10:44:47 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Dec 21 10:47:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d613e1c4 sci-mathematics/z3: Remove old Signed-off-by: Michał Górny gentoo.org> sci-mathematics/z3/Manifest | 1 - sci-mathematics/z3/files/z3-4.12.2-gcc-13.patch | 12 --- sci-mathematics/z3/z3-4.12.2.ebuild | 112 ------------------------ 3 files changed, 125 deletions(-) diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest index 4747641ffda5..dd7b34d080d2 100644 --- a/sci-mathematics/z3/Manifest +++ b/sci-mathematics/z3/Manifest @@ -1,3 +1,2 @@ -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 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 - - #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 -}