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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 442AC138334 for ; Sat, 7 Dec 2019 23:50:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4183DE0883; Sat, 7 Dec 2019 23:50:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1CA43E0894 for ; Sat, 7 Dec 2019 23:50:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 084DF34D861 for ; Sat, 7 Dec 2019 23:50:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55B468AD for ; Sat, 7 Dec 2019 23:50:52 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1575762535.7e4c5ab0f9a5639c652cd5aa746e65ce8476bcf9.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/z3/Manifest sci-mathematics/z3/z3-4.4.1.ebuild sci-mathematics/z3/z3-4.5.0.ebuild sci-mathematics/z3/z3-4.8.5.ebuild X-VCS-Directories: sci-mathematics/z3/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 7e4c5ab0f9a5639c652cd5aa746e65ce8476bcf9 X-VCS-Branch: master Date: Sat, 7 Dec 2019 23:50:52 +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: c024e6fd-6e32-4d8a-9020-7050897b8f42 X-Archives-Hash: 4fbbb6f6255dd6f0873fa907a173391f commit: 7e4c5ab0f9a5639c652cd5aa746e65ce8476bcf9 Author: David Seifert gentoo org> AuthorDate: Sat Dec 7 23:48:55 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Dec 7 23:48:55 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4c5ab0 sci-mathematics/z3: Remove old Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> sci-mathematics/z3/Manifest | 3 - sci-mathematics/z3/z3-4.4.1.ebuild | 178 ----------------------------------- sci-mathematics/z3/z3-4.5.0.ebuild | 186 ------------------------------------- sci-mathematics/z3/z3-4.8.5.ebuild | 106 --------------------- 4 files changed, 473 deletions(-) diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest index d4bad76f6b6..479dc2277d1 100644 --- a/sci-mathematics/z3/Manifest +++ b/sci-mathematics/z3/Manifest @@ -1,4 +1 @@ -DIST Z3-4.8.5.tar.gz 4177051 BLAKE2B f8c4be9dbab2d5cf6fdb0bd8e9e1648f8ac29bc8ca9241b3ef29699400b383f09601149d50899d6ca828abadacb71161af1524df6d1ed45d7fd95c4a49c0d3df SHA512 ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309 -DIST z3-4.4.1.tar.gz 3347371 BLAKE2B 57f090b891618613c4647a89620d12f2ac05ea110268e63b343594f53fa2cc7aa347781001e2778ea7dc1ce475c964ddeced7a82c304b4be706ad164fd17a285 SHA512 76991a24f47f2b53ceb8d7a9a6be19913c57994ffb6cf6acfe30f61b2e73959cf02a99f656053594fccb5aaf4d1f44b3ae7e51f1c8953b213d738ceeeaea74f8 -DIST z3-4.5.0.tar.gz 3573695 BLAKE2B 285cc4d1f998d61ddb0b854044b7c79c1bb4cccf51bbdcba7c4a45698d74d9591f84d0aa74c5ef7c8aea2c6539ac987f29e326b44037e954108df67644dff594 SHA512 1ebc2c908d90b6b879f1e819c864ff894613276af47a440f27cf94968c195656952434754c3eb20f4bdbdd8497d227d22e1b4821c0d320b11052b5648d9e2dc7 DIST z3-4.8.6.tar.gz 4328752 BLAKE2B 4932670f3c1ab9bdba18a6ad80f4fd8812eb70d71705ebdf1f93c3b052ffb632dc10e4f7f4043f098af214288d6d4a4a26ef7f8cc0d1183c9f27b14ef1787c46 SHA512 d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1 diff --git a/sci-mathematics/z3/z3-4.4.1.ebuild b/sci-mathematics/z3/z3-4.4.1.ebuild deleted file mode 100644 index 8fd027f17fe..00000000000 --- a/sci-mathematics/z3/z3-4.4.1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit flag-o-matic java-pkg-2 java-pkg-simple python-r1 toolchain-funcs - -DESCRIPTION="An efficient theorem prover" -HOMEPAGE="http://z3.codeplex.com/" -SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz" - -SLOT="0" -LICENSE="MIT" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples gmp isabelle java python" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - gmp? ( dev-libs/gmp:0 )" -DEPEND="${RDEPEND} - java? ( >=virtual/jdk-1.8 )" - -S=${WORKDIR}/${PN}-${P} -JAVA_SRC_DIR=${S}/src/api/java - -SO1="0" -SO2="1" -SOVER="${SO1}.${SO2}" - -pkg_setup() { - python_setup - - if [[ ${MERGE_TYPE} != binary ]]; then - if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then - ewarn "Please use an openmp compatible compiler" - ewarn "like >gcc-4.2 with USE=openmp" - die "Openmp support missing in compiler" - fi - fi -} - -src_prepare() { - eapply "${FILESDIR}"/${P}-gcc-6.patch - default - - sed \ - -e 's:-O3::g' \ - -e 's:-fomit-frame-pointer::' \ - -e 's:-msse2::g' \ - -e 's:-msse::g' \ - -e "/LINK_EXTRA_FLAGS/s:@LDFLAGS@:-lrt $(usex gmp -lgmp ""):g" \ - -e 's:t@\$:t\$:g' \ - -i scripts/*mk* || die - - sed \ - -e "s:SLIBEXTRAFLAGS = '':SLIBEXTRAFLAGS = '-Wl,-soname,lib${PN}.so.${SOVER}':" \ - -i scripts/mk_util.py || die - - append-ldflags -fopenmp - - cat <<- EOF > "${S}/src/api/python/__init__.py" || die - from .z3 import * - - from . import z3num - from . import z3poly - from . import z3printer - from . import z3rcf - from . import z3types - from . import z3util - - # generated files - from . import z3core - from . import z3consts - EOF -} - -src_configure() { - export Z3_INSTALL_LIB_DIR="$(get_libdir)" - export Z3_INSTALL_INCLUDE_DIR="include/z3" - set -- \ - $(usex gmp --gmp "") \ - $(usex java --java "") - echo ./configure "$@" >&2 - ./configure "$@" || die - ${EPYTHON} scripts/mk_make.py || die -} - -src_compile() { - emake \ - --directory="build" \ - CXX=$(tc-getCXX) \ - LINK="$(tc-getCXX) ${LDFLAGS}" \ - LINK_FLAGS="${LDFLAGS}" - - use java && java-pkg-simple_src_compile -} - -src_install() { - dodir /usr/include/${PN} - insinto /usr/include/${PN} - doins src/api/z3*.h src/api/c++/z3*.h - dolib.so build/lib${PN}.so - dosym "/usr/$(get_libdir)/lib${PN}.so" \ - "/usr/$(get_libdir)/lib${PN}.so.${SO1}" \ - || die "Could not create /usr/$(get_libdir)/lib${PN}.so.${SO1} symlink" - dosym "/usr/$(get_libdir)/lib${PN}.so" \ - "/usr/$(get_libdir)/lib${PN}.so.${SOVER}" \ - || die "Could not create libz3.so soname symlink" - dobin build/z3 - - if use examples; then - insinto /usr/share/${PN} - doins -r examples - fi - - if use python; then - python_moduleinto "${PN}" - instpybind() { - python_domodule src/api/python/*.py - dosym "/usr/$(get_libdir)/lib${PN}.so" \ - "$(python_get_sitedir)/${PN}/lib${PN}.so" \ - || die "Could not create $(python_get_sitedir)/lib${PN}.so symlink for python module" - } - python_foreach_impl instpybind - fi - - use java && java-pkg-simple_src_install - - if use isabelle; then - ISABELLE_HOME="${ROOT}usr/share/Isabelle" - dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc" - cat <<- EOF >> "${S}/settings" || die - Z3_COMPONENT="\$COMPONENT" - Z3_HOME="${ROOT}usr/bin" - Z3_SOLVER="${ROOT}usr/bin/z3" - Z3_REMOTE_SOLVER="z3" - Z3_VERSION="${PV}" - Z3_INSTALLED="yes" - Z3_NON_COMMERCIAL="yes" - EOF - insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc" - doins "${S}/settings" - fi - - local DOCS=( "README" "RELEASE_NOTES" ) - use doc && einstalldocs -} - -pkg_postinst() { - if use isabelle; then - if [ -f "${ROOT}etc/isabelle/components" ]; then - if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then - sed -e "/contrib\/${PN}-[0-9.]*/d" \ - -i "${ROOT}etc/isabelle/components" - fi - cat <<- EOF >> "${ROOT}etc/isabelle/components" - contrib/${PN}-${PV} - EOF - fi - fi -} - -pkg_postrm() { - if use isabelle; then - if [ ! -f "${ROOT}usr/bin/Z3" ]; 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\/${PN}-${PV}/d" \ - -i "${ROOT}etc/isabelle/components" - fi - fi - fi -} diff --git a/sci-mathematics/z3/z3-4.5.0.ebuild b/sci-mathematics/z3/z3-4.5.0.ebuild deleted file mode 100644 index 5f19493a454..00000000000 --- a/sci-mathematics/z3/z3-4.5.0.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit flag-o-matic java-pkg-2 java-pkg-simple python-r1 toolchain-funcs - -DESCRIPTION="An efficient theorem prover" -HOMEPAGE="http://z3.codeplex.com/" -SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz" - -SLOT="0" -LICENSE="MIT" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples gmp isabelle java python" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - gmp? ( dev-libs/gmp:0 )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - java? ( >=virtual/jdk-1.8 )" - -S=${WORKDIR}/${PN}-${P} -JAVA_SRC_DIR=${S}/src/api/java - -SO1="0" -SO2="1" -SOVER="${SO1}.${SO2}" - -pkg_setup() { - python_setup - - if [[ ${MERGE_TYPE} != binary ]]; then - if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then - ewarn "Please use an openmp compatible compiler" - ewarn "like >gcc-4.2 with USE=openmp" - die "Openmp support missing in compiler" - fi - fi -} - -src_prepare() { - default - - sed \ - -e 's:-O3::g' \ - -e 's:-fomit-frame-pointer::' \ - -e 's:-msse2::g' \ - -e 's:-msse::g' \ - -e "/LINK_EXTRA_FLAGS/s:@LDFLAGS@:-lrt $(usex gmp -lgmp ""):g" \ - -e 's:t@\$:t\$:g' \ - -i scripts/*mk* || die - - sed \ - -e "s:SLIBEXTRAFLAGS = '':SLIBEXTRAFLAGS = '-Wl,-soname,lib${PN}.so.${SOVER}':" \ - -i scripts/mk_util.py || die - - sed -e 's:api\\html\\ml:api/html/ml:' \ - -e 's:python/z3.py:python/z3/z3.py:' \ - -i doc/mk_api_doc.py || die - - append-ldflags -fopenmp -} - -src_configure() { - local PYTHON_SITEDIR - python_export PYTHON_SITEDIR - export Z3_INSTALL_LIB_DIR="$(get_libdir)" - export Z3_INSTALL_INCLUDE_DIR="include/z3" - set -- \ - --pypkgdir="${PYTHON_SITEDIR}/${PN}" \ - --prefix="${ROOT}usr" \ - $(usex gmp --gmp "") \ - $(usex python --python "") \ - $(usex java --java "") - echo ./configure "$@" >&2 - # LANG=C to force external tools to output ascii text only - # otherwise configure crashes as: - # File "scripts/mk_make.py", line 21, in - # UnicodeEncodeError: 'ascii' codec can't encode characters in position 80-82: ordinal not in range(128) - LANG=C ./configure "$@" || die - echo ${EPYTHON} scripts/mk_make.py "$@" >&2 - LANG=C ${EPYTHON} scripts/mk_make.py || die -} - -src_compile() { - emake \ - --directory="build" \ - CXX=$(tc-getCXX) \ - LINK="$(tc-getCXX) ${LDFLAGS}" \ - LINK_FLAGS="${LDFLAGS}" - - use java && java-pkg-simple_src_compile - - if use doc; then - pushd doc || die - ${EPYTHON} mk_api_doc.py || die - popd || die - fi -} - -src_install() { - emake \ - --directory="build" \ - CXX=$(tc-getCXX) \ - LINK="$(tc-getCXX) ${LDFLAGS}" \ - LINK_FLAGS="${LDFLAGS}" \ - install DESTDIR="${D}" - - dosym "/usr/$(get_libdir)/lib${PN}.so" \ - "/usr/$(get_libdir)/lib${PN}.so.${SO1}" \ - || die "Could not create /usr/$(get_libdir)/lib${PN}.so.${SO1} symlink" - dosym "/usr/$(get_libdir)/lib${PN}.so" \ - "/usr/$(get_libdir)/lib${PN}.so.${SOVER}" \ - || die "Could not create libz3.so soname symlink" - - if use examples; then - insinto /usr/share/${PN} - doins -r examples - fi - - if use python; then - python_moduleinto "${PN}" - instpybind() { - python_domodule src/api/python/z3/*.py - dosym "/usr/$(get_libdir)/lib${PN}.so" \ - "$(python_get_sitedir)/${PN}/lib${PN}.so" \ - || die "Could not create $(python_get_sitedir)/lib${PN}.so symlink for python module" - } - python_foreach_impl instpybind - fi - - use java && java-pkg-simple_src_install - - if use isabelle; then - ISABELLE_HOME="${ROOT}usr/share/Isabelle" - dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc" - cat <<- EOF >> "${S}/settings" || die - Z3_COMPONENT="\$COMPONENT" - Z3_HOME="${ROOT}usr/bin" - Z3_SOLVER="${ROOT}usr/bin/z3" - Z3_REMOTE_SOLVER="z3" - Z3_VERSION="${PV}" - Z3_INSTALLED="yes" - Z3_NON_COMMERCIAL="yes" - EOF - insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc" - doins "${S}/settings" - fi - - local DOCS=( "README.md" "RELEASE_NOTES" ) - local HTML_DOCS=( "doc/api/html/." ) - use doc && einstalldocs -} - -pkg_postinst() { - if use isabelle; then - if [ -f "${ROOT}etc/isabelle/components" ]; then - if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then - sed -e "/contrib\/${PN}-[0-9.]*/d" \ - -i "${ROOT}etc/isabelle/components" - fi - cat <<- EOF >> "${ROOT}etc/isabelle/components" - contrib/${PN}-${PV} - EOF - fi - fi -} - -pkg_postrm() { - if use isabelle; then - if [ ! -f "${ROOT}usr/bin/Z3" ]; 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\/${PN}-${PV}/d" \ - -i "${ROOT}etc/isabelle/components" - fi - fi - fi -} diff --git a/sci-mathematics/z3/z3-4.8.5.ebuild b/sci-mathematics/z3/z3-4.8.5.ebuild deleted file mode 100644 index 655c7b28fe6..00000000000 --- a/sci-mathematics/z3/z3-4.8.5.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) - -inherit cmake-multilib python-single-r1 toolchain-funcs - -DESCRIPTION="An efficient theorem prover" -HOMEPAGE="https://github.com/Z3Prover/z3/" -SRC_URI="https://github.com/Z3Prover/z3/archive/${P^}.tar.gz" - -SLOT="0/4.8" -LICENSE="MIT" -KEYWORDS="amd64 arm arm64 ppc64 x86" -IUSE="doc examples gmp isabelle java openmp python" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - gmp? ( dev-libs/gmp:0=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - java? ( >=virtual/jdk-1.8 )" - -S=${WORKDIR}/${PN}-${P^} - -CMAKE_BUILD_TYPE=RelWithDebInfo - -pkg_setup() { - python_setup - - if [[ ${MERGE_TYPE} != binary ]]; then - if use openmp && ! tc-has-openmp; then - ewarn "Please use an openmp compatible compiler" - ewarn "like >gcc-4.2 with USE=openmp" - die "Openmp support missing in compiler" - fi - fi -} - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}" - -DUSE_LIB_GMP=$(usex gmp) - -DUSE_OPENMP=$(usex openmp) - -DENABLE_EXAMPLE_TARGETS=OFF - -DBUILD_DOCUMENTATION=$(multilib_native_usex doc) - -DBUILD_PYTHON_BINDINGS=$(multilib_native_usex python) - -DBUILD_JAVA_BINDINGS=$(multilib_native_usex java) - ) - - cmake-utils_src_configure -} - -multilib_src_test() { - cmake-utils_src_make 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 -}