gentoo auto-resync : 27:05:2024 - 00:07:23

9 files changed, 683 insertions, 91 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 7b003018a0b5..129d3aea41f7 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/elpi/Manifest b/dev-lang/elpi/Manifest
index d45d67d04f85..4334d8499df1 100644
--- a/dev-lang/elpi/Manifest
+++ b/dev-lang/elpi/Manifest
@@ -1,5 +1,5 @@
-DIST elpi-1.17.0.tar.gz 2607106 BLAKE2B 7e6a2f1305ec69f93f7519bb8ced9e2b3d38106cf71a1506941f0c50e3af4959838fe01a092ddaad49f41de59aac34ff45c972099f1797d86ec2b446475c9391 SHA512 6539593bd4a4ff516f023601d4dbe10cf4c99d2fd99e5b6ed89da0a8d63f8c79fac0c667b11ca77e0ae618ec036c27a7adcefbd19fc26e6d11672b90f412654b
 DIST elpi-1.17.4.tar.gz 2609080 BLAKE2B 5280f0eed17b80abb1ce68613beb57bd9aba900c821b71d5f184f98c0042b69fa016426f35e531a106ae6597bbb11237b56bd38dcf08ed56cbca624f2afbdbe6 SHA512 0a4a85c967d4016c3cf4b6613e561b45b935aef3cec68fd4e3764cd7f64420cf41ce0562804b1647fef9ed2d564da737fabd9a3e42e2b9e70071be6f64a3a611
-EBUILD elpi-1.17.0.ebuild 887 BLAKE2B 8025ea6763693e53cdc7fb40c5a769ce381d9f37bf8c5e087cc2d2fc19ba654a88d047f6b228aa7086ab1dd631f1121651fd1dca424860fedd7da66de4d0ce0a SHA512 ee52ec3bbb6b66bb0e928e7e9379acd083490ed231a97d7a909856e22369bda85946056495f7376c3fcc2b5d9f1c826e848777f71913b35f776d3bc0b54d1545
+DIST elpi-1.18.2.tar.gz 2630264 BLAKE2B 9921cfb71755f46f29ec8934c5f3e3ea7d57807854c2402660ffebaeb6ce8f64416ceda4e2eaefa91d5b46cf7d9e8caeaadd75b0eddc5c35b234a228dfdf9bcb SHA512 096865d2b777d36ab8c0a63613f268491cb5b4e3a1c8a2adc11b63a3d39d04be5ddc198f0379090da8e3e0b6e7997bad6453d4b48f9f2e5d7d7d4f852af45a41
 EBUILD elpi-1.17.4.ebuild 887 BLAKE2B 8025ea6763693e53cdc7fb40c5a769ce381d9f37bf8c5e087cc2d2fc19ba654a88d047f6b228aa7086ab1dd631f1121651fd1dca424860fedd7da66de4d0ce0a SHA512 ee52ec3bbb6b66bb0e928e7e9379acd083490ed231a97d7a909856e22369bda85946056495f7376c3fcc2b5d9f1c826e848777f71913b35f776d3bc0b54d1545
+EBUILD elpi-1.18.2.ebuild 887 BLAKE2B c8850062eaa0ca1c7ab45399c79cbb5582cae1613ed01a7c51197fd91de9c4684c99d7bac9ebab1c8a2966fb9ced410cb2b1b71bc9e617845cd832cb2453393e SHA512 43793f3ce1bf6d41b19ce389241346d360d720ef98faafaa7178f648fd45e248193a3f17303cbc65a90078f60f38b69c545cbac50997eb85d7d03595d95bed2a
 MISC metadata.xml 1145 BLAKE2B 5dc8cfaed7392d45c7c30034952ea7796569ab084912ff15ff6be6e9977376845b539d3b129c1c5572d5dfba2a34caf6e458f4ff52b9bea37330287f2105549a SHA512 f7f7911e2cbd2a25cf02e4aa4710953bf31db35721e2100838f681ea064476c972e2a8b1426afe5b653fa64571791e0c956d63c4cd65d002390f0587611f4b74
diff --git a/dev-lang/elpi/elpi-1.17.0.ebuild b/dev-lang/elpi/elpi-1.18.2.ebuild
index 184849b51e67..7721a9d3b009 100644
--- a/dev-lang/elpi/elpi-1.17.0.ebuild
+++ b/dev-lang/elpi/elpi-1.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-lang/execline/Manifest b/dev-lang/execline/Manifest
index dac0eee9d17d..47f28b0846d1 100644
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@@ -1,5 +1,3 @@
-DIST execline-2.9.4.0.tar.gz 110097 BLAKE2B a59af5d1cff360ab6c2c41f3156d762e2928b22d7cab8a3b499935ded102e5b9e4efc2a0849875cf6a44cdca0e9b1f13a41443c0343ca3d7a068e4d749774701 SHA512 11d96863d2f90abc371656e17bac9fd83f1303337444db5a1f24e8a02cab654a3b5e9081af130d5cbca5a4f6ea5cf5f6c2affa66e2b4a9eb39c20410efeb8795
 DIST execline-2.9.5.1.tar.gz 110874 BLAKE2B bef3cb560f00c01c96065429220017315edc8378403c73e4a0edba67ee248f76ca849cd8a107756251db9844d3ac650259b33db2f93abc1c7aa4f68995b5b624 SHA512 11bfd825b0b72cba118eff9ecb97672d0c015e0bd50c7c8f83e101ee41c323b3a3c82e42fed75b6bc65ab6edb85a8bbeef8900b594cf651825b6313a5123c88f
-EBUILD execline-2.9.4.0.ebuild 1120 BLAKE2B 5767e44b5de7e6411b27cc3e87c2c1d127b0626fe0f81bdcf085e3b699aaeddf990d442d45f9bb927c6bc42b3746acb50ac31ed7a1a3ef8fa7578c7fc2feaf21 SHA512 7f23074d541e0b933b37e1161ea6340806ed22c6265e5af91c1ab346b3518ed9da7752d384dbd770f305dac7b556e83a7ce44804a2e946fe9f08a48b6d027ca6
 EBUILD execline-2.9.5.1.ebuild 1120 BLAKE2B 5767e44b5de7e6411b27cc3e87c2c1d127b0626fe0f81bdcf085e3b699aaeddf990d442d45f9bb927c6bc42b3746acb50ac31ed7a1a3ef8fa7578c7fc2feaf21 SHA512 7f23074d541e0b933b37e1161ea6340806ed22c6265e5af91c1ab346b3518ed9da7752d384dbd770f305dac7b556e83a7ce44804a2e946fe9f08a48b6d027ca6
 MISC metadata.xml 585 BLAKE2B ce0671014512c49b041f6c47002603a15f0f5d7f23c356465fff024506fb261096aa757cc1c707501f5be572cea9d925a25039d1549d31852ffaf9b2f17b5cb3 SHA512 bddd917f615e8ff772889a4da992c9201f6e32982374ffa29e7a8c3fce8d7a4f409c3b3ffe8c989e7802c2b321d6cfc5bb37017aa75dc38e3026c1de48bb0090
diff --git a/dev-lang/execline/execline-2.9.4.0.ebuild b/dev-lang/execline/execline-2.9.4.0.ebuild
deleted file mode 100644
index da959d63bdca..000000000000
--- a/dev-lang/execline/execline-2.9.4.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature toolchain-funcs
-
-DESCRIPTION="A non-interactive scripting language"
-HOMEPAGE="https://www.skarnet.org/software/execline/"
-SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2).4"
-KEYWORDS="~alpha amd64 arm ~mips ~riscv x86"
-
-RDEPEND=">=dev-libs/skalibs-2.14.0.0:="
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	default
-
-	# Avoid QA warning for LDFLAGS addition
-	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
-
-	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-
-	local myconf=(
-		--bindir=/bin
-		--dynlibdir="/$(get_libdir)"
-		--libdir="/usr/$(get_libdir)/${PN}"
-		--with-dynlib="/$(get_libdir)"
-		--with-lib="/usr/$(get_libdir)/skalibs"
-		--with-sysdeps="/usr/$(get_libdir)/skalibs"
-		--enable-shared
-		--disable-allstatic
-		--disable-static
-		--disable-static-libc
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	optfeature "man pages" app-doc/execline-man-pages
-}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index da2d2aa1b983..22116a29f72b 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -20,6 +20,7 @@ DIST python-gentoo-patches-3.11.9.tar.xz 8456 BLAKE2B 4e62837f17c1d056460df417b0
 DIST python-gentoo-patches-3.12.3.tar.xz 6028 BLAKE2B 7953a48a1d95a6a33bd88060fbcac463a5469371aa0c882c3945f1fea64a63c4d45fca8451f51f4eaeea00a04267ad2e54e4cc720c95e8bb5a3477e00263b80a SHA512 4779bab2b24e59e4a77987ce3e9611d99e87c9c4d016309758c26a65fe2e11ef04d48d5af628c02b1552dc1f31b768f87448f8e19e716b4fe372941e6dacac3f
 DIST python-gentoo-patches-3.13.0b1_p1.tar.xz 5480 BLAKE2B 830370b56bd662b10dd4423f1e758da79c61d535a18b35496e09d864642873449a13738da8e042b94c58e8e300ac7c003088be69e27467dd024daf54b6a34c22 SHA512 d696c96263ca51f611d508ee644f7254d2607236e829946c35dc6a6977eafa98748fa807b36d40d5e32f278db3493876b2214b4e2bb1ceb4deaa1fbb8fb2c052
 DIST python-gentoo-patches-3.13.0b1_p2.tar.xz 9300 BLAKE2B 63179b01623c6677363c4d1c2f7890e81defd4ca451259b66eff79c92bee68a92a0a33893801fabd8af2e9f07fe1bbd985a494a9ac3fe4662f9db6dc346db418 SHA512 29b29975571abe7dc4269f8b758bf825b431adc7e72bceb42eb801d35bc2eea4f11adea96c8742a0cc273b718b3a632a1051bac1d2d45e40aa419d0f624cf1f6
+DIST python-gentoo-patches-3.13.0b1_p3.tar.xz 11056 BLAKE2B ef932bac59d2316ee8fe638a3d34ce247ff587915546038627674cd4c03179998a58336f8ebae45f1fcc94c8059d61ff6f22693f25ace1462bce275f50bfb48f SHA512 956e3da7376d60d7a593af50fff9842016a3b193180e93ab8298756c9eedfb2aaf8c1287bb75111e6340b5bac20a12dcb00ef51ecf0e12ef9ae5c98202fb071b
 DIST python-gentoo-patches-3.8.19_p1.tar.xz 35008 BLAKE2B 8771e3a2329577659a4ff64987f2500b7dc4f07f78677b823c8f11e7a9e7fc0369cc127e6ad1f1000986937b7811467bd22ba02129a754246658f99b7219a4a7 SHA512 470c125e8df23c1db358c2f7bbf5ac3b28e76fb843364f7fd5aa2fd399ac9b01a2ddfc2c1765f91236c71712941d19f273fb21f960239f79a0263b5b47081d46
 DIST python-gentoo-patches-3.8.19_p2.tar.xz 35524 BLAKE2B a6b81e6ae907b60eea676cb65a9c693e62453dc44616baaadb294c5782a195c20eff6c2869b38ea110fe06e9e511468f4ab0c3d1811b16e0ab2833f9dc09b25b SHA512 9944c330b6062c2ac6e13fcfbc1c8835dfd078f6744cdfbc03ba787ae97c08bdae559cefadafe9dfe9be9c31f8c15ee895599b266d870f73c06a2f4b15c78dc3
 DIST python-gentoo-patches-3.9.19_p2.tar.xz 27684 BLAKE2B a69f00548c153da7b13dfeccb332d3d67ecf649fb5ae054590492f3e2fc2c84b78ebaf90bcf9738157c9022778e5bf2a6b4fb6a99e996dcb63859dcf6f84af23 SHA512 552a5f2d89307d4193d76df5a2cf1deb4bd5c8ad9ec81e6768987f1649f6571a318e68b92d8f8ecdba12bfe9c5f1a427a4cc577e6aaebf7748027cc50e412804
@@ -33,6 +34,7 @@ EBUILD python-3.12.3-r1.ebuild 14757 BLAKE2B 6f735b7cb258a7af4eec0e18736cfd6b87b
 EBUILD python-3.12.3.ebuild 14702 BLAKE2B e4dbc9370a9d846754b89cf13ec6db2674364061080dbc6cfe60faa8350e70772b31502bf650ae31aad4204b907095de07db201431afe6dcdc1f2973ddf0b603 SHA512 5446caf7a5aaba96604b5de6424ff359d190ed850eea7f035a3412f816388140aca01cbaba65d245db493f38cd0f2ecdbb8bc39c34e3921657ec0e091977e77d
 EBUILD python-3.13.0_beta1_p1.ebuild 15551 BLAKE2B 4c92847ac19dc66bf6093bb1207c4e83d821af861817b9b15794639d3dbbfa51991c64bd02edca652413aee31a1c663c50862564d563814d34a6a07922e2cb5a SHA512 1f0876376a13bd96f2e4c68b56ae6cf0155c6702609c532225c13c339dec79bf92a245d60230237c790f787814c48db1e3bffcc9b5eb0f46eb8ef590e906f22c
 EBUILD python-3.13.0_beta1_p2.ebuild 16998 BLAKE2B 5b554cedf13960c02c8fb5b597a290471887475a1ace7063857f42f1c3dd32d9d3af777b054851968aefcec8ba3f82db479853365deec28884fafbef1b6bf155 SHA512 069a0df320ab10b36519bafd93388e82d828bc10084735f47da21b0f5480c48bb08f8b57d2b785dc38ecfa3a0ef2d1d65e87ccf4fff904290b0e81867e3d0c60
+EBUILD python-3.13.0_beta1_p3.ebuild 16998 BLAKE2B 5b554cedf13960c02c8fb5b597a290471887475a1ace7063857f42f1c3dd32d9d3af777b054851968aefcec8ba3f82db479853365deec28884fafbef1b6bf155 SHA512 069a0df320ab10b36519bafd93388e82d828bc10084735f47da21b0f5480c48bb08f8b57d2b785dc38ecfa3a0ef2d1d65e87ccf4fff904290b0e81867e3d0c60
 EBUILD python-3.8.19_p1.ebuild 12170 BLAKE2B bb93535f4876869a58622df01f0c4d4ee4eead693604b9b195965d67933760e3911ab983b4cf1f75f5548b3b228b3353405b4e9029f1434e0e6a91bd01a00fee SHA512 69afe727c59cdb5f8a64c6d6c11ab45c28c8eefad53355d933558573fcdd8dbb6c69f658c5f8f85068bd42200a6f067ed85761afbe3260f45b77874b6761484c
 EBUILD python-3.8.19_p2.ebuild 12225 BLAKE2B b39ffe181bfd0928056b9d4463795279ce41a64c2cd8ef2829ec3aeb7093de9b2514d0c2d54fd877f83581b30d659f295cafa6cda88bf4aa68378ce0d1ca75b2 SHA512 b810c88c716b7f71f9c0875cd63da5dda4894f743880432a1d07be42c5fa62a412f51217a3f4003019405791008e9be0e9b43a5d722b98fcb67131283ded9ea3
 EBUILD python-3.9.19_p2.ebuild 13620 BLAKE2B 25ef087c8e4fccf9d2e52fb7b4ba08f3cfe6582d40ab820289a069f54cd06ab2b7a1ec20ff16283485834e73dca0651136d4206bf2ad7b6bbd316542d5ed82fd SHA512 98a73032aad45f9ca6058f7dcd88617554afb1083149b877a858d62d2f4085fdb675b9a22bbf7f08d0029dc6ef0bc1ad2f31c747b5800a65bb4a6b933c85e8d3
diff --git a/dev-lang/python/python-3.13.0_beta1_p3.ebuild b/dev-lang/python/python-3.13.0_beta1_p3.ebuild
new file mode 100644
index 000000000000..54b95e896355
--- /dev/null
+++ b/dev-lang/python/python-3.13.0_beta1_p3.ebuild
@@ -0,0 +1,643 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+LLVM_COMPAT=( 18 )
+LLVM_OPTIONAL=1
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing
+inherit pax-utils python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_beta/b}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	big-endian bluetooth build +debug +ensurepip examples gdbm +gil jit
+	libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind
+"
+REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-crypt/libb2
+	>=dev-libs/expat-2.1:=
+	dev-libs/libffi:=
+	dev-libs/mpdecimal:=
+	dev-python/gentoo-common
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-pip )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	kernel_linux? ( sys-apps/util-linux:= )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? (
+		app-arch/xz-utils
+		dev-python/ensurepip-pip
+		dev-python/ensurepip-setuptools
+		dev-python/ensurepip-wheel
+	)
+	valgrind? ( dev-debug/valgrind )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	dev-build/autoconf-archive
+	app-alternatives/awk
+	virtual/pkgconfig
+	jit? (
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}
+			sys-devel/llvm:${LLVM_SLOT}
+		')
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+if [[ ${PV} != *_alpha* ]]; then
+	RDEPEND+="
+		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
+	"
+fi
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+
+	if ! use gil || use jit; then
+		ewarn "USE=-gil and USE=jit flags are considered experimental upstream.  Using"
+		ewarn "them could lead to unexpected breakage, including race conditions"
+		ewarn "and crashes, respectively.  Please do not file Gentoo bugs, unless"
+		ewarn "you can reproduce the problem with dev-lang/python[gil,-jit].  Instead,"
+		ewarn "please consider reporting freethreading / JIT problems upstream."
+	fi
+}
+
+pkg_setup() {
+	use jit && llvm-r1_pkg_setup
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	# TODO: Makefile has annoying deps on expat headers
+	#rm -r Modules/expat || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
+
+	# breaks tests when using --with-wheel-pkg-dir
+	rm -r Lib/test/wheeldata || die
+
+	eautoreconf
+}
+
+build_cbuild_python() {
+	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	#
+	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
+	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
+	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
+	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
+
+	# We need to build our own Python on CBUILD first, and feed it in.
+	# bug #847910
+	local myeconfargs_cbuild=(
+		"${myeconfargs[@]}"
+
+		--prefix="${BROOT}"/usr
+		--libdir="${cbuild_libdir:2}"
+
+		# Avoid needing to load the right libpython.so.
+		--disable-shared
+
+		# As minimal as possible for the mini CBUILD Python
+		# we build just for cross to satisfy --with-build-python.
+		--without-lto
+		--without-readline
+		--disable-optimizations
+	)
+
+	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+
+	# Avoid as many dependencies as possible for the cross build.
+	mkdir Modules || die
+	cat > Modules/Setup.local <<-EOF || die
+		*disabled*
+		nis
+		_dbm _gdbm
+		_sqlite3
+		_hashlib _ssl
+		_curses _curses_panel
+		readline
+		_tkinter
+		pyexpat
+		zlib
+		# We disabled these for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross. This should be rechecked for the pure Makefile approach,
+		# and uncommented if needed.
+		#_ctypes _crypt
+	EOF
+
+	ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+	# Unfortunately, we do have to build this immediately, and
+	# not in src_compile, because CHOST configure for Python
+	# will check the existence of the --with-build-python value
+	# immediately.
+	emake
+	popd &> /dev/null || die
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			--verbose3
+			-u-network
+
+			# We use a timeout because of how often we've had hang issues
+			# here. It also matches the default upstream PROFILE_TASK.
+			--timeout 1200
+
+			-x test_gdb
+			-x test_dtrace
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_concurrent_futures
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+
+			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
+			# bug #900429
+			-x test_tools
+
+			# Fails in profiling run, passes in src_test().
+			-x test_capi
+		)
+
+		# Arch-specific skips.  See #931888 for a collection of these.
+		case ${ARCH} in
+			hppa)
+				profile_task_flags+=(
+					-x test_descr
+					-x test_exceptions	# bug 931908
+					-x test_os
+				)
+				;;
+			ia64)
+				profile_task_flags+=(
+					-x test_ctypes
+					-x test_external_inspection # partial PGO only (flaky in src_test)
+					-x test_signal	# PGO only
+				)
+				;;
+			mips)
+				profile_task_flags+=(
+					-x test_ctypes	# partial PGO only (more fails)
+					-x test_external_inspection	# PGO only
+					-x test_statistics
+				)
+				;;
+			ppc64)
+				if use big-endian; then
+					profile_task_flags+=(
+						-x test_descr
+						-x test_exceptions	# PGO only, bug 931908
+					)
+				fi
+				;;
+			riscv)
+				profile_task_flags+=(
+					-x test_statistics
+					-x test_urllib2
+				)
+				;;
+			sparc)
+				profile_task_flags+=(
+					-x test_ctypes
+					-x test_descr
+					-x test_exceptions	# bug 931908
+				)
+				;;
+		esac
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--without-lto
+		--with-system-expat
+		--with-system-libmpdec
+		--with-platlibdir=lib
+		--with-pkg-config=yes
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with debug assertions)
+		$(use_enable gil)
+		$(use_enable jit experimental-jit)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+		$(use_with valgrind)
+	)
+
+	# https://bugs.gentoo.org/700012
+	if tc-is-lto; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+		myeconfargs+=(
+			--with-lto
+		)
+	fi
+
+	# Force-disable modules we don't want built.
+	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
+	cat > Modules/Setup.local <<-EOF || die
+		*disabled*
+		nis
+		$(usev !gdbm '_gdbm _dbm')
+		$(usev !sqlite '_sqlite3')
+		$(usev !ssl '_hashlib _ssl')
+		$(usev !ncurses '_curses _curses_panel')
+		$(usev !readline 'readline')
+		$(usev !tk '_tkinter')
+	EOF
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+
+	if tc-is-cross-compiler ; then
+		build_cbuild_python
+		myeconfargs+=(
+			# Point the imminent CHOST build to the Python we just
+			# built for CBUILD.
+			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
+		)
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	export PYTHONSTRICTEXTENSIONBUILD=1
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addwrite "/usr/lib/python${PYVER}/site-packages"
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# this just happens to skip test_support.test_freeze that is broken
+	# without bundled expat
+	# TODO: get a proper skip for it upstream
+	local -x LOGNAME=buildbot
+
+	local test_opts=(
+		--verbose3
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_concurrent_futures
+		-x test_gdb
+	)
+
+	# Arch-specific skips.  See #931888 for a collection of these.
+	case ${ARCH} in
+		ia64)
+			test_opts+=(
+				-x test_ctypes
+				-x test_external_inspection
+			)
+			;;
+		mips)
+			test_opts+=(
+				-x test_ctypes
+				-x test_external_inspection
+				-x test_statistics
+			)
+			;;
+		ppc64)
+			if use big-endian; then
+				test_opts+=( -x test_descr )
+			fi
+			;;
+		riscv)
+			test_opts+=(
+				-x test_urllib2
+			)
+			;;
+		sparc)
+			test_opts+=(
+				# bug 788022
+				-x test_multiprocessing_fork
+				-x test_multiprocessing_forkserver
+
+				-x test_ctypes
+				-x test_descr
+				-x test_exceptions # bug 931908
+			)
+			;;
+	esac
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	# the Makefile rules are broken
+	# https://github.com/python/cpython/issues/100221
+	mkdir -p "${libdir}"/lib-dynload || die
+
+	# -j1 hack for now for bug #843458
+	emake -j1 DESTDIR="${D}" altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"sqlite3 || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# pydoc
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
+			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
+			ewarn "installed previously are no longer valid and will be regenerated"
+			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
+			ewarn "when installing some packages and checksum mismatches when removing"
+			ewarn "old versions.  To actively prevent this, rebuild all packages"
+			ewarn "installing Python 3.11 modules, e.g. using:"
+			ewarn
+			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
+		fi
+	done
+}
diff --git a/dev-lang/smlnj/Manifest b/dev-lang/smlnj/Manifest
index 3b5d9207e116..5d9086b2bd88 100644
--- a/dev-lang/smlnj/Manifest
+++ b/dev-lang/smlnj/Manifest
@@ -1,30 +1,4 @@
 AUX smlnj-110.99.3-shuffle.patch 328 BLAKE2B 1120c02d226a49604b0913f724fb0e603f06f2fc1d05718d9d19b0d1e16bceb1d789fa5d752952d14aed907f6b3c237f48a62171624a6cd8b27aadb686998575 SHA512 4240319ecdb73f575641491f89bff45ccc1c71d4ac1e3c402e956e8edf84bc9b79c815d15445a3482776f5e0af4c058448c12c317c81f63480557ee4a648e82a
-DIST smlnj-110.99.3-MLRISC.tgz 1457337 BLAKE2B a639a9afcaf1bf3e6521eeaa2dd8cb28f164b4c9b439dcb1370c9189b8ca769fa79f3b6c15aa3ee4db49afd61c321d1a6197ad3a46f7209bd51a431e1249dd49 SHA512 f1f2d7cd1316bd6c4156fc184990ccfee916993283ce0963ff30306089b5c6297d2c4fe55a280f17ae05ad45a764e3bdfcfd1b8ee9a8382a049f323b48692c8a
-DIST smlnj-110.99.3-asdl.tgz 241353 BLAKE2B a9f61116411919c51a56097d59f3501022d3b5d3fbd01660b16c3a5fc629b6b96102b17b1047e29c12c8b739a3ab66ff20a7d0c70d6edd899f26b713b9ac7f94 SHA512 cc703609a192a83766d6e8298912bf427fed66a3d5a20f98c1dcddec63ec234df1d868e418932676a0300bf68b490c5c8e2b8f8106f42bc0d38b93be5dde794d
-DIST smlnj-110.99.3-boot.amd64-unix.tgz 5971321 BLAKE2B c6a7c96344da723dfd88155586b680b6f54e7711335bc88d8f1468d3f989077febe6624596d16d7236e651f17d33b6bdf268e8a99164b46e21780d87c697551b SHA512 8616a06975f285623156637929b202fb1d060718bb990aeeff12e185f36ae0764d7074482eaa446dbf0ed8afd2527bfc38c423cdebfa8ed0346fd43b4d3442e3
-DIST smlnj-110.99.3-boot.ppc-unix.tgz 5839528 BLAKE2B 30da3659d7918126684a6e947200a4080a0366b43a03f20b5f27ec7c94a874ae9102ebf94dcb346e60c10d2155236448f4f59350813e46c3185b08f47e9cde2b SHA512 7a0c8d70c0a65f3cbe5c0d6e2172a037bc5b5314d805fe9686c11290ac30b26d26ad98dcd085092a3c76f2a23cc402857cd38afe4f9b0086f6b8a9cab9c19a53
-DIST smlnj-110.99.3-boot.sparc-unix.tgz 5981512 BLAKE2B 6a86232df38bc0ecf7525d8406f6d4f7fadf4730c20b679d4dc540a92e2cfbe14120bd211a5fc96e9b7bec55f2dcdd2b6fdf5969ff230011992d2ea942b7fec7 SHA512 eb167a171f0b0635619eff7e6c0c2ff5a347f3dbae6c690de334671a3aabc5c6ad0a21e6e3192852f2d86806c3cebb4cd6b769c8cf6e8883bb4ce137af8b1578
-DIST smlnj-110.99.3-boot.x86-unix.tgz 5923052 BLAKE2B 52e9f86e7dabaf51ddb642a135f72c6e59f870152107730f7321f7d1d6c165594bdaaf085795360a9dadccec1cd2595c56b7bf7d84d038254273ab8bd5ec1c03 SHA512 8a6680e910cda9b344192db4978c74f9eb55a872824f9ef9deb7419a43e475277997bba19de8abd8eeffda565f8900aeee31f6a94cb0a0bcdbb067b3ec12457a
-DIST smlnj-110.99.3-ckit.tgz 200785 BLAKE2B 0834239040c7e15b96c8ca8812a0d74f5254bbdca22fdba8da5059ec3a256896fa8840dcc18534b9ba3578cb204fe12665f02337f7e1f46af71f19acc2ee4c45 SHA512 c41835ccc1f0ed4352386a398f6847adfe11bd3926ebaeed6e9c6c9b24ff09ad5c676ac6d98700bb6c2f443b43e733071040452886f7a266b7053cdacc0c7b89
-DIST smlnj-110.99.3-cm.tgz 220282 BLAKE2B 6e4ecfc4d74756b1e69a3f61e25649798c6b74327e4d86ff649e9664f22e092a09b80ff0f6e0b94a5210db97985fabc3803e103b3be1da0f9c2bfccb06064e10 SHA512 5030b99dcfec2abb4be76fc15c7846b602d3fbd14ff78eba087a92b72e43a19584fe667281416ecb48fc3df1e7c9756f36d12a8e6ab66fa3917deaaa383fcf82
-DIST smlnj-110.99.3-cml.tgz 103973 BLAKE2B 4723c4a9f891274bac82168c21d19ec2506fc01f48fd330b179b468f73174c049df78a3948a10fe245f0f84f2f8b433ed0b64fc0340092e30433b247fbbd3773 SHA512 79fc9f7060d484c58171ab9577428ab12abd4376b3074bc87d5db5a080d49073a3950ea3d70baae927a2780a0072e83ce2159381c1d03791bce7ffd5bfcc8331
-DIST smlnj-110.99.3-compiler.tgz 856614 BLAKE2B c98a337003619d5968f416c83422fb1ed92dbb37423630d41e2600d62a8cda1d2eb02ecd681bc79cb71a51881c1f4e6189430a05726d6345585f87a5585bc66a SHA512 4616f1d86417ce542aa3f30159adcbbda5a89fc50248b48e53953d596180444b1af178633ba70b2c47ce9c1351cb718f0aab7bc481f6cd9ef4495b084eef4e28
-DIST smlnj-110.99.3-config.tgz 23167 BLAKE2B 78c6cafc1bc5ac8f6e1fe837c1d1fe8d725eab09713a004a2d89df02c52a2553a2b91a7f540d64b097661b80c1b7bbbbd96f9c2ffdae4e2d3655fd182a7c31aa SHA512 4a2f95cde1314f288f13af499b3af7a97ce799c4653cb8382d2361b46142e57a1943d471b7e841240f7accf7c73bd3a085a6e1d0bf3bbfb0246daf88773f0c38
-DIST smlnj-110.99.3-doc.tgz 2506809 BLAKE2B 3a4d568bd1f36d6268127120fc8aaab105fc777a8e4eae8af9d08254ef5b84a432a188b5b16d32399072a919f177f989abb6229d4126ae5da7fb10bdafecda17 SHA512 a042ab0eed78f0c2b3ece17f9fa0ab30c4327b50270e6f85476fee6676bde98f46288979d605dbd937112451e1014a09acd90f589ba2904eaea5a688caa9118a
-DIST smlnj-110.99.3-eXene.tgz 714453 BLAKE2B 579970eba09897cce2497dc3355a17ef4f8ca3a6f31cfc6a8b910aad3531558c5072c17b5a27fab1922b4a26c0ecf632abd547f2551f0de26e999351879c8c76 SHA512 ba380e7b1c751782015aa3603d54a57901697f13c0eb6c3b1928082224dca16f658cda16b4a3400ff46b3e7a46c1069f59366f35b35e837bcd73c1792515aca4
-DIST smlnj-110.99.3-heap2asm.tgz 1763 BLAKE2B 739ce12c488483b7a74f445f4584f43cd156c2912966bf8ce49ba84ed798c47e45175c47b6033a3be3411285245d4344dc58cfbae6064e2905c36af5fdde4847 SHA512 49eaf8ac9772b62d48cd52c3d395b1f2c40d4ce4f62c90ab875f934f3dae6e20e717d6bc41dc674ffa6f0ec03b437ac0a87478e214ac8d28890077faae8e42f5
-DIST smlnj-110.99.3-ml-burg.tgz 40357 BLAKE2B 3ef88f8ada0110b91db783901e1efefeea835bef94dbfbbb2de08480adaff79c484abcfb196bc473a0c5d517d6120dad56199c548cf52b5ced712090120afe62 SHA512 3b19feaba7d3616b364ccb5cf54e203a5583cfe850b1949bbf1f97182255594b5b8498225b8cfd437fb2066cb9461626358f6d3007646ca2cdfaf3f8fa6fd12c
-DIST smlnj-110.99.3-ml-lex.tgz 28038 BLAKE2B 7891b4c26aa44c945f18cd1300fb7c49455c1d2eef4d7ed425509387edd87abea8e23900fa9777798bd7db976d0f4788c3a97120f13c1778b6d476cca190a747 SHA512 5fc0acb9dcd49b663c2b0f071b1cf0a0619c9aa83ef6736eec330eca74693be3272a1c771928e0b3d0e46fc3058ba69445c8e0bfe6815042d51d5493512c81b3
-DIST smlnj-110.99.3-ml-lpt.tgz 267067 BLAKE2B 3b0a853c92eed28d0d8a4394d1b87761bd093d1e701b289e5de28a351f27e97abb1921a5e5ade6e7dea1faef1dccca4dbcb30aefe4624361b302f14084cf08af SHA512 aa3ae9109d42b42f9f619395807f0f7486f9eee794ef61a43df069ab29fcf028e5efb50831dd5a35519e592a89606be6a51aee9da0078a83e62a37c2f23f54f7
-DIST smlnj-110.99.3-ml-yacc.tgz 101376 BLAKE2B 39f9f50f612c5b263f6146d39262d669d7ee3f65daf7d24a0c950ddea8868f13ac6881860f694cba3ecb6b2f29b4755f1364fac2c08401e537d6c355071ebbde SHA512 0cec5df0cbad8b93e079a70dc5979231443a6563bd61dbeadaf3c82e5a28d61cc6d1ee080c3c003d8ece79fbab6a8a31790e29d10ebd64a644a779103751af89
-DIST smlnj-110.99.3-nlffi.tgz 74810 BLAKE2B 0129c45031c750fcb8b879fa325532170c937ac0dc50e224ff22e1ea7c0822f13794be22ff5bc8c1570ed28b8ff9aa90910cb07b3c18519344bbad17bbf351da SHA512 f35033fcaff75b930f4136d8cf903ee17702856fcb58c3b70bfd5fa69e45d3a37df277d9753e989fb1b1f7f21783758fc167d36f3a4537aa2162a754d652ba84
-DIST smlnj-110.99.3-old-basis.tgz 1363 BLAKE2B 32d3afda93fe372ec8bfc9589101c2e4c2b04259d481b39a3a932d3ff225f9142ecc978dae55081417c6437a5c64e5655c43bb29ccd9dc7d6073ff7b19a94e61 SHA512 1dff1f3e5eafb94c5b235f2cc04af4ab87a927d74eac641bad36e66db39a11078fe9aacc20fadadf9c8d13e4c3f7a211cd64efd7741b0dc45e1b22c013c81329
-DIST smlnj-110.99.3-pgraph.tgz 5367 BLAKE2B f30b054433ccb1394e557fc63dae9d097734fcbadee3bcbcd3cfe7bf2d2f833882ac5d187f846f0895b19eeb75de667b2394295858a6e0d873ff58bf55e3bd83 SHA512 3c9d4f3d42c49cd6950eb42712aafc8a58b253b0fade35b7b4c6a1bfef88b7a5805a07fad1d7e107f31d73912e4f32729b2d001dc5751aa629d0f0b4d1a20401
-DIST smlnj-110.99.3-runtime.tgz 334293 BLAKE2B ce70bd05fc311ed11285aceb4cb78af7f08a18431538a341f768fc04e9aa3b1df1f0f3f86f384622aea59fb3322eb8446176bf3481df6f0efa5d67fd1bf71da1 SHA512 21da06900903a2a460b3a8ea895b3f864df5e8f4606ee9c4303de838678c5ab8df947d2eaca74a0ad057c4ec3b7e20f498cde599d5761db14ce6ce516b4ade41
-DIST smlnj-110.99.3-smlnj-c.tgz 10591 BLAKE2B 1dd6646e64157ee31dbd04a0d7d485012ab31fb1e3855d5bf930e9705298df40d33391363dd927758ae2a931aa7d1f61259c688a437851ebff1b3979f12f6ef7 SHA512 3fb88af71a257229322d88c1bbd30a2081d58ad454f541853d327c785a50b88447db667ac787d6a6a98f449886139b71a4721af65cda18e620889cb3cc0d73de
-DIST smlnj-110.99.3-smlnj-lib.tgz 641512 BLAKE2B 1904fc25ae19f8a62669e8ad81272702df3871b04a8ee82e3526d5cbec15835d17fb9ebc710fa7cad5634a9485b5ae9534cb9015e96fae4c19d8a51bcb57b77e SHA512 e711cee0974a7357c0ecac7e38a8bda1db43da7a5262f5878994aab4df604245ccf70510ed7d1a7ff62cc184399ebe08c4a30fb83a881c95c77ed6179d411151
-DIST smlnj-110.99.3-system.tgz 283393 BLAKE2B 9fbb815ee69269ed962899a8374d5669adde670f1846c2137958fb945bc29ac52ae60a1e7393d6fe5479b037641f53bd938555c483683f4f8532c22a44073224 SHA512 90c84826cbc86ebe43cd8bb4bd8aff6ddae67c05c1d263f0528720ceb6291bdc6ef3d51ea117cea86d5af8412a43f4dc3422eae6c1de4442139e4d366398d3ae
-DIST smlnj-110.99.3-trace-debug-profile.tgz 3890 BLAKE2B 53bc19a0b805bde85527fec711e088e5805420ed969347075f1876ebbc0d13a54a9d5b444da9541fbccdd0e48444ce663806f08ed35095d63d87382dab020f32 SHA512 0fedf4d291823f279caf57695826b61da07cecbc1a10cf259a8faf4352e2631dc3d64f8442bf57c9df0c4a39150f37ab95995c4498b3a6700bd125fd2d8d6c15
 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
@@ -51,6 +25,32 @@ DIST smlnj-110.99.4-smlnj-c.tgz 10589 BLAKE2B df85102595bfdb492ee1a8967f4fc322b7
 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
-EBUILD smlnj-110.99.3.ebuild 3138 BLAKE2B 52148b15cf0eac6e1dbac33b2ba0faa297a79bc2aee2d00e418802b6e0f23db0f4f0fe07ca240c3f47e0dbaa8e70dbb3010849c4c32689ace04c31d78879eb5c SHA512 8675f496f4cb4f1be74b7e45b5035cf22d89adb21ab364c86ac15f85f7ed5b82f231c039cb7a932a1bf41f86c2bdbd67ee297664a969cdcba1ca457593c72d37
+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
+DIST smlnj-110.99.5-boot.ppc-unix.tgz 5879832 BLAKE2B 552c04efae3f32b6871c439eb1d5f36deb8bc06d154b3e44c2cf4bfcf264c108ddb6ea4f7be4bbf2165a197c0e2023e2d841255a601ef0eb99363925728921cb SHA512 ca9017bbe6f9ced187ca5a35c62aeb55f64d49cab660b2dc78122c253d91b2a1617d6446db63527e579eb1527c32a3256b3d9a4edfb7b2c7c4f4d7b95b060b28
+DIST smlnj-110.99.5-boot.sparc-unix.tgz 6019691 BLAKE2B 4eca69f41a567f012ae94fef2c158f82380e9e7d4acddffd3e4692aa3c98e08bf321c2acf9f955bd47e069e93c5f0b2c4813396b445259daf0313033a37215fc SHA512 84e0d15d6b351d2deea0385ef46e76b1cc9c813377d7026bdbc65bb4d754d78b1d66d620337a6e2443e16c1586af70e6f26aa622d3f5ff1fe6878b9091528748
+DIST smlnj-110.99.5-boot.x86-unix.tgz 5957165 BLAKE2B 162ffc78cefc46d7953b03d567aede86f80e55222467f3ff54007af1d503052a58ea2df43e20f85c1d17799e10367d7291abf2798505de4daedfdabd48e33369 SHA512 48f5aded7422f2d587e8cfa43161b18c71d4d57219a366a04162d16145ce4ae3ef7f168a65de635e770d510ba326b3a2a171d9a3a9fda9a8b587e057d114c3d3
+DIST smlnj-110.99.5-ckit.tgz 200816 BLAKE2B 19baf874be066c677c88b316659b3350a0343c45faa4a61704e93a1ba940bf2a0be7aa915ef06fc49b8b2be35bdb3ee1e69ce7e2bf75f8f713c24654a9142b4d SHA512 e276c665fe732b33e3bb2d564bcd321e51613ab660da02c808740b8dc362c19ff2eeca7f18c4ebdd618fcccb5c149c1e514ec96fdeb3768045d1a6689256625c
+DIST smlnj-110.99.5-cm.tgz 220329 BLAKE2B 30bc6a5ab4a5009cb63dbb2cc87196d94c5c7c05647607fca5cff8baf06a66b6cd48191d7c2d560ab1b3e802f3a7c0e3374250efdda0b8fc7c0ec66dc1b83148 SHA512 9fc83a637868023fbad0e955a43d36db879538a6515707068b70b50ef957f1602065f2af0603fec47488be1c7e77b1b080ca139bc7d363da30de91938a96f86a
+DIST smlnj-110.99.5-cml.tgz 103975 BLAKE2B 5eb737d7aa39c393f613464fbd655741b17d53953a3cf005bb7b595e0ae166657cdebaf7a2c47c16ea23ea13d2f7a4d9b043e9634cafb001ab1661122c71c429 SHA512 d6e789ebfae42724e70863e2bb5b315675a16254f3ec95d9dc7cc0a3f1738c6ae1333eb027fb0c63053df452d3f9faf31cda0f8ef76fb0984f738e466411a151
+DIST smlnj-110.99.5-compiler.tgz 888050 BLAKE2B 8d7ee627207fd9ed3464efa5cd35db048a08d66858e81092a877b64f0188e4f0397598e2307e338ff9fe4f030293f7e70f22005eca74c132fbd8d151e9eb19ee SHA512 f37ec10a68ce42c60821c1258cae65e93dac0fbfc5cbd9bf37de3dae61b2df065e737faf16504d8eda9e258c4520d3805c7b265457e6f60302975e5142d3c967
+DIST smlnj-110.99.5-config.tgz 23303 BLAKE2B 1f1f70da9d9d45d6ebd0681f281e46604568e0ac039d1e00bebc98dbd814236fd2940a7dfe77f41d7f6bddabef00d1b25e9de1c010d731770ed3f73d30f03ead SHA512 03457ce016c603ed23aaf310dc3c9231b267a1abb6510515c999bbec6cb25b7c3e6ab3e79a223ae835444c10b5635b2d54971ba1987f42dc308dc555b72f460e
+DIST smlnj-110.99.5-doc.tgz 2529773 BLAKE2B d4d3addc5f614b53703445bb735df38031433a731a0d10a9dc9db39e66b8a5ce5355c08805dfde7ee11525746076fa7fbd8e907705a37809dc8feff5284c7e57 SHA512 4c2d90ce6e3dd0a561bb4a355963471fd2c2226825497b6dafd19dcfb53aef34c66eb116beb8f6d51bd911884fb642ab602175f42d54e0906a875ae8619c075b
+DIST smlnj-110.99.5-eXene.tgz 714471 BLAKE2B e66ba11610d4d104b2ae8b53da23782de94a58bcb84ef8df90d049e0448fd9a5e0e014d76c67e4e831059180afed52053582682204320cfdd9fc57c41b6f81d0 SHA512 ba2ab853949c6d1f616326e35b2ec30aae0281bca5697c36fcc308ffdfc44dddfd745dc342be2c2f43e1cd4aa0d8a83508c404d357802b679af45b86a627db6e
+DIST smlnj-110.99.5-heap2asm.tgz 1763 BLAKE2B 23a1dea3f408828eb68b2807a2bac06b3a47ecf0273f8450d6f75aff5b891a96cf13d17b963e65ca04cf1c3eaf553eb7b3ae0c90c110c5898bb9d8f305c331d8 SHA512 522b9c4f078410df135ec3a0f66f4abad0275a8b1dac9544951edb18ef3c12d2db375e3bd9c2fac291c1b276c5a4ae060b392899e30fd02033606278b87790e1
+DIST smlnj-110.99.5-ml-burg.tgz 40293 BLAKE2B a9d02176f7e60bac80704d0284838bfcc24b58a1a5bbb67d86e6a1a1f8c66d9b529356d250331fefd59476fbeffc5ad603a5016a2f1433f5487eafb42c18cd98 SHA512 45e8fe097d23004d5cb97553191271506bf7a6ba8152bf5d961e378c9f503e085288e6d93aeeb486c045bd0c7cefd493eb0a2f263ea3e0ee1b814deabf4db6e3
+DIST smlnj-110.99.5-ml-lex.tgz 28040 BLAKE2B 1920b9edc631634f756efa4d4281684729f518bd90a99917a98c979dfd0fcfd4e53d726f3ca76e2f016d0b927d55e67d18e654ecbac6708f83eecade090d7f1e SHA512 0e9ade2a6703a08ea9231c659acf1acab89c6d911bb73143b967512c7f0f195eda121239635c3dab492bbf90bd95afc2ec333928f1b7d1ba7c2bd794fa55510b
+DIST smlnj-110.99.5-ml-lpt.tgz 267318 BLAKE2B 78c89ad24e3175f55453e5061f33441d974f011e921ed7ac3e968f7fa21137d93e8f106d680a7aaa6695fc7d954645a04026863d8453e662254864e05263b241 SHA512 17d2c79b80311e27a4260797a17564d5334bd91d23da6ba0e5c9b07475d51d9e896d5823ce8134ee6d621779ebc222c558f7d124a546dfcb1effe18b12240119
+DIST smlnj-110.99.5-ml-yacc.tgz 101379 BLAKE2B ebdd8498407e4b9ada7810d631b20acee44eab8029662bbe265477029332ad1937e095b6aa108178ff27a276e292e7d103c6022ab40e0c0b56bd6a12717c53a8 SHA512 984b3f74a35167ac85aa101279dd3ee6188516e27f7cb40b9be175a29419328a76e6f0812a18c97ab0fca4826531cbd0e43af0da41bebc73448e671480b7eb60
+DIST smlnj-110.99.5-nlffi.tgz 74701 BLAKE2B b27391f67f72c093d45f73c80e803b348e5a65f5a22e0a6a546c30fd05e4c49fe746649788a0da760194f9ace7ae66a166c0acf7618111aa9beeb276b933ca88 SHA512 492621b2725772af7af3cc8a0b96cc274083c010df96b9efa44ee5a0bf2965cb68bcd6415f9ba91bc1f3e64041cecf71e6298e5c66a7ea441842fdbef4416d01
+DIST smlnj-110.99.5-old-basis.tgz 1365 BLAKE2B 4b5b97131255976ee32b62a236f7cb0180b680832afe405c7286e1a501da25d2269deb5361135a90d5d0e51dad641ee39f90fa961b1664e49eb33dccf2cb8574 SHA512 1b0622f053ab83cd50516e9a6cbbb2da6b32e177e993a998c9fc1b73cb897411629f542260c38d9f4764e07ab0d5e79821c506a0e7bd9bb02bbb84ebe95e888a
+DIST smlnj-110.99.5-pgraph.tgz 5367 BLAKE2B 77a94c720c06977c7906656b063ca382ec7313d6ca3318d6b839b8305281b36553310df384c07ebd0055639cc7a5d762796e534bec97f9fed33bf8b909ad5e26 SHA512 811f098a67ded93d14e05c0e805ed6d8d508635c919d3ed6b2b844f1180ac44b25d7c81d911aaec85d917e8817f2ceba654585523039f899f0ac6c4f4a71f57a
+DIST smlnj-110.99.5-runtime.tgz 335029 BLAKE2B 5473aa7a40589ecd7de58f799623911fbd3bc02adb76ac28123d215d36bb319ba60899cac913555d55c24156a4ec6fd174d97a63e906e81b3b7fd4dc565d20fb SHA512 9a026b4a4d0c4d840d4e3a5d2db06484974315f7584c78f207eb474b6c4b188ce97cef907ff58280f924113ac0a2e6e38c13ce591631be814b072622315398dd
+DIST smlnj-110.99.5-smlnj-c.tgz 10594 BLAKE2B 42b2e852a2ca16a04a1f406034aff66c83f9d1239eb4991489cce9f786d7bb15e0aae073262509def7dd0ab449c836a87d2a7460cfffdfe51d2b9324022a0bf3 SHA512 fd7ae015f94445ad7017a7849de028820ea02bf7343c0ad4231caedb2da2029a747c4b083dbbd424550a4feccac97b293627332b043f4f7e2f2d494729fae8e5
+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 3100 BLAKE2B 5de1a7a1b7c041922bb35001ef8a9e3d4a3e7d914fc590de42893407a7bb39a2f549671cd010b548255a54a319f49e5d0c112004ae7946bd8f79d21bbd660f4f SHA512 2bbe3abce8323a266ca5b709194ad55db700fefa0a388162e0ba1c751a8f4264ff81b8512525e12e8dd6fac5fb30c857477892e233c17e4267ca3e52c43cd608
+EBUILD smlnj-110.99.5.ebuild 3123 BLAKE2B a9a059cbee1b331e219b32f57f5956ca96307857709cfd911287caa2d531b0e7e578567eac721945af524a7bcc0243220ebafdae9d943a3c056146e7d4e7c600 SHA512 32509c758e846bd4755e27c25114b73ae30cd3894a4c8246a03d5f3c8ecf06b5e4ded3ea3a0c25c3987734fedf1f6bc4ab51e776d35d162790a250a851122f96
 MISC metadata.xml 490 BLAKE2B 5cc69f4ef46189b4574bebc6d131c4075438de156497f78f0798e1e71e7dc44842264b0feb4f5629b40c404086873e7617eacedb4db556f2090588c2da803392 SHA512 ecdc8f07eba3eee5ace5de92c23c015d559a5e08642b278359903da423af3d556d5d679db8fd255dadaba2a389672abfd92378d040014554162f1feb35ae0ea7
diff --git a/dev-lang/smlnj/smlnj-110.99.3.ebuild b/dev-lang/smlnj/smlnj-110.99.5.ebuild
index 35f77904057e..49b93fb2e8fa 100644
--- a/dev-lang/smlnj/smlnj-110.99.3.ebuild
+++ b/dev-lang/smlnj/smlnj-110.99.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.smlnj.org"
 
 BASE_URI="http://smlnj.cs.uchicago.edu/dist/working/${PV}"
 
-FILES="
+SRC_FILES="
 doc.tgz
 
 config.tgz
@@ -50,7 +50,7 @@ SRC_URI="
 	x86?   ( ${BASE_URI}/boot.x86-unix.tgz -> ${P}-boot.x86-unix.tgz )
 "
 
-for file in ${FILES} ; do
+for file in ${SRC_FILES} ; do
 	SRC_URI+=" ${BASE_URI}/${file} -> ${P}-${file} "
 done
 
@@ -62,8 +62,6 @@ SLOT="0"
 # sparc support should be there but is untested
 KEYWORDS="~amd64 ~ppc ~x86"
 
-PATCHES=( "${FILESDIR}"/${P}-shuffle.patch )
-
 src_unpack() {
 	mkdir -p "${S}" || die
 	local file
@@ -114,7 +112,7 @@ src_compile() {
 }
 
 src_install() {
-	local DIR=/usr/$(get_libdir)/${PN}
+	local DIR="/usr/$(get_libdir)/${PN}"
 	local i
 
 	local file
@@ -125,8 +123,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}