gentoo auto-resync : 15:11:2024 - 03:02:36

13 files changed, 676 insertions, 50 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 61ea6c77e5ab..c0040c6ba8e8 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index f23750f7211c..80fadb6fb73e 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -4,8 +4,10 @@ AUX R-4.3.0-parallel.patch 415 BLAKE2B e996c72c167b529765c82c8880bc3ea704d3c6e34
 DIST R-4.3.1.tar.gz 34899964 BLAKE2B 7aaacad01ce59e2faa46c4b830c10d2df8e4a3a1d4f11cf2aa622ceb53876f1e702dff94a820ca954ec29f53d58fa7e135ef15e8257602c50f2642b0a0c0a86a SHA512 f571c378dbdd675e267ef4419bb1141198924dadc08297c93c8dff58504994604918b3e045bb7139ba473972a063a68ed1c7426f37d4e8208b79358561d34d77
 DIST R-4.3.2.tar.gz 35039225 BLAKE2B 2de3af9013c8648c118a1efe673b618aef84a694c6865657faef5b0ca5f780ef5273bb00b607f587219ee30a11f01ccc3b730b9124847242b9d9550de471f58c SHA512 125114357f20d4a3248aee86727768d1dc15e07e44353f8a68fe2ef1fedae508e85d944301d00c0edd61e8b012b0b3cdcde53ac60be903713f96542d83ad5b1d
 DIST R-4.4.1.tar.gz 37353459 BLAKE2B 2c44fcab719cc2a2cef4566fd4e6c22386f02827a41045ffa074ca2a6883089275354644bce47c9978ef5c96e7b9b21576e946500746c27dc00946ef3cde4fce SHA512 cc30172227b7d89a9d6e9d65c8622b2042bcbbf3f1b5e36c7460f60958a1a0589980a1867ec9989df2589c1618233f3382d4732700b147361ace3be6680b5643
+DIST R-4.4.2.tar.gz 37582785 BLAKE2B bda7e3d49c63095830d12d77bb91946c2e7b657895f3388b892ca29091dc6c23b42a6b7822910d6889f69715c3ad58f8031ab7a811f34efe0b352232e5135175 SHA512 b29d82242f70487f52849a5726610c03dffa4e54f1a32a9f3f76784fcf61f91d5c40cddee1029eeb9c9837ff26f382f348e8518dd68c84e9fc2192b981013d9a
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
 EBUILD R-4.3.1-r1.ebuild 7139 BLAKE2B 6ad669bf41cbef1e56cd10728fa2390043cd7ddde0c095f917f0779b625fbe92c4176a17e60cd0fcd23e0106a28bdf739a311c01768a4ba12a70fc238153af6d SHA512 96c50da1fbebfcf22a3cf9a558cba9df0e655f1456986a806dfd6d2362560a1cde8d922dca02cdcdd67279fe1e4191d74892b6dc1a9194399632642d3ec9adf1
 EBUILD R-4.3.2-r1.ebuild 7142 BLAKE2B 076b384f913f4f3c3dc311b1fb18c21e1bb34bf22c0b9ee3cd178f45737b37efcfa962e0f08caa844f2c84fe742a5a0bb0a1918d50ae8887b37bdac81f249718 SHA512 7aa832f3be64244db12e6ad2a875491b07c9b476f7cf549ca3c77a4597113cbef9b3daac76b29f1c4d15ee15170664bdf29e6a814fe9f3e4cbe6cfe41f820859
 EBUILD R-4.4.1.ebuild 7249 BLAKE2B bac9534523954fcb65e21dbda6e5e76d4824a55ff169de79bcdbfbe8c23f186a90e7773a92b08260c48083a736f5ebbc7621a76abb1bcd2ef17f3c23fa08bb84 SHA512 0bbb5f9113ff876f79ce0bb88d821bae3812442b087bc00b6fff5c90b6422d198e44ed6e437467a2558af8645f6ac12e347afefd3f9385c29032e876ca412db0
+EBUILD R-4.4.2.ebuild 7252 BLAKE2B ef6b0e7c2c68195cdf4be20dd225cf0b9b32e792779924f99122522b880511e98967de73005912f7ec7a16e5b72c5a127ca76bf8474eff7489ef32fc5eef32ae SHA512 2804b819ea63ab0fd39bb7376502c054186a4bb08f72206f24877e2f08e002fe8b60e28bbd2ffa11629949bcf795f9939710c3d8d9cebcabb315dec32742d3b5
 MISC metadata.xml 1359 BLAKE2B 9cfca4def686f457622427e067bffba74608366f21125a167aa6efba5013db0c6c3e6d83d5b7012f436a7db44f4578061ce8c8673c8be95b417f52d66787f664 SHA512 1884aad4c68ddf884838c02f5e078966fcd932a7f2b1eac8298d895b4fb632bbc4abf7a849fdd870e0db7136c6642a4c3b1ccd5360e9f3253919b3a0b25a8555
diff --git a/dev-lang/R/R-4.4.2.ebuild b/dev-lang/R/R-4.4.2.ebuild
new file mode 100644
index 000000000000..0a76a168a41a
--- /dev/null
+++ b/dev-lang/R/R-4.4.2.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs
+
+# latest git commit for R bash completion:
+#   https://github.com/deepayan/rcompletion
+BCPV=78d6830e28ea90a046da79a9b4f70c39594bb6d6
+
+DESCRIPTION="Language and environment for statistical computing and graphics"
+HOMEPAGE="https://www.r-project.org/"
+SRC_URI="
+	https://cran.r-project.org/src/base/R-4/${P}.tar.gz
+	https://raw.githubusercontent.com/deepayan/rcompletion/${BCPV}/bash_completion/R -> ${PN}-${BCPV}.bash_completion"
+
+LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+IUSE="cairo doc icu java jpeg +libdeflate lto minimal nls openmp perl png prefix profile readline test tiff tk X"
+
+REQUIRED_USE="
+	png? ( || ( cairo X ) )
+	jpeg? ( || ( cairo X ) )
+	tiff? ( || ( cairo X ) )"
+RESTRICT="
+	minimal? ( test )
+	!test? ( test )"
+
+# At least one package installation in the test suite requires TeX,
+# and will fail without it (bug #718056).
+DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	app-text/ghostscript-gpl
+	dev-libs/libpcre2:=
+	>=dev-libs/tre-0.8.0_p20210321[approx]
+	net-misc/curl
+	sys-libs/zlib[minizip]
+	sys-apps/coreutils
+	sys-libs/timezone-data
+	virtual/blas
+	virtual/lapack
+	cairo? (
+		x11-libs/cairo:=[X=]
+		x11-libs/pango:=
+	)
+	icu? ( dev-libs/icu:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	kernel_linux? ( net-libs/libtirpc:= )
+	libdeflate? ( app-arch/libdeflate )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng:= )
+	readline? ( sys-libs/readline:= )
+	tiff? ( media-libs/tiff:= )
+	tk? ( dev-lang/tk:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+	)"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )"
+BDEPEND="
+	sys-apps/which
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsrecommended
+	)
+	test? ( virtual/latex-base )"
+
+PATCHES=(
+	"${FILESDIR}"/R-4.3.0-parallel.patch
+	"${FILESDIR}"/R-4.3.0-no-LDFLAGS-in-libR-pkg-config.patch
+	"${FILESDIR}"/R-4.3.0-no-gzip-doc.patch
+)
+
+# false positive, the linking step fails (as it should)
+QA_CONFIG_IMPL_DECL_SKIP=( iconvlist )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	# avoid using existing R installation
+	unset R_HOME
+}
+
+src_prepare() {
+	default
+
+	# fix packages.html for doc (gentoo bug #205103)
+	sed -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
+		-i src/library/tools/R/Rd.R || die
+
+	# fix Rscript path when installed (gentoo bug #221061)
+	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EPREFIX}/usr/$(get_libdir)/${PN}\"':" \
+		-i src/unix/Makefile.in || die "sed unix Makefile failed"
+
+	# fix HTML links to manual (gentoo bug #273957)
+	sed -e 's:\.\./manual/:manual/:g' \
+		-i $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
+
+	use perl &&
+		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
+
+	# don't search /usr/local
+	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
+
+	# Fix for Darwin (macOS)
+	if use prefix; then
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			sed -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
+				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
+				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
+				-e "/SHLIB_EXT/s/\.so/.dylib/" \
+				-i configure.ac || die
+			# sort of "undo" 2.14.1-rmath-shared.patch
+			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EPREFIX}/usr/$(get_libdir)/libRmath.dylib:" \
+				-i src/nmath/standalone/Makefile.in || die
+		else
+			append-ldflags -Wl,-rpath="${EPREFIX}/usr/$(get_libdir)/R/lib"
+		fi
+	fi
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	filter-ldflags -Wl,-Bdirect -Bdirect
+
+	econf \
+		--enable-byte-compiled-packages \
+		--enable-R-shlib \
+		--disable-R-framework \
+		--disable-R-static-lib \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
+		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-system-tre \
+		--without-aqua \
+		--without-newAccelerate \
+		$(use_enable java) \
+		$(use_enable lto lto R) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable profile R-profiling) \
+		$(use_enable profile memory-profiling) \
+		$(use_with cairo) \
+		$(use_with icu ICU) \
+		$(use_with jpeg jpeglib) \
+		$(use_with libdeflate libdeflate-compression) \
+		$(use_with !minimal recommended-packages) \
+		$(use_with png libpng) \
+		$(use_with readline) \
+		$(use_with tiff libtiff) \
+		$(use_with tk tcltk) \
+		$(use_with tk tk-config "${ESYSROOT}"/usr/$(get_libdir)/tkConfig.sh) \
+		$(use_with tk tcl-config "${ESYSROOT}"/usr/$(get_libdir)/tclConfig.sh) \
+		$(use_with X x)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}"/fonts
+	emake AR="$(tc-getAR)"
+	emake -C src/nmath/standalone shared AR="$(tc-getAR)"
+	use doc && emake info pdf
+}
+
+src_install() {
+	default
+	emake -C src/nmath/standalone DESTDIR="${D}" install
+
+	if use doc; then
+		emake DESTDIR="${D}" install-info install-pdf
+		dosym ../manual /usr/share/doc/${PF}/html/manual
+	fi
+
+	newenvd - 99R <<-_EOF_
+		LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}/lib"
+		R_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	_EOF_
+
+	newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
+	# The buildsystem has a different understanding of install_names than
+	# we require.  Since it builds modules like shared objects (wrong), many
+	# objects (all modules) get an incorrect install_name.  Fixing the build
+	# system here is not really trivial.
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local mod
+		pushd "${ED}"/usr/$(get_libdir)/R >/dev/null || die
+		for mod in $(find . -name "*.dylib") ; do
+			mod=${mod#./}
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/R/${mod}" "${mod}"
+		done
+		popd >/dev/null || die
+	fi
+
+	# Users are encouraged to access some of the the R documentation
+	# interactively, through functions like "contributors()" that
+	# tries to open the "AUTHORS" file. Other files can be accessed
+	# by name with RShowDoc(), and the documentation for e.g. license()
+	# and RShowDoc() suggests a few of these names. Here we try to
+	# collect as many names as possible that a user might actually
+	# try to view through R, because if we don't decompress them,
+	# then R doesn't know what to do with 'em. Bug #556706.
+	local INTERACTIVE_DOCS=(
+		AUTHORS
+		COPYING
+		FAQ
+		NEWS
+		THANKS
+	)
+
+	# Other data sources that are shipped as "documentation," but which
+	# need to be accessible via their original unmolested filenames.
+	local INTERACTIVE_DATA=(
+		BioC_mirrors.csv
+		CRAN_mirrors.csv
+		KEYWORDS.db
+		NEWS.rds
+	)
+
+	local f NOCOMPRESS_DOCS=( "${INTERACTIVE_DOCS[@]}" "${INTERACTIVE_DATA[@]}" )
+	for f in "${NOCOMPRESS_DOCS[@]}"; do
+		docompress -x /usr/share/doc/${PF}/${f}
+	done
+
+	# Finally, an extra copy of this started showing up at some point...
+	rm "${ED}"/usr/$(get_libdir)/R/COPYING || die
+}
+
+pkg_postinst() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}
diff --git a/dev-lang/boogie/Manifest b/dev-lang/boogie/Manifest
index b4f0cffb8ca1..19cb9bbd376b 100644
--- a/dev-lang/boogie/Manifest
+++ b/dev-lang/boogie/Manifest
@@ -2,6 +2,7 @@ AUX boogie-3.0.4-disable-analyzers.patch 764 BLAKE2B 965f6a8007a4324aa95b165109d
 DIST boogie-3.2.5.tar.gz 2067333 BLAKE2B 2014351c53fa9a7fcea6cc11f8d236b398b9f44acf0ff388e45a9e3b3e306963b939c45619c4227d398100ab52d6deebaeb5a5d668047cd6d5e631b058f89a07 SHA512 92896489f82ee158b851b3579b363e43dc69c3490815e9f1ba17da115fd6f6f7264e4fcf8388b5dd1891c8ff63514df6ec037454029fb80c5db71381c4d4e8a9
 DIST boogie-3.3.3.tar.gz 2067837 BLAKE2B 36e004327cccf74326e650aff8f9d059b285510a7be0d426a9baf9a49e585ffd720fc03d7716c848ad7024971195d99de2203a7c87d88edcbdc7fc76afa50c66 SHA512 b50154b880063df408694e59d21887d82a6885fc124971e9cf5194cd82ef6c9384e6579aff38d524663c3b504f7bea20fc216de6ee4bfdff17b41e5d7a78e47a
 DIST boogie-3.4.1.tar.gz 2078182 BLAKE2B 21540c9326db2ebea568f109b10942c9bee1f9efd445c912261a1158b3a87624ddac2436bcbd4a68e9df64a9af82c6b050ec070d64f90b4a8d87ec24382ce6dd SHA512 3225d08f7d87a71d788e3e94d2f8df2867ad0e54047bd2b6b35f224ff5aa4d793bc0745c33f8e7a3a72b11334328f71756eca3b48ca476eae4e6134aa0a047b0
+DIST boogie-3.4.2.tar.gz 2078742 BLAKE2B e12ad3b464ab9c401fafa89023cc9bbb4687ca514e3c2d07ea6daf0a12f6ec7d478e74e78820beb15f567d0ae5a27a9d6b0819bc97d3bfe2fae5b0093786010d SHA512 5c020692e340b95e54f5203724c16262d847fd6737d12e7dc20765f07d514a31e91e6bb26334277f81d22f4f62acb9980cc9d5aff9b2a8130eda99497f5612cf
 DIST microsoft.bcl.asyncinterfaces.6.0.0.nupkg 76354 BLAKE2B aca3f5db71e4037dbdd604aeaebcd0962ccc171915b77b4c409ab744bf0a469c7d588f9504fc7fa49e3863e9593b66b4083235cb49e812d1f87b3dadb32e6003 SHA512 221a05a0c910f7a87b620d8f3831ed392b4eb95d112bee274d35f27009ad2a26445de9d7cd235fe6fb4a03f2550874bda3be3dddd96edaf9c0852a9c23d7b099
 DIST microsoft.codecoverage.16.2.0.nupkg 3133582 BLAKE2B 418cf403247d594cde0d827f8ca8690019a7631525f07993937085f4bbf8473364b4c99aea6e8b7b0020208d15fe0da63f0f4e69c273493c51ae011e8bd82667 SHA512 91f1d43fc038a20f5367d9aab669105dc7514dfbe749260b52789c09a75abcc6bdc000ee0c7f432231d4cc09e99bf5b863dd6289d813342f74d9dad23a651625
 DIST microsoft.csharp.4.0.1.nupkg 462346 BLAKE2B 209ccebc9103b803d26ea1f0232245c3cd231078b03a83a0011a2a79a1a8a324a72c5b3fda94b2686fff170932f366e165f81a36a70df590a39c45d70778e4be SHA512 c0e75a9162f28ba4c4572c8fac4fd4c8c97d6d3505a37683646ba5f7e5f6ac0da69d5200d2646054de90e8e08f893a10e514591b69b8273640842b2cf90bddec
@@ -195,4 +196,5 @@ DIST system.xml.xpath.xmldocument.4.3.0.nupkg 138523 BLAKE2B ba53f3b5ac0f2d1d1e9
 EBUILD boogie-3.2.5.ebuild 9626 BLAKE2B a2ddffedfc66c1264361324380ce46cc7a8726383dd01b03a8d6dac77284cddbb36e4a7bf0e502121c49b08b3f251c34d09d64c819841b18b2b744aa0f886a21 SHA512 6ce9dbe28b8177ca232da791d3151a966ecb78824e84b59b5b5f87b4d2758f1a471ec2c42a3661966bbc4dd317f8aff5c61bcb0a8ca073619739121ca51d1993
 EBUILD boogie-3.3.3.ebuild 9596 BLAKE2B 31ca8c08e10e5823e0ce0ca4c97816f52e8ece1d0ad9a1bc0b23149b3410c91a2e625c5d32934ee9da69bfbb5cbf3c67033ef223583c1d9b9bc12375b949f85c SHA512 34cd8cb925affd7bd7f2d39dd130bd9ba3181c4a3b711b2488326275a2ab76dc707892deb58654a4cd9cc4d3fcb9bea356dd4a55d9ed07798afad8621ebe6179
 EBUILD boogie-3.4.1.ebuild 9563 BLAKE2B 474c99ed732eeca83ebeea8c692d076b6fd62e119d4257eca5d393a99cada1eb2930c3b0e103261397e780f513dbb71efb094bf600b684627e71f3c03f0997da SHA512 06c4298a4c1ca0ecb46d28800e9831b57ba448b24cae4e8d99030f5c2e3e10c4b82af2aa8bb352bca84ecd112a49744c236c162ce50a13afcd698ef19201b79e
+EBUILD boogie-3.4.2.ebuild 9636 BLAKE2B 850db94a0c83290103b9808aef6d9e8728e8f0bfd37ac2a3852e4f1c190513d2cc5da5a55b7bd3d2e4992af3b7cda890d0f85de1d956aaa9a6d9b9b75bd381d3 SHA512 9e923d8c7c14d9574768ee7d1732801bb4136d2386bc94f01383a0f14bb682ceb8b8b549c2314d6b844b72bba7cab7f361ad4ea591705d48a02e52500e0974de
 MISC metadata.xml 1102 BLAKE2B 215544658792715aae72787f7c949ed89df9c05ceab5a919a861c02b7938c0d1ee228e0ede55008287b616faf70992a8c1f2854e6e5e1fc909718ae682996bb8 SHA512 b6a626c485e2a5db3390da62c629507a60417eda8b508d7ed8d1c017ac337743d2c4fe0e8554b103f989176dcd2969cc8579e91532b07a22c1b66328ef241e8d
diff --git a/dev-lang/boogie/boogie-3.4.2.ebuild b/dev-lang/boogie/boogie-3.4.2.ebuild
new file mode 100644
index 000000000000..b1d70adeb4bd
--- /dev/null
+++ b/dev-lang/boogie/boogie-3.4.2.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT="8.0"
+NUGETS="
+microsoft.bcl.asyncinterfaces@6.0.0
+microsoft.codecoverage@16.2.0
+microsoft.csharp@4.0.1
+microsoft.dotnet.internalabstractions@1.0.0
+microsoft.net.test.sdk@16.2.0
+microsoft.netcore.platforms@1.0.1
+microsoft.netcore.platforms@1.1.0
+microsoft.netcore.targets@1.0.1
+microsoft.netcore.targets@1.1.0
+microsoft.testplatform.objectmodel@16.2.0
+microsoft.testplatform.testhost@16.2.0
+microsoft.win32.primitives@4.0.1
+microsoft.win32.primitives@4.3.0
+microsoft.win32.registry@4.0.0
+microsoft.win32.registry@4.3.0
+microsoft.win32.systemevents@6.0.0
+netstandard.library@1.6.0
+netstandard.library@2.0.0
+newtonsoft.json@9.0.1
+nunit@3.12.0
+nunit3testadapter@3.15.1
+runtime.any.system.collections@4.3.0
+runtime.any.system.diagnostics.tools@4.3.0
+runtime.any.system.diagnostics.tracing@4.3.0
+runtime.any.system.globalization.calendars@4.3.0
+runtime.any.system.globalization@4.3.0
+runtime.any.system.io@4.3.0
+runtime.any.system.reflection.extensions@4.3.0
+runtime.any.system.reflection.primitives@4.3.0
+runtime.any.system.reflection@4.3.0
+runtime.any.system.resources.resourcemanager@4.3.0
+runtime.any.system.runtime.handles@4.3.0
+runtime.any.system.runtime.interopservices@4.3.0
+runtime.any.system.runtime@4.3.0
+runtime.any.system.text.encoding.extensions@4.3.0
+runtime.any.system.text.encoding@4.3.0
+runtime.any.system.threading.tasks@4.3.0
+runtime.any.system.threading.timer@4.3.0
+runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.native.system.io.compression@4.1.0
+runtime.native.system.net.http@4.0.1
+runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.native.system.security.cryptography@4.0.0
+runtime.native.system@4.0.0
+runtime.native.system@4.3.0
+runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.unix.microsoft.win32.primitives@4.3.0
+runtime.unix.system.console@4.3.0
+runtime.unix.system.diagnostics.debug@4.3.0
+runtime.unix.system.io.filesystem@4.3.0
+runtime.unix.system.net.primitives@4.3.0
+runtime.unix.system.net.sockets@4.3.0
+runtime.unix.system.private.uri@4.3.0
+runtime.unix.system.runtime.extensions@4.3.0
+system.appcontext@4.1.0
+system.buffers@4.0.0
+system.buffers@4.3.0
+system.collections.concurrent@4.0.12
+system.collections.immutable@1.2.0
+system.collections.nongeneric@4.0.1
+system.collections.nongeneric@4.3.0
+system.collections.specialized@4.0.1
+system.collections.specialized@4.3.0
+system.collections@4.0.11
+system.collections@4.3.0
+system.componentmodel.eventbasedasync@4.0.11
+system.componentmodel.eventbasedasync@4.3.0
+system.componentmodel.primitives@4.1.0
+system.componentmodel.primitives@4.3.0
+system.componentmodel.typeconverter@4.1.0
+system.componentmodel.typeconverter@4.3.0
+system.componentmodel@4.0.1
+system.componentmodel@4.3.0
+system.configuration.configurationmanager@6.0.0
+system.console@4.0.0
+system.diagnostics.debug@4.0.11
+system.diagnostics.debug@4.3.0
+system.diagnostics.diagnosticsource@4.0.0
+system.diagnostics.process@4.1.0
+system.diagnostics.process@4.3.0
+system.diagnostics.textwritertracelistener@4.0.0
+system.diagnostics.tools@4.0.1
+system.diagnostics.tracesource@4.0.0
+system.diagnostics.tracing@4.1.0
+system.diagnostics.tracing@4.3.0
+system.drawing.common@6.0.0
+system.dynamic.runtime@4.0.11
+system.globalization.calendars@4.0.1
+system.globalization.extensions@4.0.1
+system.globalization.extensions@4.3.0
+system.globalization@4.0.11
+system.globalization@4.3.0
+system.io.compression.zipfile@4.0.1
+system.io.compression@4.1.0
+system.io.filesystem.primitives@4.0.1
+system.io.filesystem.primitives@4.3.0
+system.io.filesystem@4.0.1
+system.io.filesystem@4.3.0
+system.io@4.1.0
+system.io@4.3.0
+system.linq.async@6.0.1
+system.linq.expressions@4.1.0
+system.linq@4.1.0
+system.linq@4.3.0
+system.net.http@4.1.0
+system.net.nameresolution@4.3.0
+system.net.primitives@4.0.11
+system.net.sockets@4.1.0
+system.objectmodel@4.0.12
+system.private.datacontractserialization@4.1.1
+system.private.uri@4.3.0
+system.reactive@4.4.1
+system.reflection.emit.ilgeneration@4.0.1
+system.reflection.emit.lightweight@4.0.1
+system.reflection.emit@4.0.1
+system.reflection.extensions@4.0.1
+system.reflection.extensions@4.3.0
+system.reflection.metadata@1.3.0
+system.reflection.primitives@4.0.1
+system.reflection.primitives@4.3.0
+system.reflection.typeextensions@4.1.0
+system.reflection.typeextensions@4.3.0
+system.reflection@4.1.0
+system.reflection@4.3.0
+system.resources.resourcemanager@4.0.1
+system.resources.resourcemanager@4.3.0
+system.runtime.caching@6.0.0
+system.runtime.extensions@4.1.0
+system.runtime.extensions@4.3.0
+system.runtime.handles@4.0.1
+system.runtime.handles@4.3.0
+system.runtime.interopservices.runtimeinformation@4.0.0
+system.runtime.interopservices.runtimeinformation@4.3.0
+system.runtime.interopservices@4.1.0
+system.runtime.interopservices@4.3.0
+system.runtime.loader@4.0.0
+system.runtime.numerics@4.0.1
+system.runtime.serialization.json@4.0.2
+system.runtime.serialization.primitives@4.1.1
+system.runtime@4.1.0
+system.runtime@4.3.0
+system.security.accesscontrol@6.0.0
+system.security.claims@4.3.0
+system.security.cryptography.algorithms@4.2.0
+system.security.cryptography.cng@4.2.0
+system.security.cryptography.csp@4.0.0
+system.security.cryptography.encoding@4.0.0
+system.security.cryptography.openssl@4.0.0
+system.security.cryptography.primitives@4.0.0
+system.security.cryptography.protecteddata@6.0.0
+system.security.cryptography.x509certificates@4.1.0
+system.security.permissions@6.0.0
+system.security.principal.windows@4.3.0
+system.security.principal@4.3.0
+system.text.encoding.extensions@4.0.11
+system.text.encoding.extensions@4.3.0
+system.text.encoding@4.0.11
+system.text.encoding@4.3.0
+system.text.regularexpressions@4.1.0
+system.text.regularexpressions@4.3.0
+system.threading.tasks.extensions@4.0.0
+system.threading.tasks.extensions@4.3.0
+system.threading.tasks@4.0.11
+system.threading.tasks@4.3.0
+system.threading.thread@4.0.0
+system.threading.thread@4.3.0
+system.threading.threadpool@4.0.10
+system.threading.threadpool@4.3.0
+system.threading.timer@4.0.1
+system.threading@4.0.11
+system.threading@4.3.0
+system.windows.extensions@6.0.0
+system.xml.readerwriter@4.0.11
+system.xml.readerwriter@4.3.0
+system.xml.xdocument@4.0.11
+system.xml.xmldocument@4.0.1
+system.xml.xmldocument@4.3.0
+system.xml.xmlserializer@4.0.11
+system.xml.xpath.xmldocument@4.0.1
+system.xml.xpath.xmldocument@4.3.0
+system.xml.xpath@4.0.1
+system.xml.xpath@4.3.0
+"
+
+inherit check-reqs dotnet-pkg edo multiprocessing
+
+DESCRIPTION="SMT-based program verifier"
+HOMEPAGE="https://github.com/boogie-org/boogie/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/boogie-org/${PN}.git"
+else
+	SRC_URI="https://github.com/boogie-org/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+SRC_URI+=" ${NUGET_URIS} "
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sci-mathematics/z3
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/OutputCheck
+		dev-python/lit
+		dev-python/psutil
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.4-disable-analyzers.patch" )
+
+CHECKREQS_DISK_BUILD="2G"
+DOTNET_PKG_PROJECTS=( Source/BoogieDriver/BoogieDriver.csproj )
+DOTNET_PKG_BUILD_EXTRA_ARGS=( -p:RollForward=Major )
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	dotnet-pkg_pkg_setup
+}
+
+src_unpack() {
+	dotnet-pkg_src_unpack
+
+	if [[ -n "${EGIT_REPO_URI}" ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# Remove bad tests.
+	local -a bad_tests=(
+		civl/inductive-sequentialization/BroadcastConsensus.bpl
+		civl/inductive-sequentialization/ChangRoberts.bpl
+		civl/inductive-sequentialization/PingPong.bpl
+		civl/large-samples/GC.bpl
+		civl/large-samples/shared-vector.bpl
+		civl/large-samples/verified-ft.bpl
+		civl/paxos/is.sh
+		civl/samples/reserve.bpl
+		havoc0/MouCreateClassObject.bpl
+		havoc0/MouseClassFindMorePorts.bpl
+		inst/vector-generic.bpl
+		inst/vector.bpl
+		livevars/stack_overflow.bpl
+		prover/cvc5-offline.bpl
+		prover/cvc5.bpl
+		prover/exitcode.bpl
+		prover/z3-hard-timeout.bpl
+		prover/z3mutl.bpl
+		snapshots/runtest.snapshot
+		test15/CaptureInlineUnroll.bpl
+		test2/Timeouts0.bpl
+		test2/git-issue-366.bpl
+		test21/InterestingExamples4.bpl
+	)
+	local bad_test
+	for bad_test in "${bad_tests[@]}" ; do
+		rm "${S}/Test/${bad_test}" || ewarn "Failed to remove test: ${bad_test}"
+	done
+
+	# Update the boogieBinary variable.
+	sed "/^boogieBinary/s|= .*|= '${DOTNET_PKG_OUTPUT}/BoogieDriver.dll'|" \
+		-i "${S}/Test/lit.site.cfg" || die "failed to update lit.site.cfg"
+
+	dotnet-pkg_src_prepare
+}
+
+src_test() {
+	einfo "Starting tests using the lit test tool."
+	local -a lit_opts=(
+		--order="lexical"
+		--time-tests
+		--timeout="1800"          # Let one test take no more than half a hour.
+		--verbose
+		--workers="$(makeopts_jobs)"
+	)
+	edo lit "${lit_opts[@]}" "${S}/Test"
+}
+
+src_install() {
+	dotnet-pkg-base_install
+	dotnet-pkg-base_dolauncher "/usr/share/${P}/BoogieDriver" "${PN}"
+
+	einstalldocs
+}
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index e9a896c67a05..828a3494d3db 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,6 +1,7 @@
+AUX luajit-2.1.1727870382-fix-ljlibd-prefix.patch 866 BLAKE2B a6c879b4ed03292b94f6e1cb9549139ea6ad04a4aba0c8af6edd83b3e3f5db0f5a2d7d0fe8187bc9f57ea0b25fd283c0901e4d7d1eebc9e82944d999ec3acce6 SHA512 d2493282d691c3e4cc19f590de062241b6cb7d88a1ac0e7c8cec8e4b8162659af29a9ab5363cf91110a14dc26d7f43ec39dddc94583fbed8811eec4a9fb01977
 DIST luajit-2.1.1716656478.tar.gz 1081717 BLAKE2B 42807910aa81e705ff39c382e98e479d46d31453fd6fc1857220c7d4cb66d0801e2ffd813ea3c55ab2bcde8e64275d0fec2044514d7b0ef5287714ec8061bf7a SHA512 6b00d37a33f0bafbd953569ef035546a97237a53cfb718d8aecca7e9c7afe5e4706e4a53e40b9afb8720adc8eee044d8d75b8ea6cdc50d2c3f8461d79bb73b26
 DIST luajit-2.1.1727870382.tar.gz 1082759 BLAKE2B ca2cca53238b1fcbb5a829b125f6b3efda3a863765027c8c224a01b95756255583e126ec04c115e7acc54314fb387ce1b09b9384acf0a852d51f887409bd702a SHA512 ac26594526f10e878874c02b2bbdfc6a0d1366c60456fbd09a75da5f565a2f81a1c73e385a7e7f0096a3923df5f4ac7f727100faced355bd05a9da0e95fbe1ef
 EBUILD luajit-2.1.1716656478.ebuild 1765 BLAKE2B 1e2960f12069fce84b46b1f06cc1129bd35c13e25ca3d9de5e1ccaed92ee0e827574c8f96faee5c32da1a2e3cd7335b94417ddcf0f299b4f1223b25bc98d3465 SHA512 3ed141f3339ba892fb2598b3c8d3f86760dfb5ea1c6efbf996cad9cb202faa9f5613426c5bf4dcfe741cf3b13f63bbf76bf651333eab414f4852a0622f629f64
-EBUILD luajit-2.1.1727870382.ebuild 2357 BLAKE2B fc22a5e4d9f0d7a9458fc171f3f438d7a8d04a3182cc1ce5210ae7e8f05c4fa83f700ebb31298f075a978277991eac76abd67ab95a8a3f8d20025e2834d35033 SHA512 1ea5dec28a91f0549c72800513e1db36293aa89fa65513aa2de23c2421ebc3ac3cf4e1aa1608160e87a342168b62b89cfd6a7b6d461810c2e6fd58d65519cc6a
-EBUILD luajit-2.1.9999999999.ebuild 2319 BLAKE2B c215f9324d2528f6e5da26d87d119e1447cd28a0f1e9499f4262b85bd5a987f40fa221d63bab9ad8afdc261f0e15d753ca832408219d02e845b18baea1d2b65b SHA512 e1ac4499a26eb8a2d3bb666879ab2d10cb598a3c0d7e2fa541c8fd00446598d2783908b91409c8337a21c9d8ae57627d78110da4bacfeec2a207a20a132a7cc8
+EBUILD luajit-2.1.1727870382-r1.ebuild 3187 BLAKE2B 7cbf9f9df02029d917ec8d58bca2bbbc9634690bf8340e7701168b8dea2fd916c3dfb7524b77af645e83fb8a791e876e61f264f4c658f550003c0254c8718e43 SHA512 55b8c952b89a039fa8f5148d94ecb118af7ba10e58b93edef79c8b1d4d0332b38e6e8a0aeea57a1fa631f3a01388d7217ac3284dd9cfffcf34b507db512a4353
+EBUILD luajit-2.1.9999999999.ebuild 3149 BLAKE2B 49acc6e064da6ecf1f3bfdea85c0bcc3d14da4a765476efd5f5bf4859df5baae1f42e112ba611cbf828a526b49e828f89420d4724001b7466c6841907ffc1ec8 SHA512 be175848bfad672baa5f8a02b4f9f1f3191fec64e5d1af72d3d6958660113d9d37afa7b255a1ef5f2e655ac46953106e6ef64840d3747dc77accae83c2c339b7
 MISC metadata.xml 417 BLAKE2B dca79cd3a003ad462f7da8372af0e4012c826bc5b3001417f5b5c969f9ae9dc0cf5f6a5ac35c1badfa95769c46f701a9fa1220e2c4ecd1320cd3e904a657a4ce SHA512 812208e908c4775c7a6009764416007ab3bea124da44dca696425340848a8ff4eeae7128977162c0e679c485a9c27f03639c87854b0d513eec8bceb19d316e0d
diff --git a/dev-lang/luajit/files/luajit-2.1.1727870382-fix-ljlibd-prefix.patch b/dev-lang/luajit/files/luajit-2.1.1727870382-fix-ljlibd-prefix.patch
new file mode 100644
index 000000000000..98ae276fcc9f
--- /dev/null
+++ b/dev-lang/luajit/files/luajit-2.1.1727870382-fix-ljlibd-prefix.patch
@@ -0,0 +1,25 @@
+# LJLIBD is traversed at runtime, should be relative to
+# PREFIX instead of DESTDIR/PREFIX
+#
+# https://github.com/LuaJIT/LuaJIT/issues/1303
+# https://bugs.gentoo.org/943395
+
+--- a/Makefile
++++ b/Makefile
+@@ -37,12 +37,13 @@
+ DPREFIX= $(DESTDIR)$(PREFIX)
+ INSTALL_BIN=   $(DPREFIX)/bin
+ INSTALL_LIB=   $(DPREFIX)/$(MULTILIB)
+-INSTALL_SHARE= $(DPREFIX)/share
++INSTALL_SHARE_LOCAL= $(PREFIX)/share
++INSTALL_SHARE= $(DESTDIR)$(INSTALL_SHARE_LOCAL)
+ INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
+ INSTALL_INC=   $(INSTALL_DEFINC)
+ 
+-export INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION)
+-INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
++export INSTALL_LJLIBD= $(INSTALL_SHARE_LOCAL)/luajit-$(MMVERSION)
++INSTALL_JITLIB= $(DESTDIR)$(INSTALL_LJLIBD)/jit
+ INSTALL_LMODD= $(INSTALL_SHARE)/lua
+ INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
+ INSTALL_CMODD= $(INSTALL_LIB)/lua
diff --git a/dev-lang/luajit/luajit-2.1.1727870382.ebuild b/dev-lang/luajit/luajit-2.1.1727870382-r1.ebuild
index 1a9014c337c4..c3beab8c9c1a 100644
--- a/dev-lang/luajit/luajit-2.1.1727870382.ebuild
+++ b/dev-lang/luajit/luajit-2.1.1727870382-r1.ebuild
@@ -14,19 +14,20 @@ EAPI=8
 
 inherit toolchain-funcs
 
+# Split release channel (such as "2.1") from relver (such as "1727870382")
+VER_CHANNEL=${PV%.*}
+VER_RELVER=${PV##*.}
+
 DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
 HOMEPAGE="https://luajit.org/"
 
-if [[ ${PV} == 2.1.9999999999 ]]; then
-	# This is the 2.1 rolling release live build. When a 2.2 or 3.x branch comes
-	# out, create a new ebuild for it.
-	#
-	# Upstream recommends pulling rolling releases from the v2.1 branch.
+if [[ ${VER_RELVER} == 9999999999 ]]; then
+	# Upstream recommends pulling rolling releases from versioned branches.
 	# > The old git master branch is phased out and stays pinned to the v2.0
 	# > branch. Please follow the versioned branches instead.
 	#
 	# See http://luajit.org/status.html for additional information.
-	EGIT_BRANCH="v2.1"
+	EGIT_BRANCH="v${VER_CHANNEL}"
 	EGIT_REPO_URI="https://luajit.org/git/luajit.git"
 	inherit git-r3
 else
@@ -42,6 +43,7 @@ LICENSE="MIT"
 # this should probably be pkgmoved to 2.1 for sake of consistency.
 SLOT="2/${PV}"
 IUSE="lua52compat static-libs"
+PATCHES=( "${FILESDIR}/${PN}-2.1.1727870382-fix-ljlibd-prefix.patch" )
 
 _emake() {
 	emake \
@@ -73,7 +75,22 @@ src_compile() {
 
 src_install() {
 	_emake install
-	dosym luajit-"${PV}" /usr/bin/luajit
+
+	# For tarballs downloaded from github, the relver is provided in
+	# ${S}/.relver, a file populated when generating the tarball as directed by
+	# .gitattributes. That file will contain the same relver as the relver
+	# in our version number.
+	#
+	# For the live build, this is not populated, but luajit's build process
+	# inspects the git repository directly with this command:
+	#
+	#     git show -s --format=%ct
+	#
+	# In both cases, luajit puts the relver in src/luajit_relver.txt during
+	# the build. We read this file to ensure we're using the same source of
+	# truth as luajit's own build does when generating the binary's filename.
+	local relver="$(cat "${S}/src/luajit_relver.txt" || die 'error retrieving relver')"
+	dosym luajit-"${VER_CHANNEL}.${relver}" /usr/bin/luajit
 
 	HTML_DOCS="doc/." einstalldocs
 }
diff --git a/dev-lang/luajit/luajit-2.1.9999999999.ebuild b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
index f4cd0a39d8e1..a27f77162d26 100644
--- a/dev-lang/luajit/luajit-2.1.9999999999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
@@ -14,19 +14,20 @@ EAPI=8
 
 inherit toolchain-funcs
 
+# Split release channel (such as "2.1") from relver (such as "1727870382")
+VER_CHANNEL=${PV%.*}
+VER_RELVER=${PV##*.}
+
 DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
 HOMEPAGE="https://luajit.org/"
 
-if [[ ${PV} == 2.1.9999999999 ]]; then
-	# This is the 2.1 rolling release live build. When a 2.2 or 3.x branch comes
-	# out, create a new ebuild for it.
-	#
-	# Upstream recommends pulling rolling releases from the v2.1 branch.
+if [[ ${VER_RELVER} == 9999999999 ]]; then
+	# Upstream recommends pulling rolling releases from versioned branches.
 	# > The old git master branch is phased out and stays pinned to the v2.0
 	# > branch. Please follow the versioned branches instead.
 	#
 	# See http://luajit.org/status.html for additional information.
-	EGIT_BRANCH="v2.1"
+	EGIT_BRANCH="v${VER_CHANNEL}"
 	EGIT_REPO_URI="https://luajit.org/git/luajit.git"
 	inherit git-r3
 else
@@ -42,6 +43,7 @@ LICENSE="MIT"
 # this should probably be pkgmoved to 2.1 for sake of consistency.
 SLOT="2/${PV}"
 IUSE="lua52compat static-libs"
+PATCHES=( "${FILESDIR}/${PN}-2.1.1727870382-fix-ljlibd-prefix.patch" )
 
 _emake() {
 	emake \
@@ -73,7 +75,22 @@ src_compile() {
 
 src_install() {
 	_emake install
-	dosym luajit-"${PV}" /usr/bin/luajit
+
+	# For tarballs downloaded from github, the relver is provided in
+	# ${S}/.relver, a file populated when generating the tarball as directed by
+	# .gitattributes. That file will contain the same relver as the relver
+	# in our version number.
+	#
+	# For the live build, this is not populated, but luajit's build process
+	# inspects the git repository directly with this command:
+	#
+	#     git show -s --format=%ct
+	#
+	# In both cases, luajit puts the relver in src/luajit_relver.txt during
+	# the build. We read this file to ensure we're using the same source of
+	# truth as luajit's own build does when generating the binary's filename.
+	local relver="$(cat "${S}/src/luajit_relver.txt" || die 'error retrieving relver')"
+	dosym luajit-"${VER_CHANNEL}.${relver}" /usr/bin/luajit
 
 	HTML_DOCS="doc/." einstalldocs
 }
diff --git a/dev-lang/nprolog/Manifest b/dev-lang/nprolog/Manifest
index d644f889cbb5..1c193df64b7a 100644
--- a/dev-lang/nprolog/Manifest
+++ b/dev-lang/nprolog/Manifest
@@ -1,6 +1,6 @@
 AUX nprolog-3.22-ncursesw.patch 270 BLAKE2B 4e412a1b42bea3e797ddb0f17a5d22bd0f22f5e9fd037bc199704c1abd664413df1adaafc35ed5f430b4da36279199b30b57d34cf459064efa3bc94a1f61a6ca SHA512 41c510be3afad45ba77d1882f864b62349c2d81fc4ac166d736506d14f1e9061ce4d1f9ec3a6adb15fbd4b377573b915f27efba0825701dc396848ce5e2d16e3
 DIST nprolog-3.36.tar.gz 598498 BLAKE2B 1cf2f1459698f2c7df01b4a2202e292b5c0918c363ebc761007f7996f405f7334e757678dbe510ea5c3a52dce8a5fa2b84cd898b04b3bfa4ab33d325ecd17401 SHA512 33ce46cec1c1d167b70ba0f59655f58d42e388d63f5515cec88086db1035d54700865ddfbe213f393d65180928c3951c11056471ef5499761182ea6536a0ddb2
-DIST nprolog-3.40.tar.gz 599241 BLAKE2B 7cf99fe273b69468b4b07283eb5008e46dd9661013ea0c4911a70eecb50aa3334167806c2f5f7b39c8485a22a22c960f4c5e79ffeea63d0216e3a327c1be87c2 SHA512 624f0634505312d2a4d1c9be713612cecb95fd28856df31f0bd57ba6b965383eecf7dfaa594b3c740fd05336dc5775f8cc887282438aaf9b02a635847cfdcfac
+DIST nprolog-3.41.tar.gz 599368 BLAKE2B d335f87834ca9a6cb167416ebd8024e7122fc17c5b065997e1b88c003ab7f8d772d715d363c712d75fb81d5634993f1dd106593f90f3d375696b8c6826668e98 SHA512 d0927259a3a7b157c9d346cf99c4fb354c4ff4f71c92970c63439c016137437cd2ebcfef7b4bffe50befb3abc5f463abb68eb5b859fa52220e36aac57957321d
 EBUILD nprolog-3.36.ebuild 888 BLAKE2B c0614eed790898637c575682580b6879192cb584bc11044d9af3270e919ce0d41c052326c2d1e9b9746051fb3cdee90552510029c9a2e8d64d14dedc607eb547 SHA512 5aa1cbeefdde67461fc2f08e5afb2d2b51bda61e18859ee1b65e11367fa06ce018e9001c94806f8518a5264a929407ed3b26d5e442115080771712fecdfc1a99
-EBUILD nprolog-3.40.ebuild 889 BLAKE2B 8b9ac031e349ee93be59b36a8654e718ac65954258ec03138b0e6e8c9b6ece5ef9378e7a6e641e716b2be75de337ef8d1e765d06ee2f5e685c5015cacd445523 SHA512 c3fe6314b02f2a6d9f6bc8ded5973f65e46061563a99a53a7aa8b7b7c134d95246ca6a70ac0cb51e6f8e56c23bb67d11809f05130795eb3f4659b219017d70fc
+EBUILD nprolog-3.41.ebuild 889 BLAKE2B 8b9ac031e349ee93be59b36a8654e718ac65954258ec03138b0e6e8c9b6ece5ef9378e7a6e641e716b2be75de337ef8d1e765d06ee2f5e685c5015cacd445523 SHA512 c3fe6314b02f2a6d9f6bc8ded5973f65e46061563a99a53a7aa8b7b7c134d95246ca6a70ac0cb51e6f8e56c23bb67d11809f05130795eb3f4659b219017d70fc
 MISC metadata.xml 657 BLAKE2B 9331358542d57958385bc1218b4a1c5d38185ab0822d0cc68e51bcc5f8b00645a523a1a4f60d30188efc3ed7cb934f0a6a964d27bf0915c5956c69774c734590 SHA512 972ae4d1f2179887f77d8805f2e5482c17767e38b078fa9d9ee65a2f43e0b56b76fccd0166f4c5121de9a7cead4faa7683bd8e9076c257ffb2d1deb673eb276e
diff --git a/dev-lang/nprolog/nprolog-3.40.ebuild b/dev-lang/nprolog/nprolog-3.41.ebuild
index 39a1d076726e..39a1d076726e 100644
--- a/dev-lang/nprolog/nprolog-3.40.ebuild
+++ b/dev-lang/nprolog/nprolog-3.41.ebuild
diff --git a/dev-lang/smlnj/Manifest b/dev-lang/smlnj/Manifest
index f6b318a83964..dab9bbc571c3 100644
--- a/dev-lang/smlnj/Manifest
+++ b/dev-lang/smlnj/Manifest
@@ -1,30 +1,4 @@
 AUX smlnj-110.99.4-shuffle.patch 1214 BLAKE2B 39f65a484f19c4cdaf514fa1e36832093bb83e5ae2ecece1dbdd1f477072ff9bf0402547a5fd7b7f51e1a76169939000d6836df07cb35d4928362d377d36ee09 SHA512 9beaaba70be12d7d2b689cf84034b2707d2e8998b5feb58d2f50cfb27383fc0582545cd171f19fc9a900009df4be69149de5b9eab64466305a27c5f06b00e7ec
-DIST smlnj-110.99.4-MLRISC.tgz 1457408 BLAKE2B 6d01d0a994ded4167e7429ac4d7a7184197a76b454c7270de8c0887a1a38fffc13db7c1ec23a2e26c3ee765de590cb9483ff74ef944ff71a6ed45dfab9b4c268 SHA512 8ab2d36b0f46824060c87080ea1d450de869db48a768772d4725ca2a7c807451ee675554d5440517960fe41d5f64ceb3a8368c97f667b2bbd83d03195666d64e
-DIST smlnj-110.99.4-asdl.tgz 241360 BLAKE2B 3fb88f1a44487bff643bf6d011c234cb27c31c220c8ea929b57f72ebd50c1df4da15444617e5a7adaa9f814b0aec4bf3995aad9871f9c808b4bb86df7dbd106d SHA512 9926bb97ac12b595907e2a86ffd4b208e2283275fabc3383b9a4942b99ec0daf5beaec2781072b21d1fefa2331ae99fc9a1cdbf6daf247714a495fe86c4bba2a
-DIST smlnj-110.99.4-boot.amd64-unix.tgz 5974915 BLAKE2B 81e88ecc65455ce29147130b9b848ba95e64cec184ca3c04020766eeff3bf17b4c8937d105d71748155e71cc5ae1e59a8630b9547123aa554674eba4d8f6b148 SHA512 f3a3baf0c725b590def75d5ba8bc71a46230f26f47cd921ebaf45912954d3ec47abf068c20a2719ce6b5db07b9160d6d75997e0e967073b0585bc415b92c859a
-DIST smlnj-110.99.4-boot.ppc-unix.tgz 5846611 BLAKE2B 9c4dc931135bad8be0a78c4131e0809b2394a16c0a329bfa1cbe2827bc7a19ee8efe375733694439886ba04d9213da6eef4aaee263888070288cba707cd74ce5 SHA512 2c1d569101439d027d0b5d602655eede72baae7359d0870e5d818bb03c627d88896d0b1bc8dc0b3ef9a6d25949ed76084fdd3c4df613e5107aa3e62f651c93ac
-DIST smlnj-110.99.4-boot.sparc-unix.tgz 5987747 BLAKE2B 30f1d35767a642b6d0873dbc3735d9a124d2500b9594f3a61a89688a63f3de7d5e0cdf6bf61a73a683b74ec31f4b62a904c29ad6f2c1c8fc00aa5cd4cae7e7c5 SHA512 6885819a923abce5c90bf9903aa73652020b581f42f1664cd21c79045ef6e6dc0cc014b597c26c4d216519ea0ab4c477db52f94f54199c259c0ba01cce94ae60
-DIST smlnj-110.99.4-boot.x86-unix.tgz 5928155 BLAKE2B 689bedd368396fcf5fef27c109e43bd32a3042fda9d9cfb85905639973a6a41fcdd5829903d79745a62de9fd47ddb89a91b838a4f96e6bc26f5e2c8959b6df5c SHA512 e39a7b80ceb35f4ea2d2ceb8e300f21da1dce54d34f2ff2c174a942621856ab92bdb60194d5a75194b8414abf54d7962a88fe9f04df34843f75bcf59eca43087
-DIST smlnj-110.99.4-ckit.tgz 200781 BLAKE2B f1562b39a7c3560aa6907ec7358beedc033c6be75d0cb6a48ceef0a4c1c59ab8dbc8585a107415e0fcff40fc20c1943f4ba0533bc05e11078a26e089ea793512 SHA512 6a80409659382ae8744acc0ec323a499cf4719414cb90298064c193b20d74c6a8aed22bf6b0debcbfbed33394012ab3cf4f9037a129151c357df7d9cec56bcde
-DIST smlnj-110.99.4-cm.tgz 220303 BLAKE2B fa3fdd023d999e723b588e8edc14f5a92e6393691646b55208e23197d1a13be098a392c77bfc867c52ae2085cd08e818dcfc44096c8d4613eeaca57f7d142a56 SHA512 1826ea9414758d9990d2cc683c86d044ef0cdd6f5fd605f4074a50e25d552994edfe3dba5e18825f689ef60de9560a2b503edd5ed3f5cec19bbd88c34ca28e5b
-DIST smlnj-110.99.4-cml.tgz 103974 BLAKE2B 48151b69fc020250656389c0b073bc75fd3673f21272bafd466aa966cadc3ba21f7f4de1677a4a6979b213ac5aff5bb354657516b014f9bc998a2d72d99c0e15 SHA512 a71f7be7b5a43ea2456a13d231310eee5ae16eff777271bda2fffc9f30d3916481c176c015b8e855f2c41cef5cab90d59351425659eace3bbd9e5a396c91857a
-DIST smlnj-110.99.4-compiler.tgz 856681 BLAKE2B fb073628cdadc800d4dd8d1ef66c54fe500d1aa46e38005d37702f3c7381cdaf8bdf11839f319f9f1c9a7de09d832440cb525effe90b9d603889b5bb6fa189f4 SHA512 eabb38b35fd46a2c9ef66464754d3c470f635bdc395e83a57637191e1ad81881410a55afccb78b3baedee6c944e07844085f243a03d9274708c05f0680450c8e
-DIST smlnj-110.99.4-config.tgz 23360 BLAKE2B e53f3fdd61047cdb14b1cf41f2a9d7aaf024c5ac7189b592dde1ce9bb1a3b851da10e736dcbce00c3c31719f32a169343b973fd6618ee16ee9c398000b019b3c SHA512 13ddc3f48fd532fca58fe4f9c975737726ecfc128ee592f6662b3419f8f21a69362a1ad3bc04f397f9a223dca1ebe7ecee4c31c026f6761f20ec3214ae08c883
-DIST smlnj-110.99.4-doc.tgz 2511006 BLAKE2B fb1830081bdcc59ec9b96d3d8d4408e5a89f55885b62971eb3e6025cfc133ce9d3640d8323852cd247708fa54a33dc3c1e7037d3c0129a0d047adf4697f474e4 SHA512 af4cdb5007efdc1c1b856e5d5a975494354e47c66109e0f3d3740abb81cce8948145b42501a3043dd504075ff3b0ead28e0ae4d0504a0dafd705b75c002eb1e9
-DIST smlnj-110.99.4-eXene.tgz 714479 BLAKE2B e43613b52c80c017e95c7be69a8e3424249701a094be9696016d22cdb0a91010c30bbe6acc132b05844f089d7565c085768feb64c98cae64b1b0427bbe9862dc SHA512 b0ec47155aa81a97cdc8429ec44c197fd20363f5448150cceb88f0698341fe8da25f8fab0e46c7aa8dfdee2bbb0af42078b9e7364248d5bd6afb174b379e12ff
-DIST smlnj-110.99.4-heap2asm.tgz 1763 BLAKE2B 94ac3d22e1de9e17877f48b0f01cb0a0ae35ba5b1fe706ac05be57dff990d2d6910ddd24ed7897a8409cfb5510cc5f6844c0fef81ef352c4ec947151fdc1355e SHA512 ff086979240e6081b939da400f7790f8a9a0eb36185f997574565f47740d9f673ff8d178fc165002851e746b835e58ba0b29a0a8ebfdff7f81511b1b86c6a774
-DIST smlnj-110.99.4-ml-burg.tgz 40359 BLAKE2B 7cdae677c454a5cfde6f914e974bce7b632a1028aaad36d8e8afaa48f07a0b9a787142ecf0c58a22c769ff5dc7a6b37c028bbb409e455fd4a45d756e70811ab0 SHA512 ed7361609ebaa55135896c6fa433672ab0385ca5965757d9b94ee02e05def0c13e22eedbf1662d6faa4203d9051727fd9a20e97fee9961a98fb4c47d621c4a6b
-DIST smlnj-110.99.4-ml-lex.tgz 28037 BLAKE2B 26c5fbfb845288db2d60961565cc374f56d739fe16dcfb39b091452d6ba7c01c70772d57bf7252cb9aba44ee152dcf67e92e8fae1350f7b6a023b9a47d311472 SHA512 394d4963af0ae6e5858103d7a97d3c7036246c17e2fe59447cd2f14acb3c8cfed26ec1ebfd96d46526e4afb2a8f8ce9c48f3a55e776def649fb6330c59b98670
-DIST smlnj-110.99.4-ml-lpt.tgz 267314 BLAKE2B 7a2640d7dcec0303fabf8323a8e1939ff743dd057757fb712bc09c6aa5f8466752b1eed715a5568c445bcb36dd44a965424a260ef6f210c452ba59c62420244d SHA512 9e2508b66a1134060325b95d32eb527c6c81f4fac57c7916cfded861fa15335487a3adabbe78402de59c0c78e78b9ab216d82db8319e04f3cc1cbfabd051a0e8
-DIST smlnj-110.99.4-ml-yacc.tgz 101365 BLAKE2B 12efc1b8673a51566915d78ddfeed31e69494dcf88464d3231cedb2d4f811b86025ba7d535fb2f605b9cabef8e6a466691803f8bf7daa8a52ae5fae4b118f4a3 SHA512 af1298f2d8401071d73b49a17f5aa23823cb5bcab5601d60c2c5ce841722e4ab623f84838524ce428a88066b05951b64e10981f97628da8b66ec6f3031b68fe4
-DIST smlnj-110.99.4-nlffi.tgz 74821 BLAKE2B ae5d170784cc604216f9abc1d2a996002cbef333525cce5ee94a0053a3a65f62d415d9abc0b74f0337fae7dc120a6278a223872a1b39f2b22a6f931f044da57b SHA512 9a5ae94f407651b4e342a803d3f857fd2eb62a577a23113aa7e69646a16250e992bd92c60208add10b48036a8beeff7b96cc97ac6a15cdee8e93b138b0950255
-DIST smlnj-110.99.4-old-basis.tgz 1363 BLAKE2B 984e4c888ee83907f179aef23f89299417b87dc7611abf357d20e78ce8a8411589db5cb9aa04b9f2c7ab883c301aa8eb7fdad7dd276c71f12bf5edbddd35a945 SHA512 ceeaab53cc9f88a2a0096a71cabe66e20fa0b16c2d5d189da87444fa512f9c74d96773071d78d760d45df2950cbc2726c35eb5f0f1e500493dcc77bb8f01277d
-DIST smlnj-110.99.4-pgraph.tgz 5368 BLAKE2B 2c8d5101807506c151c97e51ad11d7abe2ad4897cf766d23535e4abf830d76ec67684169e1347e46b98a2aa1518d399e75d1342b4caa2121f00c1dc2a3fa309b SHA512 0d51518c88a53c945a37d6bcf9678159811197b558c02ec529dd0d8a389466c3780ec1a58dabacbb7d46872f989f724866fd4ba6d0d30d608ca09d1a853adebc
-DIST smlnj-110.99.4-runtime.tgz 334322 BLAKE2B 61dae19bfa0f48533b9def27e971566032bdbc01ba54d5300643a668e5be86e2064aefcc93c31e074cd9fa04e1af719b3c5aa98529dc8f17629d704e3a1e712b SHA512 0406c4a55fecade5c47457c5cf4245a3a81d04214953066b846023cb863b27401121422b04d423905ceeecd9cdac238309d9b4967a396a05f13b35343e56bb51
-DIST smlnj-110.99.4-smlnj-c.tgz 10589 BLAKE2B df85102595bfdb492ee1a8967f4fc322b7d9366a579731a7984512d9ea24f4a06db2b51d96c168daa34b9d90f81bf3e4e771c590298833e059652b3732af8482 SHA512 ebe714a2cf18e0b0763e1819ddc83fbc3250ee49d386b4bbb5d5d653e92ed01d83aac0aaa89aace8d451fc0c681c82cfc725817e909fa16fd27b341067ec4b3d
-DIST smlnj-110.99.4-smlnj-lib.tgz 645485 BLAKE2B a1adc247c82dde766a34026a2cef77b4b89cc80f52b4a949173910d30aae2a8a28dc716691c7248d145791c81c27aae75f9b5a91cdcdd3397f1f944255c50c60 SHA512 ac32ed428de0512534445991ae02755170d61dfaa3d4ae5234b437edb7ed6cf9e72e94bfe8edbfd40e5bc7f7a18a97d90a42f5b4f8cbfac2b66cff1b8b6318fc
-DIST smlnj-110.99.4-system.tgz 282951 BLAKE2B 61ecb598b2daeefcd62ff8214579ecf30434368fb3b3d75edc2b701170ed9719b9f1bc8114c440ab3582329e5e965b3d1fc4287be0226707766bfc796db49fcf SHA512 35b5c2c1e27745c4f366d655768cbb5fd08953f58906751d49e6a4b5d19dd13bb0e1003e7dac5990dc121c81fc3ecab242a367ef43a02a2728ff3de9d2f0ad1b
-DIST smlnj-110.99.4-trace-debug-profile.tgz 3891 BLAKE2B 81cec5f57efc4345a287b5a0b5d93ee96271c2494feb06df3c4583bf23e6079322e9f93e0092469a233954ab145e7e6d56b821bf8bffb85c8d92338ad0fd7163 SHA512 db8c147d65b6211fdff71171a2b517726502e742c7ae48e4bb326decaaeba8ab5abfefd192cc7381182dc266d26a81d2792635821256c7ed7ff7652e9f6fbd41
 DIST smlnj-110.99.5-MLRISC.tgz 1457434 BLAKE2B 385460ebe010667dc4b22d13b4dce64a766c656ab6182b5b347e4612c5f3e428e3788f8ca3cfb1ba50f04fe86acfa7ce98ea5ee37631b179bf0c3d955548b86f SHA512 d134cd9f6f0ef49cabbbed15b390a1f4102271c5a65376afe96eb93ff196f36a591c6c252a9068b74c78158ebfbbc8e89e298f46d764701d38d4ea9bbaa7f22c
 DIST smlnj-110.99.5-asdl.tgz 241656 BLAKE2B 60900c26da035690a2b41f67ba54edb5952f30e1455c62c7a12d57986b24fb10714955ee26eb5c0e037214190e07ef246e309e9e9527dd9837d184fa0ac9d5ce SHA512 3f829f057b5e33b574a79e6efdb5a0d595a462d6d6f95036d44924e6872898b353a21ae2d650bf42589d4bb444c77fb0d7a50857ca7514fa4d229be3ed305691
 DIST smlnj-110.99.5-boot.amd64-unix.tgz 6000465 BLAKE2B 56d84401739540bde737ef35814ed73ec6381b88b29a93503e242fd60c1bb421cd30d40439cd9e334e8ea70f18e3e25f2150c0a5cc143ec649f54bf65803abe4 SHA512 aa2ea0d615d9e90dedab6b9c915e642bb6ebb4189e1bea0214c47b057208a3a2a7609bdb59126c8331ecd49d3c1717b6db2ab18c2cca362cc5ff92dd51df539e
@@ -51,6 +25,32 @@ DIST smlnj-110.99.5-smlnj-c.tgz 10594 BLAKE2B 42b2e852a2ca16a04a1f406034aff66c83
 DIST smlnj-110.99.5-smlnj-lib.tgz 658010 BLAKE2B d0f03e38116aa14c7d376facb855fd3b56778c601bc0f2bea21e1793d1a3d9a496da602f1f092fa2402eea411fac995f676cb30b1819e9a15832a60eef97a998 SHA512 0c643e3ab3f6ca5f3a483666042c3b7b835e73969ca3d7602359d8229d5291bd5b90fbc1e66a876a697a8d82fab003edebe61c18c0c0a79a7a987f430845c615
 DIST smlnj-110.99.5-system.tgz 295177 BLAKE2B cb6648d514754ea16650170dda240b2f318e326d1c6cb7a185c9f9e1a33ad32c5c71902ceda09be7a99d4610b3367f8ec590817f3b7d331d7c2b9ffa9cf5ae84 SHA512 038c233eae021293dd83cdaeee5e5d0a78259016684e74183a4f6defca4b72992158e1557c1195f8f1be4c4b5e6a6daf5bdc461eed5b1deabc75f51a8e9480c3
 DIST smlnj-110.99.5-trace-debug-profile.tgz 3892 BLAKE2B 48a4130428e48a46b1d33ae2d7d76b2e3dd564d186ae388b127ab5f72aa8a6d4d60eed5b2b03f9055ad2ac963aca09606a84c2f07aad871c83f1c4416081e887 SHA512 ca55979fccaaaf9a6668f459bbecff959b29d5e54e4c69c851fe7b9361b09e830d1133dfa821eece92610f5ed7faa3122c8c47fa2c87f5b9bbd807ec468f5a10
-EBUILD smlnj-110.99.4.ebuild 3142 BLAKE2B bba55253e511696c1c0a65f181fed8c1e7a72bacf42b7922c8d352dc72a9570bf3c556fefd13b504e02aa517451f4abc6e80c9ed385f35343c68a86f6f4e8c1d SHA512 cfc719449495fd93a69853de42b77e740a3de1ab8cc928baf6f917f478419885fc01d6a7a81a8dc9e66b8f1f17773e57758585f737e9f5465c2a66a756ccc65a
+DIST smlnj-110.99.6.1-MLRISC.tgz 1457420 BLAKE2B 8870e2488023aa766d96506d4508c6a97af5fa623b00053d5dd8c9953cb693eb9154e1aab8261e214642376b817186be1f85bcde3cbddce9da6e18907df9118e SHA512 02eac103280fbb7254f2c91bca74c0b2b678b261558a71457b34f40e6652a5cae4fee1f997d48ea6b10ccb6f39f65eaf670925e1aba6be1e5d374afe6511dd30
+DIST smlnj-110.99.6.1-asdl.tgz 241731 BLAKE2B de7bdcb3a471740d9667c69ff1856809afb98e5d844ad7d41410d523ed0aa920f92343e20bff4c61c6374b2c222e3f9cef82f210286b663293cef171894a7e59 SHA512 a7ae64d36a12fa736566d6fa2ceeacff8ccbf3cd318c8b90ad80c2db3e1c567a8eb2d40e31c6d37b9e8bbc9bca9b5730ab9b4b6eae9c0dde36b40900ff1ba7eb
+DIST smlnj-110.99.6.1-boot.amd64-unix.tgz 5994405 BLAKE2B 37c94a6fb649af3e9387dc2fb6e20e0cc2ae1f4aa421dc2703c0772e8c666c705701a28d3cd94ef6b42b03e7053632d23f96e3c39735d491aba0869e3c9d3c8f SHA512 238e669d5044fafe3b9636ec18e162266f0b6fd4cd7a397b9228b6a85e45822c4abf7d72cbed4e4b7cb92f2e2a34ca19575a2d08ec79f3e8ca2ff91ddade4e85
+DIST smlnj-110.99.6.1-boot.ppc-unix.tgz 5863277 BLAKE2B a858f2186a840f070c8b685ca2e1ecf2c586c4b8af1bd8ac47878189cb51e6f60a6d30917261e1e3c49e8160c85ec9bdb7d4ac3c8b38ad9cf638fc94e7d23990 SHA512 123be2205512cd432a8002369588d4b8cba9f6993cc78623938c69e089176ec296713c0e5b50a32e42e241a5752598c377fe27c1702a07523ff519004bb0cede
+DIST smlnj-110.99.6.1-boot.sparc-unix.tgz 6003561 BLAKE2B 11e3847f2b7e0a88817ffb78316fc09e7e3a251929c695347c36df83570595edb6685292227db9d73e71c0b833bbaaa378ed559b0a1bce4e20b345b81718e1a1 SHA512 690d222a1218833f678831f1535287a0a3ab6be6c4c428b544386f52ebd05e698277e8f83e00838f7a64fcd37ac9be2f588832a8cc633186a01696251e77c611
+DIST smlnj-110.99.6.1-boot.x86-unix.tgz 5946836 BLAKE2B f2505ea07741e24db0fe48dc933cda2711ec545b54fb6d978408ff84bcdfd2151eb18eb1c78c542e38ea68eb150b320df388655e05a01ba1c6906648b9f7aab6 SHA512 a35361865ad787d4b5eb0b34af84810f7cef2afbdb215939e0147e5207593f784efa9281a8c2cdfaeb882b34ff8e6c74d2d8aa192551ba550beabd7dd4f67314
+DIST smlnj-110.99.6.1-ckit.tgz 200761 BLAKE2B dc09dc869d04c73e5972c45cf576f9b491ae3e56a563085f3b50add766e22029c8bbea3377f74841185f06e71e965d6616cabdb00e52383c254dd6d80f6e52f0 SHA512 e8ebabce99b03cd4d05eb4b75d455b765a860c19d2b20896595f936cb4e8dbbca353b4580d23601679ddba38c2c988d49e073415140315bbdef792406352dd34
+DIST smlnj-110.99.6.1-cm.tgz 220336 BLAKE2B 49c1674de0c3cc718298bcfa66979485a893b302497dfeef4d990ae40d3e14cab114d89ed784076a5ecc3b5b31abfc5a207e0663c74590b68255331962b19a52 SHA512 287f32d0a7caf6476e39d34ee99cfe7ef83c873a8d5beab3eaefb28cbb90b5774032177cf26f9d851877597906fb190afcf035664ed254fb4f8ff8bb4d84f258
+DIST smlnj-110.99.6.1-cml.tgz 103972 BLAKE2B f32ecd3a22b50434a6812e11bf8edad2d17ca6b8585c7f9ecf76a341295c1be288815bcd301240a789a0f346f897444b0bb40c0b16518092dbc4c2371f505d34 SHA512 d4eb5d352abbd56a143f3d12aa7fef6e06098ea6d81fe1fe3dbbe5b5bc7158649b2675d315d68dcd939ab7659674d16e31116bee311dc49a5b6beabe11c9dcd3
+DIST smlnj-110.99.6.1-compiler.tgz 888655 BLAKE2B d559833962831ab6bc2bb04183c227ff455479195a9a15a346dc8ce9ca216968390a1514593343a9473bacff45ae0409128e3798627a1ba5013a300c460308a7 SHA512 24e8f224b8608ca480a1a45dc4ab727a7263347ff481a7951911f041e92343aa44d50c35bcb1be766a815cedf21c3dcf8333149132838de01198fdb091f99287
+DIST smlnj-110.99.6.1-config.tgz 23321 BLAKE2B 78e2dec8f19956607b76509d81f41b7ff4f1ad9f135a10f7c352661e56933f3ff335643ea1a819e5025d8516db22e37b160ce6a9f40993172293ba0be7aa29f5 SHA512 9e6408aea829030f196d34121a3c4155f98705c347bbc44c1e6e44974bb19dd88146a6ab734d129488bf9a470a122e1b3c933bed61ed9bce77f296d3ebd433fb
+DIST smlnj-110.99.6.1-doc.tgz 2748425 BLAKE2B 3abda6a42372abc6b2f94c4194712c28fe7186c338fc617e7afc8474fc427452a11911ceae9338883704620f028473353a3dea896aa31be68e7f2714c1f94c11 SHA512 20d293c8319da7448d03e815bb4a627a21091ea18bf1d987a8c6e7dee44cb522d9bff5a5969d35391d00db058a5ad2da58d742162697db634e30b0c558717d57
+DIST smlnj-110.99.6.1-eXene.tgz 714459 BLAKE2B 13b61c30b435b5bf628ccad91f0a83c891d8829e230474a8dd8411cf2041fc8cf48bcdb45be4d08d4330b90f2896f330adc99c855d55fdfdd799fc93cf1b16a9 SHA512 02c96373217d94213174aaecbd505cbeef4a0956931b6a3f2ff9f218a9e41d8de5e575972b23fdac78e65b333a054c0b2d3ba7a096645ce2d09f6a9a7e6a0ee7
+DIST smlnj-110.99.6.1-heap2asm.tgz 1721 BLAKE2B 757e3c121b234a8297a7620da6d56049fc392f802ef18a7aac425c42d806c4c836327312e12e32d0389a8d0259c2196d33841dce5b6258e4d5987a863e3bba82 SHA512 0c125d9f38ba61780d7b73cdb04c942e18f33cd319a282d121343dfb4cb60d31f1242767964230e0c6e16b73042672bdc44b70210974da72ecaa68d5cebafd26
+DIST smlnj-110.99.6.1-ml-burg.tgz 40296 BLAKE2B 144965833581e2c277ff78bde59ee0d3b591be41ebb26cf5929f89c7895c9d3714a79256c85e0ae7e8f8a03eaf310b1a07e35010d2ae5fbf807c9b09d5646a18 SHA512 6437b8bdc91e09150186bc320b6c0fe4c76b659b113de494cbea82580d338598ba3a5b0e9699bb989d5ae098d83ecab18af561bcb3678d2fca9517d7de89e9fe
+DIST smlnj-110.99.6.1-ml-lex.tgz 28039 BLAKE2B 004b5218022b5d1a6e2a8d8583bfdd83603b0d2f023cdc927ff903efc0f77f1d459ed307bed1e2890e9917b97921e77bb53cf003f5d01eb9d9ab1ac37fbc0e6d SHA512 0eb085978744d6f2924532ad925a8b0ba7f3d733f12b457edc1da82e9758d2b04e74aadd5ae4667e972e8386784f4e50bcac7d6c4012a4ab7be65016dbd600a4
+DIST smlnj-110.99.6.1-ml-lpt.tgz 267376 BLAKE2B 219ea9437f0ea478c1623fb563c15a5b66d3c19991a7b33027856b0a693b5f8710b05d2a6e843a0451920deaff4c580619636b973b329376a1d158f820eb8087 SHA512 e4f6d9aa4cd951a026c4dbee9cf4de79ca57fd61dabf8af5e07a7a498d46604b19e536d0789c59cae9b587c7985d0c9929029b4fd824fa9817dcbe376b95ac9b
+DIST smlnj-110.99.6.1-ml-yacc.tgz 101379 BLAKE2B f34b0a979416b29f9f7504be9a7a2f6774914f86627f7b20a67800792eab2e3c10c08e58b6d9fd8c00e8240ed19dce1a5f2610b2d4b2d874880a5ff900aa7b61 SHA512 9d024efa441c2bd0921f4245c2ee03054c017790afe040c8f7ff658b51930c51c8deac2c9d673517c288429d5baa7dc1fb18f7802519990f53f5c32f8afa8b0f
+DIST smlnj-110.99.6.1-nlffi.tgz 74692 BLAKE2B 76c123b77109ad9f46d87c385825f5df5c3712053a9bdde63c52667415b7c21effccfa8b7287bd7ecae0f3167cceb0519244ea2e74dc91fa430a66a38757597d SHA512 7fd55bebefca35fa68e6866239c7a6a760fa874d6a93fca4ee05f364db2c16fc552046e9aadbb41f66fc2eeccee523e145706bdfd06ce398a33e7e12f7788feb
+DIST smlnj-110.99.6.1-old-basis.tgz 1365 BLAKE2B 3979b6a5c5fa5ceaaef471a9a0b0cc02d9fefea7bed1a1c98162788d1dea014488429a4ea198d98537047c835c81de8cc68d861832a1976d23d55d3a4fd7d542 SHA512 46377bc3a9a9c4a048b178b65e87693c0e175b0b911232599302c4b87ca0b9ca77cb437a6da935055684b2cbbc5db42a9c8393d9be7e39c59ae8555aae6617bb
+DIST smlnj-110.99.6.1-pgraph.tgz 5367 BLAKE2B 5d28ced575017fadb407aa39edd08fa5941b27b6d44d6ca38ca25e29fe710321cba897ac365a617d2fe527df8e16b51b8a6362c8792ae21b98b520219be1cd6a SHA512 8bfc9565f10746310824744f1d83c3ab9444ad1acb4e6ded3ef9bf72818cc28b75d2ec73ac88a8f67b671dc2677b73d3939bf5f334f0600e1d25045ee4211cff
+DIST smlnj-110.99.6.1-runtime.tgz 335071 BLAKE2B 9a77826e242a9e51f737550b4599626b5c7e1f01f726e8d7ebd0446e2ea604fe8c189d0e35a2e5a7e77ec0800926871bca7cdcb5e27df34dc2d517cff1f6d62e SHA512 0b2af16c5bc901312af0d094a96abc7577c5c573635f39ec0fe48813b02a2ecbd573546f5f87c0c22381d5920faf2083dd8ad704f4462836612d03df4ee25a30
+DIST smlnj-110.99.6.1-smlnj-c.tgz 10592 BLAKE2B cccf6af644b9156898ce631a963940d40e5a7e6dbe0f0343e6c7cba3b83e03687d5c0542bd9d9920e12e7418ce81074c52f7331fba4faf56acd04bad9d99c7d4 SHA512 9f043aa240c17591904e3871aa7e5bacd20e92ee60f89b5e9ccd8d9609c731473b538e7bc36952bd65ac78e8716141bca210c340a3f80f96cef87f7f7a76934e
+DIST smlnj-110.99.6.1-smlnj-lib.tgz 666400 BLAKE2B 97da7fa5daae8ca9a3b3f781316eb1d93898013ff29e12ce406579baf4810ab5af42ab91b1a0a896d871e0872365376e17ee47cc1b09258766baa868781f94cb SHA512 466b430722ca3f7f4e95491314dc852b8c55d757d5648ff4c4a1da046997d973d6198e59fd828ee7264184f3d73ff3c8d4d1856f9c44f8eede5514ece44282bf
+DIST smlnj-110.99.6.1-system.tgz 295678 BLAKE2B 516fc3949a80929072c0fc831b8dbf9edd1bc871c2003831efb054417ffa37b86d0e7db2542212fc2df871c455a3f864b0f947718722d8ec56ed32f457b3de3c SHA512 c18cfefa32c5e8d768a64d4966f0e6c64649583787dbfdd39a79975cd832b01e17d6ae73efbfd9cd544bf17623aa7b9e6fdb9f96cbf68d1acbc4a0c85de38900
+DIST smlnj-110.99.6.1-trace-debug-profile.tgz 3892 BLAKE2B fc324e4faff721084545423595b2130d80e4def1bdbbf87ebdfee720c573f222e0b3ec18968c515c31ad36c82dfdabad191c6459544ec500b1c0001d6479fad1 SHA512 7854191ffe58103c3ee727dba6718936d75d99887351d47263de80fd2732e5b5adfb1fd58e4379823d0649e687fa7dc6f6057240f331439573d72e4e0a4696d9
 EBUILD smlnj-110.99.5.ebuild 3123 BLAKE2B a9a059cbee1b331e219b32f57f5956ca96307857709cfd911287caa2d531b0e7e578567eac721945af524a7bcc0243220ebafdae9d943a3c056146e7d4e7c600 SHA512 32509c758e846bd4755e27c25114b73ae30cd3894a4c8246a03d5f3c8ecf06b5e4ded3ea3a0c25c3987734fedf1f6bc4ab51e776d35d162790a250a851122f96
+EBUILD smlnj-110.99.6.1.ebuild 3180 BLAKE2B ed23e34cdbbe863ae2b07f284f5232b8967556ea2d45c06222cf918f50efee156bfd7fa38d165e6765bdbf1052711f64934b985dac750dcd63f7bd9a59cc47ed SHA512 970d01b1b05ed92b5b5915ca85680c069fa802397d92473ae6d80116b1c7f03cd21e23ab913f6fb3310825292b5208c87ac880d7b2781ecdd8504b9521a5dd90
 MISC metadata.xml 490 BLAKE2B 5cc69f4ef46189b4574bebc6d131c4075438de156497f78f0798e1e71e7dc44842264b0feb4f5629b40c404086873e7617eacedb4db556f2090588c2da803392 SHA512 ecdc8f07eba3eee5ace5de92c23c015d559a5e08642b278359903da423af3d556d5d679db8fd255dadaba2a389672abfd92378d040014554162f1feb35ae0ea7
diff --git a/dev-lang/smlnj/smlnj-110.99.4.ebuild b/dev-lang/smlnj/smlnj-110.99.6.1.ebuild
index fd72dd7ca0a9..e07e1a3cd989 100644
--- a/dev-lang/smlnj/smlnj-110.99.4.ebuild
+++ b/dev-lang/smlnj/smlnj-110.99.6.1.ebuild
@@ -62,6 +62,10 @@ SLOT="0"
 # sparc support should be there but is untested
 KEYWORDS="~amd64 ~ppc ~x86"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-110.99.4-shuffle.patch"
+)
+
 src_unpack() {
 	mkdir -p "${S}" || die
 	local file
@@ -81,8 +85,6 @@ src_unpack() {
 
 	# Unpack asdl to fix autoconf linker check
 	unpack "${S}"/asdl.tgz
-
-	eapply "${FILESDIR}"/${P}-shuffle.patch
 }
 
 src_prepare() {
@@ -114,7 +116,7 @@ src_compile() {
 }
 
 src_install() {
-	local DIR=/usr/$(get_libdir)/${PN}
+	local DIR="/usr/$(get_libdir)/${PN}"
 	local i
 
 	local file
@@ -125,8 +127,10 @@ src_install() {
 				-i ${file}
 	done
 
-	newbin ./config/_heap2exec heap2exec
-	exeinto ${DIR}/bin
+	exeinto /usr/bin
+	newexe ./config/_heap2exec heap2exec
+
+	exeinto "${DIR}/bin"
 	pushd bin || die
 	for i in {*,.*} ; do
 		[[ -f ${i} ]] && doexe ${i}