gentoo resync : 24.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-24 14:47:38 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-24 14:47:38 +0100
commit: b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 (patch)
tree: 911928b566777494d08ebe2c16cb64f15af71901 /dev-lang
parent: 61f10f985e19dfe20a4d9552902625edd5b6eabb (diff)
36 files changed, 319 insertions, 790 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 6f2f5797fcb8..e886c904e6a4 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/fpc/Manifest b/dev-lang/fpc/Manifest
index 7b0352c5fad8..097aae9b7664 100644
--- a/dev-lang/fpc/Manifest
+++ b/dev-lang/fpc/Manifest
@@ -2,6 +2,12 @@ DIST fpc-3.0.4-doc-html.tar.gz 5658315 BLAKE2B 49f9e6f3848ad1aaad8b1621ffd5d2026
 DIST fpc-3.0.4.i386-linux.tar 54691840 BLAKE2B c0951c85a3916c29e8e7391408da09abd86898a42159bfd7e637410ecf3e3a3f266a33edb5eb5ad458be92cf1fc7741eb249a512fe817a73a13207e216e0c0d2 SHA512 eee7528a69d5c745981efc90f571542047a5e6b4f1b391ad5341460035da5feffdfc4c38229134d23513239ccb33dcbc95354559e45746f1f6665541c60d0ca7
 DIST fpc-3.0.4.source.tar.gz 40347617 BLAKE2B 0764c92cc379d6e70a3f33368d96244ea0203b3395a5dbcadebe6ef51b508cbc7c112f9bc7bce69ae6dae1fde03bc9e45a1a8ad70ca154cc4dd51bc93cab82f9 SHA512 fc64fd94c39f220bd7531126d6281fa2141aed61c218595a7906a025660b46629a305ff7eb023f5e1359eafdec2dba69aa5405f1bbc3c1182414968689cbb52e
 DIST fpc-3.0.4.x86_64-linux.tar 56842240 BLAKE2B fda488466f409d4f50501ad17edcce2740f0a7e60ac86bbfec235ccc27c619d62d2aab01aa7878ba3e174c35fd46aab98e43eda4528e98fdf3e098330eea9b26 SHA512 085110d0fade11c4e6e79c002522080eb070cebb8ebbed48ca35e3a2dc025df678516e36c7cba5f951e20c0da57dd261d673dda6839ecdf5d88aa8dfe15a56e5
+DIST fpc-3.2.2-doc-html.tar.gz 5810672 BLAKE2B 5d2c0ce35024f58d35e59034d4c071ec58214874f31ef44b8f4ea8cb68636080b61dea9a5d0ccc8062814c0b2fe3bc5269e6584ae30fedb29dbb0709ce1b3103 SHA512 0bdefd25b9f46bb6684bb4dd8f60de796cbbf81049a7e8bac4cc4bc87dd6100a42ea05601cf1bb0254e8b73ddaf5d1bf186dbf1909f1ed7db7bdf97f50df7cdc
+DIST fpc-3.2.2.i386-linux.tar 85043200 BLAKE2B 9e2fae2d272c79cc7fcf4d062589bd888c342ccfb01e3f14e412bc58ff6b04928c6a7a0a4b3392b30f0864f16029d063632bd72bd9cac55e0a40a00fb726ef93 SHA512 b4f1a94d1a05901f4ffc2e07519e9b03666850211e571cbce33f0ba16d8a1d88de256c8e111579f46d56f157630dfc722a8ae9ce2b200fc784c588ea4e6bd5df
+DIST fpc-3.2.2.source.tar.gz 52240052 BLAKE2B e30cf1b10c4cafd0ae2a25673678213669c29dec0549f4d7b357011e84a0a2c8ecf343cb6443798e6c36c02ae97a0c7cae7ca24829510c552968d4a58426576f SHA512 6d320b4e0805d63c40d3037f9d2078068c2c9fcdeb6ac073a6fcc19249bd6325dc542fcc7fc6dbb7e69507dcd84cf9e720e7d73925afe955e2a24e8c7d92606a
+DIST fpc-3.2.2.x86_64-linux.tar 86978560 BLAKE2B 29cac8c0da4ba65cee6a0e0cd3c111202c8943ca61a02c5dfeaeb174c353db6fc07e291794ef7433f9fdf88ed694260e734bc715567c6a12292b0c8524d17f4e SHA512 534df830a951824525044479ded23ef1e61b104c0dd65c837ad0d8d9ced9eb7349925a3f759756aa95ae17e567d8b1cd5c7e2092d3c665eaac578845b48aa467
 DIST fpcbuild-3.0.4.tar.gz 68908523 BLAKE2B b5c3936cf0b803aa2cc71f9c25ded470f207c540a1691cf3c2a9876c9e4eefd5c04f45b9f1f3ca17917b14ba4a90e0f16cc890b27024ff225d9d6bb25649862b SHA512 eedfeb4d25b3f4cb30ae9c8f30e0fec2405ef806fa565933cef7904d512f781730e3f023aea2f908c21250e3ced4f74fa780abad77b560728a88cedf591505b6
+DIST fpcbuild-3.2.2.tar.gz 84195619 BLAKE2B 88848308c93f949b59197649cc344498082b6520e43eb1d4413bf68eb251fcab75c863794a188a2298d9e8aba47346253a596ac630b30049ac8bd6f6934aa5a2 SHA512 75889bb54adc70a6e2cbd291476b9b12d61c8f943a05b7d16d2024de3215c935465ff43b1400c412e128e260c7f49a9c66e35c21f86cb866e671b5b60a282d82
 EBUILD fpc-3.0.4.ebuild 4459 BLAKE2B 4e02e29ec7411fd966bd7048ad236d9910a7a137ef3b252673ca3d823780b628832bc926c9462eb88711c3c3a3a919b1fb2b399b01d5d00d6a6f1291e98a859e SHA512 b353563e68ebf3524938f1d9cf4f710067443177051d89de73f97aad729a282134859c5811129c88d7a7e516d4a6169c11c691d3300901a0fc5d8cee387b5a88
+EBUILD fpc-3.2.2.ebuild 4267 BLAKE2B e9eebbd06ebf95dfebe34e524ded59838745831bbd8cd85a2914d29341313daa8816ad9aca515c66bedd0a8eee8ee0181d655e3eba4494792ee5c93511527c69 SHA512 044c91d78d07b452cbfb2209026a3af8e5e111de8023f5eb20d0c293b9ea91d68f13e6306dc54fdc853f7f7068c46cbd199cefff226a64bb96251b3835196713
 MISC metadata.xml 385 BLAKE2B 0e0d050ec7539e841469fd1b2dd9b834e274c5acf63c6f5b38923271cac205d8680229e08dbcb931ed0b136f45800843ee21df6c7b670346b81ea988f1ba11b4 SHA512 1d1ec643e71bbaf3f38dd0f817aeba74f8871071a429b203b3b3397b114ef09e89cb5f166a08e7027e834f4f2ef6ad26049063a2d633ecbd65754945d0be1c46
diff --git a/dev-lang/fpc/fpc-3.2.2.ebuild b/dev-lang/fpc/fpc-3.2.2.ebuild
new file mode 100644
index 000000000000..843ec9edcd9a
--- /dev/null
+++ b/dev-lang/fpc/fpc-3.2.2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix toolchain-funcs
+
+HOMEPAGE="https://www.freepascal.org/"
+DESCRIPTION="Free Pascal Compiler"
+SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz
+	mirror://sourceforge/freepascal/fpc-${PV}.source.tar.gz
+	amd64? ( mirror://sourceforge/freepascal/${P}.x86_64-linux.tar )
+	x86? ( mirror://sourceforge/freepascal/${P}.i386-linux.tar )
+	doc? ( mirror://sourceforge/freepascal/Documentation/${PV}/doc-html.tar.gz -> ${P}-doc-html.tar.gz )"
+S="${WORKDIR}/fpcbuild-${PV}/fpcsrc"
+
+LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc source"
+RESTRICT="strip" #269221
+
+# fpc is special: it can't use CFLAGS and LDFLAGS directly
+# since those are geared for running through gcc's frontend
+QA_FLAGS_IGNORED="
+	usr/bin/.*
+	usr/lib.*/.*"
+
+src_unpack() {
+	case ${ARCH} in
+		amd64)
+			FPC_ARCH="x86_64"
+			PV_BIN="${PV}"
+			;;
+		x86)
+			FPC_ARCH="i386"
+			PV_BIN="${PV}"
+			;;
+		*)
+			die "This ebuild doesn't support ${ARCH}" ;;
+	esac
+
+	unpack ${A}
+
+	unpack "${PN}-${PV_BIN}.${FPC_ARCH}-linux/binary.${FPC_ARCH}-linux.tar"
+	unpack ./base.${FPC_ARCH}-linux.tar.gz
+}
+
+src_prepare() {
+	default
+
+	local f
+	while IFS="" read -d $'\0' -r f ; do
+		sed -i -e 's/ -Xs / /' "${f}" || die
+	done < <(find "${WORKDIR}" -name Makefile -type f -print0)
+
+	# let the pkg manager compress man files
+	sed -i '/find man.* gzip /d' "${WORKDIR}"/fpcbuild-${PV}/install/man/Makefile || die
+
+	# make the compiled binary check for fpc.cfg under the prefixed /etc/ path
+	hprefixify "${WORKDIR}"/fpcbuild-${PV}/fpcsrc/compiler/options.pas
+}
+
+src_configure() {
+	tc-ld-disable-gold # bug 475210
+}
+
+set_pp() {
+	case ${ARCH} in
+		amd64)
+			FPC_ARCH="x64"
+			FPC_PARCH="x86_64"
+			;;
+		x86)
+			FPC_ARCH="386"
+			FPC_PARCH="i386"
+			;;
+		*)
+			die "This ebuild doesn't support ${ARCH}" ;;
+	esac
+
+	case ${1} in
+		bootstrap)
+			pp="${WORKDIR}/lib/fpc/${PV_BIN}/ppc${FPC_ARCH}"
+			;;
+		new)
+			pp="${S}/compiler/ppc${FPC_ARCH}"
+			;;
+		*)
+			die "set_pp: unknown argument: ${1}" ;;
+	esac
+}
+
+src_compile() {
+	local pp
+
+	# Using the bootstrap compiler.
+	set_pp bootstrap
+
+	emake PP="${pp}" compiler_cycle AS="$(tc-getAS)"
+
+	# Save new compiler from cleaning...
+	cp compiler/ppc${FPC_ARCH} ppc${FPC_ARCH}.new || die
+
+	# ...rebuild with current version...
+	emake PP="${S}/ppc${FPC_ARCH}.new" AS="$(tc-getAS)" compiler_cycle
+
+	# ..and clean up afterwards
+	rm ppc${FPC_ARCH}.new || die
+
+	# Using the new compiler.
+	set_pp new
+
+	emake PP="${pp}" AS="$(tc-getAS)" rtl_clean
+
+	# ide is moved to packages directory and build unconditionally
+	emake PP="${pp}" AS="$(tc-getAS)" rtl packages_all utils
+}
+
+src_install() {
+	local pp
+	set_pp new
+
+	#fpcbuild-3.0.0/utils/fpcm/fpcmake
+	#${WORKDIR}/${PN}build-${PV}/utils/fpcm/fpcmake"
+	#fpcbuild-3.0.0/fpcsrc/utils/fpcm/bin/x86_64-linux/fpcmake
+	set -- PP="${pp}" FPCMAKE="${S}/utils/fpcm/bin/${FPC_PARCH}-linux/fpcmake" \
+		INSTALL_PREFIX="${ED}"/usr \
+		INSTALL_DOCDIR="${ED}"/usr/share/doc/${PF} \
+		INSTALL_MANDIR="${ED}"/usr/share/man \
+		INSTALL_SOURCEDIR="${ED}"/usr/lib/fpc/${PV}/source
+
+	emake "$@" compiler_install rtl_install packages_install utils_install
+
+	dosym ../lib/fpc/${PV}/ppc${FPC_ARCH} /usr/bin/ppc${FPC_ARCH}
+
+	emake -C "${S}"/../install/doc "$@" installdoc
+	emake -C "${S}"/../install/man "$@" installman
+
+	use doc && dodoc -r "${S}"/../../doc/.
+
+	if use source ; then
+		shift
+		emake PP="${ED}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall
+		find "${ED}"/usr/lib/fpc/${PV}/source -name '*.o' -delete || die
+	fi
+
+	"${ED}"/usr/lib/fpc/${PV}/samplecfg "${ED}"/usr/lib/fpc/${PV} "${ED}"/etc || die
+
+	# set correct (prefixed) path for e.g. unit files
+	sed -i "s:${ED}:${EPREFIX}:g" "${ED}"/etc/fpc.cfg || die
+
+	sed -e "s:${ED}::g" \
+		-i "${ED}"/etc/fppkg.cfg \
+		-i "${ED}"/etc/fppkg/default \
+		-i "${ED}"/usr/lib/fpc/${PV}/ide/text/fp.cfg \
+		|| die
+
+	rm -r "${ED}"/usr/lib/fpc/lexyacc || die
+
+	case ${ARCH} in
+		amd64)
+			mkdir -p "${ED}"/usr/$(get_libdir) || die
+			mv "${ED}"/usr/lib/*.so "${ED}/usr/$(get_libdir)/" || die
+			;;
+	esac
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && ! use doc; then
+		elog "To read the documentation in the fpc IDE, enable the doc USE flag"
+	fi
+}
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index 6d6487167a02..2203477a4bb4 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -1,8 +1,4 @@
-DIST MoarVM-2020.11.tar.gz 5402860 BLAKE2B f29ec4a8f4979fd65adb24cbfbbed586b69d47dd1176770e1e0e46a8bc35ef90146bae468fd6e088cd19201ba7e43d43d486d569970a81a695d6b642f57c2417 SHA512 c3ffe128db43316f93ad19f2804cd963cd2613dc46ffd29b099a165f122f6e7fdf28ce0b6c226a31f44abaeca72468f6774c39ceac3cea992596e8ce042ae7a5
-DIST MoarVM-2020.12.tar.gz 5429137 BLAKE2B dbf9b0b29226dde10b27ddb9195678c86efc77eff16b57745d31dbcef316c8ba4f5233e2c3672b436d089ce59d4ed9acc908e483d081768946c088708caf5711 SHA512 2e95a3336f0b5687f525a5117daf6cd62da6c59fd6d96d508637a30ca5a0bc7a86a35bb21f09f29068e2ec940b859944838eec4c4a2412a3f3bf8320c3d9cfd5
-DIST MoarVM-2021.02.tar.gz 5451480 BLAKE2B a714b135296c309812719b7fb14e2ea999820599a23796403e6512952edba327e4f685fb5f8ec8ea3b5ef2fc12c4303a6077a71a5bc325cdd287e27cc87e3e01 SHA512 23f54c0746aec4b4b35adcb07eb7f8cc81751d3552ef537ed29353d3ff9d46544c495475cb2c147bb80cb0917e79216e142ee5cf643fa4e76f72caadb3354f1c
-EBUILD moarvm-2020.11.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
-EBUILD moarvm-2020.12.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
-EBUILD moarvm-2021.02.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
+DIST MoarVM-2021.06.tar.gz 5449936 BLAKE2B 2bf6fc2e1a4dd0741819305e506945b09ed2a0fc1348ff98565cae397e76044176f05e87faeed1f52d5efadccb6d44edcb987553f5e164417153a8f23ba09493 SHA512 b23e20ed3e0830395ac09bd84a33ea3ab7ba52bce835c67b1feec45823ca2f0c9d04957d1f1b48b400fc30a48db37c5f89c3975b0273f684d9677145e2296f2c
+EBUILD moarvm-2021.06.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
 EBUILD moarvm-9999.ebuild 1736 BLAKE2B 9f434f8561c55716165952dce8e35bd3659fbd0f3a42f688049e023faa0f10c4aa245ca810279ae80527c4ec5fe5c514bc5ae534aa30e839693657ce68fc7f9c SHA512 5867e2ee90401a86cd0341d8ab5ae75fecb7d366d88e1269439248686942b5c1855e45857b4388491631b26361aac3b0495d7214158931e955655a34d557fada
 MISC metadata.xml 802 BLAKE2B a2fc329ff27764a800785617bf71bdb99f764c3709130a094ac398d99aeef1414c1188d55088ada2f41eb4892709ef681d47b9f64e27a0426d5ec0cd8c90640e SHA512 2afbbc8899857a4bd3583f2bad121fd68208dfbdd4d0852bfbf28860e45e49a4b600ee74c254f7ffa782e8c1e939d56744acf82771a49fe0caed7e31492b8c60
diff --git a/dev-lang/moarvm/moarvm-2020.12.ebuild b/dev-lang/moarvm/moarvm-2020.12.ebuild
deleted file mode 100644
index df017e9cd54a..000000000000
--- a/dev-lang/moarvm/moarvm-2020.12.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_PN="MoarVM"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
-HOMEPAGE="http://moarvm.org"
-LICENSE="Artistic-2"
-SLOT="0"
-
-IUSE="asan clang debug doc +jit optimize static-libs ubsan"
-
-RDEPEND="dev-libs/libatomic_ops
-		>=dev-libs/libuv-1.26
-		dev-libs/libffi"
-DEPEND="${RDEPEND}
-	clang? ( >=sys-devel/clang-3.1 )
-	dev-lang/perl"
-
-DOCS=( CREDITS README.markdown )
-
-# Tests are conducted via nqp
-RESTRICT=test
-
-src_configure() {
-	MAKEOPTS+=" NOISY=1"
-	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX}/usr"
-	local libdir="${EPREFIX}/usr/$(get_libdir)"
-	einfo "--prefix '${prefix}'"
-	einfo "--libdir '${libdir}'"
-	local myconfigargs=(
-		"--prefix" "${prefix}"
-		"--has-libuv"
-		"--has-libatomic_ops"
-		"--has-libffi"
-		"--libdir" "${libdir}"
-		"--compiler" "$(usex clang clang gcc)"
-		"$(usex asan        --asan)"
-		"$(usex debug       --debug            --no-debug)"
-		"$(usex optimize    --optimize=        --no-optimize)"
-		"$(usex static-libs --static)"
-		"$(usex ubsan       --ubsan)"
-	)
-
-	perl Configure.pl "${myconfigargs[@]}" moarshared || die
-}
diff --git a/dev-lang/moarvm/moarvm-2021.02.ebuild b/dev-lang/moarvm/moarvm-2021.02.ebuild
deleted file mode 100644
index df017e9cd54a..000000000000
--- a/dev-lang/moarvm/moarvm-2021.02.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_PN="MoarVM"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
-HOMEPAGE="http://moarvm.org"
-LICENSE="Artistic-2"
-SLOT="0"
-
-IUSE="asan clang debug doc +jit optimize static-libs ubsan"
-
-RDEPEND="dev-libs/libatomic_ops
-		>=dev-libs/libuv-1.26
-		dev-libs/libffi"
-DEPEND="${RDEPEND}
-	clang? ( >=sys-devel/clang-3.1 )
-	dev-lang/perl"
-
-DOCS=( CREDITS README.markdown )
-
-# Tests are conducted via nqp
-RESTRICT=test
-
-src_configure() {
-	MAKEOPTS+=" NOISY=1"
-	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX}/usr"
-	local libdir="${EPREFIX}/usr/$(get_libdir)"
-	einfo "--prefix '${prefix}'"
-	einfo "--libdir '${libdir}'"
-	local myconfigargs=(
-		"--prefix" "${prefix}"
-		"--has-libuv"
-		"--has-libatomic_ops"
-		"--has-libffi"
-		"--libdir" "${libdir}"
-		"--compiler" "$(usex clang clang gcc)"
-		"$(usex asan        --asan)"
-		"$(usex debug       --debug            --no-debug)"
-		"$(usex optimize    --optimize=        --no-optimize)"
-		"$(usex static-libs --static)"
-		"$(usex ubsan       --ubsan)"
-	)
-
-	perl Configure.pl "${myconfigargs[@]}" moarshared || die
-}
diff --git a/dev-lang/moarvm/moarvm-2020.11.ebuild b/dev-lang/moarvm/moarvm-2021.06.ebuild
index df017e9cd54a..df017e9cd54a 100644
--- a/dev-lang/moarvm/moarvm-2020.11.ebuild
+++ b/dev-lang/moarvm/moarvm-2021.06.ebuild
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 935df121e4f5..655f4efd7a37 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,8 +1,4 @@
-DIST nqp-2020.11.tar.gz 3954688 BLAKE2B d273c78c8f2083908b2815dc10787fec31404eb13c1e64253e7e5ae896d27a3755cf5c8045d47c4f465178568731e0d74951db6e45d103cf3ee18470124e97e0 SHA512 51b5e7f9d290bca7ada24cf9c12c61608be92269fc848976cada49f7445694e0f26929b5f9e90a9153eb379f0d74a6bb8068cd5ebf383d4501f75535b70e7605
-DIST nqp-2020.12.tar.gz 3957981 BLAKE2B d45ad66ebb0788db6e7191b4b7af4093b73e63e5f66ab4ccab62163b0285adb7d4e18a7c906c34f99dd63e0920f4d6e16e11005eb5df1d726796e9f106f9c4f8 SHA512 4ce87dc868c91565ebe896db766403bb018b2f5ea919bd0fb5b173498ba124712ffa795ec4e219240e5aabb59c55285bee5e46d3ac3d5869fc445b0ab3ea8485
-DIST nqp-2021.02.tar.gz 3987077 BLAKE2B 3f67e33b948805a7c4dad1999e310d36da0cd8d4663b20ada5af6079c8ad2966c1f65e9f24c620f16480b7dea42a166f73fec61f3849e2cdd79b28ec017b0d7f SHA512 ff6cf66f4c1d9bccbd4cc5f52e49d380aaeef3fa060ced9e1da6c233e674fa90c08a5f1fa86e1a7beb5661d1271454934b520ba3e07e27cebaece343be84bdfe
-EBUILD nqp-2020.11.ebuild 3634 BLAKE2B 5d8351300dcfe9ead4467a1253f0cafc2ea23afcc3c2200711fd8acbee95048c08adc10ed44978c496b3d1e79071dc4755d7c005d1045bd871d068525b69c167 SHA512 d6c66b3e9d127586524e368560afc6ba49e5f8a48b3054ef8dcbacfe6fe7e81325269f3eeeb72e2237cbeaa203b85797d636944459e55378490ce98df2ca2fb8
-EBUILD nqp-2020.12.ebuild 3634 BLAKE2B 5d8351300dcfe9ead4467a1253f0cafc2ea23afcc3c2200711fd8acbee95048c08adc10ed44978c496b3d1e79071dc4755d7c005d1045bd871d068525b69c167 SHA512 d6c66b3e9d127586524e368560afc6ba49e5f8a48b3054ef8dcbacfe6fe7e81325269f3eeeb72e2237cbeaa203b85797d636944459e55378490ce98df2ca2fb8
-EBUILD nqp-2021.02.ebuild 3634 BLAKE2B 5d8351300dcfe9ead4467a1253f0cafc2ea23afcc3c2200711fd8acbee95048c08adc10ed44978c496b3d1e79071dc4755d7c005d1045bd871d068525b69c167 SHA512 d6c66b3e9d127586524e368560afc6ba49e5f8a48b3054ef8dcbacfe6fe7e81325269f3eeeb72e2237cbeaa203b85797d636944459e55378490ce98df2ca2fb8
+DIST nqp-2021.06.tar.gz 5208065 BLAKE2B 7314f425e418161befc55f9490453a3a4c3caa0ddf13e2b3bbcc9a20a6204aba9517885b6ecccddbbaf078b60c74be90fe556bf99dcc6014e57a7c873e96381d SHA512 482ec4a99d09b3660f03fd3c822a2f8c72dbdfeda1bcfdac0b4bcfa364ec57cbfdebf3b2872f8649c86d3d2d7603961d75e00d73dc417e5ac2a32f643bcfcabe
+EBUILD nqp-2021.06.ebuild 3634 BLAKE2B 5d8351300dcfe9ead4467a1253f0cafc2ea23afcc3c2200711fd8acbee95048c08adc10ed44978c496b3d1e79071dc4755d7c005d1045bd871d068525b69c167 SHA512 d6c66b3e9d127586524e368560afc6ba49e5f8a48b3054ef8dcbacfe6fe7e81325269f3eeeb72e2237cbeaa203b85797d636944459e55378490ce98df2ca2fb8
 EBUILD nqp-9999.ebuild 3634 BLAKE2B 5d8351300dcfe9ead4467a1253f0cafc2ea23afcc3c2200711fd8acbee95048c08adc10ed44978c496b3d1e79071dc4755d7c005d1045bd871d068525b69c167 SHA512 d6c66b3e9d127586524e368560afc6ba49e5f8a48b3054ef8dcbacfe6fe7e81325269f3eeeb72e2237cbeaa203b85797d636944459e55378490ce98df2ca2fb8
 MISC metadata.xml 516 BLAKE2B 82a24b38f05cfc436b30a042aa0aa16f638cd471a3ca51d1c0f6c096387a83d95a4e4ed7b9ba3f0f84d3faa630dc6e4d5b6fa884cf76aaaa67aa544eeefc8ae0 SHA512 c96c7a42e554542060ef6b83b9a44ac33c425748b788d7ea438590a49346e06ee71decc29afaa72b758fa4a963e1f0692eac24420141d6e016aefc08f97881c8
diff --git a/dev-lang/nqp/nqp-2020.12.ebuild b/dev-lang/nqp/nqp-2020.12.ebuild
deleted file mode 100644
index 81e93919b90b..000000000000
--- a/dev-lang/nqp/nqp-2020.12.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2 multibuild
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="https://rakudo.org"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
-		dev-java/asm:4
-		dev-java/jline:0
-		dev-java/jna:4
-	)
-	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8 )"
-DEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.8 )
-	dev-lang/perl"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
-		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
-		ewarn "already being installed. So if it fails, try uninstalling both"
-		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-java_prepare() {
-	# Don't clean stage0 jars.
-	einfo "Cleaning upstream jars"
-	java-pkg_clean 3rdparty/
-
-	# Don't use jars we just deleted.
-	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
-		src/vm/jvm/runners/nqp-j || die
-}
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use moar && MULTIBUILD_VARIANTS+=( moar )
-	use java && MULTIBUILD_VARIANTS+=( jvm )
-
-	multibuild_copy_sources
-
-	# This will pull in conditional java_prepare
-	default
-}
-
-nqp_configure() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	local myconfargs=(
-		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX}/usr" )
-
-	perl Configure.pl "${myconfargs[@]}" || die
-	popd || die
-}
-
-nqp_compile() {
-	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}" \
-			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
-			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}"
-	fi
-}
-
-nqp_test() {
-	emake -j1 \
-		-C "${BUILD_DIR}" \
-		test
-}
-
-nqp_install() {
-	# This is the actual reason we need multibuild.eclass.
-	# We need to distinguish the install procedure for MoarVM and JVM backends.
-	case "${MULTIBUILD_VARIANT}" in
-		moar)
-			emake \
-				DESTDIR="${ED}" \
-				-C "${BUILD_DIR}" \
-				install
-			;;
-		jvm)
-			pushd "${BUILD_DIR}" > /dev/null || die
-			# Set JAVA_PKG_JARDEST early.
-			java-pkg_init_paths_
-
-			# Upstream sets the classpath to this location. Perhaps it's
-			# used to locate the additional libraries?
-			java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
-			insinto "${JAVA_PKG_JARDEST}"
-			local jar
-
-			for jar in *.jar; do
-				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
-					# jars for NQP itself.
-					java-pkg_dojar ${jar}
-				else
-					# jars used by NQP.
-					doins ${jar}
-				fi
-			done
-
-			# Upstream uses -Xbootclasspath/a, which is faster due to lack
-			# of verification, but gjl isn't flexible enough yet. :(
-			java-pkg_dolauncher ${PN}-j --main ${PN}
-			dosym ${PN}-j /usr/bin/${PN}
-			dobin tools/jvm/eval-client.pl
-			popd > /dev/null || die
-			;;
-		*)
-			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
-			;;
-	esac
-}
-
-src_configure() {
-	multibuild_foreach_variant nqp_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant nqp_compile
-}
-
-src_test() {
-	multibuild_foreach_variant nqp_test
-}
-
-src_install() {
-	multibuild_foreach_variant nqp_install
-
-	dodoc CREDITS README.pod
-	use doc && dodoc -r docs/*
-}
diff --git a/dev-lang/nqp/nqp-2021.02.ebuild b/dev-lang/nqp/nqp-2021.02.ebuild
deleted file mode 100644
index 81e93919b90b..000000000000
--- a/dev-lang/nqp/nqp-2021.02.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2 multibuild
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="https://rakudo.org"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
-		dev-java/asm:4
-		dev-java/jline:0
-		dev-java/jna:4
-	)
-	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8 )"
-DEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.8 )
-	dev-lang/perl"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
-		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
-		ewarn "already being installed. So if it fails, try uninstalling both"
-		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-java_prepare() {
-	# Don't clean stage0 jars.
-	einfo "Cleaning upstream jars"
-	java-pkg_clean 3rdparty/
-
-	# Don't use jars we just deleted.
-	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
-		src/vm/jvm/runners/nqp-j || die
-}
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=()
-	use moar && MULTIBUILD_VARIANTS+=( moar )
-	use java && MULTIBUILD_VARIANTS+=( jvm )
-
-	multibuild_copy_sources
-
-	# This will pull in conditional java_prepare
-	default
-}
-
-nqp_configure() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	local myconfargs=(
-		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX}/usr" )
-
-	perl Configure.pl "${myconfargs[@]}" || die
-	popd || die
-}
-
-nqp_compile() {
-	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}" \
-			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
-			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
-		emake -j1 \
-			-C "${BUILD_DIR}"
-	fi
-}
-
-nqp_test() {
-	emake -j1 \
-		-C "${BUILD_DIR}" \
-		test
-}
-
-nqp_install() {
-	# This is the actual reason we need multibuild.eclass.
-	# We need to distinguish the install procedure for MoarVM and JVM backends.
-	case "${MULTIBUILD_VARIANT}" in
-		moar)
-			emake \
-				DESTDIR="${ED}" \
-				-C "${BUILD_DIR}" \
-				install
-			;;
-		jvm)
-			pushd "${BUILD_DIR}" > /dev/null || die
-			# Set JAVA_PKG_JARDEST early.
-			java-pkg_init_paths_
-
-			# Upstream sets the classpath to this location. Perhaps it's
-			# used to locate the additional libraries?
-			java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
-			insinto "${JAVA_PKG_JARDEST}"
-			local jar
-
-			for jar in *.jar; do
-				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
-					# jars for NQP itself.
-					java-pkg_dojar ${jar}
-				else
-					# jars used by NQP.
-					doins ${jar}
-				fi
-			done
-
-			# Upstream uses -Xbootclasspath/a, which is faster due to lack
-			# of verification, but gjl isn't flexible enough yet. :(
-			java-pkg_dolauncher ${PN}-j --main ${PN}
-			dosym ${PN}-j /usr/bin/${PN}
-			dobin tools/jvm/eval-client.pl
-			popd > /dev/null || die
-			;;
-		*)
-			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
-			;;
-	esac
-}
-
-src_configure() {
-	multibuild_foreach_variant nqp_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant nqp_compile
-}
-
-src_test() {
-	multibuild_foreach_variant nqp_test
-}
-
-src_install() {
-	multibuild_foreach_variant nqp_install
-
-	dodoc CREDITS README.pod
-	use doc && dodoc -r docs/*
-}
diff --git a/dev-lang/nqp/nqp-2020.11.ebuild b/dev-lang/nqp/nqp-2021.06.ebuild
index 81e93919b90b..81e93919b90b 100644
--- a/dev-lang/nqp/nqp-2020.11.ebuild
+++ b/dev-lang/nqp/nqp-2021.06.ebuild
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 7a2014527616..8e7ecd706cc8 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -23,7 +23,7 @@ DIST python-gentoo-patches-3.7.10_p6.tar.xz 23868 BLAKE2B 3b3786030a461d06a96dbe
 DIST python-gentoo-patches-3.8.10_p2.tar.xz 20288 BLAKE2B 4d9db5c8d5c27673d5a026149e5678c2b4072d6d0326ae015bf4fd5b5065beeff0cd6ee0a061f79ab3258d3d156d555a38cbdca2e5e05b4405038847dcc97c8e SHA512 165a4e3b537538e792a98141a8e4af6b5cde369e6322155731ecb1b55d0e609f06208d88d68dbb1fbe59a5127ae7ac49d76d8fb6505ccf835931b2a802cd85de
 DIST python-gentoo-patches-3.9.5_p2.tar.xz 14728 BLAKE2B b6b0a0c316d99e8282bdbb5e62a90f84880ff89b0b1e236a5bce37fbdd3c3b187f7964873882dbcbc8c9765af107377240e8aac544987452830f0069aff471c0 SHA512 42e4dd48f4b93bd45a70093b447b4862ab286c1b5adc32d22a3e3d08e67db13bfa829bdbcf989fac9b7c8634a4735cfb4a7b16bfc40bdff0c11bc5a768bbeaf8
 EBUILD python-2.7.18_p10.ebuild 10278 BLAKE2B 1831412a47fd78750e3fc1d6bc91c403f70ae1e51500adbc197f671d5057230bee9aac2437ff1fda45923021a3ead7c91cc5fb27967426bc7d45c8dd4162a0d8 SHA512 59eb7b80b2e39da2b2ed47a33b3ddf13975c40ce565f6552c66d7e3bc2bdcd8534065b8f0782d49b5dbb52afd7135af5f0858e963a0bd182723e76445d5495e7
-EBUILD python-2.7.18_p11.ebuild 10285 BLAKE2B 5ef793671415ce15644f5f120fbc083444c5d0dcdac2cfdec6a78f072529abf5caded73a1704ae2248949b1c349e03ef1359c64cb14f540d755abb0b110d26ef SHA512 111ebd8d68a57b84d8fb93d472903f1afd6d0a7fa4df6244634b00a8a0380fead2c7609430c81b0287a1ef44db173d538a99578787b59f05c7fff4e401ff0764
+EBUILD python-2.7.18_p11.ebuild 10283 BLAKE2B 460a28164ecc075fc168b8b6fdf9a732456c31ee03210b08875c0d396872c8c693413bdadfcb02c90229b1c2f2bbe726ad4fe02f3aa4273f249c2e8c88ed1eb7 SHA512 afd986004babf8282cf1d754a136bcb5ce0330b72425e856cd11f65755276359d7a2f9df6ff70eeee21814ef492d7d79014c3f2fff2c2514a892af4b2fd573f6
 EBUILD python-3.10.0_beta2.ebuild 10045 BLAKE2B 085fb4c2d64576159313076da40f6c7096d6815151d2a3e082a5bae5164d40442996d579e887dc5a39fa52dfb1220b67fc26f840b2f0b1997346fccfdee56009 SHA512 e66d80207f5897b6bcd72f1506ee5418c13eb1cc51a1b3681e653d49d7473f5755edc8096c7d3becb613275f1e40a13b399b9c61dfc85da9b9e209791ea2d230
 EBUILD python-3.10.0_beta3.ebuild 10045 BLAKE2B 085fb4c2d64576159313076da40f6c7096d6815151d2a3e082a5bae5164d40442996d579e887dc5a39fa52dfb1220b67fc26f840b2f0b1997346fccfdee56009 SHA512 e66d80207f5897b6bcd72f1506ee5418c13eb1cc51a1b3681e653d49d7473f5755edc8096c7d3becb613275f1e40a13b399b9c61dfc85da9b9e209791ea2d230
 EBUILD python-3.6.13_p5.ebuild 9827 BLAKE2B 1b4e38ac6584840625040b89cb888db177a46cd6faec6c236c32f56b890fc6487c826dd9820f05ba9493a792df8f2bab252c7e1c3c86a49fc0e3e1ae00828b43 SHA512 185ca27fa6ba4ed17b89d0e6f21efa5fd44aa40637f3844401e7d6140f82d6d2a815d61210aad50c322de029bae7a46654c90e4ec448bbee6caab25d3a82d711
diff --git a/dev-lang/python/python-2.7.18_p11.ebuild b/dev-lang/python/python-2.7.18_p11.ebuild
index b7add6ea2b7c..414210415080 100644
--- a/dev-lang/python/python-2.7.18_p11.ebuild
+++ b/dev-lang/python/python-2.7.18_p11.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 93df9c1fe461..c4e6e2eec0bc 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -1,7 +1,3 @@
-DIST rakudo-2020.11.tar.gz 5678270 BLAKE2B 314da91b516d509fcfcfff16e46444243083bdeb21294bc33a2996f1883317b663cc3442cbb6090c8339c5607b4e64a4c8c3c9f2fa5d728bd5c6513d6ef20bcf SHA512 d6c0f7849570b82611db311445f6b60000ecf1c0773d1bb5f4da0d27a9e0d443149ab72f954da2e75a8323d9be9c31f655dee1183a8ca714d89c63baa6e2489e
-DIST rakudo-2020.12.tar.gz 5690849 BLAKE2B 2f2bae068419279346d4dd49b734221d9a8bbeaac94b8fd44f03812ed33fbf8d4e096ba768388cb56571970d41f8ef319bf12d1f33a1cf36fe3ebb7ec6da40be SHA512 dfb94d1c8f75ec16e0149a37b57a9d9fc80ddaf256526edd3d3a23c0435881a187efbe88fd95a2174a9e9d93820987e561bb77745c7492e7ac50eb72879b4ab8
-DIST rakudo-2021.02.tar.gz 7530228 BLAKE2B 9b70b737abfe18ea43aea4c45d965567357ef811ab719b9013b8e31e610c91e2868dcdb978abe7a62a5e375ea81e1f914d8031b36c5947f73d32824c12f83dd2 SHA512 067abbc2d9f11251486c30aa70a7961f0864dd08aac12aaadf47c5d019066fb38433b2bcc27f5f70a50f6d213462df9fe6631c22e6ea0148f348659fb5030329
-EBUILD rakudo-2020.11.ebuild 1615 BLAKE2B 11d22170b2a2a91c405db0e16e099a670a50c981c289c30cef897294cce48022fee2aa7d7f51161bbda52850d6e9878c423877f47fcdd8aeda5bdbbfc2533f7e SHA512 781d36e3c0aee054795c8f9a4ebf40b28fdac7fb83eaefa1ce65d9b9cad3d224bd8a6a241820d2e779f1d397f8e2a677dcbbcb5b52acf389369e05b2747ac558
-EBUILD rakudo-2020.12.ebuild 1615 BLAKE2B 11d22170b2a2a91c405db0e16e099a670a50c981c289c30cef897294cce48022fee2aa7d7f51161bbda52850d6e9878c423877f47fcdd8aeda5bdbbfc2533f7e SHA512 781d36e3c0aee054795c8f9a4ebf40b28fdac7fb83eaefa1ce65d9b9cad3d224bd8a6a241820d2e779f1d397f8e2a677dcbbcb5b52acf389369e05b2747ac558
-EBUILD rakudo-2021.02.ebuild 1615 BLAKE2B 11d22170b2a2a91c405db0e16e099a670a50c981c289c30cef897294cce48022fee2aa7d7f51161bbda52850d6e9878c423877f47fcdd8aeda5bdbbfc2533f7e SHA512 781d36e3c0aee054795c8f9a4ebf40b28fdac7fb83eaefa1ce65d9b9cad3d224bd8a6a241820d2e779f1d397f8e2a677dcbbcb5b52acf389369e05b2747ac558
+DIST rakudo-2021.06.tar.gz 5211187 BLAKE2B e6a73ada3bc7550ad9e2415374f8ecd9aeed021faf8bc52697c8d4bd1fc16782036fecf346f1b132f2d50b894f99ebca548e6e4209b1ff643a045679415ae3fd SHA512 1141979c63a5128919d24c4660cff8011fade12487bd7f437dbaeb6d121ab2d93e42022227ad47d6d840ddb12118c9f1cde8285d87677ff88b135c4e9f079ecc
+EBUILD rakudo-2021.06.ebuild 1600 BLAKE2B 5161bd656fd7fa2788be6db0b622c79c0404212136b69a47fbbde5ae802de441372381439278891f43584847fac5d9e76795c46ae1a1448871c6d233a983bffc SHA512 b96ae07a86c28535e21ee2e2ac98b34626e07bc34d54a3f1a1ec5e8675306b5838203ac7f4b266812c05d4e465a2cd9066558c3226a0c63a86ea0e14c61e1890
 MISC metadata.xml 395 BLAKE2B b9b773f93823cac435589cc51630593affbcbf083f13f87576a56cd1fbc7493cf7513b709d7cfe12d5d323ec205cb10f72eb3ba42685c76631a2773774aeadf3 SHA512 91dc0ea511efb537b854bfccd3df153ec29cb83c6fb6b7cdf186e09193239a7b5aa3fabfb2c4225d991207f33feb0b10a6d29200b3790a4c662a36f47cff9766
diff --git a/dev-lang/rakudo/rakudo-2020.11.ebuild b/dev-lang/rakudo/rakudo-2020.11.ebuild
deleted file mode 100644
index 8337e3f34074..000000000000
--- a/dev-lang/rakudo/rakudo-2020.11.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2
-
-DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="https://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.7 )"
-DEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.7 )
-	>=dev-lang/perl-5.10"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo; then
-		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
-		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
-		ewarn "then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-src_configure() {
-	local backends
-	use moar && backends+="moar,"
-	use java && backends+="jvm"
-
-	local myargs=(
-		"--prefix=/usr"
-		"--sysroot=/"
-		"--sdkroot=/"
-		"--backends=${backends}"
-	)
-
-	perl Configure.pl "${myargs[@]}" || die
-
-	if use java; then
-		NQP=$(java-pkg_getjars --with-dependencies nqp)
-	fi
-}
-
-src_compile() {
-	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
-}
-
-src_test() {
-	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
-}
diff --git a/dev-lang/rakudo/rakudo-2021.02.ebuild b/dev-lang/rakudo/rakudo-2021.02.ebuild
deleted file mode 100644
index 8337e3f34074..000000000000
--- a/dev-lang/rakudo/rakudo-2021.02.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-opt-2
-
-DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="https://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://rakudo.org/dl/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="clang java +moar test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.7 )"
-DEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.7 )
-	>=dev-lang/perl-5.10"
-
-pkg_pretend() {
-	if has_version dev-lang/rakudo; then
-		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
-		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
-		ewarn "then do a new installation."
-		ewarn "(see Bug #584394)"
-	fi
-}
-
-src_configure() {
-	local backends
-	use moar && backends+="moar,"
-	use java && backends+="jvm"
-
-	local myargs=(
-		"--prefix=/usr"
-		"--sysroot=/"
-		"--sdkroot=/"
-		"--backends=${backends}"
-	)
-
-	perl Configure.pl "${myargs[@]}" || die
-
-	if use java; then
-		NQP=$(java-pkg_getjars --with-dependencies nqp)
-	fi
-}
-
-src_compile() {
-	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
-}
-
-src_test() {
-	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
-}
diff --git a/dev-lang/rakudo/rakudo-2020.12.ebuild b/dev-lang/rakudo/rakudo-2021.06.ebuild
index 8337e3f34074..551b3af73d09 100644
--- a/dev-lang/rakudo/rakudo-2020.12.ebuild
+++ b/dev-lang/rakudo/rakudo-2021.06.ebuild
@@ -60,7 +60,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+	emake NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
 }
 
 src_install() {
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 700bcf02e242..773cd18ed6e8 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -27,16 +27,16 @@ DIST ruby-3.0.0.tar.xz 14374176 BLAKE2B 9e7520e0b1ae6644285449c4ae92983d306772b3
 DIST ruby-3.0.1.tar.xz 14486780 BLAKE2B 60872c457f5bcb58e1bb1792ca13ae21c7cc30d22ae9bd072b3f6d6b83f41e535d905d19fd1aaf7a377801a5b610930bd1727219ab3c1461ee3d1ec7d041c2b6 SHA512 97d2e883656060846b304368d9d836e2f3ef39859c36171c9398a0573818e4ed75bfd7460f901a9553f7f53518c505327a66e74f83704a881469f5ac61fe13d7
 EBUILD ruby-2.5.8-r1.ebuild 7015 BLAKE2B 1f3bc0c42021c044724881e3c06d25adb0fb70d5986bd0495610335938d4ebca880568489769510d947e8bd9f3cc72b7c6799b8c6793cf6c978d9c878832752e SHA512 9fe46a00f3fed169aae53f6bfd210b2144ae5da1bd3d40c15ae958ac6c8ec6b1c52f18ea62eda955ff0763c80f93c84a9c1dcb1d7f4133452374b1a382f4e92a
 EBUILD ruby-2.5.8.ebuild 6132 BLAKE2B 84722425d05bf97feb43e1c853b9d2f40deb4210651864a043d122102d6f5580075f84feda66013c3e63bad24730a631ddfec9cc93308cf35a82d6fffe69f02d SHA512 eff8e37b1fc1d85cd31d4bedd4a54621de2916317e0c323b71e07ae30a84684d901e9daae6f0df7a18af8729a955784ac4c06204069a5c6eb4f8754cbb7de450
-EBUILD ruby-2.5.9.ebuild 7015 BLAKE2B 1f3bc0c42021c044724881e3c06d25adb0fb70d5986bd0495610335938d4ebca880568489769510d947e8bd9f3cc72b7c6799b8c6793cf6c978d9c878832752e SHA512 9fe46a00f3fed169aae53f6bfd210b2144ae5da1bd3d40c15ae958ac6c8ec6b1c52f18ea62eda955ff0763c80f93c84a9c1dcb1d7f4133452374b1a382f4e92a
+EBUILD ruby-2.5.9-r1.ebuild 7035 BLAKE2B 68cc6e313795e668d528a621fb17bedbb294d30a7c7b1c96dece0b5e76cb205603d2282019df9450cad4afad2f35d0f185254c6ac4bfcee2abce542fda3e1da6 SHA512 7e2ea164f2241eb77da9bd813495208ba7f3f5fbe52cd0c2f9ab61500dbe0c83b7e30e9b5169c48b81326651075057c4ea8e761e564383c977fb90dc0601084e
 EBUILD ruby-2.6.6-r2.ebuild 7425 BLAKE2B 090de7f9a2f681ee3455b2c2c99b37cbff1795a377062208caf61ab706b9d7b5200db8f94d74ab511441a83f56da684986c50ee1512132da104d33ed8f588950 SHA512 cc5b1f56199bbe12fe459e7c77e9b2212f3b4b986f491cf64d0633f16b5164c4f3b3107e90d95871cc4d4f15fd4e649bc039944646753f62a8c6b9a958d4bae7
 EBUILD ruby-2.6.6-r3.ebuild 7521 BLAKE2B f9b840f6e93c668084b92738d964563e6bc9ca24176286e763b876e53b895683feee954b1324a3d9a9e6246acff82fa40b8875e121cb1c213b239cd2f8367134 SHA512 65b650fced8e38ec1d1351d70aa9f5de3833dad4f057f086a12b4286fae0e096b4dc9c74a242bd91d382159034cb7f33614516620b083bacccad841e25448aa5
-EBUILD ruby-2.6.7.ebuild 7521 BLAKE2B f9b840f6e93c668084b92738d964563e6bc9ca24176286e763b876e53b895683feee954b1324a3d9a9e6246acff82fa40b8875e121cb1c213b239cd2f8367134 SHA512 65b650fced8e38ec1d1351d70aa9f5de3833dad4f057f086a12b4286fae0e096b4dc9c74a242bd91d382159034cb7f33614516620b083bacccad841e25448aa5
+EBUILD ruby-2.6.7-r1.ebuild 7541 BLAKE2B 2937674eb743654214206e023b8a7be5ce626ab40833557de64fd3d3ba6bf44bd506a17835ea6a54f2d786eac6dab12ea7dfa6bf1454d3a17b5c7e98a28f07eb SHA512 f5d16a8ad63870e165c4be36af9c13cda5234b66cfba6d9665fd555946179870b5a2e918fda54f80363f8171701e1335923b04d0bd64ea07c67caf06c4c49941
 EBUILD ruby-2.7.2-r1.ebuild 7717 BLAKE2B 178fc83dbedabf028eb8d5aa4cefffe6954f3af888c45253d88c3eeb3dbfaa35be562e93d88b3ad5f38612b800074f968be4488d15df70b39215e56ca26537e5 SHA512 d7025dc2290c780d28403ecfc79d2f1894f00ccd700f5562ba87c46b0ef8a8106c5415c8c4adb6334345f76e3459b2a54282b0ecf34cb5076b9969aaf1d9de0c
 EBUILD ruby-2.7.2.ebuild 7596 BLAKE2B 8874b9814884b31225717fadd976460826077662f896a5e32500498c9ae415ea76d9a7074c463cfe70c3d3bbc7edcdc33137a24cd55290608fcc56e35fc1a8ed SHA512 3ac990e0e749773e08fba9a7e40cc214cbff973f3e9578612be14ade699e09f0944696fe99caa6704e6d838923cad3709342f5b5510936a9276199065a3d8e87
-EBUILD ruby-2.7.3-r1.ebuild 7877 BLAKE2B 0c4e3d5402359395230a7a3afd44a1958cbac59a25adb1feca26d2ba366ed5ca07d9782f098cf2772057c63f291815ae7743be8405f2dc4f07075198d7b861b5 SHA512 ca74597afd1732aad6c8e922b1c4900d9c0b6a228bb45d23ef038da6f42ce4e136481af7bc59cd904a911ec94f7d21034f880e74084b8e92fcd34573dadec2c0
+EBUILD ruby-2.7.3-r2.ebuild 7897 BLAKE2B 7017c7dabc6554639b59285e3b07a6bcbb0dbdd7553fef4479db7947ceb8780053297eac2fcc96e475bb678d3b449d990a93c3a4d7b24ed81383247c6a550ff4 SHA512 c004e5f1743e6291cd82373d11850a85adb1bb80b42e3d216aa392a6ffb5f95362bcf0b691ce05f5be83b9d0e55d5de44d7c900fda76d1a749048b7c2e46c9b4
 EBUILD ruby-2.7.3.ebuild 7717 BLAKE2B 178fc83dbedabf028eb8d5aa4cefffe6954f3af888c45253d88c3eeb3dbfaa35be562e93d88b3ad5f38612b800074f968be4488d15df70b39215e56ca26537e5 SHA512 d7025dc2290c780d28403ecfc79d2f1894f00ccd700f5562ba87c46b0ef8a8106c5415c8c4adb6334345f76e3459b2a54282b0ecf34cb5076b9969aaf1d9de0c
 EBUILD ruby-3.0.0-r1.ebuild 7600 BLAKE2B cb532faf77b93eec30cbd1caf3343a853bb4be65067a42f1ff96e4f0565f28e26ba856d3dc90200229ac18e2f6b046b08fb38a586ee655236b4ca9279d949d9a SHA512 6a2345f3ff2961df0ef706b40be7a702f8118f722787f960722931d5b5f1ed4af9b5586fa61096c518429a8b432b896a8b06e6edae3db3b541924631709fff67
 EBUILD ruby-3.0.0-r2.ebuild 7721 BLAKE2B 5b7d4df65f66a80e3b2ba160ea7a4259b4a6c4a38976641daf7c5507ea89c3de9c42054f9ebd8a585f4dd1616bb76cfd4b40f01ad2818c7a2c6bd6d00871ab77 SHA512 c34884110a979535743c0a66227851820d290be435bcfaaac11fa7d69466e3c43775b2c63b3cd4176066ba8152104df4728c61fb594fc48dbfa2bbbac96a1b4e
 EBUILD ruby-3.0.0.ebuild 7594 BLAKE2B cddaa0cbcf14d48f99c0880dcefaf0fc10e1c3f364e777f75d4f7c5b2384bcc32da76e6f2a5ac2f7ee9ae639c0b2b7a86ed2b31a9bd283885ac1ef16ee244f9a SHA512 3708a18731f9edd0732720cf3eb7b17e5e2f822bcb1f847408f7192d1ee18e331400b48f80897ea6483c55d57523187739a5b4a8e2efecac2bbaf7858550f61d
-EBUILD ruby-3.0.1.ebuild 7716 BLAKE2B 995145e1724334429e5887713a3ff8425d1705af8e59623f986e71a11adf7952eb0a97a938d6b3049eccff5c92c4b5d5dd66fa8dfdfcbc068fab542ca275e1f2 SHA512 e2e179c5de7c1541a7186387c1747fd7cc3faa169e4dfd7e299176817063f4a2f16307611a25c5df91af4df8f935a119578555f50399bc9eee7e515060b027fe
+EBUILD ruby-3.0.1-r1.ebuild 7736 BLAKE2B 6a59d38cb6a1c7c4a369ea24a879b0ffdd02334e202c5317f0203f70e8f580f7b07cf836d656511dfd7e76832a7a5f0ac546b74b684d013033496cfe69947f3f SHA512 977e699d6ed53b25df303602b615455963d5c1b26ec8e62e13306c146187557f6e9afc582244340a0e20d4d57022b6b038d81d5a4de6a8bf64d47912babd8b70
 MISC metadata.xml 523 BLAKE2B 4ed08360a279c8d44fe87f677cdc24a76eda6d37c591186951e16321f464d4451d0d1299c4e1d996bffe15a8cca672d4c5c1bc5fb0aa6cda69b8eff90ec31df8 SHA512 f74c386a3d6314d630aff11c40314db40b7f9fb202910480b37aa65b7bac62d6e87fa7590b2a26aa1713bb65be486ed84138e1273eaf7c8b966d7414e6b55464
diff --git a/dev-lang/ruby/ruby-2.5.9.ebuild b/dev-lang/ruby/ruby-2.5.9-r1.ebuild
index 67217e9b50d5..ad8c1d6bebba 100644
--- a/dev-lang/ruby/ruby-2.5.9.ebuild
+++ b/dev-lang/ruby/ruby-2.5.9-r1.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
 	dev-libs/libffi:=
 	sys-libs/readline:0=
 	sys-libs/zlib
+	virtual/libcrypt:=
 	>=app-eselect/eselect-ruby-20171225
 "
 
diff --git a/dev-lang/ruby/ruby-2.6.7.ebuild b/dev-lang/ruby/ruby-2.6.7-r1.ebuild
index e14b3d9f9419..056be37e79c0 100644
--- a/dev-lang/ruby/ruby-2.6.7.ebuild
+++ b/dev-lang/ruby/ruby-2.6.7-r1.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 	dev-libs/libffi:=
 	sys-libs/readline:0=
 	sys-libs/zlib
+	virtual/libcrypt:=
 	>=app-eselect/eselect-ruby-20181225
 "
 
diff --git a/dev-lang/ruby/ruby-2.7.3-r1.ebuild b/dev-lang/ruby/ruby-2.7.3-r2.ebuild
index fd9d16014070..ae0de75300f2 100644
--- a/dev-lang/ruby/ruby-2.7.3-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.7.3-r2.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 	dev-libs/libffi:=
 	sys-libs/readline:0=
 	sys-libs/zlib
+	virtual/libcrypt:=
 	>=app-eselect/eselect-ruby-20191222
 "
 
diff --git a/dev-lang/ruby/ruby-3.0.1.ebuild b/dev-lang/ruby/ruby-3.0.1-r1.ebuild
index 4b08bc079a99..26f16571a638 100644
--- a/dev-lang/ruby/ruby-3.0.1.ebuild
+++ b/dev-lang/ruby/ruby-3.0.1-r1.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 	dev-libs/libffi:=
 	sys-libs/readline:0=
 	sys-libs/zlib
+	virtual/libcrypt:=
 	>=app-eselect/eselect-ruby-20201225
 "
 
diff --git a/dev-lang/spark/Manifest b/dev-lang/spark/Manifest
index 69da32b0009e..d323de2fd3ec 100644
--- a/dev-lang/spark/Manifest
+++ b/dev-lang/spark/Manifest
@@ -1,9 +1,5 @@
-AUX spark-2017-gentoo.patch 923 BLAKE2B 7db222ddf50ffde64c54b308e43c6f74acc4fd4ed6d6ff200e61a04a4ebcb7b61bc013f973708eea9ff1f959a144022f643e22627de15c77038a0cb692b7d180 SHA512 0e3b96e8a31d5c3c5013cddf62d6cebd29d0bfe45ad270b579c7723b21f81a810ae34805e57940f0ab7169ecda2ebb20cddfb0d600b2184910a932daf272544f
-AUX spark-2019-gentoo.patch 852 BLAKE2B 128873e85d432057323a2d246a932915e67da0f10d4bdfebbeccc70edeee1f7d09740475772797fc672057e3fa07bb89b358653882770a063beb548ac7020f93 SHA512 4f595563e1684eb5093dc9f4835b2c7365d2ac2cc286eb7a977cef984fbf13257746a44d2d8553eed08dd015ae0e73a7239a2c3a0e1990f81bbf04937b4e1768
-DIST gnat-2019-20190517-18C94-src.tar.gz 8950160 BLAKE2B ce6b8ca0687b3d345db72a8b3216e67ba706cfd7f6ca98f45ec2ae356d9c5b3a42a4b3aac5e89285871157ddaca3aff1b970934de88f8190d84aff060bf1fc4b SHA512 4d57c97fc1f3d5274e0c4ffa536ec056e7c3f1619010affff008cd07a0bfa638d18fee1705a5dd76f12d168baef85677cc34ef40f5e52fd5292ac886c0d4c5ee
-DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
-DIST spark-2019-20190517-19665-src.tar.gz 22778220 BLAKE2B b0e2141c4b8aa603ee51fe984654c502d214cc5461cf7afba90926b4f3393772bc755a4ec8ef307496f5c052d3c478312f987b79d8b31bec3e9dba962cedd419 SHA512 9ee15e1ae80720a0295ec8a59e1b414f82a4044ebd47f81f8daea7a155720bb151714d9e9c2830612f5530d906f6c393e84ffde16982afef547f1c8edc27e97a
-DIST spark-gpl-2018-src.tar.gz 20244517 BLAKE2B efb8120a869eaf79aa513ea3b3393dcefdb548e66a00a630bfb9d28a59785c15362c111df3635423a7312c491c9929a7bcd8e7161607dc4d3acd6d1c27f3ca3e SHA512 83490a95c2d6401bcd077a8ec508eaf18609b5b480ccd9f247f4bb61164b5e52e34473526cd49ebdf5fd15ac422ed4a121dc50cab96241db02af9e32812a4df8
-EBUILD spark-2018-r1.ebuild 1604 BLAKE2B 04a70f878ac1cc0b570a5bf5e9498a02f885a47d705dacb024a4fd0f0a386a0fb1e954d2d19d59ae2ab3dde0e0b1e4c7ea89e0fbf1c512e639f29be9ff993a97 SHA512 0095a548f989bb1b6d605b4404f7c6a2c19bf0204debd4ecf6663e5f2ea172f10deb095942ba8b787f6be7c07c8b60180b19d95f51c2d15f16460b4ab619fc5d
-EBUILD spark-2019.ebuild 1759 BLAKE2B f9a9ba8d25c322f0e171c9724d809a54be28bc3291a57b3f19d5cb9793e1768339e4d8a5df4bb75ba1078068cd628d5fe77183c90699f34ecc01c21285f88209 SHA512 bf945749d9657b938cd9c94aadf51f32e44fd4289337bd8cda435b673fcc230381abf96797112b5fb676246bbf595c958ec8230924243f12f514ca4a13b24912
+AUX spark-2021-gentoo.patch 860 BLAKE2B 6eb65c19b604a8d9370bf4da87899c1b8471c52763c17b97322856ddb701e46f6d5c5de03df204c287c728413e5ab8de2f320c75d9c3acb049abad62360037da SHA512 ac636251eb45868430e46d0f5566ab655dc5a223bd44fa4b76bd75c679779cc037bf6ef376f9f4ec22a90b1347bf302d382e1d540b448acb6308c1b3e33036ec
+DIST gnat-2021-20210519-19A70-src.tar.gz 8765762 BLAKE2B ef48f54c6109566e37bfa5dee9262305d0529b3dfd333ee28bc4e66f4709a0673f673d742bc04deb15dc145404f7618d350dbdf3f2a7ab37c861e57d011946fa SHA512 3cb79be024fdd9b738d99ffc8e224d32bb382b5da2d02b97b2061a5ea58456f33d4564c92e224af2713ce15fd5481edd715e5b9a52abc74fdc142f27e103c201
+DIST spark-2021-2021-20210519-19A1A-src.tar.gz 11361491 BLAKE2B 67f8d27ae68ef4929aafaf96c470394e093883619c5c778e804f1ff62c297d5a3f628e04e987fb06741cb824710599928a7ec3b94fa6d7af029cff35be0898c3 SHA512 b595516892f6054d3c856c30c4296be9cd61adca3ea2cffe3c9060fbab249d36ce1b8fff6f80e1e8173ef6e232dd9c2da8a581ae9964845120c03d09896b635c
+EBUILD spark-2021.ebuild 2430 BLAKE2B 405ce0dc9fc1caa0d3a076ee8af0bf683a72025cdd51babc72387e6e1ab9e7c0e7808b0df80d2202a773ba3009d62c7e11a134a8149c53442aee62e68b0599e2 SHA512 f31cbf1bc0ad150a9edf44c01888ad51d960cb15fe950f4a9b860141e1f7e3c3362f1b574129f840152bca850fe4408ee246096952674c1d0eeefde6ac21e0ef
 MISC metadata.xml 670 BLAKE2B 16a5a9781edcf7b7caf8134d4bb8b8997d4711daa07392809e055d989aa06e74f28a66d99b279eab9fd97f4444a756ec1de9cf92ebb00d4673ad50e008f51458 SHA512 4c51c93557ea581e109dfc62a602327f1056139a0e11e3c187ba8b1f8a0d4b4089894cb83cc909a922bf0a90f572a0b01f00face3782e861a46edeab1c7d3949
diff --git a/dev-lang/spark/files/spark-2017-gentoo.patch b/dev-lang/spark/files/spark-2017-gentoo.patch
deleted file mode 100644
index 8258c9feab7e..000000000000
--- a/dev-lang/spark/files/spark-2017-gentoo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gnat2why/gnat2why_c.gpr	2017-10-04 21:41:41.613376056 +0200
-+++ b/gnat2why/gnat2why_c.gpr	2017-10-04 21:42:30.582572536 +0200
-@@ -1,4 +1,7 @@
- project Gnat2Why_C is
-    for Languages use ("C");
-    for Object_Dir use "obj";
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Gnat2Why_C;
---- a/gnatprove/configuration.adb	2019-11-08 19:20:16.876198539 +0100
-+++ b/gnatprove/configuration.adb	2019-11-08 19:21:13.550201663 +0100
-@@ -694,7 +694,9 @@
-          Tree         : Project_Tree;
- 
-       begin
--         Set_Path_From_Gnatls (Proj_Env.all, "gnatls", GNAT_Version);
-+         Set_Path_From_Gnatls (Proj_Env.all,
-+                               "gnatls",
-+                               GNAT_Version);
-          Free (GNAT_Version);
-          Set_Object_Subdir (Proj_Env.all, Subdir_Name);
-          Proj_Env.Register_Default_Language_Extension ("C", ".h", ".c");
diff --git a/dev-lang/spark/files/spark-2019-gentoo.patch b/dev-lang/spark/files/spark-2021-gentoo.patch
index d940471dfcf8..e2f44d237962 100644
--- a/dev-lang/spark/files/spark-2019-gentoo.patch
+++ b/dev-lang/spark/files/spark-2021-gentoo.patch
@@ -1,16 +1,6 @@
---- a/gnat2why/gnat2why_c.gpr	2017-10-04 21:41:41.613376056 +0200
-+++ b/gnat2why/gnat2why_c.gpr	2017-10-04 21:42:30.582572536 +0200
-@@ -1,4 +1,7 @@
- project Gnat2Why_C is
-    for Languages use ("C");
-    for Object_Dir use "obj";
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Gnat2Why_C;
---- a/gnatprove/configuration.adb	2019-11-28 08:13:36.857402405 +0100
-+++ b/gnatprove/configuration.adb	2019-11-28 08:14:23.777570096 +0100
-@@ -1161,7 +1161,9 @@
+--- a/src/gnatprove/configuration.adb	2021-06-21 22:30:18.962850246 +0200
++++ b/src/gnatprove/configuration.adb	2021-06-21 22:31:03.621210570 +0200
+@@ -1269,7 +1269,9 @@
  
           end if;
  
@@ -21,3 +11,13 @@
           Free (GNAT_Version);
           Set_Object_Subdir (Proj_Env.all,
                              Filesystem_String
+--- a/gnat2why/gnat2why_c.gpr	2017-10-04 21:41:41.613376056 +0200
++++ b/gnat2why/gnat2why_c.gpr	2017-10-04 21:42:30.582572536 +0200
+@@ -1,4 +1,7 @@
+ project Gnat2Why_C is
+    for Languages use ("C");
+    for Object_Dir use "obj";
++   package Compiler is
++      for Driver ("C") use External ("CC", "gcc");
++   end Compiler;
+ end Gnat2Why_C;
diff --git a/dev-lang/spark/spark-2018-r1.ebuild b/dev-lang/spark/spark-2018-r1.ebuild
deleted file mode 100644
index e49999294ef5..000000000000
--- a/dev-lang/spark/spark-2018-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2018 )
-inherit ada toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Software development for high-reliability applications."
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a47
-	-> ${MYP}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5
-		-> gnat-gpl-2018-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
-	sci-mathematics/alt-ergo
-	sci-mathematics/why3-for-spark"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
-
-src_prepare() {
-	ln -sf "${WORKDIR}"/gnat-gpl-2018-src/src/ada gnat2why/gnat_src || die
-	default
-	sed -i \
-		-e "s:gnatls:${GNATLS}:g" \
-		gnatprove/configuration.adb || die
-}
-
-src_compile() {
-	emake GPRARGS="-XLIBRARY_TYPE=relocatable" gnat2why
-	emake PROD="-XLIBRARY_TYPE=relocatable" gnatprove
-}
-
-src_install() {
-	emake INSTALLDIR="${D}"/usr install
-	einstalldocs
-	dosym ../../../lib64/why3/why3server /usr/libexec/spark/bin/why3server
-	dobin install/bin/gnatprove
-	mv install/share/doc/spark/* "${D}"/usr/share/doc/${PF} || die
-	exeinto /usr/libexec/spark/bin
-	doexe install/bin/gnat2why
-	doexe install/bin/spark_memcached_wrapper
-	doexe install/bin/spark_report
-	doexe install/bin/spark_codepeer_wrapper
-	mv "${D}"/usr/bin/target.atp "${D}"/usr/libexec/spark/bin || die
-}
diff --git a/dev-lang/spark/spark-2019.ebuild b/dev-lang/spark/spark-2019.ebuild
deleted file mode 100644
index 0a0f4fd0550c..000000000000
--- a/dev-lang/spark/spark-2019.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2019 )
-PYTHON_COMPAT=( python2_7 )
-
-inherit ada python-any-r1 toolchain-funcs multiprocessing
-
-DESCRIPTION="Software development for high-reliability applications."
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf912431e87a8f1c967d51
-	-> ${P}-20190517-19665-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49
-		-> gnat-2019-20190517-18C94-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
-	sci-mathematics/alt-ergo
-	sci-mathematics/why3-for-spark"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${P}-2019-20190517-19665-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-pkg_setup() {
-	ada_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	ln -sf "${WORKDIR}"/gnat-2019-20190517-18C94-src/src/ada gnat2why/gnat_src || die
-	default
-	sed -i \
-		-e "s:gnatls:${GNATLS}:g" \
-		gnatprove/configuration.adb || die
-}
-
-src_compile() {
-	emake -C gnat2why GPRARGS="-XLIBRARY_TYPE=relocatable -v"
-	emake -C gnatprove PROD="-XLIBRARY_TYPE=relocatable -v"
-}
-
-src_install() {
-	emake INSTALLDIR="${D}"/usr install
-	einstalldocs
-	dosym ../../../lib64/why3/why3server /usr/libexec/spark/bin/why3server
-	dobin install/bin/gnatprove
-	mv install/share/doc/spark/* "${D}"/usr/share/doc/${PF} || die
-	exeinto /usr/libexec/spark/bin
-	doexe install/bin/gnat2why
-	doexe install/bin/spark_memcached_wrapper
-	doexe install/bin/spark_report
-	doexe install/bin/spark_codepeer_wrapper
-	mv "${D}"/usr/bin/target.atp "${D}"/usr/libexec/spark/bin || die
-}
diff --git a/dev-lang/spark/spark-2021.ebuild b/dev-lang/spark/spark-2021.ebuild
new file mode 100644
index 000000000000..9c090883d172
--- /dev/null
+++ b/dev-lang/spark/spark-2021.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_2021 )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit ada python-any-r1 toolchain-funcs multiprocessing
+
+ADA_MIRROR=https://community.download.adacore.com/v1
+ID=969ce28e217bd5aa4db549a544d20846408a5229
+MYP=${P}-2021-20210519-19A1A-src
+GNATID=005d2b2eff627177986d2517eb31e1959bec6f3a
+GNATDIR=gnat-${PV}-20210519-19A70-src
+
+DESCRIPTION="Software development for high-reliability applications."
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="${ADA_MIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz
+	${ADA_MIRROR}/${GNATID}?filename=${GNATDIR}.tar.gz -> ${GNATDIR}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
+	sci-mathematics/alt-ergo
+	sci-mathematics/why3-for-spark"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+pkg_setup() {
+	ada_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	ln -sf "${WORKDIR}"/${GNATDIR}/src/ada gnat2why/gnat_src || die
+	default
+	sed -i \
+		-e "s:gnatls:${GNATLS}:g" \
+		src/gnatprove/configuration.adb || die
+}
+
+src_compile() {
+	emake -C gnat2why GPRARGS="-XLIBRARY_TYPE=relocatable -v"
+	gprbuild -p -XLIBRARY_TYPE=relocatable -v -P gnatprove.gpr || die
+	emake -C include generate
+}
+
+src_install() {
+	# Create the fake prover scripts to help extract benchmarks.
+	insinto /usr/libexec/spark/bin/
+	doins benchmark_script/fake_*
+
+	gprbuild -q -c -u -gnats spark2014vsn.ads \
+		-XLIBRARY_TYPE=relocatable -v \
+		-gnatet="${D}"/usr/libexec/spark/bin/target.atp || die
+	insinto /usr/share/spark
+	doins share/spark/help.txt
+	doins -r share/spark/config
+	insinto /usr/share/spark/theories
+	doins share/spark/theories/*why
+	doins share/spark/theories/*mlw
+	insinto /usr/share/spark/runtimes
+	doins share/spark/runtimes/README
+	insinto /usr/include/spark
+	doins include/*.ad?
+	insinto /usr/lib/gnat
+	doins include/*.gpr
+	doins -r include/proof
+
+	dosym ../../../lib64/why3/why3server /usr/libexec/spark/bin/why3server
+	dobin install/bin/gnatprove
+	exeinto /usr/libexec/spark/bin
+	doexe install/bin/gnat2why
+	doexe install/bin/spark_memcached_wrapper
+	doexe install/bin/spark_report
+	doexe install/bin/spark_codepeer_wrapper
+	doexe install/bin/spark_semaphore_wrapper
+
+	einstalldocs
+}
diff --git a/dev-lang/starlark-rust/Manifest b/dev-lang/starlark-rust/Manifest
index dc6babae929c..a03aef0ea27a 100644
--- a/dev-lang/starlark-rust/Manifest
+++ b/dev-lang/starlark-rust/Manifest
@@ -156,5 +156,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST yansi-term-0.1.2.crate 14342 BLAKE2B 31a1651bb43644cf880d591a22fe9d899ab0acbc744ced2952f120b4abfa0c42f6513089e34deaff1a453f3a26f9fb78442f016baa9524ccac9b21e4a7ed6ad6 SHA512 ba720e36487871427aaa7139e8aeaf5b2b3f2d1df4798d7e238e323dc3d3220f12202e223f74339201be3466848c372dc1712e1842e5cd6bd51c3dedf76c9ff6
-EBUILD starlark-rust-0.4.0.ebuild 3722 BLAKE2B 29ee2374a066f36ceae5b9ccafbdc4e6c3bf448db6f291eee3d986f97cbc22db39d83c95cb134bf93ca1830efe56e010b7c956d23abbdfcd4c750dd3d8e5a28f SHA512 2cd0c4cbed27d7d2373c38b94fade3277553b34c1d3e12304400085c41f0e4615fb1361865f4af71dbed898e5eed37e6e73b71e4e8c03368a5eda1711546d94b
+EBUILD starlark-rust-0.4.0.ebuild 3804 BLAKE2B f609d13446eac70515afa715e4dc57496546286b1d78fc3e1e8d5b8dd7c581acecedfe8976778a7a0dd84454e4a8def3c5049416ae90c0f35e25f20329bbb4a9 SHA512 564cddf25a0c620e5856d77b979d28064489dda32b5ec9d8659f77e5f24097f4789ef56de358761c1e8f6f5151c560f855b7cfadc78a4d432b4a88377a5e88ad
 MISC metadata.xml 601 BLAKE2B 917f50abeaa30d0b8b5c6d7d4505c138482321813cd791155289193d694ef37806a50c07fd789cb3206ea698eda0f182cdc216fc49f46e8d9c338776684b3748 SHA512 af72e05360ea24d1af783d877009b2119cf9a55b74266661290deb722358f3821a8cbbb1ac2da3ea704bc8ba091e155cbf55e3c9cf1997e89b1a1a3258771869
diff --git a/dev-lang/starlark-rust/starlark-rust-0.4.0.ebuild b/dev-lang/starlark-rust/starlark-rust-0.4.0.ebuild
index 6edd58cd1329..529c75bcce0a 100644
--- a/dev-lang/starlark-rust/starlark-rust-0.4.0.ebuild
+++ b/dev-lang/starlark-rust/starlark-rust-0.4.0.ebuild
@@ -177,6 +177,9 @@ IUSE=""
 BDEPEND="${RUST_DEPEND}
 	>=dev-lang/rust-1.53.0[nightly]"
 
+# RUSTFLAGS support needed: https://bugs.gentoo.org/796887
+QA_FLAGS_IGNORED=".*"
+
 src_prepare() {
 	grep -lZ println starlark/bin/*.rs | xargs -0 sed -e 's:e\?println!:eprintln!:g' -i
 	assert "failed to patch println to eprintln in bin/*.rs"
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 78607a73ec2c..79dd128c0739 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -4,9 +4,9 @@ DIST swipl-8.2.4.tar.gz 10998859 BLAKE2B b18f26102a685ff5c66aeaf0c14a08c532f9327
 DIST swipl-8.3.23.tar.gz 11162363 BLAKE2B 3808da5bfda1059332dde6a134c2c014c6ee190791ac0c1ace6ea6713719470c1f63df9cf25bdfa69ab73a63090d9d4e37a3afee3b0c107786568a7786c5cbea SHA512 ca592bfa815496d3668a3251f3249c578df46185d856df7bddb88786923fd247542eecd8505181c5f6d4cbb9ddde0d54177d053ab7bd8d024910ccb3f00f7430
 DIST swipl-8.3.24.tar.gz 11202181 BLAKE2B c5ac25b3cb73deeef51b8469977e9554ffc9da275dfb4541e7f653fb3e3f411abb971fc66ebf77d662ecdbd2d57070b18b76200f7d26d649a491a6789b807ef4 SHA512 36c436088e7eb78147d2e61fb6377e1703b5a1a6290e98a73810d18e07bda2b598aeb7aaff22b2a4caef90c3873c7a06c7ae84e71bb5f52cc2c6b315e4680f28
 DIST swipl-8.3.25.tar.gz 11186018 BLAKE2B a06befea48e065d516eeeb4ce2fa87342647d02ec509eaec208be143520af7d4de3217ac726720a36cdd15e1e263963cfc71bb2d7249ff55f9673e7e1bea5620 SHA512 4a06cd36ffbf22d8e582776c6181c8e848abe9bfca32e5e0e43d58e801c8b7c8e1d8556279716461df020530d0ea44cdcfe9390e8387b2a8e8936adf8c3f9774
-EBUILD swi-prolog-8.2.3.ebuild 2637 BLAKE2B c160e9ed130006f0696118245abaa1d635c63ff9d6fc3fe4fd6a60fdf62bf7250944a5537314be87b316017729d5c351cb30ecc5778f3839b701b5126969ed11 SHA512 21075e6b11271548c377870daae5d82a09a91aa13e86bbdbab49aef53a8621523a65e9a19f02a1bbb559d16533b5244f2e8e500c02e6a6f7f0e681b8c75825cd
-EBUILD swi-prolog-8.2.4.ebuild 2830 BLAKE2B fc2d901e420fc8c9d842aa5ebfe9494c907f0529a3a6bbae1d96fe05a5b4840c953f1d3022b3d8c83d151df47073615e6120445ae7dd65e11237228c9fcfd2ce SHA512 b2dd922607b75e31e02ed48da294a2d06e3e707d2b479cc5b55569cd80b4250c01f84c4d8d232b94f46c51f637294347a2be8fca461f2d76cbe537897d13627a
-EBUILD swi-prolog-8.3.23.ebuild 2829 BLAKE2B e378ac669bfd0a1bbf3fe9b9b93daf3887050f3c826963f74fa4ec95e036cbc402b83f47f2ff79eeae5ca58fcb2f1598a0208b2159c633270d0b5915bf63fced SHA512 778ae54cceaf0140da6b2c09fe3ed3f39bf77b1e7a4e22235bbad956e4e1f6d9c90544bfd313f71d882218acb32998dc87a50628f2bccad47cbc13d870584166
-EBUILD swi-prolog-8.3.24.ebuild 2829 BLAKE2B e378ac669bfd0a1bbf3fe9b9b93daf3887050f3c826963f74fa4ec95e036cbc402b83f47f2ff79eeae5ca58fcb2f1598a0208b2159c633270d0b5915bf63fced SHA512 778ae54cceaf0140da6b2c09fe3ed3f39bf77b1e7a4e22235bbad956e4e1f6d9c90544bfd313f71d882218acb32998dc87a50628f2bccad47cbc13d870584166
-EBUILD swi-prolog-8.3.25.ebuild 2829 BLAKE2B e378ac669bfd0a1bbf3fe9b9b93daf3887050f3c826963f74fa4ec95e036cbc402b83f47f2ff79eeae5ca58fcb2f1598a0208b2159c633270d0b5915bf63fced SHA512 778ae54cceaf0140da6b2c09fe3ed3f39bf77b1e7a4e22235bbad956e4e1f6d9c90544bfd313f71d882218acb32998dc87a50628f2bccad47cbc13d870584166
+EBUILD swi-prolog-8.2.3-r1.ebuild 2638 BLAKE2B 9d46f34c3d035c75ce7ecc09600ece9766705305d7fe23760df165e507fc607059e1bd615319640ede894b9ccf285e461e1e94b78197730a4e0550671f9b1840 SHA512 0eaf416fd71c4ef82978c41c5363cc81a3cbeebb50f4115b5e64514fb82dd4fcfa9cadd11cf630eb33ef34b9ae128b721c9364d2f50bc5883a463ec380cd5e17
+EBUILD swi-prolog-8.2.4-r1.ebuild 2831 BLAKE2B abcef64cf914725a35ca4bfadf24030eb068e25ce477ff4227377c80334ca630c000ad0c06154fcea57fce8b68732529b1f1bc222d929c4a4087e7c19623c864 SHA512 c5c30a95d7ac79ab6fd2a2832e0a46a511164dddfc1ad32d3fbbf7dad2596a01b1c12ae1855147b7e94aebc2b7facfd724b2fb10f89d2c2354fc251457f385b5
+EBUILD swi-prolog-8.3.23-r1.ebuild 2830 BLAKE2B 71485d97656afe1e2c3a07bdf18cbe999b83999d8a45b825c49d05df7b93e9e3cb1663715679fa6043f8d389e72ade7794784b622f4ffc0deba0cf1a2ce22238 SHA512 3fb525550656ac67f0b93aca01eb16b33e48f8c56deb766cad1ca06a6a43fb2a7677a717401aca752b15e6c9a0a53351873f404cebc977ad36d454a944b0b502
+EBUILD swi-prolog-8.3.24-r1.ebuild 2830 BLAKE2B 71485d97656afe1e2c3a07bdf18cbe999b83999d8a45b825c49d05df7b93e9e3cb1663715679fa6043f8d389e72ade7794784b622f4ffc0deba0cf1a2ce22238 SHA512 3fb525550656ac67f0b93aca01eb16b33e48f8c56deb766cad1ca06a6a43fb2a7677a717401aca752b15e6c9a0a53351873f404cebc977ad36d454a944b0b502
+EBUILD swi-prolog-8.3.25-r1.ebuild 2830 BLAKE2B 71485d97656afe1e2c3a07bdf18cbe999b83999d8a45b825c49d05df7b93e9e3cb1663715679fa6043f8d389e72ade7794784b622f4ffc0deba0cf1a2ce22238 SHA512 3fb525550656ac67f0b93aca01eb16b33e48f8c56deb766cad1ca06a6a43fb2a7677a717401aca752b15e6c9a0a53351873f404cebc977ad36d454a944b0b502
 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.3.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.3-r1.ebuild
index 7c44c9b501a6..39819e8af952 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.2.3.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.2.3-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="sys-libs/ncurses:=
 	readline? ( sys-libs/readline:= )
 	libedit? ( dev-libs/libedit )
 	gmp? ( dev-libs/gmp:0 )
-	ssl? ( dev-libs/openssl:0 )
+	ssl? ( dev-libs/openssl:0= )
 	java? ( >=virtual/jdk-1.8:* )
 	uuid? ( dev-libs/ossp-uuid )
 	qt5? (
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.4.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.4-r1.ebuild
index 531032848810..40ca2887121c 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.2.4.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.2.4-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="sys-libs/ncurses:=
 	readline? ( sys-libs/readline:= )
 	libedit? ( dev-libs/libedit )
 	gmp? ( dev-libs/gmp:0 )
-	ssl? ( dev-libs/openssl:0 )
+	ssl? ( dev-libs/openssl:0= )
 	java? ( >=virtual/jdk-1.8:* )
 	uuid? ( dev-libs/ossp-uuid )
 	qt5? (
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.23.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.23-r1.ebuild
index 2a8883edddfd..cf72f0070592 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.23.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.23-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="sys-libs/ncurses:=
 	readline? ( sys-libs/readline:= )
 	libedit? ( dev-libs/libedit )
 	gmp? ( dev-libs/gmp:0 )
-	ssl? ( dev-libs/openssl:0 )
+	ssl? ( dev-libs/openssl:0= )
 	java? ( >=virtual/jdk-1.8:* )
 	uuid? ( dev-libs/ossp-uuid )
 	qt5? (
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.24.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.24-r1.ebuild
index 2a8883edddfd..cf72f0070592 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.24.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.24-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="sys-libs/ncurses:=
 	readline? ( sys-libs/readline:= )
 	libedit? ( dev-libs/libedit )
 	gmp? ( dev-libs/gmp:0 )
-	ssl? ( dev-libs/openssl:0 )
+	ssl? ( dev-libs/openssl:0= )
 	java? ( >=virtual/jdk-1.8:* )
 	uuid? ( dev-libs/ossp-uuid )
 	qt5? (
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.25.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.25-r1.ebuild
index 2a8883edddfd..cf72f0070592 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.25.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.25-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="sys-libs/ncurses:=
 	readline? ( sys-libs/readline:= )
 	libedit? ( dev-libs/libedit )
 	gmp? ( dev-libs/gmp:0 )
-	ssl? ( dev-libs/openssl:0 )
+	ssl? ( dev-libs/openssl:0= )
 	java? ( >=virtual/jdk-1.8:* )
 	uuid? ( dev-libs/ossp-uuid )
 	qt5? (
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-24 14:47:38 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-24 14:47:38 +0100
commit	b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 (patch)
tree	911928b566777494d08ebe2c16cb64f15af71901 /dev-lang
parent	61f10f985e19dfe20a4d9552902625edd5b6eabb (diff)