gentoo resync : 15.12.2019

6 files changed, 3 insertions, 498 deletions

diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 9598008f8121..8bf53b70953e 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,10 +1,3 @@
-AUX z3-4.4.1-gcc-6.patch 668 BLAKE2B d6d87a3f8204f04359b2843e6988b9ac2c13df9fae5d15ad0309848d98d2b909599f41fb157cb60efa43ec1179952f157cf78f3d7b1c7b5491b640868af7b212 SHA512 2efd883026643f365141665f257a863c6b22ad30327db82ad03719d33abfd58bc681cf4c9db9145098584817e57e59f7b1fe90a5390e72a49bce66cd23481f7f
-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
-EBUILD z3-4.4.1.ebuild 4306 BLAKE2B 7e81603d96667c8e5748467668615f07a9e2194be963b67ae94eb90b29252d7fb53be373df21efbbea007aa8671609f2199fcb8a5f866b1f284228ad0d6e9d00 SHA512 1a370b019b33e83d5984b6abf321b39ff25f3b633ca60b2c48ddf9e33b30252389b5cb6f2e34e0dc1103730c9e5bf60ac688d67914d9c5dae52cf5fc5354620c
-EBUILD z3-4.5.0.ebuild 4721 BLAKE2B 8d0dab01c8c06bb07462bb51311520bb9f600b64ab43dd1ad5975c39554416d1a019665d30079535f5e20cefa5d65c6e6eb7140fd2ebc90cd2c363e9c732421c SHA512 e52d01917d884d10c24bf081303bdef7b1efa3b042f838ebc7de678a473fdd01d7738a216c9e14c4929b847fe7e5c3abe7a92bdafc827a1c1aa54b86abe46664
-EBUILD z3-4.8.5.ebuild 2638 BLAKE2B 2f9f25e652ab0eb24a7d254478d1ad36ad5b08cf1fbd742f90f132a939cc62cd74b38f60ee76246a4714041848cab487bd9464708cff7e4793dd295c8d7c5346 SHA512 733f387ae61a3de6e582844e6d49b329e19e3aa4ec193867acbc2220f8a1432fc566f103641967f76693f42b9e33b0097a6a7b0a36296c5d03b59e19a0335bba
-EBUILD z3-4.8.6.ebuild 2342 BLAKE2B 41f06a28720f4e277bb2baab64874c8b50df603a414be87ae1b260f7e344899664878e4db12fcf6da013ed64d0e2c4a98c072782c5056d3049a62eded391877a SHA512 ed360f44d8e79c0b92e442c2352c910da87a619a1ed16b6d83874cb283e090dc4e7ea5ebcfa273224aa09edeb8846cfde3f062983938d52c271303a5f2292d5d
+EBUILD z3-4.8.6.ebuild 2339 BLAKE2B de6532630288a2fd70f3d8ed47ee61b627bff96e26779a03f213ef868bb47c04fbaa62e30741fe31c7204e894c44166b1ecd4198d858b2b16088005b5da5242d SHA512 d0f9ef9fc1359830a495c679a6404f87bb7a0f377b9c740d4648a093d1ea731d9a434149ee5f5f6ca5410a52afc8f12e3d55045636788d38c8b1eaabf90a729e
 MISC metadata.xml 862 BLAKE2B 1d219fcfb0772a48ec398a51b8916748db336730b91b66e336e8df0b8522b9a47df718d6303aff5f305b699e9297aaad9b352c69d529a93f66cf2a1b76c8f094 SHA512 2a5cc11ae87199a23c72ffb7366c65cbb33683bb6ad142d1df84a65b56bd69f50907bca69f066a1c860947254c241089521c026bac9ff92bd405038c266907ef
diff --git a/sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch b/sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch
deleted file mode 100644
index 2dc0ddd12f26..000000000000
--- a/sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/util/debug.cpp b/src/util/debug.cpp
-index 54c67fe..66676c6 100644
---- a/src/util/debug.cpp
-+++ b/src/util/debug.cpp
-@@ -78,3 +78,3 @@ void invoke_gdb() {
-         char result;
--        bool ok = (std::cin >> result);
-+        bool ok = bool(std::cin >> result);
-         if (!ok) exit(ERR_INTERNAL_FATAL); // happens if std::cin is eof or unattached.
-diff --git a/src/util/mpz.cpp b/src/util/mpz.cpp
-index 8559279..7dca14b 100644
---- a/src/util/mpz.cpp
-+++ b/src/util/mpz.cpp
-@@ -136,3 +136,3 @@ mpz_manager<SYNCH>::mpz_manager():
-     mpz one(1);
--    set(m_two64, UINT64_MAX);
-+    set(m_two64, (uint64)UINT64_MAX);
-     add(m_two64, one, m_two64);
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 8fd027f17feb..000000000000
--- 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 5f19493a454c..000000000000
--- 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 <module>
-	#    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 655c7b28fe6a..000000000000
--- 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
-}
diff --git a/sci-mathematics/z3/z3-4.8.6.ebuild b/sci-mathematics/z3/z3-4.8.6.ebuild
index 67b683d00d7f..5845b66caf22 100644
--- a/sci-mathematics/z3/z3-4.8.6.ebuild
+++ b/sci-mathematics/z3/z3-4.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
 
 inherit cmake-multilib python-single-r1 toolchain-funcs
 
@@ -14,7 +14,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"