4 files changed, 183 insertions, 0 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 2b1defd6c1c4..3892f9a2d8b0 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 333e63554d95..bfd0a1614153 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,10 +1,12 @@
 AUX mono-5.12-try-catch.patch 1267 BLAKE2B e33836d53fd4c9a4e64614d3f309058b2009487a853aee48fae99cd0326095b6dc26e7fbdd178e25f9fc3901f74f937ce5e9d3bb4322ca50e139d13f66c209a5 SHA512 3a82d4bed31b212e23fe24647fc5b9c4788be5f4966377a3bef9f92a51d16181e77e19ca1ec4736792da6a18206986bbb54d967499e2ca7e224201cf811f91b5
 AUX mono-6.12.0.122-disable-automagic-ccache.patch 513 BLAKE2B ca0f3f1b2d9f3357f8e5197acdb18c3f02a9e09d90140fec133e20edaf960e74a4bd4949b453d79c656c3314fa720e94794b91a748469ca91abf78c8ca0bb8c6 SHA512 5e97c420272644f0636dcee2baf49cfc91d055c42990197c1c2724358e6847cf4866f22c247d4930ad7b780037c252970c3c3baae7641794ed8f50ff6456f23e
+AUX mono-6.12.0.199-configure-c99.patch 1464 BLAKE2B 2123b6c51c47578c6ab574d82debe381af8b8bfebf3ffa1724fd72cc6a620040a4612febbba61a52bbe80f4850569b919f08e3e820ebb283451610cc52f96c9d SHA512 b7e2cd76880a4dba829cc554d6f1d3444edce953efec17f14ccbc5a49f2727205d54bfadba5a680814087d0a070e200288ab5bf2ad418ed6d4317d06fbde0259
 DIST mono-6.12.0.122.tar.xz 292266176 BLAKE2B 07043c5fbca33edf64ebca0392b47af9b9ab502be772efb5afbe5ec9e8683b7f4e96a305ee906dff617842bdba2819c2abc130d7aff23b12779f403bbd88f3bd SHA512 0fbd4147498cc81e384933147eb6aa5c559d17a794a308af7ffa43dce51e0faefde24fc75e987ed804dcb161b52756944bc3611100fc0a4adcc260ca97ddaecd
 DIST mono-6.12.0.182.tar.xz 303230932 BLAKE2B fc959e1d57d91670e8adf8ab64d3c0f16b7291f6a70d191b4401bf42a6bd35a7ac23b1aa5d2ed5cda833f29204bd56d800910320169941283cab52a1cb79ef30 SHA512 5f0f02f2adf89785af8f620c16d69fc97b87c9b39133286e6f1237a397f4842ea8d26802d9f802f8798a86540dc1bc3b5201428f218c78fbcf91f0d575cde512
 DIST mono-6.12.0.199.tar.xz 304146664 BLAKE2B a38f0f1b80b300132247cee4621fc59bd65845c919ccd0cc55e00928b8a1b85b0695a9bb436c3efc0afd4e7dfa001714485964cf44239bb7c438ca6ed818dabf SHA512 9e379aaeb2e8750edbda74648c0ae9cc8cb9b2d7af85512bf2e729132c2e0322e776ef0b7657da708cbc1ae2a62f5532519d339fa68f465b30a65ca30d4a1e51
 EBUILD mono-6.12.0.122.ebuild 3526 BLAKE2B 2333187c97e31a5e09056f123abd5ca984ae5888e842a980a68df5fc0ea2cd2d6ead3b3dcfe29067a3ea25481e0c1c728af8f0485c4ad2e6b0e68248639f346c SHA512 dd998ddb53d65672670c0feb9bab1a96431f5bf7c1791ada827bad6cb0e69c9fa4ea378eea92bf9a87c646716768dbac722bfc1b026be569657c69d949b6f69e
 EBUILD mono-6.12.0.182.ebuild 3518 BLAKE2B eaee6daf89ed51614ce54e1756ba34b0a134e1fd1c3ee3cb7a4243f0cdd778fe836e91d5d03c53b2ac6b9f7bc49c17a5905e8d4ca01f845af941a556353e2b4b SHA512 c5a63ad68c5fa90e12aa0af1a07624f975ad73e928c6249331d9f2d64f9c1921093fb7d774e006d5a1e75ffe6d3591de0331c962b02e0f99c25b8495a7fa5602
 EBUILD mono-6.12.0.199-r1.ebuild 3597 BLAKE2B fd5aea9135969ff2e168563d4d4fcdad564071909f471b89b32d24526e515f20ae8259d2e88eef4797751eb9cb35e1c6b8586747ea0ccf0a7b5d5445b1438531 SHA512 4b21200d90321ebb4d8678d84f70a731d9a4f428114ceec8b9fd364587524b1dd833ba181391cf3870dd41c5f5174faafcd222ba3fce45ae5a2b3665f18a9472
+EBUILD mono-6.12.0.199-r2.ebuild 3649 BLAKE2B f69c6bce3dcde37778333afd955b8ec89a233e346ba4c25c00df1e142565b5e5f956a2d674cdd26b3d932f07c8b7ab61c7d09e1b44725529cb94dd803ab8acec SHA512 fcbf36ce3876caf9c532d64bc735c72989119972b94a481a39bf5f750ff791db104d397bd93186fcaec141ae055a542d95860840160022b063cea8dd4b4dc4c9
 EBUILD mono-6.12.0.199.ebuild 3520 BLAKE2B bb714e5df2f8d45736e06247e0954f85d1da2e1a620212085421ce55f752144696e619917b5fe87a724e2cd08fb96e7b5cc4438acd379a47a95817b073e48c9a SHA512 ae93c91462f48ed49fc73c7af2580c9c6d8a0588520458d213c3ff2ac69cb7495b5f04fbc15666909a5bc60e92d6aa206cd9d6b88e98e521b6754ab96dfc36b4
 MISC metadata.xml 643 BLAKE2B f0fd2de7a1abf76c572f13550e6b6f82d03d66c016cf9be691710d5e8057c164dc3cf3e73d271ecfa64ccc80f0993c913d7806d1dab542ca935ed524b0e9d9a4 SHA512 8be588953da57d228d46281674f9f1e20ae5a9d382e5a5c4251263308a619f18a26f086761c538e375d18b01985dbcc79a0e28e92268ff6da194ff519d00dfd6
diff --git a/dev-lang/mono/files/mono-6.12.0.199-configure-c99.patch b/dev-lang/mono/files/mono-6.12.0.199-configure-c99.patch
new file mode 100644
index 000000000000..3018dbe8339c
--- /dev/null
+++ b/dev-lang/mono/files/mono-6.12.0.199-configure-c99.patch
@@ -0,0 +1,51 @@
+https://github.com/mono/mono/pull/21730
+
+From 90315aa24569d13da93230ac2d3e5ec3c96f35b4 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Sat, 9 Dec 2023 00:06:09 +0100
+Subject: [PATCH] configure: Fix type errors in __thread test
+
+The thread start routine must return void *, and int and void *
+are distinct types.  Compilers increasingly issue errors instead
+of warnings for such type errors, and this causes the configure
+probe to fail unconditionally, even if the system supports
+__thread variables.
+---
+ configure.ac | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index dbc4904d9b2e4..7518439118e37 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2831,14 +2831,16 @@ if test x$host_win32 = xno; then
+ 			__thread int i;
+ 			static int res1, res2;
+ 
+-			void thread_main (void *arg)
++			void *thread_main (void *parg)
+ 			{
++				int arg = *(int *)parg;
+ 				i = arg;
+ 				sleep (1);
+ 				if (arg == 1)
+ 					res1 = (i == arg);
+ 				else
+ 					res2 = (i == arg);
++				return NULL;
+ 			}
+ 
+ 			int main () {
+@@ -2846,8 +2848,10 @@ if test x$host_win32 = xno; then
+ 
+ 				i = 5;
+ 
+-				pthread_create (&t1, NULL, thread_main, 1);
+-				pthread_create (&t2, NULL, thread_main, 2);
++				int one = 1;
++				pthread_create (&t1, NULL, thread_main, &one);
++				int two = 2;
++				pthread_create (&t2, NULL, thread_main, &two);
+ 
+ 				pthread_join (t1, NULL);
+ 				pthread_join (t2, NULL);
diff --git a/dev-lang/mono/mono-6.12.0.199-r2.ebuild b/dev-lang/mono/mono-6.12.0.199-r2.ebuild
new file mode 100644
index 000000000000..f18742acabed
--- /dev/null
+++ b/dev-lang/mono/mono-6.12.0.199-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_BUILD="4500M"
+inherit autotools check-reqs flag-o-matic linux-info mono-env pax-utils multilib-minimal
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="https://mono-project.com"
+SRC_URI="https://download.mono-project.com/sources/mono/${P}.tar.xz"
+
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux"
+IUSE="doc minimal nls pax-kernel selinux xen"
+
+# Note: mono works incorrect with older versions of libgdiplus
+# Details on dotnet overlay issue: https://github.com/gentoo/dotnet/issues/429
+DEPEND="
+	app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	ia64? ( sys-libs/libunwind )
+	!minimal? ( >=dev-dotnet/libgdiplus-6.0.2 )
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${DEPEND}
+	app-misc/ca-certificates
+	selinux? ( sec-policy/selinux-mono )
+"
+# CMake is used for bundled deps
+BDEPEND="
+	dev-util/cmake
+	sys-devel/bc
+	app-alternatives/yacc
+	pax-kernel? ( sys-apps/elfix )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.12-try-catch.patch
+	"${FILESDIR}"/${PN}-6.12.0.122-disable-automagic-ccache.patch
+	"${FILESDIR}"/${PN}-6.12.0.199-configure-c99.patch
+)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if use kernel_linux ; then
+		if linux_config_exists ; then
+			linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel"
+		else
+			# https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
+			ewarn "kernel config not found"
+			ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
+			ewarn "See https://bugs.gentoo.org/261869 for more info."
+		fi
+	fi
+
+	# bug #687892
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	mono-env_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# We need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
+	# get killed in the build proces when MPROTECT is enabled, bug #286280
+	# RANDMMAP kills the build process too, bug #347365
+	# We use paxmark.sh to get PT/XT logic, bug #532244
+	if use pax-kernel ; then
+		ewarn "We are disabling MPROTECT on the mono binary."
+
+		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
+		sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
+	fi
+
+	default
+
+	# PATCHES contains configure.ac patch
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# Many, many unsafe warnings. Miscompiled with -O3 too: bug #915985.
+	append-flags -O2 -fno-strict-aliasing
+	filter-lto
+
+	local myeconfargs=(
+		$(use_with xen xen_opt)
+		--without-ikvm-native
+		--disable-dtrace
+		--enable-system-aot
+		$(multilib_native_use_with doc mcs-docs)
+		$(use_enable nls)
+	)
+
+	# Workaround(?) for bug #779025
+	# May be able to do a real fix by adjusting path used?
+	if multilib_is_native_abi ; then
+		myeconfargs+=( --enable-system-aot )
+	else
+		myeconfargs+=( --disable-system-aot )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	emake -C mcs/tests check
+}
+
+multilib_src_install() {
+	default
+
+	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
+	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
+	# for reference.
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}
+
+pkg_postinst() {
+	# bug #762265
+	cert-sync "${EROOT}"/etc/ssl/certs/ca-certificates.crt
+}