6 files changed, 142 insertions, 9 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 16d22d37ff27..1b623148fb84 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/form/Manifest b/sci-mathematics/form/Manifest
index a28fd3bba62c..43beb9c706cd 100644
--- a/sci-mathematics/form/Manifest
+++ b/sci-mathematics/form/Manifest
@@ -1,5 +1,7 @@
+AUX 64form-gentoo.el 196 BLAKE2B c0c02c02c5292317f9303ae70f084031e5933582f6635a593e50db9332778295cc35a0fbef7bc6a9b9a6ebea469c50b714e6a3de23b27351884382ed180665f7 SHA512 dc6fa5d675ffc2cfe1289815f27610fc01923d16804bbf66287896f21afec496ba534df4fc569505b0deeda477ef46035fe2353c4e491c2e90c0f9d4e79a0b38
 DIST form-4.2.1.tar.gz 1444257 BLAKE2B 27ac9ee1412e6f478324b170e37e6e31822b74f902a5739d5fa00558aa4c9f7a977bd5fe3d6982313f1232a774c592d44af07fec8a290266c31bf3a100e87d1a SHA512 5569ae3e487194b0d082f4a032fb4b8d57238218d92d9b04d5f51db2a73e065eb1efdc26011bda46723e902fa3f324010ca2f8e91ba9a077e87b0a07b40cf594
 DIST form-4.3.0.tar.gz 1457721 BLAKE2B 029c62b0e1d92cf66be0290e45467e9de47f8ac9a593e7d012c13d877fb84aa1a212bb99b7a1a7b8b5b04c4cb056b58da80812faf5f0af5d33629c7632768ae6 SHA512 3f7f9cabf37d33fce0dcb7e091ac5ce60412ebe840fcea432655ab7f0c86c620200d60df085af3011d92d8057d9501583f16686257e5d097f6d0571d7f1b6742
+DIST form-mode.el.gz 6657 BLAKE2B 41d014e4ca8036249d53f5361012095e2ed2ef5e43543ba809a058f0ed241bd3ec984d9b61ab13a5b447faf07decf4e696362f24cacea3af5870cccdf43b1415 SHA512 aa81cc9c45a90af982179d56b874de0d152538653242ea028450675ab8421df2e0d53988c7efa3527845dae145c8047b71574191eedd90511fa89ad812851e25
 EBUILD form-4.2.1.ebuild 1746 BLAKE2B 571d9e4b9903bed7104ce42acbfb28d905d904e64d06c20de432f187fc9d6808f1d7b5e171cbe51b3e187bf40b3cccdfb2b8eeaeeeb9055854347122f45de782 SHA512 a659fc5b39b04562dce5a3fc2c9cb507fc209abb3b6009bdd8787ac547a3d14e3a0e6998489d3fbfee057458d9af6ae8de33df3f938e930a8e6bd1bd711b640e
-EBUILD form-4.3.0.ebuild 1746 BLAKE2B f8238b4ac53b22964f14f69392631bdcca8938418250f100779e712fe9b4b1f106d73bb643adc1b0de4708698fe80b35f586898f1cfbe6ef05f775665f98f229 SHA512 e00b9602de863f8ba6b91b3d06a5b08550f68d741c7a9cf78705b6878c80ce2d2b0a0490f20d32589ff6a9e75a15f514c75f6c2b4670a01d3fc10fd913bbf985
+EBUILD form-4.3.0-r1.ebuild 2174 BLAKE2B 503588f0c73a606b089e1208eca99e2d9fe3f131f5fa11d23fb37fae01bd3b3a3c6b0f8c5405ec3060cba607955fc9cdc06b7049521e0b8932570dc5ac8afc81 SHA512 68173b4ba583d540dfbfc1b57a79119bef6950a1f82bbb05e640f8db28440d73b5d54df1e188ad389aad1bb6f80dc2591af1cc27488a9436a38a4274574719bd
 MISC metadata.xml 515 BLAKE2B 9305198d106c3faefa094554d1b58ba3dc639b653d9db90d58784c6e7ab21188073c3e0e4d0671e6431451544c42e349af81c74a88f4e6022f5697c8fb39f13e SHA512 821c33a7f95b17c2c55799cf3973edc1180d3c0260f85658393f7552b6c2b8beea2ccf80008df61d236ba704b90e7bb943089d6d2f5830d22c3e69b2c168c9f1
diff --git a/sci-mathematics/form/files/64form-gentoo.el b/sci-mathematics/form/files/64form-gentoo.el
new file mode 100644
index 000000000000..e9da182fec15
--- /dev/null
+++ b/sci-mathematics/form/files/64form-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; form site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'auto-mode-alist '("\\.frm\\'" . form-mode))
+(autoload 'form-mode "form-mode" "Major mode for form files." t)
diff --git a/sci-mathematics/form/form-4.3.0.ebuild b/sci-mathematics/form/form-4.3.0-r1.ebuild
index 42e130cd9849..abdbf0481b5f 100644
--- a/sci-mathematics/form/form-4.3.0.ebuild
+++ b/sci-mathematics/form/form-4.3.0-r1.ebuild
@@ -3,25 +3,29 @@
 
 EAPI=8
 
-inherit autotools toolchain-funcs
+inherit autotools toolchain-funcs elisp-common
 
 DESCRIPTION="Symbolic Manipulation System"
 HOMEPAGE="https://www.nikhef.nl/~form/ https://github.com/vermaseren/form/"
-SRC_URI="https://github.com/vermaseren/${PN}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/vermaseren/${PN}/releases/download/v${PV}/${P}.tar.gz
+	emacs? ( https://dev.gentoo.org/~grozin/form-mode.el.gz )"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="devref doc doxygen gmp mpi threads zlib"
+IUSE="devref doc doxygen emacs gmp mpi threads zlib"
 
 RDEPEND="
 	gmp? ( dev-libs/gmp:0= )
 	mpi? ( virtual/mpi )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
-	devref? ( dev-texlive/texlive-latex )
-	doc? ( dev-texlive/texlive-latex )
-	doxygen? ( app-doc/doxygen )"
+	devref? ( dev-texlive/texlive-latexrecommended )
+	doc? ( dev-texlive/texlive-latexrecommended )
+	doxygen? ( app-doc/doxygen )
+	emacs? ( app-editors/emacs:* )"
+
+SITEFILE="64${PN}-gentoo.el"
 
 src_prepare() {
 	default
@@ -51,12 +55,12 @@ src_compile() {
 	default
 	if use devref; then
 		pushd doc/devref > /dev/null || die "doc/devref does not exist"
-		LANG=C emake pdf
+		LANG=C VARTEXFONTS="${T}/fonts" emake pdf
 		popd > /dev/null
 	fi
 	if use doc; then
 		pushd doc/manual > /dev/null || die "doc/manual does not exist"
-		LANG=C emake pdf
+		LANG=C VARTEXFONTS="${T}/fonts" emake pdf
 		popd > /dev/null
 	fi
 	if use doxygen; then
@@ -78,4 +82,16 @@ src_install() {
 		docinto html
 		dodoc -r doc/doxygen/html/.
 	fi
+	if use emacs; then
+		elisp-install ${PN} "${WORKDIR}"/*.el
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 9aed3e426a33..ee4e7853a70e 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,5 @@
 DIST z3-4.11.2.tar.gz 5428273 BLAKE2B 85fe5b94c5bfaeaca5b1dfe42fe9763a278c414955a9aed45abbb3e60c366a86bcdcd7c3bdcf27cc67bc10c76700069d548cb1e27ccf3286c8c6eccfa9d492d1 SHA512 be2573d38c0e50b46fcb025d50335e016769fdeab3c26f5dc2a13102fae889d23039258ea8d38de3f53daa4cf073704d8639ac291e781a74633194adedaae21a
+DIST z3-4.12.0.tar.gz 5468532 BLAKE2B 229e8fb19cfb377f3ec9a728254c913a582ee16cfafaa8eb66683df01fc8320b527e493fe692fa85029360f6065d5a068ccbf337cdaf4b8f492ac8a2c3674063 SHA512 53a51c8304fa4356d13293f68b14d9d9eef57a0771c6698d38aea5fac62c4e52c41ff003cb6d771a32645d2aa4ef59be5f792f2efbee927d06ac8280094976e5
 EBUILD z3-4.11.2.ebuild 2598 BLAKE2B 11ed8b0481fd1b020907a8dfa31b23210a292d5f9fda1c472709138686f9c072b7ad3392849d7e4b18e3ea69b778c97579099cb738ca0e7dcece73a0ecaed94a SHA512 fd0e47c7015b77c7fe8d9256b94ef5508e97e3d0d4f8eb20ad4932614829b73221af30841d521a32d50ab341c39dcdec07a27ebe3c968c227d75a4769b254a24
+EBUILD z3-4.12.0.ebuild 2604 BLAKE2B b19844adc8eb2155fe1b203a3bcae36b339033a9771b0685f709d0e1695e2a537adb54dcdc3afaa03259c9dfb91b20fd4511a957dea9a46d6c1ebf20e939dd84 SHA512 de65594b85e908e228a8f3f69d1da65201e8509623d93597516593b8bd5ffd70948af3245bbe0ace3c7516c861f7676efce0dff97c19839e9df0180f5da2af7a
 MISC metadata.xml 1800 BLAKE2B 26b4fd829e8daf66cfb19f61afffe9535099260732b3856c400881e68dbc4c2ffe88ff57f3a23449a2259696f23969c6502d4f3432b9cafc2e89e99167c94b90 SHA512 92f05bb1617630c16801ae5ea4215436c4d5dde6890d1a9e90c81f8ce1cddf101b73e016d1ec67eb41ccb4b59753547e6d08ac6a70a5b2d3dc792dc9fba13166
diff --git a/sci-mathematics/z3/z3-4.12.0.ebuild b/sci-mathematics/z3/z3-4.12.0.ebuild
new file mode 100644
index 000000000000..56bcff6924d7
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.12.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+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
+
+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
+}