7 files changed, 136 insertions, 1 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 40c659edc05e..5bba8c40e011 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/coq-serapi/Manifest b/sci-mathematics/coq-serapi/Manifest
index 38e2d4a2e925..d98c43303d8b 100644
--- a/sci-mathematics/coq-serapi/Manifest
+++ b/sci-mathematics/coq-serapi/Manifest
@@ -1,5 +1,8 @@
 AUX 50sertop-gentoo.el 85 BLAKE2B d06e7c0823a3bedbf5f9c91ea8ea26bc9ed9d2ea44030316a1f3d65c19e51d874f03c845af5ae8237a9562cff7c81e24196c5ae29e54d79d1ba322f51904ba5d SHA512 42e61d798800d2e4c7e0702bdff53401a06ff6def54a1c7c0a8a6fd3e6a2f502c48bc84a04356818aa2ec5241bdd63b407837df123bfad76fafb78cf8a5a6cca
+AUX coq-serapi-0.19.0-sertop-el.patch 303 BLAKE2B 106d44d3dc7e0e6400861382e582734111a2e64ab018d78722214d2858a0449e9f519fc7119893a78615e2d9afb5f481446141714a6f288cda6236f0d1156b01 SHA512 038508239e54194ff70207611c517c5f46ecb323f0492c3cd901492bc717995753dea6dd003228de7d2ccde2aaf8d87033cb5fd4271fd6f1504a00ea7de0eb82
 AUX coq-serapi-sertop.el-path.patch 319 BLAKE2B 272eca8af934e10e978d149f90ee702fba443db7506468dda344242c5fe8a336f3ba3836c536bfac9ec6e540e1ee2f4c1a031d69e42901fbea92441b64e4c2a5 SHA512 5d228659e7c07e8fae69ffbff9d6a9de3113aa444c467194ce9e238a0db86c59c2be45b3e14683e47c2453c701b869e53647c9b051652af5ced8f4b3b5a15e73
 DIST coq-serapi-0.18.1.tar.gz 275040 BLAKE2B 9224505da004ff54c3d21c394e6049b5e15b91c3531cd0d80aae89ee6ce9e92bb626a43fdef8fad58fea4d017b3ed3f13d5d1735e7cfc1ae3bcebed2c70ce332 SHA512 a8eca10734a5b1aa5c6a890998f18d673050ca1e975b5e88643176bfd627b4c0d05cf0be1b75ccfd155b9e74f357ee61bf8225fd144b6a624a3bdd359396428c
+DIST coq-serapi-0.19.0.tar.gz 180779 BLAKE2B 27083a851139e983158b4cb251d37971d0eec61dd91303a0d09512e690c56a75624dab8c5120eebaed1e7bb168d0b2b889d538854812506c4d0a804f7bee7423 SHA512 e01706beb957315011682f2f74448e66c7a8a077418eeaf7d3fa21414bdf88950b75adbfe2392656e4d6036ce6585d4d53b1dadfd8379249b2943ea389c9c83e
 EBUILD coq-serapi-0.18.1.ebuild 1494 BLAKE2B 75d3ef68924782674d04ec8aacd8426a6d9715b868d1288ce71c6550aeb98b212c98ef4c454964c9f2031c5016eddca1cedb43fb9695a97bfbd250ef97126113 SHA512 252dd29a108ce468badff4beb35ac2697fa4eb7480184a37316eb4561f5c4330c023d0f95e5f384a98c612cb826a320c4b2bd1a21480d9728f168585c76e6b31
+EBUILD coq-serapi-0.19.0.ebuild 1506 BLAKE2B 3d4fa121e18fce87c36d18c07fb74e3b476923f70297a9379ec33cf8226c784ed701de068d73739437fed6efc669f49ee71efcb869d7f249fa97b70df4f78f25 SHA512 d7b63c62d34855d298f6129dff53ca46bb805a0714719111d95611bc39d6c2db77db9d0404edc50145ae14beebe53a7acd214be42ba62720c8e3d6d2d78bf818
 MISC metadata.xml 935 BLAKE2B e1444df414ce499df466597f5e0949e8ebf2d6da23d77028546324109659f58c5f0284a315ea062410a2f2e4631aac8d3564664719e89d76ad6ded9bb8ba7a5f SHA512 172fedbb2aa42e2be9aff426d64fcd69d2dfa206bb0e6072c6ecdc14a1923a2f0676303d8d8aebfe9a3e96e0a1e89185d2d4952bdb9ba1fff44b3891f26d6bf7
diff --git a/sci-mathematics/coq-serapi/coq-serapi-0.19.0.ebuild b/sci-mathematics/coq-serapi/coq-serapi-0.19.0.ebuild
new file mode 100644
index 000000000000..ed213e2d76e6
--- /dev/null
+++ b/sci-mathematics/coq-serapi/coq-serapi-0.19.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COQ_MIN_V=8.19.0
+COQ_MAX_V=8.20.0
+
+inherit dune elisp-common
+
+DESCRIPTION="Serialization library and protocol for interaction with the Coq proof assistant"
+HOMEPAGE="https://github.com/ejgallego/coq-serapi/"
+
+# The tarball in SRC_URI is comprised of <supported coq>+<package version>
+SRC_URI="https://github.com/ejgallego/${PN}/archive/${COQ_MIN_V}+${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COQ_MIN_V}-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=sci-mathematics/coq-${COQ_MIN_V}:= <sci-mathematics/coq-${COQ_MAX_V}:=
+	>=dev-ml/ppx_sexp_conv-0.13.0:=
+	dev-ml/cmdliner:=
+	dev-ml/ppx_compare:=
+	dev-ml/ppx_deriving:=
+	dev-ml/ppx_deriving_yojson:=
+	dev-ml/ppx_hash:=
+	dev-ml/ppx_import:=
+	dev-ml/sexplib:=
+	dev-ml/yojson:=
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	emacs? (
+		>=app-editors/emacs-23.1:*
+	)
+	test? (
+		sci-mathematics/coq-mathcomp
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.19.0-sertop-el.patch" )
+
+SITEFILE="50sertop-gentoo.el"
+
+src_compile() {
+	dune_src_compile
+
+	use emacs && elisp-compile sertop/*.el
+}
+
+src_install() {
+	dune_src_install
+
+	rm -r "${ED}/usr/share/emacs" || die
+
+	if use emacs ; then
+		elisp-install "${PN}" sertop/*.el{,c}
+		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/coq-serapi/files/coq-serapi-0.19.0-sertop-el.patch b/sci-mathematics/coq-serapi/files/coq-serapi-0.19.0-sertop-el.patch
new file mode 100644
index 000000000000..b6aa6c1784ca
--- /dev/null
+++ b/sci-mathematics/coq-serapi/files/coq-serapi-0.19.0-sertop-el.patch
@@ -0,0 +1,11 @@
+--- a/sertop/sertop.el
++++ b/sertop/sertop.el
+@@ -37,7 +37,7 @@
+                            (buffer-file-name))))
+ 
+ (defvar sertop-executable-path
+-  (or (expand-file-name "sertop.native" sertop--root)
++  (or (executable-find "sertop.native")
+       (executable-find "sertop"))
+   "Path to sertop.")
+ 
diff --git a/sci-mathematics/gap/Manifest b/sci-mathematics/gap/Manifest
index 21b9346c0594..4959caba2d86 100644
--- a/sci-mathematics/gap/Manifest
+++ b/sci-mathematics/gap/Manifest
@@ -1,3 +1,4 @@
+AUX gap-4.12.2-cc-and-cxx-for-gac.patch 1677 BLAKE2B 4a6a4b0d8b62b7ffdb0da2ba683439dde1ed80d3a3e74f92f5a46098619a13f755bd5b7d024a14541d2cc0f65ccb3677f18719c14972741ea347a7ce35c9ac42 SHA512 f8a48975777db8e09d31350a2688eb621cd27869c61c52fd99b6b6991f7a695e3e43b80277ebb6b4466dbf6de7b0bc05b3dfa8497aaba114763b4315c5d99414
 DIST gap-4.12.2-core.tar.gz 37671069 BLAKE2B 7e2c35f0bb232fc5478ff09e98b9c4d021ee5df775f2ff4934b27f871c18a3781386c24b94f1255517c4193c1eb9ff6396ea70e8d6cf72ccbb5480ca837ef8eb SHA512 d16af2648b0a655df7ce28cf8e2c6b3d0e33eda806674844a9813b4cb5068b137005225c02b8651a25b608e9b76a184f54f2e291a957a4675c38a7883ef83a38
-EBUILD gap-4.12.2-r3.ebuild 4237 BLAKE2B a5742d700d7aa5ac217e240160deb77323f0da79e4399b86cbe6cde3d9e2c040f040430947b647422bd9c0ce3ec8d9ae9bd70aec5331629dcc5a8a2c5484b340 SHA512 42a6f2ab3a0f2f833b8a2cb6efaef8a477d2ff40bf7781d4bbca3719461e366e250654b4ad865853d69d287791ac376ccae1fa1a4044ce8a947a911c05d1aa33
+EBUILD gap-4.12.2-r4.ebuild 4294 BLAKE2B 4e5783b052809638768188569f5236ec96832bba1dc009937a61a8b8c53fb16264079bf717a3ddcd6ae42ba4e4d09a9ad36a8ec80ef7f2c7526e96cef967da7a SHA512 0f593ff8c3bec90982048d879738bc6d08a833f938ac4cd4476bb193ebf68a8e07b752958e14d093b13225978a8e29bf164d98d16d58045cdc3daa818e352811
 MISC metadata.xml 1582 BLAKE2B 9151244f139b0d675e327731c336c41d5d69c25856286c182944d57255fbb6d7b1f023195b3a01c829ff6f3ea1d5e6eb6edbcc796a30120deacde82b90b5f39c SHA512 f4490e9b13cee6604f14df39ea048d7578e080a8faa97b0bb22191a7dce56904416870ed64c289f91526087009f7488e8baed4e531c78f50a5b917e9e1684ce2
diff --git a/sci-mathematics/gap/files/gap-4.12.2-cc-and-cxx-for-gac.patch b/sci-mathematics/gap/files/gap-4.12.2-cc-and-cxx-for-gac.patch
new file mode 100644
index 000000000000..cfdfb4ac8a11
--- /dev/null
+++ b/sci-mathematics/gap/files/gap-4.12.2-cc-and-cxx-for-gac.patch
@@ -0,0 +1,42 @@
+From 2933af2d8a986430a4fcf2ab4d577e5bb049662a Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Fri, 2 Feb 2024 18:14:59 -0500
+Subject: [PATCH] cnf/gac.in: respect $CC and $CXX if they're non-null
+
+This allows the user to override the stored C and C++ compilers
+(typically obtained from sysinfo.gap) if desired. This is especially
+useful on rolling release and/or source-based distributions where the
+"current" compiler can change frequently and without user interaction.
+
+Closes: https://github.com/gap-system/gap/issues/5606
+---
+ cnf/gac.in | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/cnf/gac.in b/cnf/gac.in
+index 1faafba820..3a9fc6eb16 100644
+--- a/cnf/gac.in
++++ b/cnf/gac.in
+@@ -63,6 +63,22 @@ GAP_CFLAGS="${GAP_CFLAGS} ${GAC_CFLAGS}"
+ GAP_CXXFLAGS="${GAP_CXXFLAGS} ${GAC_CFLAGS}"
+ GAP_LDFLAGS="${GAP_LDFLAGS} ${GAC_LDFLAGS}"
+ 
++# Using the stored C/C++ compilers from sysinfo.gap is sometimes
++# undesirable. For example, if the compiler suite is upgraded or
++# downgraded, the particular executable used to build GAP itself may
++# no longer exist. The CC and CXX environment variables provide a
++# somewhat standard way for the user to indicate which compilers he
++# would like to use. So if those are set, we prefer them to the stored
++# values. This allows people who know what they are doing to override
++# the default behavior, while keeping the defaults safe for normal
++# people.
++if test -n "${CC}"; then
++    c_compiler="${CC}"
++    c_dyn_linker="${CC}"
++fi
++if test -n "${CXX}"; then
++    cxx_compiler="${CXX}"
++fi
+ 
+ # is output going to a terminal?
+ if test -t 1 && command -v tput >/dev/null 2>&1 ; then
diff --git a/sci-mathematics/gap/gap-4.12.2-r3.ebuild b/sci-mathematics/gap/gap-4.12.2-r4.ebuild
index d44da14dfd8a..f9f41bafaaab 100644
--- a/sci-mathematics/gap/gap-4.12.2-r3.ebuild
+++ b/sci-mathematics/gap/gap-4.12.2-r4.ebuild
@@ -62,6 +62,8 @@ RDEPEND="${DEPEND}"
 # packages, use package.provided.
 PDEPEND="${REQUIRED_PKGS} !minimal? ( ${AUTOLOADED_PKGS} )"
 
+PATCHES=( "${FILESDIR}/${P}-cc-and-cxx-for-gac.patch" )
+
 pkg_setup() {
 	if use valgrind; then
 		elog "If you enable the use of valgrind during building"