Merge updates from master

10 files changed, 283 insertions, 332 deletions

diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 0db5dc860c44..1ba9c1d618bc 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,4 +1,2 @@
-DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75
-DIST doxygen-1.8.20.src.tar.gz 5132703 BLAKE2B 2a9e6df833c64d7052331b52647943f7eaad8214d66962970ad55628cc2ab26883655908588bee2d4872bb2d6d85f8d18cbb03e7dabe0280f337ab53d8538ec9 SHA512 65d104d25061ee59199c74c0328f59fbeaf14f0dade755187ebd43f59008adfef243d4da448b71ae04dc325b848f9bdd109eb20e6f6092f3ed19862426d060cf
 DIST doxygen-1.9.1.src.tar.gz 5117435 BLAKE2B 28c1a1cb8390e17e2b399cea765f837782ee268a999606eef4031a5f65943c793c97bdbd2e2a25a39358ecac5df2c7a62aa4cca72753a924e4e718c512b8a9c7 SHA512 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed
 DIST doxygen-1.9.2.src.tar.gz 5076037 BLAKE2B 7b21b228a2049f3048fba744d94066524a0fca37335a7ffd2616fd62a8a7d8d9d28d0bd506245c63771264a279a21f327e5386a9b4c490eea7f79ddd9583b566 SHA512 2729d013b0363a919bbf6babd300389b76e95dd9dbb16ac0f57fc5a0392d3e2076ea4fba958a236311513e68e4aa056a77bd22c9c92b410a17eed095e5adccc0
diff --git a/app-doc/doxygen/doxygen-1.8.17-r1.ebuild b/app-doc/doxygen/doxygen-1.8.17-r1.ebuild
deleted file mode 100644
index eb4af7f0b654..000000000000
--- a/app-doc/doxygen/doxygen-1.8.17-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils flag-o-matic llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-else
-	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( >=sys-devel/clang-10:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doc? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	doxysearch? ( dev-libs/xapian:= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	doc? ( ${PYTHON_DEPS} )
-	${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692
-	"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
-	"${FILESDIR}/${PN}-1.8.17-llvm10.patch" #730170
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
-		local pro
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}" || die
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		-DGIT_EXECUTABLE="false"
-		)
-	use doc && mycmakeargs+=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-		cmake-utils_src_make -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/doxygen-1.8.20.ebuild b/app-doc/doxygen/doxygen-1.8.20.ebuild
deleted file mode 100644
index 75f3e53ee1da..000000000000
--- a/app-doc/doxygen/doxygen-1.8.20.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils flag-o-matic llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-else
-	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( >=sys-devel/clang-10:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doc? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	doxysearch? ( dev-libs/xapian:= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	doc? ( ${PYTHON_DEPS} )
-	${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
-		local pro
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}" || die
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		-DGIT_EXECUTABLE="false"
-		)
-	use doc && mycmakeargs+=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-		cmake-utils_src_make -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch
deleted file mode 100644
index 861c79a6b0d9..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/CMakeLists.txt	2019-04-04 06:51:41.509647160 +0200
-+++ b/src/CMakeLists.txt	2019-04-04 06:52:08.413646804 +0200
-@@ -263,7 +263,7 @@
-     add_definitions(${LLVM_DEFINITIONS})
-     llvm_map_components_to_libnames(llvm_libs support core option)
-     target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
--    set(CLANG_LIBS libclang clangTooling ${llvm_libs})
-+    set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs})
- endif()
- 
- target_link_libraries(doxygen
diff --git a/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch b/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch
deleted file mode 100644
index 2b2ca0ef733f..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
-index ae52cab..04b9293 100644
---- a/addon/doxyapp/CMakeLists.txt
-+++ b/addon/doxyapp/CMakeLists.txt
-@@ -14,7 +14,7 @@ doxyapp.cpp
- )
- 
- if (use_libclang)
--    set(CLANG_LIBS libclang clangTooling ${llvm_libs})
-+    set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
- endif()
- 
- target_link_libraries(doxyapp
-diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
-index 2387f1b..c880c3d 100644
---- a/addon/doxyparse/CMakeLists.txt
-+++ b/addon/doxyparse/CMakeLists.txt
-@@ -14,7 +14,7 @@ doxyparse.cpp
- )
- 
- if (use_libclang)
--    set(CLANG_LIBS libclang clangTooling ${llvm_libs})
-+    set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
- endif()
- 
- target_link_libraries(doxyparse
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3f4767c..d6891a6 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -310,9 +310,9 @@ if (use_libclang)
-     endif()
-     include_directories(${LLVM_INCLUDE_DIRS})
-     add_definitions(${LLVM_DEFINITIONS})
--    llvm_map_components_to_libnames(llvm_libs support core option)
-+    llvm_map_components_to_libnames(llvm_libs support)
-     target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
--    set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs})
-+    set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
- endif()
- 
- target_link_libraries(doxygen
diff --git a/dev-lang/smlnj/Manifest b/dev-lang/smlnj/Manifest
index 02683a41b302..5ad770c26e5e 100644
--- a/dev-lang/smlnj/Manifest
+++ b/dev-lang/smlnj/Manifest
@@ -22,3 +22,29 @@ DIST smlnj-110.82-smlnj-c.tgz 10544 BLAKE2B 6c096fbb8a8f135ac0fac1b4be6c4e4521dd
 DIST smlnj-110.82-smlnj-lib.tgz 449307 BLAKE2B aa6d21c608d89fc8696075ad13fa5179ee9a80a54f8dd8a446fa148065807a4094048b6da3537c222ff59cf0a6f837706cb6797d0873ac126ca0a3d743b5c7c7 SHA512 9e85b09e8bb4b253da7f0bea44bed55792a022967aa550e3ab0203566b84c6b8e126d91d4a0365c9bdb618d8e5bc1643ecd74ae30d750ff002d81dfea1c809ed
 DIST smlnj-110.82-system.tgz 240758 BLAKE2B 0903bd45a042c4cc5d327a88680f33f44128c1c9c929699813e3c7ba9b88975407b0b7b37b9048090c043485e8f144207529b7575904aa197122851d877b42b9 SHA512 b39fd42fd7418dee86accba9759dc3bb61234ff66ff695a2487c0e98b5640d5256e14edb7e23c8541e17ae35f7c9b27c7c1551d448c1383f61c33b20585a7662
 DIST smlnj-110.82-trace-debug-profile.tgz 3911 BLAKE2B c025b55430519123f4fe7907d45184cd31d0d72d89e1c5f0b8793fa4c59089b7e10f73c740b0eba3bfb39d2ec0e709a9f43482a6143d93b5128239833ca18619 SHA512 47af805b930d0c540139062c3ce3d1ba504e918c2f7817cad52bbae9e16ddc1dfea96f3058ae74afd247113101d59617d2098bfab8e38c701616c12f4610855e
+DIST smlnj-110.99.2-MLRISC.tgz 1457511 BLAKE2B dca76da4c5966ecaff35616723f9ec57fca6ce6c29940ed65691819ea6f3c8b617ce8ab207ae902550004f7b99a5cd7b3a5fe514ff591d64fbd12bce18fae3e7 SHA512 4c5ce0050c6e6df0cc408906be579e770f6630eadd42f4062925bc166a277d6f79c03dccaf7ce2eb058a4118dd018e8dfafcb0c4270728e55dde2b41d44adbed
+DIST smlnj-110.99.2-asdl.tgz 289435 BLAKE2B 1e2328139b8626263f024970a53f4d6c088acba168a3727ee0aa0fb066902177da32bb0aeccdc6c73c77ebe41de3ccb83b98ed91da33f12365ca51157d05446f SHA512 7bc50e7a84cb1b682ce84ae16420376494bdc9640bf43e8ffb55886d3f979ee20bec7197bc294599f726fb097cfa21e47adb790872d5e4e5b1f695b785adcffd
+DIST smlnj-110.99.2-boot.amd64-unix.tgz 5969670 BLAKE2B 7b4fdff5c5d12217768e0605c46845cfcf70b14ea0dd71cd993bce0c2a9e1ebc94f1b118e198e02ab81b07a922876000a92ca2c34092b65b5726c70e2411c747 SHA512 251eee7f7e5d7d23bc80be996ccd1587df7c02b8a33bd55133728a862341b7419926866f8c6ff21ba353260d6cf69b4c685a0914c8141d3181d8b19f7307afaf
+DIST smlnj-110.99.2-boot.ppc-unix.tgz 5826936 BLAKE2B e4d116dcafbc0fcf8cdb39e60febc0389ed6364bad082ae7d2fdbd7eb0cc738f8b74f7133d0b18b111faf6e020c15165d33787896c8d6a0bbf75ad4ce0030940 SHA512 839e206cb438c1ca4ae1677c85cc9f02aaac2f11b27b89d1d2e2e956e24a0a0aeec198e2b4dc1aa36f8cf04670425ec248a9a478894163513c865c94eb1f886c
+DIST smlnj-110.99.2-boot.sparc-unix.tgz 5962719 BLAKE2B 8ab73dee9221072c6b0b9fc1d504cf754a0c88cc819b19335b2012c29ed76e5cc32b7a835ab476d436def8de3342a9c425bca181b0c22a5b3637be5bedfd2450 SHA512 c0f4abecb5becb65cabb6c217310b47e347a3645840b96e153e379adabd22c313e9ac30031e4d871f3f4dbc9f6380854f25ec02e0fba372e26c91d1826da71a2
+DIST smlnj-110.99.2-boot.x86-unix.tgz 5904970 BLAKE2B dc2e4a05f39be830290f863837b551d752c072839bb2448e8445bd527bc2df55da64bd71787d1b6c0c651f6b6f645b906ed25d444a37f005c98934503cd06307 SHA512 84636788419067faa201ef100fec7bcdb85ff862125e788d8d4494bbecfac4907310fd58b73b8887116b3217dd4c52896022dd761632102e45916292a4edb28f
+DIST smlnj-110.99.2-ckit.tgz 201126 BLAKE2B 272849e5caae212061acc14f13d055d8f75ea1c61364be1bb039ecd5cf3166b7f9e39133266383aa411ccd980fa75c223873634d493f6bcf5e6e3bbca55c2544 SHA512 58366e811873a770816bccccdf2cb2f9b646b8a539f48bc91f883594bfb829e5cdb2fe8551c8a174b44a72f738164453907a04f71891233018f3da400dddc5d8
+DIST smlnj-110.99.2-cm.tgz 220283 BLAKE2B aeb1bd53afc88df154b4ec4f5af6eab3a8704e317f5e340e90b5338286e3a513ed576bd306cc5487c68fe9e0d600fe2be116ad23c515d3aba6da4b135dfd5d93 SHA512 e260b249de07084e5607028c9919de95b99b78bab4e33e45dbba37d20a6213de15652259727cca24c46a2b818eb4f70cabb47e6663e46738f67a86598c4a49b4
+DIST smlnj-110.99.2-cml.tgz 104474 BLAKE2B ae172683d722401776a435a13bd8c58d255602ec994cd36828d337fd8d3895512cc3c54b4fef978c05e5fe953f0f2eb8b7625e8684b9840a5080e9eee9069c59 SHA512 fb95ba4e358d595547a9d644b7f24c4b10aeeb1c92f692e6f433ffa367f68f75da9878f2e52c00334e21a43f91d86e377350054439dff1556369d94b56d6365f
+DIST smlnj-110.99.2-compiler.tgz 861590 BLAKE2B 99229a6520616590963a9aa57e5c7487e9029d4de1db2c82b1ac26ae3cc6b88cd60770efb2dad3292ffa3c1849094c84d4c43677ee20170aeea6cb77bc5d684a SHA512 22a4739e829b4c637b919bd5c968813fd888fb2fb2003d3482f1776593c5d8a43c9349405f82e2d60cbe85108b2547b1ae5742e97c942968b4a5f294acfae663
+DIST smlnj-110.99.2-config.tgz 517615 BLAKE2B e65bfad1636d892494bd67be1c6a16d43844a1928c2084677f4901edb75b44957bcfb8e9e4bf94e8799738f3d7762d01c9d652bab0a7fe39696edf8353c88668 SHA512 772b27c4e6a1761fb84b7f67dbfb2e77e60f4d1e1c840d1269b9004025a20599eb2703bf162526490c062f4a278c050f8e87647981ed9de8a04156eed17f2871
+DIST smlnj-110.99.2-doc.tgz 2454776 BLAKE2B dd8f4121ef5eed01fc6e34fdd91b06ece9a4b3f5b8c8e5ad9e8e7b2ffd9034888905e14aa5e2294e9f32be27a0b6fa88af76827dd264da4ba1aeacba0f3065d3 SHA512 94033ca2bff911f770ac1be0be799f0ab96741c1641dac56576c7a714de43f91cba6cf2aa278725eea457a30223fcd5c3a5e683c19e2530c527792e9197b34fe
+DIST smlnj-110.99.2-eXene.tgz 721072 BLAKE2B 39899855d97454ded04c8c0ebf1e65211124593298272997822773f1c2f5961f4a156048a3a0944116e3930b2446c8c3d2499183b4de4a95610639f4bbddbe16 SHA512 15f4eab1966c1f53ce5e3cd7e0ddb8f07ad0b81c9c2a2f3b5e960978b9714eb86579f465b87512e6ff8c713ad2d794af59b1a7e0e0711bd936f3235976fed33a
+DIST smlnj-110.99.2-heap2asm.tgz 1767 BLAKE2B 9b9e3de7856189a9a528644cace3cc446d308822e29cb37781ffbdae8581626cdaa40b472d05da9328d59c84dda41089e8be40273f75ba40913c18a84d75515a SHA512 5e23d68c7d22080eb9916a671f6923d9d7a0000123143fa1fc7cc29410ade6d6186ef4209b2313bfc70ee8a3356ea906605cbbaf76ffce27553f5f0eca607487
+DIST smlnj-110.99.2-ml-burg.tgz 40492 BLAKE2B 15a66c5e93d6a35fe60e052d227870606407ede8f38a5e9376b823800a0894271393e1c286def8dbc83dd8bff895c47371c625d990fdc808363409b9ef0f38bf SHA512 149fe611a8b23cc1a7dafd8fd0ef92e0173592c9d2e07d0ca2504056c842ee72235bf881c4bec16e4cb8bea0d1588462b9059e9d2f97c1faf6f8e014cdbb510b
+DIST smlnj-110.99.2-ml-lex.tgz 28160 BLAKE2B f0906f4c71fa68f14c9dd00c2bd4925752cd6c5f582c44692ea994fc4b91b4c2d5e56453f2437ca6826b3192f1a75fca04ec5aca09420d9ab4d104abbee83313 SHA512 838720dae9b334b4c2061e7183549151a6f1926b953908384b0aabece6a00fec9b215ce2cb6bafb0355d4e1ebc591f9f672fa8eeefbdbe39d54217b959758cc7
+DIST smlnj-110.99.2-ml-lpt.tgz 267087 BLAKE2B 08781336857ff7bebf39b60c900f7489db660f470027dc023dd3927ca4ebb9335959b4425ee1befc21fca540141764043656da7447a1df74b1f37c6ef3fdbde3 SHA512 ea4e6d4813b365a8ba9308a1ca2d92e4b7b58272659b8da8feaf434db9837bf4ca488118ba49e1b300dbd3a2e479c8835d936e9b58db1a6a0c7c6ce53b305809
+DIST smlnj-110.99.2-ml-yacc.tgz 101699 BLAKE2B ec9269b6b9c497aa761bbba654960edb68a4a53cb5e3e04d99c750d0d767da1445d28faff0cd6fb6f78d9538fdc9d6c571e79324b1e9b81ae8fe67fc4ebce7be SHA512 6204ecf50bcda4e8fb30e7a0c676f369dc43c7b30caace92281fcddd8e29037ace1096e6d6af5119cfad914e2158fb213502619859c53678d57207a8540f95f7
+DIST smlnj-110.99.2-nlffi.tgz 75289 BLAKE2B 7a8e8087e65a8f3150d208f1577a39c96942f083b11627433e3a16677e960b1c6ae179eab2c79d3b49d4c20ac56550f3f1d83178c2bde643c9a23d96b549d8f1 SHA512 9e5457268186e1e4cb4b7a6c9b3d4c7b3b02092691056b6fa3e451a5bf773e49b72f2f63a43651fa9f025b57aefc6545005dbacace919b2902bc9b6ae11fc345
+DIST smlnj-110.99.2-old-basis.tgz 1207 BLAKE2B adfd848a43c6f1488f6246427a9cc63ec604e3801a2b6498fe3025b26a628630fbd5b4e6657b5f1006bad60a95ce3df41f7df8ad125699fd8e5aa849bb40f3f9 SHA512 629c9f520239d9e593682925001225270d8131ef67f4d6808faf87b866b4290b7138a1d553f02b7bb907f664925760cc45da2de0c0412e1f8d35f71a92df2fa7
+DIST smlnj-110.99.2-pgraph.tgz 5412 BLAKE2B 026d65cf19fcad000f69efc07094f381dfd68eefd8e484066d61a8bba0ee659e5044ea7233b8de23a224a72af8dbd0e40e7caecdfcf9ef0a4f1ca4a5db138f3e SHA512 1d06c0c6e00110ec0c6334856c3481d80057b10cb7b312cf4de38a99b009ee4858adeb4c2f8f504f51a5fdfaf14578972250b4b49a661ba14dc04ea5781fc536
+DIST smlnj-110.99.2-runtime.tgz 335103 BLAKE2B 2b5f33d1cf78c5925f5912be6d0e8dd3a94ec7364613a7c33671ffd6c12a7e8aba8918ee8f788a0a11721b80508147cc570db568c13adcedb731cde0c19199a2 SHA512 dc72bd10b647b5b1d19ec9d31c328142484ae08a0fa274b59abda3022933833d23732a402d41cb0fc55fd1bf3f42cfa3360f0ca2c8911bec4273a9b84f2f05ec
+DIST smlnj-110.99.2-smlnj-c.tgz 10609 BLAKE2B b44b5fa92fb8bc7eac4ac49672629810faebefd17960912009c27f1bbd1201d3fa8079b5c302cab41c19ca8c56b7ab32f211707395f1a4db011b5afd6c4e8fbf SHA512 640f8a59653a1bbd2ab77cc8f9b741e11a4c5b39a90960363858a8f79e2ce2c1ac2647a8d8a3eee1583bfb6f996efc288e00c01059f9206bbe922fcff5014f50
+DIST smlnj-110.99.2-smlnj-lib.tgz 790390 BLAKE2B 8194c48196e5e58eb22e6f4f1a91b7b8671acfd2425b88b826d0d2f8f0075f309b3cfcfb77df61fdf5944b3f384201a10effec0438efd9a32f3b4ba68f94d6b0 SHA512 46e125b21dc1dd6acc029baed6d6c1052fd517c275f3ba8f9d54d5b461f7e5aedc3bc9b1018c056977f8c9aafd25990eef308637ce840f67567e0184bdfb556e
+DIST smlnj-110.99.2-system.tgz 281742 BLAKE2B c9af6495f6991cd9e6768ceab1c8841e30ba83d981e2b8b0482851c8cca9db548e22a2abce2ee0764e4e5ad37723d5819e4e44c91e4e69a4b353327e6ea55769 SHA512 aa27b46301ddfe3f6bf26e04a3763c52b016435d7aa9142f30300b026d2587cd85c84992084c2d9cd1a2dd90b1b82897fb106067aff0d16207050302ba985421
+DIST smlnj-110.99.2-trace-debug-profile.tgz 3921 BLAKE2B ebc7d3270bcee5464c7eb5a70c851d865ffbf2ba31a084b61074ffe22f7d97c255fe4584fdbf491c7d5e2db65e3efb5648eb5995b81561cdfee152ae8b31c859 SHA512 e1fd41e15934eda2d33b69d21eeb582306dfc09576cc7f69f72cbc599e4b321c453327a7cc31f4689e6d3d87b2fc0453817ef696e565dff4d7ef4c1e18e31c29
diff --git a/dev-lang/smlnj/metadata.xml b/dev-lang/smlnj/metadata.xml
index 805914f65297..dfa9e7f609c3 100644
--- a/dev-lang/smlnj/metadata.xml
+++ b/dev-lang/smlnj/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-<!-- maintainer-needed -->
-	<use>
-		<flag name="pax-kernel">Enable if the user plans to run the
-		package under a pax enabled hardened kernel</flag>
-	</use>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <use>
+    <flag name="pax-kernel">Enable if the user plans to run the
+      package under a pax enabled hardened kernel</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-lang/smlnj/smlnj-110.99.2.ebuild b/dev-lang/smlnj/smlnj-110.99.2.ebuild
new file mode 100644
index 000000000000..a327249fde59
--- /dev/null
+++ b/dev-lang/smlnj/smlnj-110.99.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Standard ML of New Jersey compiler and libraries"
+HOMEPAGE="http://www.smlnj.org"
+
+BASE_URI="http://smlnj.cs.uchicago.edu/dist/working/${PV}"
+
+FILES="
+doc.tgz
+
+config.tgz
+
+asdl.tgz
+cm.tgz
+compiler.tgz
+runtime.tgz
+system.tgz
+MLRISC.tgz
+smlnj-lib.tgz
+old-basis.tgz
+
+ckit.tgz
+nlffi.tgz
+
+cml.tgz
+eXene.tgz
+
+ml-lpt.tgz
+ml-lex.tgz
+ml-yacc.tgz
+ml-burg.tgz
+
+pgraph.tgz
+trace-debug-profile.tgz
+
+heap2asm.tgz
+
+smlnj-c.tgz
+"
+
+SRC_URI="
+	amd64? ( ${BASE_URI}/boot.amd64-unix.tgz -> ${P}-boot.amd64-unix.tgz )
+	ppc?   ( ${BASE_URI}/boot.ppc-unix.tgz -> ${P}-boot.ppc-unix.tgz )
+	sparc? ( ${BASE_URI}/boot.sparc-unix.tgz -> ${P}-boot.sparc-unix.tgz )
+	x86?   ( ${BASE_URI}/boot.x86-unix.tgz -> ${P}-boot.x86-unix.tgz )
+"
+
+for file in ${FILES} ; do
+	SRC_URI+=" ${BASE_URI}/${file} -> ${P}-${file} "
+done
+
+S="${WORKDIR}"
+
+LICENSE="BSD"
+SLOT="0"
+
+# sparc support should be there but is untested
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_unpack() {
+	mkdir -p "${S}" || die
+	local file
+	for file in ${A} ; do
+		if [[ ${file} != ${P}-config.tgz ]] ; then
+			cp "${DISTDIR}/${file}" "${S}/${file#${P}-}" || die
+		fi
+	done
+
+	# make sure we don't use the internet to download anything
+	unpack ${P}-config.tgz
+	rm config/*.bat || die
+	echo SRCARCHIVEURL=\"file:/${S}\" > "${S}"/config/srcarchiveurl
+}
+
+src_prepare() {
+	mkdir base || die  # without this unpacking runtime will fail
+	./config/unpack "${S}" runtime || die
+
+	default
+
+	# respect CC et al. (bug 243886)
+	sed -e "/^AS/s:as:$(tc-getAS):" \
+		-e "/^CC/s:gcc:$(tc-getCC):" \
+		-e "/^CPP/s:gcc:$(tc-getCC):" \
+		-e "/^CFLAGS/{s:-O[0123s]:: ; s:=:= ${CFLAGS}:}" \
+		-i base/runtime/objs/mk.* || die
+}
+
+src_compile() {
+	local config_opts=( )
+	use amd64 && config_opts+=( "-default 64" )  # force 64-bit build for amd64
+
+	SMLNJ_HOME="${S}" ./config/install.sh ${config_opts[@]} ||
+		die "compilation failed"
+}
+
+src_install() {
+	local DIR=/usr/$(get_libdir)/${PN}
+	local i
+
+	local file
+	for file in bin/{*,.*} ; do
+		[[ -f ${file} ]] &&
+			sed -e "2iSMLNJ_HOME=${EPREFIX}/${DIR}" \
+				-e "s:${WORKDIR}:${EPREFIX}/${DIR}:" \
+				-i ${file}
+	done
+
+	newbin ./config/_heap2exec heap2exec
+	exeinto ${DIR}/bin
+	pushd bin || die
+	for i in {*,.*} ; do
+		[[ -f ${i} ]] && doexe ${i}
+	done
+	for i in ml-* sml ; do
+		dosym ../../${DIR}/bin/${i} /usr/bin/${i}
+	done
+	popd || die
+
+	exeinto ${DIR}/bin/.run
+	pushd bin/.run || die
+	for i in run* ; do
+		doexe ${i}
+	done
+	popd || die
+
+	insinto ${DIR}/bin/.heap
+	doins bin/.heap/*
+
+	insinto ${DIR}
+	doins -r lib
+	doman doc/man/man*/*.*
+	dodoc -r doc/*
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 37ca6271011c..db1520c652d2 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,2 +1,3 @@
 DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
 DIST strace-5.14.tar.xz 2067020 BLAKE2B 479ecf5e66e26e722d108c905130f482c411857db234ac013bf3568905c0f7b896f001ba6da2cabccd0a987c7802aebec9c6298decb691de125e8154c28e1c6f SHA512 3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a
+DIST strace-5.15.tar.xz 2248664 BLAKE2B fff08e49552ad1208b658f91e37c540cc7315ac255aba2e69db5bfeb942114b865f1114a45663481f1ab967db45d187bdbcf70ffe80449169df0c37ff82a1a94 SHA512 67251792ad0fb7f44013c3ae5e5b757106223c9d123d349e31de7565e0f2bfdc6bbd46a9c269e58508bd288ee70f104f8e2185f2203bd91431c5c776db0d9384
diff --git a/dev-util/strace/strace-5.15.ebuild b/dev-util/strace/strace-5.15.ebuild
new file mode 100644
index 000000000000..8dffe5746047
--- /dev/null
+++ b/dev-util/strace/strace-5.15.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl selinux static unwind elfutils"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="virtual/pkgconfig"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+	selinux? ( sys-libs/libselinux[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.11-static.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	# Stub out the -k test since it's known to be flaky. bug #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	local myeconfargs=(
+		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
+		--enable-mpers=check
+
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+		$(use_with selinux libselinux)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
+	fi
+	dodoc CREDITS
+}