gentoo resync : 30.09.2020

55 files changed, 879 insertions, 2918 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ebbb9643755c..387f36d53a53 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 48cca60e0a25..76f35487e9a5 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -8,7 +8,6 @@ AUX epmd.service-r1 159 BLAKE2B ec50e4bfd89dc2d35fc2e549c695f9aae163d3df4d3c7a0d
 AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f907e6f8b1ec2730d2b98aad5405383742563e050bc6ffaae22d55a22998658460109fac9f6628458f5e976e9fbfe71cc26f1d64 SHA512 0fd7cbef64a9a54e0959d49b50096f9abc6fcede4360c153631c7f649f5c41b35ffb1f2d06f80964bf49421464bcc43c96147c227d60cf413c51b3e89ae9ad24
 DIST erlang-22.3.2.tar.gz 55856668 BLAKE2B d5d2ae17b8fb1b7c3da0c145e4e17d38e47d5291d6bc77228c9280eaa114630003f0e75cc0b6eafd21642a86448d8fd907d95c006cdfe6f18978e796e20585bd SHA512 02333fed57394012834452aff38d9a3340c52b109b14e444b6e7975ac3a65485de1deda6ae6c732a28f75ca2518000de576f70497118306699e35af5f249a0d1
 DIST erlang-22.3.4.tar.gz 55861416 BLAKE2B 881eb664ea449fa021cdb6daaeb998ea5f736eae0900ad67c1416c0e0e0888b212e1fd1fc0ee655f1c05821b56bae52f150c3f29c2eddbac205d2a6f2fce5494 SHA512 14e90efb40568a1fd7a32b82fcdf32df8ccbda938b9e538bb3b1a77d343ae16f5721abb3d47e8dd567d7aa91d1dea6da8b7ada8a5cd8d33c38ba324f1d65eca1
-DIST erlang-23.0.1.tar.gz 56387006 BLAKE2B 4ecbb5a4de0f83d80da179071d5bed7c6e7eca11f5f8f8c5681673967eaf6f0573240b9ac59e00e7162fdaa3d41e89b357263f47371f0ff9365b448a9f7cf4a9 SHA512 fc9114312327f2b7289078b29ae658a1100c860dfae03e892c1b316007b5ff286cfc301772b336eb1f5b983b3d5f507f03eff2917f418b1b9cb9714f42a59db4
 DIST erlang-23.0.2.tar.gz 56391276 BLAKE2B a9f3203a28dfb3a8abe93f7cabd34b7c34346cf400dbad751c180dcbe33c40761c74680ef7ed1a3221a69c0519f37183787463f659e5a10393404df95c59fbec SHA512 82764ab879ea7588de505c6d58716999dc207163d8dcded226fe6849a3239c00088cb614558b77c038dcad1440f9b2e3ca2b2f1251df5d71b423d3f6e7497c6e
 DIST erlang-23.0.3.tar.gz 56388263 BLAKE2B 58f41ab2956c93fbabc6b91f89e3c3f3c23a7dc7dc5473f1cf99817043aa18949933d6182e7e7daefa394529d2b2be8efb51462d8e7a8beb23ed70dbe2c0a319 SHA512 f7752bfa06dd283b36e330ba4270ee37ca759be697c804e6ac249becdc67de4bccb43f60a8d47f9a094d778f11fb17cf6d29de8ce60471aeb18c5fbd64cdfb4d
 DIST erlang_doc_html_22.3.tar.gz 34041790 BLAKE2B 76372acf5d6a581fb97cac9fa8230f1505650e9398d0a8e6ed163718f6d64cbbb3b7c79a1b7129827482345ddf950be4a5d83f0dac44e173f0ef45b148b73faa SHA512 9199b6229b73a22e271c232ce03b83b65c265367062d57ca5babd23a2f0a088fde3054b25c65c1bf2cb714cb70354ce4324aa8e865db72beb1f788c27389558c
@@ -17,7 +16,6 @@ DIST erlang_doc_man_22.3.tar.gz 1366911 BLAKE2B 89931e9ea4ef54526eb910d3b0a56711
 DIST erlang_doc_man_23.0.tar.gz 1383486 BLAKE2B 63a9989c26797fe07fbd0ccca0d8425d94bc60a86fa93b5332c8d1f3e12a0071d9e6d4759be73bf44bf35dd14723b9e6707a84ba834e1775bc28aeec1edbe168 SHA512 81575ce7b267f5bb48bd844808e8edd4e373640bbc481372b288602eb9d3c9917e6c7c040c035b63a2f6edf437c3d826d6afdf5801765b51d9edd4a3b2a5b16f
 EBUILD erlang-22.3.2.ebuild 4569 BLAKE2B cd3901f37bb9156c4f4b234aefdfb02fea06c9cde15622e428c73b05f29c70c02c82415359d1ad68f665b88a0a13d6e0177c46ea1b992cbd2d01af2f3912d2ef SHA512 ee49c37719ab86d5f2335336cccd9b9264906f8d9af315fc5abf7a5ff4564d38d763eee1c3450489117aaa69697bb2948c1f5cc9fd8401c7866423a620ce5ea5
 EBUILD erlang-22.3.4.ebuild 4574 BLAKE2B b55208b5f2c15f62d6687f3ad44e54f958323cb7ae771d4f3313acf5a57edc30a51e0f0c2477765a591a1b9035029094894d8776567bc4996bfa9a5ace1a0b72 SHA512 0d17ac78b892861017bd245444e06eefc52761da19eeb663aaa26b8ad099cc4b1fcfa553353651670f1a575a00ef06805b6e7db97c789cd3dc2fcfd1a3c1f68e
-EBUILD erlang-23.0.1.ebuild 4569 BLAKE2B cd3901f37bb9156c4f4b234aefdfb02fea06c9cde15622e428c73b05f29c70c02c82415359d1ad68f665b88a0a13d6e0177c46ea1b992cbd2d01af2f3912d2ef SHA512 ee49c37719ab86d5f2335336cccd9b9264906f8d9af315fc5abf7a5ff4564d38d763eee1c3450489117aaa69697bb2948c1f5cc9fd8401c7866423a620ce5ea5
 EBUILD erlang-23.0.2.ebuild 4574 BLAKE2B 09f50e6cd3bb9d1066e76b7642b758ae980158303472efd97ad3306a4d7ac64000eee51f126cbc28d2e5daa967081492d97f937d240673f9899413ac438dcbb8 SHA512 faf0daa84d3641e09c8fba82ad632ac08b8335b94b5e812dc66a3849508f8bd062698fc3dc9ee90927eb72f21f87d59c99f7da841d196f70e4ed15873ddfdbf8
 EBUILD erlang-23.0.3.ebuild 4579 BLAKE2B b7a52935662849574e256264fa0b58be9eb2da0475b9f4ea9400adb3c8677316138d2a747f38989d115ed77e90cf0ce60ee897401c55beaf16fd5bbe57ebf378 SHA512 22881fb4febeab72ba16aa63b568c102444e170ad27de09c73e3c8d115f4cc218f4723ff2c17ef0e8314853d88425ff3491aef8fd40bcd06deddb26d8082dba0
 MISC metadata.xml 834 BLAKE2B 1f394278eed4a3ac5e1c04f4ffced7042cc910d9e84ed4ad955cf91240446410f0ffbf1c138cc76cfa55d40c0eb0f110da98cd49c59df2b12ae70c13afd45a06 SHA512 7c067d233ffae83e4b1b55ba9e8adffe125d27f5f81401a4e4262d9b713b08bdaa4dd927570b2d32591092ca387372ee206e25e0b939ca721c96317fcd3d2be2
diff --git a/dev-lang/erlang/erlang-23.0.1.ebuild b/dev-lang/erlang/erlang-23.0.1.ebuild
deleted file mode 100644
index eefe9fc3c904..000000000000
--- a/dev-lang/erlang/erlang-23.0.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0"
-
-inherit elisp-common java-pkg-opt-2 systemd wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-# We use this subslot because Compiled HiPE Code can be loaded on the exact
-# same build of ERTS that was used when compiling the code.  See
-# http://erlang.org/doc/system_principles/misc.html for more information.
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	acct-group/epmd
-	acct-user/epmd
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	emacs? ( >=app-editors/emacs-23.1:* )
-	java? ( >=virtual/jdk-1.8:* )
-	odbc? ( dev-db/unixODBC )
-	sctp? ( net-misc/lksctp-tools )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	systemd? ( sys-apps/systemd )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/18.2.1-wx3.0.patch"
-	"${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch"
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	./otp_build autoconf || die
-}
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local myconf=(
-		--disable-builtin-zlib
-		$(use_enable hipe)
-		$(use_enable kpoll kernel-poll)
-		$(use_with java javac)
-		$(use_enable sctp)
-		$(use_with ssl ssl "${EPREFIX}"/usr)
-		$(use_enable ssl dynamic-ssl-lib)
-		$(use_enable systemd)
-		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	local path="$1"
-	local var_name="$2"
-	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
-	local erl_libdir_rel="$(get_libdir)/erlang"
-	local erl_libdir="/usr/${erl_libdir_rel}"
-	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
-	local erl_erts_ver="$(extract_version erts VSN)"
-	local my_manpath="/usr/share/${PN}/man"
-
-	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
-	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		# Note: we explicitly install docs into:
-		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
-		# To maintain that layout we gather everything in 'html-docs'.
-		# See bug #684376.
-		mkdir html-docs || die
-		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
-		docompress -x /usr/share/doc/${PF}
-	else
-		local DOCS=("README.md")
-	fi
-
-	einstalldocs
-
-	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
-	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
-	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
-	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
-	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${erl_libdir}/Install" || die
-
-	insinto "${my_manpath}"
-	doins -r "${WORKDIR}"/man/*
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	newenvd - "90erlang" <<-_EOF_
-		MANPATH="${my_manpath}"
-	_EOF_
-
-	if use emacs ; then
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init-r2 epmd
-	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
-	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 34149157162d..98b0cf899cf9 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,13 +1,4 @@
-AUX 0.9.2-include.patch 314 BLAKE2B 44f0f36503f9e2e9e588ef78a6d27fac00d2b63f5220a791fc90ac40fa90638731ac1f0989227b74eb6ad893420b781ef4ba005b75adab6459d2d6393ba16e6f SHA512 3dc426de776f004b9c9840f37af0002907036b6f9d370535c51a2ed6916156d34d640214bec2dba58c9553917c16b996b61194bf15bb3e1c6f2b6f81edb13a4c
-AUX 0.9.5-antlr.patch 3059 BLAKE2B abf4380e73e846960143c8c7e25ff7a81c99ae98c06750c7479f39c93cd1ec476d9adb9f6714e9d72c6797aa663f931c4446a48f7f407ed61523877515d23691 SHA512 2d8d47162fc0179319b728041421a72c965657023e396285de5ec2849b667e21117a587c771b88eb84c54f983747cb1635b7bfb0955762af1912efa88128593c
-AUX 0.9.5-png.patch 489 BLAKE2B d83cf980353485b8210bd888d41ee27254f89d850a4fb59381f27ed9905a87c0ef6d49f0b79c1c2148ecc624544d59b49cc3a5f1ee48a05d607aaa9777f9c36b SHA512 6a7b09286fb62ad18b57434804260a6155c1f4739d72a9ed440c6efe1d682b126a297885d092fbf0cb1e2809a663cb9c7755507c807613199b317f981df7cfc1
-AUX 0.9.6-disable-tests-hanging-under-xvfb-run.patch 1884 BLAKE2B 193e24b0842996f00773b1eec164a2c57eb40decefc7c80048aebec7ad51d7decfed55ad352e8fa911c4fa87a4376de88d14b5b01fa88ce3378edf8234c1b5b8 SHA512 00e97be57c6e278814d9bab8f41c294475f5bae3dad682d288814cec153b27adf1f45257851620dfdb450a184f39b621d5d8fa0c407c612e06c8639454c8f5f7
-AUX 0.9.6-fix-file-move.patch 639 BLAKE2B 664ced9bba24646ec2149e51af67866ed46ebb5941f2b9ab0a62b157088937549131d3fffb8abef60d85644feb8928030ad55e916af4d03059cd803415ce517e SHA512 761266807892aca4d9e8031ddf75b8066d364efc63c624151f6929ac74ee0d43dd4e7e189ba754bbb6d2b134f390f67fc919b33f0402ef8a221801ff678fb78a
-AUX 0.9.6-fix-python-function-call.patch 987 BLAKE2B 3cae08850e5a6ccccf90c072e9d965cbe79fec7c8a8234a1014f3264a9df30c2c43aa238519f3ed068cc7cab2e8344eecaddba574e2573bdaad8224fa36e290a SHA512 f75c8bee4dbbbdff6fbfe5fa5d41cdfda2acbfd4806e3233fb4d6b499680ea9e9653461a1f6686bf44738fa26fe49d22e14e6bf0e857fd9713655e9763103680
-AUX 0.9.6-formats.patch 4241 BLAKE2B 8513efa84b2f8b4f2a06ee0784df6e7194b59f321a95c00151eaf02caf92611baf2b92de7a5c520746718c802919b6e985774df67736c5fc89bd4b243d590612 SHA512 7f947b0a13d7a1f56df311ced9673cf9b85a77f351164a4162d386a35a5022ae4f914216a2d801b0a8a7e52341318d498e480cba1f9959b08500753150a6da07
-AUX 0.9.6-fun-fix.patch 2064 BLAKE2B 45d2f76e437cbd557460a51a6fd49881a8dde5c200b829dc3ace4a3f6483c74e5c528d57f0aae261bfe042d015ddab3fa8c2b773c6c911be8d105977db394d59 SHA512 e3bafb4803541442c39f35370cedf3e2a2dd4502f2011c72ff92eb9f1f846362e560da69ac60914c71fc0c759e186368cae644b6eff9baa78c057cee70d08bd9
-AUX 0.9.6-gcc6.patch 1255 BLAKE2B a529b29d007a0b71f1a1f2ecfc0940d73696ba97dc2a48bfd3be995d3d9e37b788b1fa6c1d13a7c63f2c5dbe2b07accfd86766f56f495f984baf0acb7ab6f27f SHA512 870231a918cd2d114ac31973bbd2c53733c3e64811c48eadf88c78f82a353aecf4d604e28dfa3a532efb3b0480e5d7209e8fad1fef793212027e89f53608c619
-AUX 0.9.6-python-use-path-and-startup.patch 682 BLAKE2B f4a3f07c7757e297a8a40056aad3f36705f035f8ca63dfd0d8c75dec15953b826d8074fbbf1b698ec8d9c92a4e364993c2eced1df3c86ef4a3915a17b2ed65ba SHA512 f6e20eadb6acfd3805d5f41bba8d90e9dba5230211577e0b47217638b97745dd921c657dad7adf935abeeb9316989554858976d915f14b79dc2082eb132f9418
-DIST gdl-0.9.6v2.tgz 1777167 BLAKE2B 4d92ed93f12e0979d591959d60ae9fa6785400e4f169a00f462103d263bce1aa02e615cc8467b53146791a12045850f9dae1da113f9caff4d6b44dd2a5798b3b SHA512 a816ee2e3822af380a1131a6138263c33560db7286cd699b864da305a1103d5afc881a1cd3574d2e243bfb7e65e759e46322c5e55c66ec15620d9c514565c2c5
-EBUILD gdl-0.9.6-r3.ebuild 4120 BLAKE2B 754ad88aab633d014a8c0bc16700001bc72bc4271792765ac7ea648f6a7ba33fee58fbe26694471cac44803a794181ac5163108c07a12310b072361837f856f9 SHA512 e639db3b5a75e450ef15fb54f8c2e90b3d9cedf19382f99a6ea4cd5e23903bbfa5c87029b976d357032b06a229243aa1217da8240ce3b2a3e54849e5072b9dc0
-MISC metadata.xml 1028 BLAKE2B bf82665c331acc8ebe611ea473e0ce9e68bef85cae01a89a5356c5db4a7b5c611fc580f5abbf116492d1b49c2f54379644c30cff099d2c0a7c6c317cb3a76aff SHA512 bbf8bafc0aa727148a15b800c096037ef4ad4f17de36ee76082fd51355d7e60a211faf57ddeb9ee1012258a78e67f948fca4c8a010dce891b1e0875cb088e23d
+AUX gdl-1.0.0_rc3-cmake.patch 3673 BLAKE2B 81ede9a3b1fc6147ab528f49efabb140ff505a687ac6a4c1c3f91f0d652b9d13b866ecaefc9d4106011207379afbf390ab1e395a45da63954fd25b0e80bc86f6 SHA512 b4407bf99154ad8e6ad5d7635273b51df6a49b62e06aa18ce420e046380bc27fda74c37e4559fa136d28b5b4723b23d325bfce1b3340208f4b79ee5e0ee6e9d1
+DIST gdl-1.0.0_rc3.tar.gz 32650313 BLAKE2B cdecfe0646e2271e2389e0a04f8da1e8de4534faf743f233169bccf326198025eff7fd7a7b62ed8bd05fa4a0222c6fd30f9469e3edf0f5b2991ef3ef545e616b SHA512 3fde22c7e709b9cdc72a23d2317c043037379c7903418211a699c7e5caa2ed17e78e32e6d2f9b4aa89200e729fc21555821140dfdd58a5a636a858e2841f6335
+EBUILD gdl-1.0.0_rc3.ebuild 3706 BLAKE2B 37eecea0adf2e4ee5f9be23ee82c7055c64ec5bc8e225868439e308832815150a73871077569036bb96857aecdfdb131015f1aaec7e60be4f96e79f783e36a8f SHA512 3e112af740afb1c548a8f18f74b1ce996e438f59270cd187ada7943459390b8ed42f0a13233df5476743ad23999791dd13a2bbe14833b6d0ea58cbc3bd63efa4
+MISC metadata.xml 1118 BLAKE2B 62643bcc8fb4f18696aaf9655818296bef05f32fe24c77d8a03b97820989e4281a714114b0dfd246b01e7ef496b810a0546e03406ae883cf2af17a65c462d1ad SHA512 b08af333e71c0cb79a09bc8643d7a38bbb607b3c003fadbe0a4c7d9036dbc0d9a8dcf5b9a7b99f47477608a31468540540576ee807c694878221294dd81e62ea
diff --git a/dev-lang/gdl/files/0.9.2-include.patch b/dev-lang/gdl/files/0.9.2-include.patch
deleted file mode 100644
index 49613da16e21..000000000000
--- a/dev-lang/gdl/files/0.9.2-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gdl-0.9.2.orig/src/cformat.g	2010-07-25 17:59:19.000000000 +0100
-+++ gdl-0.9.2/src/cformat.g	2012-06-21 16:34:12.000000000 +0100
-@@ -16,6 +16,7 @@
-  ***************************************************************************/
- 
- header "pre_include_cpp" {
-+#include <cstdlib>
- #include "includefirst.hpp"
- }
- 
diff --git a/dev-lang/gdl/files/0.9.5-antlr.patch b/dev-lang/gdl/files/0.9.5-antlr.patch
deleted file mode 100644
index f5b627ab444e..000000000000
--- a/dev-lang/gdl/files/0.9.5-antlr.patch
+++ /dev/null
@@ -1,91 +0,0 @@
- CMakeLists.txt               | 14 +++++++++++---
- CMakeModules/FindANTLR.cmake | 11 +++++++++++
- src/CMakeLists.txt           | 18 +++++++++++-------
- 3 files changed, 33 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 407e39a..c4b3278 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -111,6 +111,8 @@ set(SZIPDIR "" CACHE PATH "GDL: Specify the SZip directory tree")
- 
- set(GDL_DATA_DIR "/share/gnudatalanguage" CACHE PATH "GDL: data directory relative to CMAKE_INSTALL_PREFIX")
- 
-+set(BUNDLED_ANTLR OFF CACHE BOOL "Use bundled ANTLR grammar ?")
-+set(ANTLRDIR "" CACHE PATH "Specify the system ANTLR directory tree")
- 
- # check for 64-bit OS
- if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-@@ -174,9 +176,15 @@ check_library_exists(m nexttoward "" HAVE_NEXTTOWARD)
- # mpi
- check_include_file(mpi.h HAVE_MPI_H)
- 
--# SA: whithout it compilation of antlr fails if there's a conflicting 
--#     version of antlr in system-wide directories
--include_directories(src)
-+if(BUNDLED_ANTLR)
-+  # SA: whithout it compilation of antlr fails if there's a conflicting 
-+  #     version of antlr in system-wide directories
-+  include_directories(src)
-+else(BUNDLED_ANTLR)
-+  find_package(ANTLR QUIET)
-+  set(LIBRARIES ${LIBRARIES} ${ANTLR_LIBRARIES})
-+  include_directories(${ANTLR_INCLUDE_DIR})
-+endif(BUNDLED_ANTLR)
- 
- if(WIN32 AND NOT CYGWIN)
- 	# For Win32 find Pdcureses instead of (N)Curses
-diff --git a/CMakeModules/FindANTLR.cmake b/CMakeModules/FindANTLR.cmake
-new file mode 100644
-index 0000000..b61cc5b
---- /dev/null
-+++ b/CMakeModules/FindANTLR.cmake
-@@ -0,0 +1,11 @@
-+
-+
-+find_library(ANTLR_LIBRARIES NAMES antlr)
-+find_path(ANTLR_INCLUDE_DIR NAMES antlr/ANTLRUtil.hpp)
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(ANTLR DEFAULT_MSG ANTLR_LIBRARIES ANTLR_INCLUDE_DIR)
-+
-+mark_as_advanced(
-+ANTLR_LIBRARIES
-+ANTLR_INCLUDE_DIR
-+)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1f7ffec..776a1fd 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -262,9 +262,8 @@ widget.cpp
- widget.hpp
- )
- 
--add_subdirectory(antlr)
- 
--include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
-+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR})
- link_directories(${LINK_DIRECTORIES})
- 
- if(PYTHON_MODULE) #libgdl
-@@ -275,11 +274,16 @@ else(PYTHON_MODULE) #gdl
- 	add_executable(gdl ${SOURCES})
- endif(PYTHON_MODULE)
- 
--add_dependencies(gdl antlr) # be sure that antlr is built before gdl
--target_link_libraries(gdl antlr) # link antlr against gdl
--if (MINGW)
--target_link_libraries(gdl ws2_32)
--endif (MINGW)
-+if(BUNDLED_ANTLR)
-+  add_subdirectory(antlr)
-+  include_directories(${CMAKE_SOURCE_DIR}/src/antlr)
-+  add_dependencies(gdl antlr) # be sure that antlr is built before gdl
-+  target_link_libraries(gdl antlr) # link antlr against gdl
-+  if (MINGW)
-+    target_link_libraries(gdl ws2_32)
-+  endif (MINGW)
-+endif(BUNDLED_ANTLR)
-+
- target_link_libraries(gdl ${LIBRARIES})
- add_definitions(-DHAVE_CONFIG_H)
- 
diff --git a/dev-lang/gdl/files/0.9.5-png.patch b/dev-lang/gdl/files/0.9.5-png.patch
deleted file mode 100644
index 1140fcc9ac75..000000000000
--- a/dev-lang/gdl/files/0.9.5-png.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 407e39a..f24a087 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -270,7 +270,6 @@ if(PNGLIB)
- 	set(USE_PNGLIB ${PNG_FOUND})
- 	if(PNG_FOUND)
- 		set(LIBRARIES ${LIBRARIES} ${PNG_LIBRARIES})
--		set(LINK_DIRECTORIES ${LINK_DIRECTORIES} ${PNG_LIBRARY_DIRS})
- 		include_directories(${PNG_INCLUDE_DIRS})
- 	else(PNG_FOUND)
- 		message(FATAL_ERROR "libpng is required but was not found.\n"
diff --git a/dev-lang/gdl/files/0.9.6-disable-tests-hanging-under-xvfb-run.patch b/dev-lang/gdl/files/0.9.6-disable-tests-hanging-under-xvfb-run.patch
deleted file mode 100644
index 6ce92aff0ab7..000000000000
--- a/dev-lang/gdl/files/0.9.6-disable-tests-hanging-under-xvfb-run.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Disable tests which work fine with local X but hang under xvfb-run
-Author: Axel Beckert <abe@debian.org>
-Last-Update: 2014-10-10
-
---- a/testsuite/Makefile.am
-+++ b/testsuite/Makefile.am
-@@ -18,7 +18,6 @@
-   test_bug_2876372.pro \
-   test_bug_2892631.pro \
-   test_bug_2949487.pro \
--  test_bug_2974380.pro \
-   test_bug_3033108.pro \
-   test_bug_3054361.pro \
-   test_bug_3055720.pro \
-@@ -43,7 +42,6 @@
-   test_bug_3152899.pro \
-   test_bug_3189072.pro \
-   test_bug_3199465.pro \
--  test_bug_3275334.pro \
-   test_bug_3285659.pro \
-   test_bug_3286031.pro \
-   test_bug_3288652.pro \
-@@ -74,16 +72,12 @@
-   test_ce.pro \
-   test_clip.pro \
-   test_common.pro \
--  test_congrid.pro \
-   test_constants.pro \
-   test_convert_coord.pro \
-   test_correlate.pro \
-   test_deriv.pro \
--  test_device.pro \
-   test_dicom.pro \
-   test_erfinv.pro \
--  test_execute.pro \
--  test_extra_keywords.pro \
-   test_fft.pro \
-   test_fft_dim.pro \
-   test_fft_leak.pro \
-@@ -122,7 +116,6 @@
-   test_memory.pro \
-   test_message.pro \
-   test_modulo.pro \
--  test_moment.pro \
-   test_mpfit.pro \
-   test_multiroots.pro \
-   test_nans_in_sort_and_median.pro \
-@@ -130,10 +123,8 @@
-   test_netcdf.pro \
-   test_null.pro \
-   test_obj_new.pro \
--  test_plot_oo.pro \
-   test_plotting_ranges.pro \
-   test_pmulti.pro \
--  test_pmulti_basic.pro \
-   test_postscript.pro \
-   test_product.pro \
-   test_ps_decomposed.pro \
-@@ -144,7 +135,6 @@
-   test_python_module_2.pro \
-   test_qromb.pro \
-   test_qromo.pro \
--  test_random.pro \
-   test_readf.pro \
-   test_reads.pro \
-   test_rebin.pro \
-@@ -167,13 +157,11 @@
-   test_suite.pro \
-   test_systime.pro \
-   test_trisol.pro \
--  test_tv.pro \
-   test_typename.pro \
-   test_url.pro \
-   test_voigt.pro \
-   test_wait.pro \
-   test_wavelet.pro \
--  test_window_background.pro \
-   test_where.pro \
-   test_zeropoly.pro \
-   test_zip.pro \
diff --git a/dev-lang/gdl/files/0.9.6-fix-file-move.patch b/dev-lang/gdl/files/0.9.6-fix-file-move.patch
deleted file mode 100644
index 31d4f066f49c..000000000000
--- a/dev-lang/gdl/files/0.9.6-fix-file-move.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Remove trailing slash at the end of dir when moving files specified by wildcard
-Forwarded: https://sourceforge.net/p/gnudatalanguage/patches/97/
---- a/src/pro/file_move.pro
-+++ b/src/pro/file_move.pro
-@@ -31,7 +31,7 @@
-         res=FILE_SEARCH(dir, FILE_BASENAME(source[ii]), /fully)
- 
-         for jj=0,N_ELEMENTS(res)-1 do begin
--            if(FILE_DIRNAME(res[jj], /MARK_DIRECTORY) eq dir) then flist=[flist, res[jj]] ;
-+            if(FILE_DIRNAME(res[jj]) eq dir) then flist=[flist, res[jj]] ;
-             ;print, 'dir ', dir, ' res ', FILE_DIRNAME(res[jj])
-         endfor
- 
diff --git a/dev-lang/gdl/files/0.9.6-fix-python-function-call.patch b/dev-lang/gdl/files/0.9.6-fix-python-function-call.patch
deleted file mode 100644
index fe90774e5c7b..000000000000
--- a/dev-lang/gdl/files/0.9.6-fix-python-function-call.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Bug: https://sourceforge.net/p/gnudatalanguage/bugs/377
-Bug: https://sourceforge.net/p/gnudatalanguage/bugs/679
-Forwarded: https://sourceforge.net/p/gnudatalanguage/patches/91
- https://sourceforge.net/p/gnudatalanguage/patches/92
-Description: Fix Python calling GDL functions
- * user defined functions crash
- * data arrays of 64 bit element size are not completely converted to Python
---- a/src/pythongdl.cpp
-+++ b/src/pythongdl.cpp
-@@ -329,7 +329,7 @@
- 		  }
- 	      }
- 	  
--	    sub = proList[ proIx];
-+	    sub = funList[ proIx];
- 	  }
-       }
-     else
---- a/src/topython.cpp
-+++ b/src/topython.cpp
-@@ -67,7 +67,7 @@
-     // TODO: free the memory:  PyArray_Free(PyObject* op, void* ptr) ?
-     throw GDLException("Failed to convert array to python.");
-   }
--  memcpy(PyArray_DATA(ret), DataAddr(), this->N_Elements() * sizeof(Sp::t));
-+  memcpy(PyArray_DATA(ret), DataAddr(), this->N_Elements() * Data_<Sp>::Sizeof());
-   return ret;
- }
- 
diff --git a/dev-lang/gdl/files/0.9.6-formats.patch b/dev-lang/gdl/files/0.9.6-formats.patch
deleted file mode 100644
index 105fa9cb8eff..000000000000
--- a/dev-lang/gdl/files/0.9.6-formats.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -up gdl-0.9.6/testsuite/test_formats.pro.formats gdl-0.9.6/testsuite/test_formats.pro
---- gdl-0.9.6/testsuite/test_formats.pro.formats	2015-09-06 13:15:01.000000000 -0600
-+++ gdl-0.9.6/testsuite/test_formats.pro	2016-01-12 14:26:18.811283030 -0700
-@@ -13,6 +13,10 @@
- ;    is OK for negative input, wrong for positive one !!
- ; -- extra "\ ^J" added in GDL between the Re/Im parts for (D)Complex
- ;
-+; Changes: 
-+; 2016-01612 : AC various changes for better managing paths,
-+;              expecially for Cmake automatic tests !
-+;
- ; md5sum of current version of "formats.idl" (-1 et 12 ...)
- ; 5d1cfbc31312a833f62033e297f986a2  formats.idl
- ;
-@@ -53,7 +57,10 @@ end
- pro GENERATE_FORMATS_FILE, nb_cases, verbose=verbose, test=test
- ;
- filename='formats.'+GDL_IDL_FL()
--;
-+if FILE_TEST(filename) then begin
-+    FILE_MOVE, filename, filename+'_old', /overwrite
-+    MESSAGE,/cont, 'Copy of old file <<'+filename+'_old'+'>> done.'
-+endif
- ; value to be write : one negative, one positive
- ;
- struct_neg = {BYTE:-1b,short:-1us,ushort:-1us, $
-@@ -104,17 +111,53 @@ soft=GDL_IDL_FL(/verbose)
- ;
- GENERATE_FORMATS_FILE, nb_cases, verbose=verbose
- ;
--if (soft NE 'idl') AND ~FILE_TEST("formats.idl") then MESSAGE, "missing reference file <<formats.idl>>"
-+; locating then read back the reference idl.xdr:
-+;
-+; we need to add the current dir. into the path because new file(s)
-+; are writtent in it. Do we have a simple way to check whether a dir
-+; is already in !PATH ?
-+;
-+CD, current=current
-+new_path=!path+PATH_SEP(/SEARCH_PATH)+current
-+list_of_dirs=STRSPLIT(new_path, PATH_SEP(/SEARCH_PATH), /EXTRACT)
-+;
-+; only this reference file is mandatory !
-+;
-+filename='formats.idl'
-+file_fmt_idl=FILE_SEARCH(list_of_dirs+PATH_SEP()+filename)
-+;
-+if (soft NE 'idl') AND (STRLEN(file_fmt_idl) EQ 0) then begin
-+    MESSAGE, 'reference file <<'+filename+'>> not found in the !PATH', /continue
-+    if KEYWORD_SET(no_exit) OR KEYWORD_SET(test) then STOP
-+    EXIT, status=1
-+endif
-+if N_ELEMENTS(file_fmt_idl) GT 1 then print, 'multiple reference file <<'+filename+'>> found !'
-+file_fmt_idl=file_fmt_idl[0]
-+;
-+filename='formats.gdl'
-+file_fmt_gdl=FILE_SEARCH(list_of_dirs+PATH_SEP()+filename)
-+if N_ELEMENTS(file_fmt_gdl) GT 1 then begin
-+    print, 'multiple reference file <<'+filename+'>> found ! First used !!'
-+    print, TRANSPOSE(file_fmt_gdl)
-+    file_fmt_gdl=file_fmt_gdl[0]
-+endif
-+;
-+filename='formats.fl'
-+file_fmt_fl=FILE_SEARCH(list_of_dirs+PATH_SEP()+filename)
-+if N_ELEMENTS(file_fmt_fl) GT 1 then begin
-+    print, 'multiple reference file <<'+filename+'>> found !'
-+    print, TRANSPOSE(file_fmt_fl)
-+    file_fmt_fl=file_fmt_fl[0]
-+endif
- ;
- if (soft EQ 'idl') then begin
--   if ~FILE_TEST("formats.gdl") then MESSAGE, /cont, "missing file <<formats.gdl>>"
--   if ~FILE_TEST("formats.fl") then MESSAGE, /cont, "missing file <<formats.fl>>"
--   if ~FILE_TEST("formats.gdl") AND ~FILE_TEST("formats.fl") then begin
--      MESSAGE, /cont, "No useful file found for comparison. Just Reference file written."
--   endif
--   if FILE_TEST("formats.gdl") then soft='gdl' else begin
--         if FILE_TEST("formats.fl") then soft='fl'
--   endelse
-+    soft=''
-+    if ~FILE_TEST(file_fmt_fl) then MESSAGE, /cont, "missing file <<formats.fl>>" else soft='fl'
-+    if ~FILE_TEST(file_fmt_gdl) then MESSAGE, /cont, "missing file <<formats.gdl>>" else soft='gdl'
-+    if (soft EQ '') then begin
-+        MESSAGE, /cont, "No useful file found for comparison. Just Reference file written."
-+        return
-+    endif
- endif
- ;
- ; reading back the 2 files : one created ("formats.gdl" or
-@@ -123,9 +166,10 @@ endif
- print, "Files to be compared : formats.idl, formats."+soft
- ;
- GET_LUN, lun1
--OPENR, lun1, "formats.idl"
-+OPENR, lun1, file_fmt_idl
- GET_LUN, lun2
--OPENR, lun2, "formats."+soft
-+if (soft EQ 'gdl') then OPENR, lun2, file_fmt_gdl
-+if (soft EQ 'fl') then OPENR, lun2, file_fmt_fl
- ;
- ref=STRING("")
- val=STRING("")
-@@ -155,7 +199,7 @@ CLOSE, lun1, lun2
- FREE_LUN, lun1, lun2
- ;
- if (nb_errors GT 0) then begin
--   MESSAGE, /continue, 'Using a "diff formats.idl formats.gdl" in a shell'
-+   MESSAGE, /continue, 'Using a "diff formats.idl formats.{gdl|fl}" in a shell'
-    MESSAGE, /continue, 'should help to debug !'
- endif
- ;
diff --git a/dev-lang/gdl/files/0.9.6-fun-fix.patch b/dev-lang/gdl/files/0.9.6-fun-fix.patch
deleted file mode 100644
index a3a4118ceb0a..000000000000
--- a/dev-lang/gdl/files/0.9.6-fun-fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Author: Vitaliy Tomin <highwaystar@users.sf.net>
-Description: Fix direct calling of direct function calls from Python
-Bug: https://sourceforge.net/p/gnudatalanguage/bugs/678
---- a/src/pythongdl.cpp
-+++ b/src/pythongdl.cpp
-@@ -392,25 +392,31 @@
-     
-     BaseGDL* retValGDL = NULL;
-     Guard<BaseGDL> retValGDL_guard;
--    if( functionCall)
--      {
--	if( libCall) 
--	  retValGDL = static_cast<DLibFun*>(static_cast<EnvT*>(e)->
--					    GetPro())->Fun()( static_cast<EnvT*>(e));
--	else
--	  retValGDL = interpreter->call_fun(static_cast<DSubUD*>
--					    (static_cast<EnvUDT*>(e)
--					     ->GetPro())->GetTree());
--	retValGDL_guard.Reset( retValGDL);
--      }
--    else
--      {
--	if( libCall) 
--	  static_cast<DLibPro*>(e->GetPro())->Pro()(static_cast<EnvT*>(e)); // throws
--	else
--	  interpreter->call_pro(static_cast<DSubUD*>
--				(e->GetPro())->GetTree()); //throws
--      }
-+
-+    if (functionCall) {
-+        DLibFun* sub_fun_chk = dynamic_cast<DLibFun *>(static_cast<EnvT *>(e)->GetPro());
-+        if (sub_fun_chk) {
-+            //handle direct call function first
-+            if (sub_fun_chk->DirectCall()) {
-+                BaseGDL* directCallParameter = e->GetParDefined(0);
-+                retValGDL = static_cast<DLibFunDirect*>(sub_fun_chk)->FunDirect()(directCallParameter, true /*isReference*/);
-+            }
-+        } else if (libCall)
-+        retValGDL = static_cast<DLibFun *>(static_cast<EnvT *>(e)->GetPro())
-+                        ->Fun()(static_cast<EnvT *>(e));
-+      else
-+        retValGDL = interpreter->call_fun(
-+            static_cast<DSubUD *>(static_cast<EnvUDT *>(e)->GetPro())
-+                ->GetTree());
-+      retValGDL_guard.Reset(retValGDL);
-+    } else {
-+      if (libCall)
-+        static_cast<DLibPro *>(e->GetPro())
-+            ->Pro()(static_cast<EnvT *>(e)); // throws
-+      else
-+        interpreter->call_pro(
-+            static_cast<DSubUD *>(e->GetPro())->GetTree()); // throws
-+    }
- 
-     // copy back args and keywords
-     success = CopyArgToPython( parRef, kwRef, *e, argTuple, kwDict);
diff --git a/dev-lang/gdl/files/0.9.6-gcc6.patch b/dev-lang/gdl/files/0.9.6-gcc6.patch
deleted file mode 100644
index e017255b0bef..000000000000
--- a/dev-lang/gdl/files/0.9.6-gcc6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up gdl-0.9.6/src/specializations.hpp.gcc6 gdl-0.9.6/src/specializations.hpp
---- gdl-0.9.6/src/specializations.hpp.gcc6	2015-08-24 15:26:47.000000000 -0600
-+++ gdl-0.9.6/src/specializations.hpp	2016-03-03 16:30:46.694379312 -0700
-@@ -534,16 +534,6 @@ void Data_<SpDString>::MinMax( DLong* mi
- 
- // default_io.cpp
- template<>  
--std::istream& operator>>(std::istream& i, Data_<SpDFloat>& data_); 
--template<>  
--std::istream& operator>>(std::istream& i, Data_<SpDDouble>& data_); 
--template<>  
--std::istream& operator>>(std::istream& i, Data_<SpDComplex>& data_); 
--template<>  
--std::istream& operator>>(std::istream& i, Data_<SpDComplexDbl>& data_); 
--template<>  
--std::istream& operator>>(std::istream& is, Data_<SpDString>& data_); 
--template<>  
- std::ostream& Data_<SpDLong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr); 
- template<>  
- std::ostream& Data_<SpDULong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr); 
---- gdl-0.9.6/src/typedefs.hpp.gcc6	2014/08/09 15:33:29	1.76
-+++ gdl-0.9.6/src/typedefs.hpp	2016/02/04 22:48:46	1.77
-@@ -235,7 +235,7 @@
-   
-   Guard& operator=( Guard& r)
-   {
--    if( &r == this) return;
-+    if( &r == this) return *this;
-     delete guarded;
-     guarded = r.guarded;
-     r.guarded = NULL;
diff --git a/dev-lang/gdl/files/0.9.6-python-use-path-and-startup.patch b/dev-lang/gdl/files/0.9.6-python-use-path-and-startup.patch
deleted file mode 100644
index a76cd8cb6275..000000000000
--- a/dev-lang/gdl/files/0.9.6-python-use-path-and-startup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Initialize GDL path if one is defined
-Forwarded: https://sourceforge.net/p/gnudatalanguage/patches/93/
---- a/src/pythongdl.cpp
-+++ b/src/pythongdl.cpp
-@@ -537,6 +537,14 @@
-     // instantiate the interpreter (creates $MAIN$ environment)
-     interpreter = new DInterpreter();
- 
-+    string gdlPath=GetEnvString("GDL_PATH");
-+    if( gdlPath == "") gdlPath=GetEnvString("IDL_PATH");
-+    if( gdlPath == "")
-+      {
-+        gdlPath = "+" GDLDATADIR "/lib";
-+      }
-+    SysVar::SetGDLPath( gdlPath);
-+
-     PyObject* m = Py_InitModule("GDL", GDLMethods);
- 
-     gdlError = PyErr_NewException((char*)"GDL.error", NULL, NULL);
diff --git a/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch b/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch
new file mode 100644
index 000000000000..dd7abcc54d90
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch
@@ -0,0 +1,94 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -206,10 +206,6 @@
+ # mpi
+ check_include_file(mpi.h HAVE_MPI_H)
+ 
+-# SA: whithout it compilation of antlr fails if there's a conflicting 
+-#     version of antlr in system-wide directories
+-include_directories(src)
+-
+ if (NOT WIN32)
+     # Ncurses MANDATORY for readline on POSIX
+     # -DNCURSESDIR=DIR
+@@ -399,8 +395,10 @@
+ 
+ # PLplot MANDATORY
+ # -DPLPLOTDIR=DIR
+-set(CMAKE_PREFIX_PATH ${PLPLOTDIR})
+-find_package(Plplot QUIET)
++
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PLPLOT REQUIRED plplot plplot-c++)
++
+ set(HAVE_LIBPLPLOTCXXD ${PLPLOT_FOUND})
+ if(PLPLOT_FOUND)
+     set(LIBRARIES ${LIBRARIES} ${PLPLOT_LIBRARIES})
+@@ -490,33 +488,16 @@
+ # -DMAGICK=ON|OFF
+ # -DMAGICKDIR=DIR
+ if(MAGICK)
+-  set(CMAKE_PREFIX_PATH ${MAGICKDIR})
+-  find_package(ImageMagick QUIET COMPONENTS Magick++ MagickWand MagickCore)
+-  mark_as_advanced(ImageMagick_EXECUTABLE_DIR ImageMagick_Magick++_INCLUDE_DIR ImageMagick_Magick++_LIBRARY
+-    ImageMagick_MagickCore_INCLUDE_DIR ImageMagick_MagickCore_LIBRARY ImageMagick_MagickWand_INCLUDE_DIR ImageMagick_MagickWand_LIBRARY)
+-  set(USE_MAGICK ${ImageMagick_FOUND})
+-  if(ImageMagick_FOUND)
+-    find_program(MAGICKXXCONFIG Magick++-config)
+-    if(MAGICKXXCONFIG)
+-      execute_process(COMMAND ${MAGICKXXCONFIG} "--libs" OUTPUT_VARIABLE MAGICKXXCONFIGLIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+-      set(LIBRARIES ${LIBRARIES} ${MAGICKXXCONFIGLIBS})     
+-    else(MAGICKXXCONFIG)
+-      message(FATAL_ERROR "ImageMagick is required but was not found (Magick++-config).\n"
+-    "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n"
+-    "Use -DMAGICK=OFF to not use it.\n"
+-        "(suitable Debian/Ubuntu package: libmagick++-dev)\n"
+-        "(suitable Fedora/CentOS package: ImageMagick-c++-devel)")
+-    endif(MAGICKXXCONFIG)
+-    set(LIBRARIES ${LIBRARIES} ${ImageMagick_LIBRARIES})
+-    include_directories(${ImageMagick_INCLUDE_DIRS})
+-    set(MAGICK_LIBRARIES ${ImageMagick_LIBRARIES})
+-  else(ImageMagick_FOUND)
+-    message(FATAL_ERROR "ImageMagick is required but was not found.\n"
+-      "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n"
+-      "Use -DMAGICK=OFF to not use it.\n"
+-      "(suitable Debian/Ubuntu package: libmagick++-dev)\n"
+-      "(suitable Fedora/CentOS package: ImageMagick-c++-devel)")
+-  endif(ImageMagick_FOUND)
++  find_package(PkgConfig REQUIRED)
++  pkg_check_modules(Magick++ REQUIRED Magick++)
++  pkg_check_modules(MagickWand REQUIRED MagickWand)
++  pkg_check_modules(MagickCore REQUIRED MagickCore)
++
++  set(MAGICK_LIBRARIES ${Magick++_LIBRARIES} ${MagickWand_LIBRARIES} ${MagickCore_LIBRARIES})
++  set(LIBRARIES ${LIBRARIES} ${MAGICK_LIBRARIES})
++  include_directories(${Magick++_INCLUDE_DIRS})
++  include_directories(${MagickWand_INCLUDE_DIRS})
++  include_directories(${MagickCore_INCLUDE_DIRS})
+ endif(MAGICK)
+ 
+ # if GM or IM activated, we check whether Plplot is OK for that
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -186,9 +186,9 @@
+ )
+ endif(USE_EXPAT)
+ 
+-add_subdirectory(antlr)
++find_library(ANTLR_LIBRARY NAMES antlr)
+ 
+-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
++include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+ link_directories(${LINK_DIRECTORIES})
+ 
+ if(PYTHON_MODULE) #GDL.so
+@@ -203,8 +203,7 @@
+ 	add_executable(gdl ${SOURCES})
+ endif(PYTHON_MODULE)
+ 
+-add_dependencies(gdl antlr) # be sure that antlr is built before gdl
+-target_link_libraries(gdl antlr) # link antlr against gdl
++target_link_libraries(gdl ${ANTLR_LIBRARY}) # link antlr against gdl
+ if (MINGW)
+ target_link_libraries(gdl ws2_32)
+ endif (MINGW)
diff --git a/dev-lang/gdl/gdl-0.9.6-r3.ebuild b/dev-lang/gdl/gdl-0.9.6-r3.ebuild
deleted file mode 100644
index 3a51f5b1f4b9..000000000000
--- a/dev-lang/gdl/gdl-0.9.6-r3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
-
-DESCRIPTION="GNU Data Language"
-HOMEPAGE="https://github.com/gnudatalanguage/gdl"
-SRC_URI="mirror://sourceforge/gnudatalanguage/${P}v2.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+eigen fftw graphicsmagick gshhs hdf hdf5 +imagemagick netcdf openmp
-	  png proj postscript python static-libs udunits wxwidgets"
-
-RDEPEND="
-	dev-cpp/antlr-cpp:2=
-	sci-libs/gsl:0=
-	sci-libs/plplot:0=[-dynamic]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	x11-libs/libX11:0=
-	fftw? ( sci-libs/fftw:3.0= )
-	gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= )
-	hdf? ( sci-libs/hdf:0= )
-	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	netcdf? ( sci-libs/netcdf )
-	proj? ( sci-libs/proj )
-	postscript? ( dev-libs/pslib )
-	python? (
-		${PYTHON_DEPS}
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)
-	udunits? ( sci-libs/udunits )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	dev-java/antlr:0[java(+),script(+)]
-	virtual/pkgconfig
-	eigen? ( dev-cpp/eigen:3 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/0.9.2-include.patch
-	"${FILESDIR}"/0.9.5-antlr.patch
-	"${FILESDIR}"/0.9.5-png.patch
-	"${FILESDIR}"/0.9.6-fix-file-move.patch
-	"${FILESDIR}"/0.9.6-fix-python-function-call.patch
-	"${FILESDIR}"/0.9.6-fun-fix.patch
-	"${FILESDIR}"/0.9.6-python-use-path-and-startup.patch
-	"${FILESDIR}"/0.9.6-disable-tests-hanging-under-xvfb-run.patch
-	"${FILESDIR}"/0.9.6-gcc6.patch
-	"${FILESDIR}"/0.9.6-formats.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	use wxwidgets && need-wxwidgets unicode
-	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-
-	# make sure antlr includes are from system and rebuild the sources with it
-	# https://sourceforge.net/p/gnudatalanguage/patches/39/
-	rm -r src/antlr || die
-	einfo "Regenerating grammar"
-	pushd src >/dev/null || die
-	local i
-	for i in *.g; do
-		antlr ${i} || die
-	done
-	popd >/dev/null || die
-
-	# gentoo: avoid install files in datadir directory
-	# and manually install them in src_install
-	sed -e '/AUTHORS/d' -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# MPI is still very buggy
-	# x11=off does not compile
-	local mycmakeargs=(
-		-DMPICH=OFF
-		-DBUNDLED_ANTLR=OFF
-		-DX11=ON
-		-DEIGEN3="$(usex eigen)"
-		-DFFTW="$(usex fftw)"
-		-DGRIB=OFF
-		-DGSHHS="$(usex gshhs)"
-		-DHDF="$(usex hdf)"
-		-DHDF5="$(usex hdf5)"
-		-DLIBPROJ4="$(usex proj)"
-		-DNETCDF="$(usex netcdf)"
-		-DOPENMP="$(usex openmp)"
-		-DPNGLIB="$(usex png)"
-		-DPSLIB="$(usex postscript)"
-		-DUDUNITS="$(usex udunits)"
-		-DWXWIDGETS="$(usex wxwidgets)"
-	)
-
-	if use imagemagick; then
-		if use graphicsmagick; then
-			mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
-		else
-			mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
-		fi
-	else
-		mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
-	fi
-
-	configuration() {
-		mycmakeargs+=( $@ )
-		cmake-utils_src_configure
-	}
-	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
-	use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use python && python_foreach_impl cmake-utils_src_make
-}
-
-src_test() {
-	# there is check target instead of the ctest to define some LDPATH
-	virtx emake -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use python; then
-		installation() {
-			mv src/libgdl.so GDL.so || die
-			python_domodule GDL.so
-		}
-		python_foreach_impl run_in_build_dir installation
-		dodoc PYTHON.txt
-	fi
-	#dodoc AUTHORS README
-	echo "GDL_PATH=\"+${EPREFIX}/usr/share/gnudatalanguage\"" > 50gdl || die
-	doenvd 50gdl
-}
diff --git a/dev-lang/gdl/gdl-1.0.0_rc3.ebuild b/dev-lang/gdl/gdl-1.0.0_rc3.ebuild
new file mode 100644
index 000000000000..b5fb1c358bcb
--- /dev/null
+++ b/dev-lang/gdl/gdl-1.0.0_rc3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{6..9} )
+
+# gdl's build system is a travesty, and actually calls
+# itself in the testsuite, which is something that ninja
+# obviously doesn't support.
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake python-r1 toolchain-funcs virtualx wxwidgets
+
+DESCRIPTION="GNU Data Language"
+HOMEPAGE="https://github.com/gnudatalanguage/gdl"
+SRC_URI="https://github.com/gnudatalanguage/gdl/archive/v$(ver_cut 1-3)-rc.$(ver_cut 5).tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+eigen fftw glpk graphicsmagick gshhs hdf hdf5 +imagemagick netcdf
+	openmp png proj postscript python tiff udunits wxwidgets"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-cpp/antlr-cpp:2=
+	dev-libs/expat
+	sci-libs/gsl:0=
+	sci-libs/plplot:0=[cxx,-dynamic]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	x11-libs/libX11
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( sci-mathematics/glpk:= )
+	gshhs? (
+		sci-geosciences/gshhs-data
+		sci-geosciences/gshhs:0=
+	)
+	hdf? ( sci-libs/hdf:0= )
+	hdf5? ( sci-libs/hdf5:0= )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	netcdf? ( sci-libs/netcdf )
+	proj? ( sci-libs/proj )
+	postscript? ( dev-libs/pslib )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	tiff? (
+		media-libs/tiff
+		sci-libs/libgeotiff
+	)
+	udunits? ( sci-libs/udunits )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	eigen? ( dev-cpp/eigen:3 )"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( app-admin/chrpath )"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)-rc.$(ver_cut 5)"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0_rc3-cmake.patch )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	use wxwidgets && setup-wxwidgets unicode
+	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+
+	# remove bundled antlr
+	rm -r src/antlr || die
+
+	# gentoo: avoid install files in datadir directory
+	# and manually install them in src_install
+	sed -e '/AUTHORS/d' -i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# MPI is still very buggy
+	# x11=off does not compile
+	local mycmakeargs=(
+		-DMPI=OFF
+		-DREADLINE=ON
+		-DX11=ON
+		-DEXPAT=ON
+		-DEIGEN3=$(usex eigen)
+		-DFFTW=$(usex fftw)
+		-DGRIB=OFF
+		-DGLPK=$(usex glpk)
+		-DHDF=$(usex hdf)
+		-DHDF5=$(usex hdf5)
+		-DLIBPROJ4=$(usex proj)
+		-DNETCDF=$(usex netcdf)
+		-DOPENMP=$(usex openmp)
+		-DPNGLIB=$(usex png)
+		-DUDUNITS2=$(usex udunits)
+		-DWXWIDGETS=$(usex wxwidgets)
+		-DGRAPHICSMAGICK=$(usex imagemagick $(usex graphicsmagick))
+		-DMAGICK=$(usex imagemagick $(usex !graphicsmagick))
+		-DTIFF=$(usex tiff)
+		-DGEOTIFF=$(usex tiff)
+		-DSHAPELIB=OFF
+		-DPLPLOTDIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	configuration() {
+		mycmakeargs+=( "$@" )
+		cmake_src_configure
+	}
+	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
+	use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
+}
+
+src_compile() {
+	cmake_src_compile
+	use python && python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	# there is check target instead of the ctest to define some LDPATH
+	virtx cmake_build check
+}
+
+src_install() {
+	cmake_src_install
+	if use python; then
+		installation() {
+			chrpath -d src/GDL.so || die
+			python_domodule src/GDL.so
+		}
+		python_foreach_impl run_in_build_dir installation
+		dodoc PYTHON.txt
+	fi
+
+	newenvd - 50gdl <<-_EOF_
+		GDL_PATH="+${EPREFIX}/usr/share/gnudatalanguage"
+	_EOF_
+}
diff --git a/dev-lang/gdl/metadata.xml b/dev-lang/gdl/metadata.xml
index a0c94d341881..16e4a758b28f 100644
--- a/dev-lang/gdl/metadata.xml
+++ b/dev-lang/gdl/metadata.xml
@@ -13,6 +13,7 @@
 	<use>
 		<flag name="eigen">Build matrix manipulation with <pkg>dev-cpp/eigen</pkg></flag>
 		<flag name="hdf">Add support for the Hierarchical Data Format v.4</flag>
+		<flag name="glpk">Use GNU Linear Programming Kit <pkg>sci-mathematics/glpk</pkg></flag>
 		<flag name="gshhs">Add support for projection adn continent maps with <pkg>sci-geosciences/gshhs-data</pkg></flag>
 		<flag name="proj">Add support for <pkg>sci-libs/proj</pkg> (geographic projections)</flag>
 		<flag name="udunits">Add support for manipulating units of physical quantities</flag>
diff --git a/dev-lang/gnuprologjava/Manifest b/dev-lang/gnuprologjava/Manifest
index 0914b50c7e93..63b9ace62b54 100644
--- a/dev-lang/gnuprologjava/Manifest
+++ b/dev-lang/gnuprologjava/Manifest
@@ -1,5 +1,4 @@
 AUX gnuprologjava-0.2.6-manual.patch 414 BLAKE2B 6bad70e46f1c2e9bdf9e4ef45cdbc4a4074671de28188aac7b69082e44eed86ef3fc1be1b5e83ea81da52df5d1b218583ab7ae73fdeeeb8241f50e8d45c23713 SHA512 419b509abae773e5ac3f2d79328bb4014776cc7c6390b8afa2d3d7242afec41e92d22830ed1be3c15f3d007c9fa08b303b553d883b18e1bde1fe9af09a0c7644
 DIST gnuprologjava-0.2.6-src.zip 477058 BLAKE2B 00248df0b307b733595b585ed5b847413d5de32c3348008ce53bb4dab93bfc465531bd59ea224f5c0bc6a66c3186ff55d353a0fe88d222b490927100cbafceea SHA512 b175c74e754a7176f5fc38ea2215809bb9d60ec5b8852f99a48a72a0bdb316b33b7195ff5c85398bb63aa2e522d12dfc75e2ff3af9f89ff44448d2f73357f0a4
 EBUILD gnuprologjava-0.2.6-r1.ebuild 877 BLAKE2B 2641b8cbde51bd39f51fba2edceb66aa7b1d3fef763c8079c714c7b911061b022014e484942a1af80ab70ad2af0ef72ac7f78394bab7dedb3574bea3b8f4fcb1 SHA512 fe5a0a27ceae3c19408a0aacdcb3cce53866b0591ccebae9090cfad33307bb1181f3f1ceb46448c6183947cb78658e3d794de158d49aaba6c8494afae314e1ec
-EBUILD gnuprologjava-0.2.6.ebuild 838 BLAKE2B 289f4e669963ac5660b20ac07f21d3c5029a14e908b4d8a09d25930c3d86fb5477b81799a19803b0575c1f5a917275d5e262c6199b7e7d2b2055702768e5674d SHA512 f74d26baa10ad05b53fe3af7c63e3b6749bce9d23e28d2dcc1ac001784e3c4782b965abf1603e21a42a95d575c547aaea6d2e5e2ac4e8b86e3db71efc7efb3cf
 MISC metadata.xml 236 BLAKE2B 665f3de6dc90f46a18379b3416063a49b1a79ddd7ef89eaed9be78f9adc5b234e9693cd31d6cf2d3477fc7dc00055492bef7de78da6c901c4a6e55eb0e781325 SHA512 e776224736bd575412c7b5b799f649c6b2947a70e6a9aea580063d9da7d09a8144e5ebaf7ac3ef131d578486cf05dec814dce11b2aeb884cded3be3cab70fcec
diff --git a/dev-lang/gnuprologjava/gnuprologjava-0.2.6.ebuild b/dev-lang/gnuprologjava/gnuprologjava-0.2.6.ebuild
deleted file mode 100644
index c94727fc1877..000000000000
--- a/dev-lang/gnuprologjava/gnuprologjava-0.2.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="GNU Prolog for Java is an implementation of ISO Prolog as a Java library"
-HOMEPAGE="http://www.gnu.org/software/gnuprologjava"
-SRC_URI="mirror://gnu/gnuprologjava/${P}-src.zip"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=virtual/jdk-1.6:="
-DEPEND="${RDEPEND}
-	dev-java/ant-core"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-manual.patch
-}
-
-src_compile() {
-	eant jar
-	if use doc ; then
-		eant doc
-	fi
-	mv build/${P}.jar build/${PN}.jar || die
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r build/api || die
-		java-pkg_dohtml -r build/manual || die
-	fi
-
-	dodoc NEWS.txt docs/readme.txt
-}
diff --git a/dev-lang/polyml/Manifest b/dev-lang/polyml/Manifest
index d1bd6a1edd4a..ed271763c9d7 100644
--- a/dev-lang/polyml/Manifest
+++ b/dev-lang/polyml/Manifest
@@ -1,26 +1,7 @@
-AUX polyml-5.4.1-asm.patch 1026 BLAKE2B adb541bddcc00957fca16a50f841b8572da68b0cd5a085da3e28473c58a3e95e93f6277ad76b8349e19ec168a8a898d1c5f9d86e7f0d7fd0aa0fec4204e5346f SHA512 bf19cedff74b11feba72c0ba2f5a9b6ee8169b5bb1b783d3559640070025ca0e7627d751bc703c41d812025d6909cba56101e49f0199f2aee310bc95ca4f2d6d
-AUX polyml-5.4.1-configure.patch 459 BLAKE2B e97785d1581259f8fa8102034d6b6e3b7c43c5337afeef75c903753cc69bd3174175781fcf5dac498f85339f40e05f7c636e2b95ecf9fa9dcdc3749d841baee2 SHA512 4e3a5e6651c8b6b9cb018f72f100755eee0265ad7dd0ba57030b7bce95670ff35e7191661be469b59206266f5eb51042d98504601311629bc2e83ed36a0cef8f
-AUX polyml-5.5.0-asm.patch 351 BLAKE2B 7fb6afeeefafbbc15dd9088ed417688dbbdc007c9d9c380675797af1a9c620779eeae7aec2fe43e04a6e06c0b2786261adae2c71c69b8ab679ba3449ba69ea7c SHA512 92a14615483aaac76e708ae19fccab132f80223ebaad7a390482af164335199a7d2e52be8726cc96d7971efae73a9cdf0284ec96f014af606edce2024d5b3996
-AUX polyml-5.5.0-configure.patch 4658 BLAKE2B 7ab06882eb18efd3ee3e90e65d1cd5aae3437080e4d675b6406f46637d59ef33229823b58330fbfcf0020714ebc51105e90f8fdcca9215ab934de39b68fd75c4 SHA512 d4a8ee5d41469d958d7f61a6608c5d4bd50e5497fadcd5333b2a94cd253c65d27f493bd743574eb3ccab37a39fdb2182e25106443f1855b30be1a70c9d450cc6
-AUX polyml-5.5.0-x-it-basis.patch 562 BLAKE2B f883eb0f72ca5678318472feaf41a009bb9f418431d78c126252f55d67f7ec0339ec7337a87c578373d66c0e9120f6db0d9480f5010f5a925a3cfb6a4ea201ab SHA512 ed5864b7ce5767133a47d914b5b439177e5c841669870292f90a73edee2e505aff6883b9a80baf0036d87bf728038ffa4609f9bacde4a704bfca291aa9cf50a4
-AUX polyml-5.5.1-inputN-return-for-zero-chars.patch 1476 BLAKE2B 38c9fa12ee5755493f8e3883d8f1e9045fb7f79586b5ee0c9e1d3d4e6180d939eba07052b092f7a714ebceceb90a5615f6890392b20dfe3b1c695e40df0d90c0 SHA512 998e9eb09a3b35bbbb6a9748e0b19c423f2204ccfb3f5a6de3173ca91f67d523884743f382052c22d14655310265ef7f8259e5104c61f9ab2b9a52f7257a011f
-AUX polyml-5.5.1-optimize-closure.patch 6695 BLAKE2B 421c5da3accc302f201be6f8a137d24014ec9b3ba3ec6c67175ffea37b08d4a9379bcf560f2ffe5a7180b67a5cacbfec6f76fcfccd3f2b923a345255856b6ecc SHA512 7cf1c66114058c8b3c9ceed3a84fe9a99f0cf063cce3364be79c7402353e8e29c5082cfedef16a32f38cb4275b0b3622db88cf7746115d1c43c483635a46f147
-AUX polyml-5.5.2-r1952-check_for_negative_sized_array.patch 548 BLAKE2B ea01cee4f83d87fe0793fc69a020c7dec9e2a54572acdea64850eb32a80cc3160c3c30031c823db93a1ed4454de21da916bb321bc4104f189ecf977737c14e60 SHA512 d979c6542a2a983ab1b536e8b983d4d0a154f4f5e00f3d4161dd38f965f63ea5bd339785904690928a715ec43cb2a296f535ff6af1da522b096ffae0bba759a4
-AUX polyml-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch 4089 BLAKE2B 8407734817afa2902ca115f129c3feb0197082848921a6a41389c49516329b0c6294d9a381b143cfe1b2a1855b1916a49fc50de8f969a6c5bffc87b7c10ff982 SHA512 8b4f174ace31a839ea592402c10068af62f03227a43a663ea17ea5eefecf52472fc6a3437cd99f1593de7d575af57ae4b8156756695623c7db0f9e726e5f21a6
-AUX polyml-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch 1247 BLAKE2B 7df0a97bdb56d264b090bebad500d4f1f4354d8d66feed289a4f535e63d3357a33a6533acd4170e7c4e69bf477f56355684b3037f0c895adad299de20cf246d0 SHA512 ac2d1baff1c8d743ee783ac81f31df12cc4598874dd5a9a7855cd06fb179af2c64bc02a87d85a72238f19c805128143693839bd0a58d9a4002bc75fae985303b
-AUX polyml-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch 951 BLAKE2B c2aa5777c35d27d0c403f6676b323a280e43c30bbacdcbfc6535d39b66031b11e6e40074ecd3fb72b40953942fb53cb88d62f82e47cff072a4e53ca973615019 SHA512 644e90f26ef80aa8e945257eafa4da1ee2da9d353db40b5c6e367d032f41db4a6589a2527bce9d84d45794d88d31edaeb3cea53d57b4421bf209f6c07be69cf0
 AUX polyml-5.6-configure.patch 390 BLAKE2B 7f20e9de1c00a429ed86ab33cd05bd2aed0a4c431d92f52e7c93c4c44f4f4611637299020d3cbf7c32b9d43f868757f4b7c534f68e5b7120c75ee0b27b5f8316 SHA512 d868d6739e88ccacf7ab5ee495ffaa54fb3ace83c57633fde2d97fb894c9e0c81e896e15192318f9b8bbcb678efb95a827549a0fd30d2ca87473b582fa09f850
 AUX polyml-5.6-ffi3.patch 584 BLAKE2B 6c7e38c077968f439f03739a4d95bad6d5f631b4cf4e1a51a58ae6273c40a1ae5dbd1fe3aa6e338215f9cedec950435e846351275be7bccb80fd313965888b78 SHA512 22bb8e13672ddb0a8f7a3ed9908fb652e238c849b553ab3ceb9b33daebc35d6502dbff3f099ab933f4e2639b5eac2294e21d45bfc96dcb1b9c6be0129c57232d
 DIST polyml-5.6.tar.gz 6066166 BLAKE2B dc7e35ad1f51f270f9043736bca8b3d8a96e208dfa2833a2de3c06c969e8bb9d5e92c3ab025e4e55539188a9d6d5000b7befdd3cfc17aa3b0e54315778ab71b0 SHA512 cd4f25c225831dec512f7136dfda4ba31abd6939d9e8e0cacdb6d48212488b56ba5969c76e76fcbfcfa83d015a67d9cf62457286086f3c2b3f7914a7939d7b59
 DIST polyml-5.8.tar.gz 9817105 BLAKE2B 93992c8baa78017bfda6c2151d1f48805829b77c0b7ed9bec87c951fc4a4236459ed59aab1eca88ed4a1d7aa10eb9734f93324583e012b18bb7d8cce84b5a35b SHA512 50baed79b50b14bd87acc637de93fd6d0f05e61fe0f03682a12a1d2c5f382313488d48f84b49ad915b01acc5a3a5769fb05fcaa7b24499c56402ddd3ba393930
-DIST polyml.5.4.1.tar.gz 6107319 BLAKE2B 1fdff3b26fa7554a0f3d31cca0dc4a4e013fb930e6295cd6107012bc67e87db1f64916087edb34e403c3e1a88b26bff947c1cc9d946fe93ac7a1144434d15081 SHA512 4a7b404ed648b5a9fd9d52917214688d15f4f9a5f4570ba13b52a8304bde1cc4b534f539ffc3c9554283816ae130e4c898a179d776df6d3220fba9743a19b175
-DIST polyml.5.5.1.tar.gz 5465794 BLAKE2B 0ae6973c866cdf33e0eeb26475c95f26f11eca13458ab52c2c6fd3f4b3034cd5e71a7e4dbff5574070a11833479bff2723066bfc71367d71cd6e4f9f17a5cba1 SHA512 283954c8bf5599d83ea69916b827b1acae7137fe4add67537026092da2e6f1a89d71d3a394dbba599bbe9e967ded1446f39f4d81afb90301532db6be949f7a6f
-DIST polyml.5.5.2.tar.gz 5599140 BLAKE2B 08b7c4be7c52bd8f57c53f6caa24be7ab457c7419459192f33369bf3c7024002ffd98dfd7af4db53c3a2484f9c966010a635f4e09e9edf8a62b5d5230f9a04bf SHA512 248c2a38c4691898bc1243a041f4683bf227d9c8a98c6c3545af2a8a3249ed5ed96f33f90cb2dede8809b42f33c0557650147302cfe046a5fba965ccd93cbc5b
-DIST polyml.5.5.tar.gz 5504389 BLAKE2B 8ad51504e4bc4a3f6090052d641389b7378aa56295ebe8503ea09082a0bb85ee157c04ac19ca66ab8b8c8b49b0d645339d499ea7d4eba18eae6f90be8afcc907 SHA512 4725c2e4a786b8c63bc6fc1cadad0de818ed935014d51040af43defa07b03ba7bedb2185bfb2e39a0db7284479e79e698b31ec7fe8463c306b668de1eda69b89
-EBUILD polyml-5.4.1.ebuild 884 BLAKE2B aad076fd479a9d037fdb44ff2c8838f5ec7f374e4d544de4b7d9925e0b538e7582e99be66ba8e95ae61b4dfde5e0d765625040ebfd0410b52257822bfe201ad9 SHA512 cd5474f947837de1566c88b407fc9c7869167d516cf9c24d551d6785a03f3d2f9366d4c12e7aba16572f41c4650bf1a7a3fa351e2acf8c19186a728fd7bf8b1e
-EBUILD polyml-5.5.0.ebuild 1123 BLAKE2B f7d424922bd490449f0fc7f098e8c7b56c3533211e4476bcc52ee0df5acc6beb606d089dca8862c43aca053073d009c0c3bd610df632cff044ad1568adf109a6 SHA512 70a0b5e67002bafd4a550f188d46e00a2f524ddbdcaf7763b77a119f9f18567f6f7d610c8ac434ee0abad4936eae7055e2efb17e7530c01131c6a1e0b230611b
-EBUILD polyml-5.5.1.ebuild 1808 BLAKE2B f70c8ea8616894fc6551a1bcdf7e7de3dd5c4bfb1b344e8c1b12204b7aa05e67f234298f1d0d9e99751a1f23e6ee2faacb6cbbfdae4ab5bdead98b646689ba92 SHA512 322132df157489c9ee5dded3da25b489480df00d3d5b395e7d8f3a08e0f30fa2cb9942582c05397a171c274082adf8b327fac0e201a094fcd00477b63fa37055
-EBUILD polyml-5.5.2.ebuild 1965 BLAKE2B 36f8fc6a9b085e0d646e7cc4990cd198b8acb2da3c03667331c4bf0004bf4823110fb59bf7f74f701d8738f1a2f0438517510fa28326b3352b1e3c86a38c50d0 SHA512 692128341e53deb259b6516dad1e2e311f625b034b95a351bb907ecae17c25f61f69eb91046af7a3c453f81204b72c4ca7f32e2347fd52c33664464b4e0658cc
 EBUILD polyml-5.6.ebuild 1209 BLAKE2B a5490bacdab41a33525d841ef527a45b4f5068130888c206db3dd51cdbbba5a779f364e03603450c8432443fc512305c0aa9a5db81aa78884fb677ef89f1a4b9 SHA512 d8fc8f66cfe3b9065e530cf3d839756250a9b08847d3dafc80f18e062cd92f11d209c8cb432208c46f2206dbc4e31a2e2d5b9317202182fd9f00af2b1eceb0cb
 EBUILD polyml-5.8.ebuild 1219 BLAKE2B 05123eacb9c5e19207cbf6fe3f6ccc81372333baeadb092d078897fdef0da567f22186e71edba2e3f506064f7d7b0d5bc6e9609fe736effec2cc47d48b147727 SHA512 f414bd49ba8a01f190354ab5a76d056f9e454c58d3a2344ff7f4dff5957098476c595322e362a2f5ebd1e238ef45228eb1eeecbc292d0c83fba2adfa67a0e21d
 MISC metadata.xml 357 BLAKE2B f994f420abc8bb1020fc533a0adf04c861961b8e6cd72626db3d7d2e8ef8558903df895d182266eb419e75f6293524e690b45738902cb74ac79afe04a94f2a99 SHA512 d7f4c4c4f07e7f516fac55a58d83256f54566e0bce940d178e739b05c740abf842f6f343add927dd098546828547f16f3176e874fb8501e84d12ca7ead9fcb32
diff --git a/dev-lang/polyml/files/polyml-5.4.1-asm.patch b/dev-lang/polyml/files/polyml-5.4.1-asm.patch
deleted file mode 100644
index af8bd8d49149..000000000000
--- a/dev-lang/polyml/files/polyml-5.4.1-asm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- polyml.5.4.1-orig/libpolyml/x86asm.asm	2011-07-13 00:06:49.000000000 +1000
-+++ polyml.5.4.1/libpolyml/x86asm.asm	2012-01-08 16:00:09.740684843 +1100
-@@ -2714,4 +2714,7 @@
- 
- 
- ENDIF
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
- END
---- polyml.5.4.1-orig/libpolyml/power_assembly.S	2010-04-09 01:49:20.000000000 +1000
-+++ polyml.5.4.1/libpolyml/power_assembly.S	2012-01-08 15:46:35.006200143 +1100
-@@ -1735,3 +1735,6 @@
-     dd  Mask_assign_byte         /* 254 */
-     dd  Mask_assign_word         /* 255 */
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- polyml.5.4.1-orig/libpolyml/sparc_assembly.S	2010-08-13 01:01:36.000000000 +1000
-+++ polyml.5.4.1/libpolyml/sparc_assembly.S	2012-01-08 15:46:12.516642791 +1100
-@@ -1498,3 +1498,6 @@
-     .long   Mask_assign_byte         /* 254 */
-     .long   Mask_assign_word         /* 255 */
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/dev-lang/polyml/files/polyml-5.4.1-configure.patch b/dev-lang/polyml/files/polyml-5.4.1-configure.patch
deleted file mode 100644
index aaaed02f8e16..000000000000
--- a/dev-lang/polyml/files/polyml-5.4.1-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- polyml.5.4.1-orig/configure.ac	2010-09-03 21:22:40.000000000 +1000
-+++ polyml.5.4.1/configure.ac	2012-01-09 22:44:04.153668402 +1100
-@@ -321,7 +321,7 @@
- AC_ARG_WITH([portable],
-     [AS_HELP_STRING([--with-portable],
-               [Build the portable interpreter version of Poly/ML instead of native @<:@default=no@:>@])], [
--    ac_cv_with_portable=yes], [
-+    ac_cv_with_portable="$withval"], [
-     ac_cv_with_portable=no])
- 
- case "${host_cpu}" in
diff --git a/dev-lang/polyml/files/polyml-5.5.0-asm.patch b/dev-lang/polyml/files/polyml-5.5.0-asm.patch
deleted file mode 100644
index cffa627b9f32..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.0-asm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- polyml.5.5-orig/libpolyml/x86asm.asm	2012-05-03 21:07:59.000000000 +1000
-+++ polyml.5.5/libpolyml/x86asm.asm	2012-09-19 17:41:51.767737295 +1000
-@@ -3003,4 +3003,7 @@
-     dd  Mask_assign_byte         ;# 254
-     dd  Mask_assign_word         ;# 255
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
- END
diff --git a/dev-lang/polyml/files/polyml-5.5.0-configure.patch b/dev-lang/polyml/files/polyml-5.5.0-configure.patch
deleted file mode 100644
index 1a2e114e6503..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.0-configure.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-Index: polyml/configure
-===================================================================
---- polyml/configure	(revision 1599)
-+++ polyml/configure	(revision 1600)
-@@ -20870,10 +20870,8 @@
- # Check whether --with-portable was given.
- if test "${with_portable+set}" = set; then :
-   withval=$with_portable;
--    ac_cv_with_portable=yes
- else
--
--    ac_cv_with_portable=no
-+  with_portable=check
- fi
- 
- 
-@@ -20894,36 +20892,46 @@
- 
- $as_echo "#define HOSTARCHITECTURE_SPARC 1" >>confdefs.h
- 
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-             ;;
-       power* | ppc*)
- 
- $as_echo "#define HOSTARCHITECTURE_PPC 1" >>confdefs.h
- 
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-             ;;
-       arm*)
- 
- $as_echo "#define HOSTARCHITECTURE_ARM 1" >>confdefs.h
- 
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-             ;;
-       ia64*)
- 
- $as_echo "#define HOSTARCHITECTURE_IA64 1" >>confdefs.h
- 
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-         ;;
-       *) as_fn_error $? "Poly/ML is not supported for this architecture" "$LINENO" 5 ;;
- esac
- 
--# If we have explicitly set --with-portable or we are on a machine without
--# a code-generator set to use the interpreter.
--if test "$ac_cv_with_portable" = "yes"; then
-+# If we explicitly asked to use the interpreter set the architecture to interpreted.
-+if test "x$with_portable" = "xyes" ; then
-+    polyarch=interpret
-+fi
- 
-+# If we asked not to use the interpreter check we have native code support.
-+if test "x$with_portable" = "xno" ; then
-+    if test "x$polyarch" = "xinterpret" ; then
-+        as_fn_error $? "--without-portable was given but native code is not supported on this platform" "$LINENO" 5
-+    fi
-+fi
-+
-+# Set the define if this is the interpreter.  This is no longer actually used.
-+if test "x$polyarch" = "xinterpret" ; then
-+
- $as_echo "#define INTERPRETED 1" >>confdefs.h
- 
--       polyarch=interpret
- fi
- 
- # Put this test at the end where it's less likely to be missed.
-Index: polyml/configure.ac
-===================================================================
---- polyml/configure.ac	(revision 1599)
-+++ polyml/configure.ac	(revision 1600)
-@@ -368,10 +368,10 @@
- # Test the --with-portable option to build the interpreter even if
- # we have a code-generator.
- AC_ARG_WITH([portable],
--    [AS_HELP_STRING([--with-portable],
--              [Build the portable interpreter version of Poly/ML instead of native @<:@default=no@:>@])], [
--    ac_cv_with_portable=yes], [
--    ac_cv_with_portable=no])
-+            [AS_HELP_STRING([--with-portable],
-+              [Build the portable interpreter version of Poly/ML instead of native @<:@default=no@:>@])],
-+            [],
-+            [with_portable=check])
- 
- case "${host_cpu}" in
-       i[[3456]]86*)
-@@ -384,28 +384,39 @@
-             ;;
-       sparc*)
-             AC_DEFINE([HOSTARCHITECTURE_SPARC], [1], [Define if the host is a Sparc (32 bit)])
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-             ;;
-       power* | ppc*)
-             AC_DEFINE([HOSTARCHITECTURE_PPC], [1], [Define if the host is a Power PC (32 bit)])
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-             ;;
-       arm*)
-             AC_DEFINE([HOSTARCHITECTURE_ARM], [1], [Define if the host is an ARM (32 bit)])
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-             ;;
-       ia64*)
-             AC_DEFINE([HOSTARCHITECTURE_IA64], [1], [Define if the host is Itanium])
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-         ;;
-       *) AC_MSG_ERROR([Poly/ML is not supported for this architecture]) ;;
- esac
- 
--# If we have explicitly set --with-portable or we are on a machine without
--# a code-generator set to use the interpreter.
--if test "$ac_cv_with_portable" = "yes"; then
-+# If we explicitly asked to use the interpreter set the architecture to interpreted.
-+if test "x$with_portable" = "xyes" ; then
-+    polyarch=interpret
-+fi
-+
-+# If we asked not to use the interpreter check we have native code support.
-+if test "x$with_portable" = "xno" ; then
-+    if test "x$polyarch" = "xinterpret" ; then
-+        AC_MSG_ERROR(
-+            [--without-portable was given but native code is not supported on this platform])
-+    fi
-+fi
-+
-+# Set the define if this is the interpreter.  This is no longer actually used.
-+if test "x$polyarch" = "xinterpret" ; then
-        AC_DEFINE([INTERPRETED], [1], [Define if using the interpreter] )
--       polyarch=interpret
- fi
- 
- # Put this test at the end where it's less likely to be missed.
diff --git a/dev-lang/polyml/files/polyml-5.5.0-x-it-basis.patch b/dev-lang/polyml/files/polyml-5.5.0-x-it-basis.patch
deleted file mode 100644
index 2f6ce7b864bd..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.0-x-it-basis.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: polyml/mlsource/extra/XWindows/ml_bind.ML
-===================================================================
---- polyml/mlsource/extra/XWindows/ml_bind.ML	(revision 1600)
-+++ polyml/mlsource/extra/XWindows/ml_bind.ML	(revision 1601)
-@@ -2437,7 +2437,7 @@
- 
- exception XWindows = XWindows.XWindows;
- 
--let
-+local
-   open XWindows;
-   
-   fun printRect _ _ (r:XRectangle) =
-@@ -2447,6 +2447,6 @@
-     PolyML.PrettyString ("Rect " ^ PolyML.makestring R)
-   end;
- in
--  PolyML.addPrettyPrinter printRect
-+  val () = PolyML.addPrettyPrinter printRect
- end;
- 
diff --git a/dev-lang/polyml/files/polyml-5.5.1-inputN-return-for-zero-chars.patch b/dev-lang/polyml/files/polyml-5.5.1-inputN-return-for-zero-chars.patch
deleted file mode 100644
index 8f5b02ee9084..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.1-inputN-return-for-zero-chars.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://sourceforge.net/p/polyml/code/1875/
-Required for sci-mathematics/isabelle-2013.2
-
-------------------------------------------------------------------------
-r1875 | dcjm | 2013-10-30 10:49:05 -0600 (Wed, 30 Oct 2013) | 1 line
-
-Backport commit 1874 from trunk.  This fixes TextIO.inputN and StreamIO.inputN so they return immediately if the request is for zero characters.
-Index: polyml/basis/BasicStreamIO.sml
-===================================================================
---- polyml/basis/BasicStreamIO.sml	(revision 1851)
-+++ polyml/basis/BasicStreamIO.sml	(working copy)
-@@ -213,6 +213,8 @@
-         fun inputN (f, n) =
-         if n < 0
-         then raise Size
-+        else if n = 0 (* Defined to return the empty vector and f *)
-+        then (emptyVec, f)
-         else
-         let
-             val (vecs, f') = inputNList (f, n)
-Index: polyml/basis/TextIO.sml
-===================================================================
---- polyml/basis/TextIO.sml	(revision 1851)
-+++ polyml/basis/TextIO.sml	(working copy)
-@@ -597,6 +597,8 @@
-         |   inputN' n (ref(Direct(strm as {buffer, bufp, buflimit, ...}))) =
-             if n < 0 orelse n > CharVector.maxLen
-             then raise Size
-+            else if n = 0
-+            then "" (* Return the empty string without blocking *)
-             else if !buflimit = 0
-             then (* Last read returned end-of-file.  Clear the EOF state once
-                     we return this empty string. *)
diff --git a/dev-lang/polyml/files/polyml-5.5.1-optimize-closure.patch b/dev-lang/polyml/files/polyml-5.5.1-optimize-closure.patch
deleted file mode 100644
index 5b33203d69e1..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.1-optimize-closure.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-https://sourceforge.net/p/polyml/code/1869/
-Required for sci-mathematics/isabelle-2013.2
-
-------------------------------------------------------------------------
-r1869 | dcjm | 2013-10-11 05:59:58 -0600 (Fri, 11 Oct 2013) | 1 line
-
-Back-port commits 1855 and 1867 from trunk.  These fix two optimiser bugs.  Includes the regression tests.
-
-Index: polyml/mlsource/MLCompiler/CodeTree/CODETREE_OPTIMISER.sml
-===================================================================
---- polyml/mlsource/MLCompiler/CodeTree/CODETREE_OPTIMISER.sml	(revision 1851)
-+++ polyml/mlsource/MLCompiler/CodeTree/CODETREE_OPTIMISER.sml	(working copy)
-@@ -645,8 +645,9 @@
-                     (thisDec :: decs, thisArg @ args, LoadLocal newAddr :: mapList)
-                 end
- 
--            |   mapPattern(ArgPattCurry(currying, ArgPattTuple{allConst=false, filter, ...}) :: patts, n, m) =
--                (* It's a function that returns a tuple. *)
-+            |   mapPattern(ArgPattCurry(currying as [_], ArgPattTuple{allConst=false, filter, ...}) :: patts, n, m) =
-+                (* It's a function that returns a tuple.  The function must not be curried because
-+                   otherwise it returns a function not a tuple. *)
-                 let
-                     val (thisDec, thisArg, thisMap) =
-                         transformFunctionArgument(currying, [LoadArgument m], [LoadArgument n], SOME filter)
-@@ -657,7 +658,7 @@
- 
-             |   mapPattern(ArgPattCurry(currying as firstArgSet :: _, _) :: patts, n, m) =
-                 (* Transform it if it's curried or if there is a tuple in the first arg. *)
--                if List.length currying >= 2 orelse
-+                if (*List.length currying >= 2 orelse *) (* This transformation is unsafe. *)
-                    List.exists(fn ArgPattTuple{allConst=false, ...} => true | _ => false) firstArgSet
-                 then
-                 let
-@@ -685,6 +686,13 @@
- 
-             and transformFunctionArgument(argumentArgs, loadPack, loadThisArg, filterOpt) =
-             let
-+                (* Disable the transformation of curried arguments for the moment.
-+                   This is unsafe.  See Test146.  The problem is that this transformation
-+                   is only safe if the function is applied immediately to all the arguments.
-+                   However the usage information is propagated so that if the result of
-+                   the first application is bound to a variable and then that variable is
-+                   applied it still appears as curried. *)
-+                val argumentArgs = [hd argumentArgs]
-                 (* We have a function that takes a series of curried argument.
-                    Change that so that the function takes a list of arguments. *)
-                 val newAddr = ! localCounter before localCounter := ! localCounter + 1
-@@ -1214,9 +1222,11 @@
-                             let
-                                 fun checkArg (ArgPattTuple{allConst=false, ...}) = true
-                                         (* Function has at least one tupled arg. *)
--                                |   checkArg (ArgPattCurry(_, ArgPattTuple{allConst=false, ...})) = true
--                                        (* Function has an arg that is a function that returns a tuple. *)
--                                |   checkArg (ArgPattCurry(_ :: _ :: _, _)) = true
-+                                |   checkArg (ArgPattCurry([_], ArgPattTuple{allConst=false, ...})) = true
-+                                        (* Function has an arg that is a function that returns a tuple.
-+                                           It must not be curried otherwise it returns a function not a tuple. *)
-+                                (* This transformation is unsafe.  See comment in transformFunctionArgument above. *)
-+                                (*|   checkArg (ArgPattCurry(_ :: _ :: _, _)) = true *)
-                                         (* Function has an arg that is a curried function. *)
-                                 |   checkArg (ArgPattCurry(firstArgSet :: _, _)) =
-                                         (* Function has an arg that is a function that
-Index: polyml/Tests/Succeed/Test146.ML
-===================================================================
---- polyml/Tests/Succeed/Test146.ML	(revision 0)
-+++ polyml/Tests/Succeed/Test146.ML	(revision 1875)
-@@ -0,0 +1,24 @@
-+(* Bug in transformation of arguments which are curried functions.  It is not
-+   safe to transform "f" in the argument to "bar".  Although it is curried
-+   the application to the first argument "()" is not immediately followed
-+   by the application to the second. *)
-+
-+local
-+    val r = ref 0
-+in
-+    (* Foo should be called exactly once *)
-+    fun foo () = (r:= !r+1; fn i => i)
-+
-+    fun checkOnce () = if !r = 1 then () else raise Fail "bad"
-+end;
-+
-+fun bar f = let val r = f() in (r 1; r 2; List.map r [1, 2, 3]) end;
-+
-+bar foo;
-+
-+checkOnce();
-+
-+exception A and B and C;
-+fun rA () = raise A and rB () = raise B;
-+fun h (f, g) = let val a = f() in g(); a () end;
-+h(rA, rB) handle A => ();
-
-Property changes on: polyml/Tests/Succeed/Test146.ML
-___________________________________________________________________
-Added: svn:eol-style
-## -0,0 +1 ##
-+native
-\ No newline at end of property
-Index: polyml/Tests/Succeed/Test147.ML
-===================================================================
---- polyml/Tests/Succeed/Test147.ML	(revision 0)
-+++ polyml/Tests/Succeed/Test147.ML	(revision 1875)
-@@ -0,0 +1,31 @@
-+(* Bug in optimiser transformation.  A function argument that returns a tuple
-+   can be transformed to take a container but only if it is not curried. *)
-+
-+(* Cut down example from Isabelle that caused an internal error exception. *)
-+
-+fun one _ [] = raise Fail "bad"
-+  | one pred (x :: xs) =
-+      if pred x then (x, xs) else raise Fail "bad";
-+
-+fun foo (scan, f) xs = let val (x, y) = scan xs in (f x, y) end;
-+  
-+fun bar (scan1, scan2) xs =
-+  let
-+    val (x, ys) = scan1 xs;
-+    val (y, zs) = scan2 x ys;
-+  in ((x, y), zs) end;
-+
-+fun bub (scan1, scan2) = foo(bar(scan1, (fn _ => scan2)), op ^);
-+
-+val qqq: string list -> string * int = bub(one (fn _ => raise Match), (foo((fn _ => raise Match), String.concat)));
-+
-+(* Further example - This caused a segfault. *)
-+
-+PolyML.Compiler.maxInlineSize := 1;
-+fun f g = let val (x,y) = g 1 2 in x+y end;
-+
-+fun r (x, y, z) = fn _ => (x, y+z);
-+
-+val h: int-> int*int = r (4,5,6);
-+
-+f (fn _ => h);
-
-Property changes on: polyml/Tests/Succeed/Test147.ML
-___________________________________________________________________
-Added: svn:eol-style
-## -0,0 +1 ##
-+native
-\ No newline at end of property
diff --git a/dev-lang/polyml/files/polyml-5.5.2-r1952-check_for_negative_sized_array.patch b/dev-lang/polyml/files/polyml-5.5.2-r1952-check_for_negative_sized_array.patch
deleted file mode 100644
index 1451d2df8d84..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.2-r1952-check_for_negative_sized_array.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: polyml/basis/Array.sml
-===================================================================
---- polyml/basis/Array.sml	(revision 1951)
-+++ polyml/basis/Array.sml	(revision 1952)
-@@ -129,7 +129,7 @@
-      
-     fun array(len, a) =
-         let
--            val () = if len >= maxLen then raise General.Size else ()
-+            val () = if len < 0 orelse len >= maxLen then raise General.Size else ()
-             val vec = System_alloc(len+1, 0wx40, RunCall.unsafeCast a)
-         in
-             System_setw(vec, 0, RunCall.unsafeCast len);
diff --git a/dev-lang/polyml/files/polyml-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch b/dev-lang/polyml/files/polyml-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch
deleted file mode 100644
index 783577026f67..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Index: polyml/libpolyml/foreign.cpp
-===================================================================
---- polyml/libpolyml/foreign.cpp	(revision 1953)
-+++ polyml/libpolyml/foreign.cpp	(revision 1954)
-@@ -4,7 +4,7 @@
- 
-     Copyright (c) 2000-7
-         Cambridge University Technical Services Limited
--    Further development Copyright David C.J. Matthews 2008-2011.
-+    Further development Copyright David C.J. Matthews 2008-2014.
- 
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-@@ -251,6 +251,10 @@
- 
- static Volatile *vols;
- static PLock volLock; // Mutex to protect vols.
-+// TODO: There is a theoretical risk of deadlock if any ML allocation is made while this
-+// lock is held.  An allocation can result in a GC which requires all threads to release
-+// ML memory but another thread could block waiting for the mutex.
-+// N.B. raising an exception involves an allocation.
- 
- #define FIRST_VOL 0
- 
-@@ -268,24 +272,8 @@
- static unsigned callBackEntries = 0;
- static PLock callbackTableLock; // Mutex to protect table.
- 
--
- /**********************************************************************
-  *
-- *  Malloc / Free Wrappers
-- *   
-- **********************************************************************/
--
--static POLYUNSIGNED malloc_count = 0;
--#if 0
--#define Vmalloc(where,size) {where = malloc(size); printf("malloc: %p,%d\n",where,size); fflush(stdout); malloc_count++;}
--#else
--#define Vmalloc(where,size) {where = malloc(size); malloc_count++;}
--#endif
--#define Vfree(p) { free(p);  malloc_count--;}
--
--
--/**********************************************************************
-- *
-  *  Volatile Allocation
-  *   
-  **********************************************************************/
-@@ -349,8 +337,12 @@
-     PLocker plocker(&volLock);
-     Handle res = vol_alloc(taskData);
-     trace(("size= %" POLYUFMT "\n",size));
--    Vmalloc( C_POINTER(UNVOLHANDLE(res)), size );
-+    void *p = malloc(size);
-+    if (p == 0)
-+        RAISE_EXN("Insufficient memory");
-+    C_POINTER(UNVOLHANDLE(res)) = p;
-     OWN_C_SPACE(UNVOLHANDLE(res)) = true;
-+
-     return res;
- }
- 
-@@ -685,7 +677,7 @@
-             {
-                 // Can now free this.            
-                 trace(("Freeing malloc space of <%" POLYUFMT ">\n",from));
--                Vfree(vols[from].C_pointer);
-+                free(vols[from].C_pointer);
-                 vols[from].C_pointer = 0;
-                 vols[from].Own_C_space = false;
-             }
-@@ -702,7 +694,6 @@
-         }
-     }
-     next_vol = to;
--    info(("unfreed mallocs=<%" POLYUFMT "> next_vol=<%" POLYUFMT ">\n", malloc_count, next_vol));
-     
-     /* Callback table.  Added DCJM 12/4/04.  We always process these as strong references.
-     For the time being at any rate we treat these as permanent entries so that once a
-@@ -910,8 +901,9 @@
-         RAISE_EXN("libffi error: ffi_prep_cif failed");
- 
-     // malloc memory for the result
--    void *result;
--    Vmalloc(result, result_type->size);
-+    void *result = malloc(result_type->size);
-+    if (result == 0)
-+        RAISE_EXN("Insufficient memory to allocate space for result");
- 
-     processes->ThreadReleaseMLMemory(taskData);
-     ffi_call(&cif, sym, result, arg_values);
-@@ -1580,6 +1572,9 @@
- 
-     unsigned num_args = length_list(argTypeList->Word());
-     ffi_type **arg_types = (ffi_type**)malloc(num_args * sizeof(ffi_type*));
-+    if (arg_types == 0)
-+        RAISE_EXN("Insufficient memory to allocate space for arguments");
-+
-     PolyWord p = argTypeList->Word();
-     for (POLYUNSIGNED i=0; i<num_args; i++,p=Tail(p))
-         arg_types[i] = ctypeToFfiType(taskData, Head(p));
-@@ -1587,6 +1582,9 @@
- 
-     // The cif needs to be on the heap so that it is available in the callback.
-     ffi_cif *cif = (ffi_cif *)malloc(sizeof(ffi_cif));
-+    if (cif == 0)
-+        RAISE_EXN("Insufficient memory to allocate space for cif");
-+
-     if (ffi_prep_cif(cif, abi, num_args, result_type, arg_types) != FFI_OK)
-         RAISE_EXN("libffi error: ffi_prep_cif failed");
- 
diff --git a/dev-lang/polyml/files/polyml-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch b/dev-lang/polyml/files/polyml-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch
deleted file mode 100644
index 36c82947f37b..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: polyml/libpolyml/gc_mark_phase.cpp
-===================================================================
---- polyml/libpolyml/gc_mark_phase.cpp	(revision 2006)
-+++ polyml/libpolyml/gc_mark_phase.cpp	(revision 2007)
-@@ -130,13 +130,6 @@
-                     if (locPtr == LARGECACHE_SIZE) locPtr = 0;
-                     largeObjectCache[locPtr].base = obj;
-                     largeObjectCache[locPtr].current = currentPtr;
--                    // To try to narrow down a bug that results in the ASSERT failing,
--                    // add these extra checks.
--                    POLYUNSIGNED lengthWord = obj->LengthWord();
--                    ASSERT (OBJ_IS_LENGTH(lengthWord));
--                    POLYUNSIGNED length = OBJ_OBJECT_LENGTH(lengthWord);
--                    ASSERT(length == originalLength);
--                    ASSERT(currentPtr > (PolyWord*)obj && currentPtr < ((PolyWord*)obj)+length);
-                 }
-             }
-             else StackOverflow(obj);
-@@ -579,6 +572,8 @@
-     ASSERT(nInUse == 0);
-     MTGCProcessMarkPointers *marker = &markStacks[0];
-     marker->active = true;
-+    marker->locPtr = 0;
-+    marker->largeObjectCache[0].base = 0;
-     nInUse = 1;
- 
-     // Scan the permanent mutable areas.
diff --git a/dev-lang/polyml/files/polyml-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch b/dev-lang/polyml/files/polyml-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch
deleted file mode 100644
index 0629f12f72ca..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: polyml/libpolyml/gc_mark_phase.cpp
-===================================================================
---- polyml/libpolyml/gc_mark_phase.cpp	(revision 2008)
-+++ polyml/libpolyml/gc_mark_phase.cpp	(revision 2009)
-@@ -176,6 +176,16 @@
-     // Clear the mark stack
-     for (unsigned i = 0; i < MARK_STACK_SIZE; i++)
-         markStack[i] = 0;
-+    // Clear the large object cache.  Actually only largeObjectCache[0].base
-+    // needs to be set to zero and for the objects allocated on the heap it is
-+    // cleared before each GC in either MarkRoots or MarkPointersTask.
-+    // The remianing case is the RescanMarked sub-class which is allocated on the stack
-+    // but it doesn't hurt to clear it in all cases.
-+    for (unsigned j = 0; j < LARGECACHE_SIZE; j++)
-+    {
-+        largeObjectCache[locPtr].base = 0;
-+        largeObjectCache[locPtr].current = 0;
-+    }
- }
- 
- // Called when the stack has overflowed.  We need to include this
diff --git a/dev-lang/polyml/polyml-5.4.1.ebuild b/dev-lang/polyml/polyml-5.4.1.ebuild
deleted file mode 100644
index 022401f5434b..000000000000
--- a/dev-lang/polyml/polyml-5.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base autotools
-
-MY_P=${PN}.${PV}
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="https://www.polyml.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="X elibc_glibc +gmp portable test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="X? ( x11-libs/motif:0 )
-		gmp? ( >=dev-libs/gmp-5 )
-		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=("${FILESDIR}/${PN}-5.4.1-configure.patch"
-	"${FILESDIR}/${PN}-5.4.1-asm.patch")
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with X x) \
-		$(use_with gmp) \
-		$(use_with portable) \
-		$(use_with threads)
-}
-
-src_test() {
-	emake tests
-}
diff --git a/dev-lang/polyml/polyml-5.5.0.ebuild b/dev-lang/polyml/polyml-5.5.0.ebuild
deleted file mode 100644
index 3cde23196400..000000000000
--- a/dev-lang/polyml/polyml-5.5.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base autotools versionator
-
-# Although the download is called 5.5, after building it poly -v says
-# it is 5.5.0.
-MY_PV=$(get_version_component_range "1-2" "${PV}")
-MY_P="${PN}.${MY_PV}"
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="https://www.polyml.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="X elibc_glibc +gmp portable test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="X? ( x11-libs/motif:0 )
-		gmp? ( >=dev-libs/gmp-5 )
-		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
-		virtual/libffi"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=("${FILESDIR}/${PN}-5.5.0-configure.patch"
-	"${FILESDIR}/${PN}-5.5.0-x-it-basis.patch"
-	"${FILESDIR}/${PN}-5.5.0-asm.patch")
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-system-libffi \
-		$(use_with X x) \
-		$(use_with gmp) \
-		$(use_with portable) \
-		$(use_with threads)
-}
-
-src_test() {
-	emake tests
-}
diff --git a/dev-lang/polyml/polyml-5.5.1.ebuild b/dev-lang/polyml/polyml-5.5.1.ebuild
deleted file mode 100644
index 0ceb98cb5d9c..000000000000
--- a/dev-lang/polyml/polyml-5.5.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base autotools pax-utils
-
-MY_P="${PN}.${PV}"
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="https://www.polyml.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="X elibc_glibc +gmp portable test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="X? ( x11-libs/motif:0 )
-		gmp? ( >=dev-libs/gmp-5 )
-		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
-		virtual/libffi"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	# Bug 256679 - patch the assembler code.  The remaining executable stacks in ./.libs/poly
-	# comes from the polyml generated ./polyexport.o file.
-	"${FILESDIR}/${PN}-5.5.0-asm.patch"
-	# https://sourceforge.net/p/polyml/code/1875/ for isabelle-2013.2
-	"${FILESDIR}/${PN}-5.5.1-inputN-return-for-zero-chars.patch"
-	# https://sourceforge.net/p/polyml/code/1869/
-	# Adds Test146.ML that fails, applying it anyway as it is required by
-	# sci-mathematics/isabelle-2013.2
-	"${FILESDIR}/${PN}-5.5.1-optimize-closure.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-	if [ -f "${S}/Tests/Succeed/Test146.ML" ]; then
-		mv "${S}/Tests/Succeed/Test146.ML" "${S}/Tests/Succeed/Test146.ML.disable-test-as-it-fails"
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--disable-static \
-		--with-system-libffi \
-		$(use_with X x) \
-		$(use_with gmp) \
-		$(use_with portable) \
-		$(use_with threads)
-}
-
-src_compile() {
-	# Bug 453146 - dev-lang/polyml-5.5.0: fails to build (pax kernel?)
-	pushd libpolyml || die "Could not cd to libpolyml"
-	emake
-	popd
-	emake polyimport
-	pax-mark m "${S}/.libs/polyimport"
-	emake
-	pax-mark m "${S}/.libs/poly"
-}
-
-src_test() {
-	emake tests
-}
diff --git a/dev-lang/polyml/polyml-5.5.2.ebuild b/dev-lang/polyml/polyml-5.5.2.ebuild
deleted file mode 100644
index 0cb11d7b3447..000000000000
--- a/dev-lang/polyml/polyml-5.5.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base autotools pax-utils
-
-MY_P="${PN}.${PV}"
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="https://www.polyml.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="X elibc_glibc +gmp portable test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="X? ( x11-libs/motif:0 )
-		gmp? ( >=dev-libs/gmp-5 )
-		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
-		virtual/libffi"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	# Bug 256679 - patch the assembler code.  The remaining executable stacks in ./.libs/poly
-	# comes from the polyml generated ./polyexport.o file.
-	"${FILESDIR}/${PN}-5.5.0-asm.patch"
-	# Patches from https://sourceforge.net/p/polyml/code/HEAD/tree/fixes-5.5.2
-	# which are required to build and run sci-mathematics/isabelle-2015
-	"${FILESDIR}/${PN}-5.5.2-r1952-check_for_negative_sized_array.patch"
-	"${FILESDIR}/${PN}-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch"
-	"${FILESDIR}/${PN}-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch"
-	"${FILESDIR}/${PN}-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-	if [ -f "${S}/Tests/Succeed/Test146.ML" ]; then
-		mv "${S}/Tests/Succeed/Test146.ML" "${S}/Tests/Succeed/Test146.ML.disable-test-as-it-fails"
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--disable-static \
-		--with-system-libffi \
-		$(use_with X x) \
-		$(use_with gmp) \
-		$(use_with portable) \
-		$(use_with threads)
-}
-
-src_compile() {
-	# Bug 453146 - dev-lang/polyml-5.5.0: fails to build (pax kernel?)
-	pushd libpolyml || die "Could not cd to libpolyml"
-	emake
-	popd
-	emake polyimport
-	pax-mark m "${S}/.libs/polyimport"
-	emake
-	pax-mark m "${S}/.libs/poly"
-}
-
-src_test() {
-	emake tests
-}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 5a7f8664693c..5cf76d366b3b 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -7,6 +7,7 @@ DIST Python-3.7.8.tar.xz 17399552 BLAKE2B 4bf6c47b1132b6d31a79232002c4d38e2cd123
 DIST Python-3.7.9.tar.xz 17389636 BLAKE2B 484833aa2aa4e29051a02969294f72099ff6f1a47d944b1a0dd15f8e6c22a0406d551bcbcd1048cf89defedaccf060733211e34b38e31fd8391dd823eaa35bc0 SHA512 e4217b25529b5336e43b63d17f3758a8177a58184564cf02bd92a312f58dba9e096485c9e3cb3544f966e847ea15b3ab30ed065d28a6ca52a6d7e0faddf7d9f9
 DIST Python-3.8.4.tar.xz 18020412 BLAKE2B cfcfb293c413b25fc3ca48116cf8ffaba7bee18e9af9accf26be9b4373a0c62dd8e9da70e5a8a38ba6da4d1afbdbd589ae5ea4b618b65130ae061698b445908c SHA512 37a36d014a8372742be9d0bd9dd3a275e100dc21b1515c145bc62425d4d157327b6e63ad99bc888c0b36c1da4c05676c40eb086e75072d1906e3210ec3043dcb
 DIST Python-3.8.5.tar.xz 18019640 BLAKE2B bb3e0566afe28759e4ab129ad0986a0fc5103514f2e2b22ff4aa3973c3173ebdd24d4267fbaf903841814a611fd9ea122673e5a1918934366e5c0efaef9d7517 SHA512 460cee65d7df7150694590575502d7f22e548ebfc99c8f8b363eef8bf30ee72e58d8ffacb1d607824f877f880eb9fd6775a508388029583e1e1df3380f3f9587
+DIST Python-3.8.6.tar.xz 18233864 BLAKE2B c8a8ef6055e344dda30eb808804cfa62016b4f840257cffd5a495e5932f5696e50579d49b8181a487c9cd4a89bdb95656e80981039783a21d20f7980aa2c9883 SHA512 22faec84f6e172e1ac7c6bd6fd37e9b6ae4afc91cf5136aa8cac8ebbed8d18793f9196e8749b8ccc43447cb6c41cb450f65ea72dd363c06dfaeb14e0455f5560
 DIST Python-3.9.0rc1.tar.xz 18798364 BLAKE2B 2ebf669720bcc057f7e1056aca6ff42686a8e567a5ea10304f19e53ae80ba6ba60b9157ae401427be4afa1ec296d97bb81a2b55c60a4df3dba39ae545484e0fc SHA512 8fddf940600bdd4096c0144f689fb9e803bdc7a1ee00f46ccfde3566342ed465c7ac6806613e4f61440fb65f8f83057204bd0dc432ac379759cd4d410c151eef
 DIST Python-3.9.0rc2.tar.xz 18802576 BLAKE2B fa39f359ca79db83873a9a05c07b3915e759df887c80835f6d0db0e4906f919677c3cac23b83aeb7397800107207f742a876efa8dd74a2bf3b418fd1b05df069 SHA512 77aced89518d86c1fb0e48a96be135c8385f6fb912543f7bb8e792b15ca0d59005269a4c35d4185d31536980572f8fa0adee022a572a268e1f8e9832a052ef5c
 DIST python-gentoo-patches-2.7.18-r1.tar.xz 15500 BLAKE2B 7008b29827dbbd80d4ab8f010ccf9efced99c6b4b9109e4430c0ba269ce53529cb6fedd832502c8d2d3aa21938749cc3591c2545b21c0a59a6e60f8598e84ccc SHA512 e656ab07281fd932b92165674619bbf55ecf410d2937ae4ae771d490b4532540498cc731d30d19c1e8aafd1f64df8a406bbfbb46ea985b3dcd8edb89a0b7f20f
@@ -18,6 +19,7 @@ DIST python-gentoo-patches-3.7.8-r3.tar.xz 13232 BLAKE2B 9df47b1f61d08f62a80221b
 DIST python-gentoo-patches-3.7.9.tar.xz 10588 BLAKE2B f60c8500671e7e3977412474c838905846e0609a7fdac787f2c6a8bfa53c887dcfd3466c5276772ffb8c20205e8b3f207f7d148c04524f19d095964b519da62d SHA512 11f411eb2d59fd45fbd80bdb1d1a83d413770779244045006942c5cb84837cba606673bcde102ae03b1d4579f526b551c93a64d39dba530b4584ba8dd8e9f13e
 DIST python-gentoo-patches-3.8.4-r2.tar.xz 12660 BLAKE2B 3197edc6beb2b1be05399f268ff9b337ed67f699e3867160fea8e50f763a62b184ddd7adcdfa55dafc8c14f91e020b409461027361d04858db667992794b1168 SHA512 c56adbec04bfb950f7fb65f38cc0b78eaae9783800c755b7ac934b07725fcf4d69bbc2c29f7d1255acd6e88559a216dc8a6088042a479aa0d453b706e318c0cf
 DIST python-gentoo-patches-3.8.5.tar.xz 11280 BLAKE2B 163c577da75f4ec0ebe86b5a08bea96d5ae406020bd211439b1405c0f8a5dddc9422a9ea5b16eed195433cbec010d9def3126a578d3f9716325482216b9e4d62 SHA512 6b7f72b8deb87fb7a169e97391185823984b5e9c99ec5232504c670843fbe0ca76afe32fc3fbe1f850ec6c42e9325cf4697022f36f7b00a4028b324069dd4d5b
+DIST python-gentoo-patches-3.8.6.tar.xz 10956 BLAKE2B e3241d97f886d0a37f85735102db8f00902df59ee12e8501b6c7f549dd4b26a6289bf34ff8dba02b369ed7875fad3d18e177afe9e367db4cb06f2ee908482f9e SHA512 7afa8e54f7b7e6ab35edc16d4214384b8ad8a03068d1984656876d6477b278af931e8c797d03d1bed2f10f9d58ac387db1a43921e54fb17cf4b779f33820abc0
 DIST python-gentoo-patches-3.9.0rc1.tar.xz 8856 BLAKE2B 7bd032dfd047640c6a53633b5b9ee7b24199106b985230f772dda978d3b79fe0406eea64c4a842603a20afb71a90469befa7ec59a5ef1f793e4c901aa85952d1 SHA512 85a7d4397abf2a0f3c3d07a94a3e184ba3dcb347f3b70ee2cb77e81aac63846b01323a0228afd0fd1d32b3cafb64b18f82e6f5bfd88e4d564261ddae11e747eb
 EBUILD python-2.7.18-r1.ebuild 10596 BLAKE2B 2aa1a8152a9fd960de4dbc37e3b959d412855e3901c946783b908feeaf25af6333a5d375a26eef50436b8c5167019c7c7b5e0610787850f73b57ee6a4814fe65 SHA512 cdc9dafd0fadd459a4a8d22c5dc7b89fc125ca13ee3ca45166416acc26628b7f97478b4efd9e976177e209b1e2fa592a5034c79f343096053f4ddd790424f0d7
 EBUILD python-2.7.18-r2.ebuild 10598 BLAKE2B da6ce13402115486dac4e869dfec74cc3e8a0f25311d20769da2da4da8a48f7cc9741d16f25d2a957929523b50c410a57eb2d88f6a3ee0c835a6c76cf94067f4 SHA512 84785d05fa0266891e66b9bd6f86dd881260c70aceca425ade838e42ca932705b5fe0eb4380db7dd5405619f1a4d6ad0f0b1e2e27c5245c7910d4507eac89d12
@@ -28,6 +30,7 @@ EBUILD python-3.7.8-r2.ebuild 10157 BLAKE2B 9d802985fd19463a82452e390a7c20144c83
 EBUILD python-3.7.9.ebuild 10158 BLAKE2B 7a4d34bb98b2e9fa552982909aa7929605c3c35416b1c1008ed6f58be9fb19324d5278668fa654190eefe235d019b65e12db9210e89147a9c18a792710624ae4 SHA512 4cf310237bbbe00b916caa4c70c8b5a8abb1f0832968f79e80776c33c13c8ef4ac2605262c797c95c6796509e8f9841a17aedaf7ac9969bd6efd3b12532cddf2
 EBUILD python-3.8.4-r1.ebuild 9928 BLAKE2B 9ebf074bef412756a79b6a9995f8eebdb92239e0558101b873e5d81a3ce74ef8bdcd0fcfb12f93a5d684d919b840912f91213351ef2db4e634feb00e3071ca81 SHA512 c3f9125df55adada570e75a521017e503e095335f98ef899b9d932ac731af8e21487e0710a70572c2766193ed02cc1e32f2350b457add36519762607c131a629
 EBUILD python-3.8.5.ebuild 10257 BLAKE2B cd47eea37fd760e8d295fabab6202a6cba3d34bd74735bc4ba1ee79c91fb5ca369ac0d1bc7eafc58d1caa7af9ae1235f0da16ce0f3b29aaa4aacafec87532375 SHA512 f98dc41b5565e712fb290633b13a86526edd85714840d3ad7b7f53c22283cc589fe740cb3dbffa4a4b06aabee76983863484395ec524a01db110ac69d0d62419
+EBUILD python-3.8.6.ebuild 10264 BLAKE2B e5944d7a4541e80ca09c5338e5a4bbe262e818f2c9f5f8e1f0a70215689077b60afd26f0b1f93ceabc160104cf4fc60d305776682b5a1e8e79e3932a97feb434 SHA512 8450971ec472fff9df800c45cda50c98874cceef811ee46e58eed1358bdab6c598cecb94a1087879e2bbd74d298d04e5fb6280dad7399281df570903cc2ddd71
 EBUILD python-3.9.0_rc1.ebuild 9542 BLAKE2B 8185c40c749ce46f8bcadccf0da4f6f67d7b134cf3c145d5d7aecde49bbe1fd3aef035362b6d96c1cae596d91df58daeb2d504713cce5ab93a4b02f650bdf438 SHA512 5ac13c9dbb331b6eb50314770623ca29c7bb1fff15177845b0d2a67c82795062b6fc02d274364d9ecd58a5e9d4caf23350df414b46d7c483a90e178916c9bce9
 EBUILD python-3.9.0_rc2.ebuild 9542 BLAKE2B 7534f920099c3cfe5293ba093496a5858e4107f8e9e7f885c62a8d70e2c7ae4a0185b28d3753d07809b8bc99dc71ee7c4aef94880989ff43fc43fd77cbcae076 SHA512 f4fbf2530ea2c7c64d2aedaaa05890977d45709b5d6bfea2e8bf417996e59f6f8be41ac59b8811fc105b7c6f13ecb8b514fa7c4643a6871286f974190897db09
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-3.8.6.ebuild b/dev-lang/python/python-3.8.6.ebuild
new file mode 100644
index 000000000000..cb6c8db09403
--- /dev/null
+++ b/dev-lang/python/python-3.8.6.ebuild
@@ -0,0 +1,355 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+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:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+	virtual/pkgconfig
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	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
+		$(use_enable ipv6)
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# 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
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# 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
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || 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 "${S}"/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"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${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
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || \
+			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || \
+			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
+	then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/snobol/Manifest b/dev-lang/snobol/Manifest
index e181e0d060c3..512693acc1ef 100644
--- a/dev-lang/snobol/Manifest
+++ b/dev-lang/snobol/Manifest
@@ -1,5 +1,3 @@
-DIST snobol4-1.1.tar.gz 677333 BLAKE2B a6ccecaa66657438b2c05dfca9f7db95270b4d1a3502ad06c8d217d50d54ac33b0195eb8b2e045ac0b6c49c19a5bf3ee46e4a35b45555d67fc669317c7a5db2b SHA512 ae8482bc64f3d9020dc4d7e390296114e7498ef2764ebb69b6c4960d0c1b01daf4d77dff1aa583231a7f50d4c54f7f72cedc3e4744b03f4b2370fa6de837a3cc
 DIST snobol4-1.4.1.tar.gz 736837 BLAKE2B bb86d2cd3788ad66b7246d86ebd9f289189f5bd059238d2df3fb621aa4a1e910a8ad029f482077eb78916a84c3a28d868e8ac6eef83b48d7f09a8964c57a855d SHA512 5413af10018141e93f05c9ea637711bb3981f2b67557691d05dde8911178d90900f0fdef6c1d2416ebdda6afeeabd21b9e371b6711b2d093df629cc865fc61f9
-EBUILD snobol-1.1.ebuild 1434 BLAKE2B 77b38c81c661e550885fdb8cb7fb9f07e84cb30be582f8032733e7de30baf384f665334ed5006a4ed5b940c8c4431555523def324c931d36a14f083d62a1c431 SHA512 151cc5ab28dbe1ebbfe2fd48ac6e69ff6bcfbc51a90ea311a2031eb86ac91dd9f0367a728ae33d719b830116fbf776a65d5c74157fa56dceebfe7af7324871c2
 EBUILD snobol-1.4.1.ebuild 1293 BLAKE2B 8181290a619a940f1b7c9d4b2009dedccc2f43244a439418da099520ae9c352f1ec20f5913695f436c879dbd30112d794c9ba658a1cf338f74cf44a2a780a186 SHA512 4a967e0d6a91cd6ff86f4ee7f025a9cd18420f8f71404ff08c5ecbf5b9a4849856c9b700ce05f4cd94a63ae65d45d93d1a10dc823f23011249f078e94bf16a91
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/dev-lang/snobol/snobol-1.1.ebuild b/dev-lang/snobol/snobol-1.1.ebuild
deleted file mode 100644
index 562b03b8eecd..000000000000
--- a/dev-lang/snobol/snobol-1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Phil Budne's port of Macro SNOBOL4 in C, for modern machines"
-HOMEPAGE="http://www.snobol4.org/csnobol4/"
-MY_PN="snobol4"
-MY_P="${MY_PN}-${PV}"
-#SRC_URI="ftp://ftp.snobol4.org/snobol4/${MY_P}.tar.gz ftp://ftp.ultimate.com/snobol/${MY_P}.tar.gz"
-SRC_URI="ftp://ftp.snobol4.org/snobol/old/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="sys-devel/gcc
-		sys-devel/m4"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	#export CFLAGS="-O0 -pipe"
-	sed -i.orig -e '/autoconf/s:autoconf:./autoconf:g' \
-		-e '/ADD_LDFLAGS/s/-ldb/-lndbm/' \
-		"${S}"/configure
-	echo "ADD_OPT([${CFLAGS}])" >>${S}/local-config
-	echo "ADD_CPPFLAGS([-DUSE_STDARG_H])" >>${S}/local-config
-	echo "ADD_CPPFLAGS([-DHAVE_STDARG_H])" >>${S}/local-config
-	echo "BINDEST=${EPREFIX}/usr/bin/snobol4" >>${S}/local-config
-	echo "MANDEST=${EPREFIX}/usr/share/man/man4/snobol4.1" >>${S}/local-config
-	echo "SNOLIB_DIR=${EPREFIX}/usr/lib/snobol4" >>${S}/local-config
-}
-
-src_configure() {
-	# WARNING
-	# The configure script is NOT what you expect
-	:
-}
-
-src_compile() {
-	emake
-	emake doc/snobol4.1
-}
-
-src_install() {
-	into /usr
-	newbin xsnobol4 snobol4
-	dodir /usr/lib/snobol4
-	insinto /usr/lib/snobol4
-	doins snolib.a snolib/bq.sno
-
-	doman doc/*.1
-	dohtml doc/*.html
-	rm doc/*.html
-	dodoc doc/*.ps doc/*.txt doc/*.pdf
-}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 9f47de16747f..3b77706f7cef 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -8,7 +8,9 @@ AUX spidermonkey-perl-defined-array-check.patch 341 BLAKE2B e11a74cc2afbea5e39ec
 DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7 SHA512 9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128
 DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c SHA512 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
 DIST firefox-78.2.0esr.source.tar.xz 331996944 BLAKE2B bd16877d078de66a418ae114c534b26313f112b9e40ad5cf112fb07a4d7335dc47071ee6e959e3e4c179b95afbdc5ab9cda7cdefa96355dbbaf6b75c7805d171 SHA512 38f91a24634ce5d0c10340c9ac762071f8488f4bd7649bff9ed9cb1cbecda23e207b593118d38488810540e63be39d9c1c45c3b9a6acb477b6b2edf636e56d5b
+DIST firefox-78.3.0esr.source.tar.xz 331073228 BLAKE2B 01f3d3c0b8b963dedfa89631c518225104c739637a8bf22c121e3a942fa0b1d1f8cf1c4c2edad2e823e0e3922f865cc8d3430c6fc9246deea855295eaff84a0e SHA512 89e12797429d99760b294e302d803432f533b7c2c10f1fcd3781b89b27ec9698173d4fbf1bfe7506186602daf6666c09152407ce5668fb5b7391e38b5566f2f2
 DIST firefox-esr-78-patches-01.tar.xz 30808 BLAKE2B c3005a04233462c800ff0da7ba5e4f1e4d350c21e2642a93aa48637fcc19b8c0e97222669629a152ad6403652f83d4fdf3191b3c2741dca5327b101ef491d962 SHA512 7b2aba8dd4ff2f8ac3236ae95eec73aff3560e8f11f170f09b28ae2c7681dc0220ac63724a331dcc792c86e73145acee173a19bce5fcf995ba40ed5d067e1eff
+DIST firefox-esr-78-patches-02.tar.xz 36288 BLAKE2B f177027ea550b4f41616c104865a4d1a99fa0a84ca431176b5191107f23b2fcdd8361ad97493d3182d01dfeb7f2805caf16725b8a81bf1f7847cf400f87018d6 SHA512 7eff0a4f5d2b4abcb0293877b3fe562b5fa2581f46b4905ff8ad839559049e4d903dcca4aad6a7196720cc7b3cd93ae88ca0093da51f70e56609faaadf646c78
 DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
 DIST mozjs-52.9.1pre1.tar.bz2 30178574 BLAKE2B 0920432b5140e78297a9bcbccb54268d75a223d5e75e4ff90b3b01aab4f7736b4a4e05c47b3a925ff0a74607a0abad3b6583c75d070ef5142009b20ebaf6e4bf SHA512 187b231b246a5ae09e55c0fef77866b316d75f38f4c2e066d5d4325d8da63433027020c929439cab46af3253ac63ab2f780223a8fd2c6ff535b3409bb6c4aa0f
 DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0
@@ -22,4 +24,5 @@ EBUILD spidermonkey-52.9.1_pre1-r2.ebuild 4592 BLAKE2B 506e6a1958e0c4cd7f3898410
 EBUILD spidermonkey-60.5.2_p0-r4.ebuild 4238 BLAKE2B a5f3d1bcb0c12a678795d2e632822687e2d025bbb679daf0a5ffc2d262118bd5120f0a112ed39cf1feda178b609c6a2395e3d424c9e796b824a048bcb7385deb SHA512 3961fce1b9984e3929005a4d0ce3e0494ff1de7d42d07c70023b57d4e45f2d3cca1c6c8d8c803b95dcacf5a56ef9a66a339fe891bef594d079f275861d16b035
 EBUILD spidermonkey-68.12.0.ebuild 6847 BLAKE2B 686cb9a7c48fce686c33b62398a9a5a87c6447ceb19d7a2eb7b90ce122cd5ae65f6a2238a0fc082bf034944e4f856ae86811299ad1e6a848bff74995e7435d0b SHA512 d35822d650390c09fd89e118933ae4261237c38350e2185cc628ff25b5568b86e009834961f19afdbdb920b9f2df10606ba75fbe375b95a7399921979c6f7d9f
 EBUILD spidermonkey-78.2.0.ebuild 7024 BLAKE2B abaefb9e14eed44068f4e2f5c40497a363e093c2baf533af3d69aa63260e174e8d3371dcecab54ff85a1ab6f2f51d198a2ddc2650df0d84b9c084ffd5ce7d965 SHA512 0c2943adfb48663bc174e31bfaaf65f485577447ba1c326a2112a13bf5753f3406400dcf3aff59973ec269324b9356fed20c06c4717691475c558ae8c8a0e06e
+EBUILD spidermonkey-78.3.0.ebuild 7032 BLAKE2B 7d7152dfbc2d7c059fc5debd21615ad680cabdbc0eef432cbe5a981c02586153c9f72ec2f8d82efd7f357402ac3999a5a08a1d313a3bc0540361e0350319a4aa SHA512 b7079d75dcc81455b2d81be19183a75efb192a949a748c5d3476032a2332960883d2a2b5f93011f67bcc8d4cee9aa49ae2a83be8ce917a0f7816eccb7df9b7a3
 MISC metadata.xml 744 BLAKE2B d495aa93bf62337ed6ba895708caa6215e23d50c54c64ea34b1be76d06f5b53fc08da5b314130345f91a96fb9427f87f044289337d98f54a3b4d80ae237ff5ab SHA512 9e6e220335341133f35dd78ced565fd6ee1951f968388913097453eca7bd78cc3bc7a54245b6d28a2dda398160215d799d89ea367df4d587fb23287990ee3956
diff --git a/dev-lang/spidermonkey/spidermonkey-78.3.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.3.0.ebuild
new file mode 100644
index 000000000000..beec62444260
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-78.3.0.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+WANT_AUTOCONF="2.1"
+
+inherit autotools check-reqs multiprocessing python-any-r1 toolchain-funcs
+
+MY_PN="mozjs"
+MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
+
+MY_MAJOR=$(ver_cut 1)
+
+MOZ_ESR="1"
+
+# Convert the ebuild version to the upstream mozilla version
+MOZ_PV="${MY_PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+FIREFOX_PATCHSET="firefox-esr-78-patches-02.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-01.tar.xz"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/releases"
+MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
+
+if [[ "${PV}" == *_rc* ]]; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/firefox-${MOZ_PV}.source.tar.xz"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}
+	https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_URI}
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~x86"
+
+SLOT="78"
+LICENSE="MPL-2.0"
+IUSE="cpu_flags_arm_neon debug +jit test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/llvm
+	>=virtual/rust-1.41.0
+	virtual/pkgconfig"
+
+CDEPEND=">=dev-libs/icu-67.1:=
+	>=dev-libs/nspr-4.25
+	sys-libs/readline:0=
+	>=sys-libs/zlib-1.2.3"
+
+DEPEND="${CDEPEND}
+	test? (
+		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	)"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/firefox-${MY_PV}/js/src"
+
+python_check_deps() {
+	if use test ; then
+		has_version "dev-python/six[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_pretend() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="6400M"
+	else
+		CHECKREQS_DISK_BUILD="5600M"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="6400M"
+	else
+		CHECKREQS_DISK_BUILD="5600M"
+	fi
+
+	check-reqs_pkg_setup
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	pushd ../.. &>/dev/null || die
+
+	eapply "${WORKDIR}"/firefox-patches
+	eapply "${WORKDIR}"/spidermonkey-patches
+
+	default
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	einfo "Removing pre-built binaries ..."
+	find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	MOZJS_BUILDDIR="${WORKDIR}/build"
+	mkdir "${MOZJS_BUILDDIR}" || die
+
+	popd &>/dev/null || die
+	eautoconf
+}
+
+src_configure() {
+	tc-export CC CXX LD AR RANLIB
+
+	cd "${MOZJS_BUILDDIR}" || die
+
+	# ../python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	local -a myeconfargs=(
+		--host="${CBUILD:-${CHOST}}"
+		--target="${CHOST}"
+		--disable-jemalloc
+		--disable-optimize
+		--disable-strip
+		--enable-readline
+		--enable-shared-js
+		--with-intl-api
+		--with-system-icu
+		--with-system-nspr
+		--with-system-zlib
+		--with-toolchain-prefix="${CHOST}-"
+		$(use_enable debug)
+		$(use_enable jit)
+		$(use_enable test tests)
+	)
+
+	# Modifications to better support ARM, bug 717344
+	if use cpu_flags_arm_neon ; then
+		myeconfargs+=( --with-fpu=neon )
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			myeconfargs+=( --with-thumb=yes )
+			myeconfargs+=( --with-thumb-interwork=no )
+		fi
+	fi
+
+	# Forcing system-icu allows us to skip patching bundled ICU for PPC
+	# and other minor arches
+	ECONF_SOURCE="${S}" \
+		econf \
+		${myeconfargs[@]} \
+		XARGS="${EPREFIX}/usr/bin/xargs"
+}
+
+src_compile() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+}
+
+src_test() {
+	if "${MOZJS_BUILDDIR}/js/src/js" -e 'print("Hello world!")'; then
+		einfo "Smoke-test successful, continuing with full test suite"
+	else
+		die "Smoke-test failed: did interpreter initialization fail?"
+	fi
+
+	local -a KNOWN_TESTFAILURES
+	KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
+	KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
+	KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/timeZone_backward_links.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/tz-environment-variable.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/Locale/likely-subtags.js )
+	KNOWN_TESTFAILURES+=( test262/intl402/Locale/prototype/minimize/removing-likely-subtags-first-adds-likely-subtags.js )
+
+	if use x86 ; then
+		KNOWN_TESTFAILURES+=( non262/Date/timeclip.js )
+		KNOWN_TESTFAILURES+=( test262/built-ins/Number/prototype/toPrecision/return-values.js )
+		KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.1.js )
+		KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.2.js )
+	fi
+
+	echo "" > "${T}"/known_failures.list || die
+
+	local KNOWN_TESTFAILURE
+	for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
+		echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
+	done
+
+	PYTHONPATH="${S}/tests/lib" \
+		${PYTHON} \
+		"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+		--exclude-file="${T}"/known_failures.list \
+		"${MOZJS_BUILDDIR}"/js/src/js \
+		|| die
+
+	if use jit ; then
+		KNOWN_TESTFAILURES=()
+
+		echo "" > "${T}"/known_failures.list || die
+
+		for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
+			echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
+		done
+
+		PYTHONPATH="${S}/tests/lib" \
+			${PYTHON} \
+			"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+			--exclude-file="${T}"/known_failures.list \
+			"${MOZJS_BUILDDIR}"/js/src/js basic \
+			|| die
+	fi
+}
+
+src_install() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+
+	# fix soname links
+	pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
+	mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
+	popd &>/dev/null || die
+
+	# remove unneeded files
+	rm \
+		"${ED}"/usr/bin/js${MY_MAJOR}-config \
+		"${ED}"/usr/$(get_libdir)/libjs_static.ajs \
+		|| die
+
+	# fix permissions
+	chmod -x \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
+		"${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h \
+		|| die
+}
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 335719821b8f..1bcc1f3404da 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,19 +1,9 @@
-AUX build-2.9.2.xml 2863 BLAKE2B f7c86965edbe1ba6d332b170caab1db5d872174b3b014d25dda12681e8183de1d5de9c3a3a2595d7e6ebd3f44528703f0f7478aa1e4f0fc6b24d182a51f3a88f SHA512 ca4dd0b76ae5a503a07f4c660f8715ff38b1c8e582de52928dad040f42a5fb7a9c774e039d9b7ca4b310b29241da6ab6b43115d741ed6dfbcc8538e384a05673
 AUX build-3.x.xml 2968 BLAKE2B e403d134a62504c396842f2fad71cf2aec1786c5d7902d7d08398894eb0dfe709617ae137b2249cf81d5c82f14707364b072990b1cc695b9deb49f6cffb96377 SHA512 4e65ba93141f8c47b2be9f534b05be3c4fa33428df73a23148b8f0f675f617071ad6c14c8aaa1f1ed6de03832f3e26b0b065b2f67834199244fbe55b398f0f20
-AUX tuprolog-2.9.2-no-dynamic-object-test.patch 758 BLAKE2B 8e4ed5b4a5a12e6140c5bdf4074a02061cc82c50b29dfa7d09fc4b2b44b7a6b580abda565d1c1615ae864fcc7fc6a86b6d71e69e3eabec00e2bf92800da06ee8 SHA512 bbaef70b751fe049680826fb82dc46a339f88d7b8062df0865fddb15de2c991939e7e2fae0f889db0c72d802790287487f442316ad6c9e7fa7276b30083b7365
-AUX tuprolog-2.9.2-no-ikvm.patch 3929 BLAKE2B 0a6ec1d96c71762fee02b5701e2c445b000fae37eb335ed2a3fecdaabd4f28fbe894b2768a0c01e298accc267ff233e413370e7e744009b364b8b4888635b71f SHA512 a90b55f74841271a6ae9f4143203a9920adee9f7ab32c814d41f8830b7310919fcf035361f87fcd1ba7f7f0f0efe0c0a29ddff704c0d4d14ed2a41b4f7574a74
-AUX tuprolog-3.0.1-no-ikvm.patch 4844 BLAKE2B 6518c8821ef06f5b99de779d139b4d23e9e1458622edc267b237e7cb83d64164cd27a321d751423cbd0403a3666096322e80d0fdc6300df51a3ab54d4c1d9412 SHA512 c018d9028a9a4aea6c36057ac2d8b46d41da4961570fff491521c7b6bb816653db54a9e2a1049bd037aede7fa00262089f3787cad4a1e10836aa4f7442c727cd
-AUX tuprolog-3.0.1-oolibrary-unit-test.patch 762 BLAKE2B 615eb657e9c40a4cec568ae1a8b1868eaaa94d7911386099b65f06dd8002f9d77bce675f79c03db0c900f4b7fb10149b95aa328c582674fefe94ec7af8996d9d SHA512 54e3e9ef7ecc5ff27e687067a057e0c66f37e4d5f268d670210df89435333f7e303e640e12a4afd3c7906e3c52cd2de2466dc81b6cd2113aeb2ee0c7b5ad7a88
 AUX tuprolog-3.1.0-no-ikvm.patch 4862 BLAKE2B c5e49ecc13f923157a9287ece06b1ecf1c8a418e449cc9f73ca6a5c2f2bbc7ec567b76ba04a43c6f42fce381941c1f5ee3897a6df20d6600e8d00c550100f9f2 SHA512 ceb45121b4bec54cdd26683ce1e7a63baea9d5c899cd5993d51cbaf8fdbc4b9138f926e164e1dd96eafb2af6b2112c44bf15b1f79c6b9096ac028e02c2dab1a0
 AUX tuprolog-3.1.0-test-suite.patch 518 BLAKE2B 08cfea93b9675826bacb9f7a9970120a02fed2826d8edfa025dfaf4ee03f3bceba32cb197178a9edb1bf2d41354d6ca22c25e3a851578d61735c63c54cd5e6c2 SHA512 58d3ea5c0bb4606c72fa1bb7a1d92974fe9e5229e9674212f8fdbf53d09a345090fda96bf05dd867c01484577bd5f28a56813c8808e072c7c03282afc6d9933a
-DIST tuprolog-2.9.2.tar.gz 6262268 BLAKE2B 39bbc4dcb2336a713f47252ff6f7d00f15aa0072c4864c2d3e453ec43b2c646f9cdc7a69444e21d9cc20ba283ddee5fd980855811f8f80ba4afe7c37cdd47317 SHA512 831c7390fe33fc57cb01d4b1d61485ac5df1aa8ebf386d5aae5c5d32f7677d46aa5aa6cc0eb1d3bb79989a54f8484ad8b97754b7f75fc21af6116ae170a28316
-DIST tuprolog-3.0.1.tar.gz 6326591 BLAKE2B a051eb3f22c01e1c269b167fa7d1daec6e4818229e2035c1140401c38094c53451ea720638adaa6d6fda0ea70daf6f5f1bc9ea84f1e4ba9de9f00ca83529697c SHA512 56fa96f717b5c8e56fd2979f2953744964d844e5abf215456e31309d3d92bde142f9bff55e6442b6de55f219c7f143a275ccf89359ff2f2944459bbc94770afa
 DIST tuprolog-3.1.0.tar.gz 7201383 BLAKE2B 9d8b610240611cd5b3d0dae104a44c72bb5e7c0512e4dbf3e178204d9d36e461219cd869ca1e16e3054ca3e1ee34d3b2c6fa5c659df16f54e3266c7c826af8d6 SHA512 1093e29a79964cb3991326da14f020cdc8ff64f2444c84dbb6b22aa5c4ecbf48f74dbc26af0af949ccc31020573ce5908684af794db4654fb475efa697a82cbf
 DIST tuprolog-3.2.0-gentoo-patchset-0.tar.gz 1813 BLAKE2B 4ed7ffbb752a821a2b2842cfdbc1f4ec92d14b35a1c5a722207b45ec9dbdc44588acc010fb6386e8ed2e7d30d3bc8d425f0f74e8cc953cb7afad8305904e1499 SHA512 454757fc01f3f697510426e7a2a41b57350c1e3f980e381e197616e10eaf88339155226096f1d417397b9bc6f4964a45b3d547c6794ad23a4a014b06212b08f0
 DIST tuprolog-3.2.0.tar.gz 6242286 BLAKE2B 77a3d3f886673aca72fffd9bb60657efcbe7ea5bb0f84eea7a72df513295d572c8116472f8d544240fac676ac9a6a0fcecfc3166e6426ef7d8af80eac4ba8d85 SHA512 e27bd989d66bae26c646cb69670fb75232ebdd18d1dbb9d600f9847921ecd56d17221736b3ec15c087857509272ce89af8bc44924130430db3860870a06bb499
-EBUILD tuprolog-2.9.2.ebuild 1301 BLAKE2B 88be118553d16626a1c411017072614889f74b1b23636586c6ccae116cb5561e441c5403e84f606e8ada9cacb7ce2c6f63d3702e149f90e53d336501b33e99aa SHA512 1638295c84bc6c32b695f39b866c299b8375be07d48e061dd08b5d8b6b5763e42477971c6ec3e8bf3af61107997c332b41bf6e7ec24c7089c2ebc4efb6216cd2
-EBUILD tuprolog-3.0.1.ebuild 1347 BLAKE2B 93688d55fe1c777e78164da283c356b6371cd4036a6a8d1c917d9801bce70c8278cf0bbfedd9651364a425c7b56b42500cd6f0dd856fbc42742ca955ba630491 SHA512 8137b9e2b4371fc4f3a90a61e3febb4dc4c700db185d9d846f2671fc57353bd6527df8011086ebe6f49cb5ca9890ff9effc06e7c2e1b5689e273c84419f11fa2
 EBUILD tuprolog-3.1.0-r1.ebuild 1360 BLAKE2B 3f81572cf4281d056c4f913beca279a9042854c28eba5736e3c2b3086293092b267759cfbb5111d00262eb8fc29c77a96fdd2bde719e1fa8b5cece6064c0b104 SHA512 06d7bc49dd97a4f3999222ae3b67dbd00d8c047cc7849b6b90578c1b278a834a34df578bcb2fc7b353503a1d47d2eb77645c8e3f16a37de891adf81cf1fef583
-EBUILD tuprolog-3.1.0.ebuild 1294 BLAKE2B cd580a5297944c2c897b4adbec8d7e491b0aa44ac62f2413b433933c047f2c3e095d3e0233372919a471a5e662bd6031d79675341e5bf43ce96f286f39512058 SHA512 434ddf51d71489a18298eea3a695b22c8b4be18bec88094750b3822d01b1edb4287a4ff5f9627274dc851a54ce32d7a13800c38c540bfb5509b4bf8a37c74292
 EBUILD tuprolog-3.2.0.ebuild 1442 BLAKE2B b35cbdabc2f62bcf6da14417301b2d00724235478a10c2926d5cd7231af9a4f783ec8ea6ebe85057a18d27c176a21682c9b683ae1e047ff4b8209e3ff2f2a492 SHA512 953441a4b4a231a3aa9b237880a5e626b05ecf936266074a6760010ba858169c1bb7e71d8e8009f0c6eaa4ee46d07f54b5009836f5c1c821c24cb1fcf4095c7b
 MISC metadata.xml 318 BLAKE2B bbdb9dc3b4feafc27fa6fae1b0740bde801196a214bb96f5815a2a274c89d6208c158c2616e40f17fbef4f8becd03b686410a3ee7b8253cceb70b80bc4b03c5f SHA512 6a43476b9ed9a343488c8a80908e8b4fcb96c75d9a3e6b6c05c22d8ffb87f5c8df8a3cfd2db5297f60236d6740ab0770e68e1acb4c457398a280df9dc4c266a9
diff --git a/dev-lang/tuprolog/files/build-2.9.2.xml b/dev-lang/tuprolog/files/build-2.9.2.xml
deleted file mode 100644
index 823c2371d1fd..000000000000
--- a/dev-lang/tuprolog/files/build-2.9.2.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" ?><project default="jar" name="tuprolog">
-
-	<!-- some properties -->
-	<property name="src.dir" value="src"/>
-	<property name="build.dir" value="build"/>
-	<property name="docs.dir" value="docs"/>
-	<property name="dist.dir" value="dist"/>
-	<property name="test.dir" value="test"/>
-	<property name="test.build.dir" value="test.build"/>
-	<property name="jarfile" value="${ant.project.name}.jar"/>
-	<property file="build.properties"/>
-
-	<path id="compile.classpath">
-		<fileset dir="lib" includes="*.jar"/>
-		<pathelement path="${gentoo.classpath}"/>
-	</path>
-
-	<!-- init -->
-	<target name="init">
-		<tstamp/>
-		<mkdir dir="${dist.dir}"/>
-		<mkdir dir="${build.dir}"/>
-		<mkdir dir="${docs.dir}"/>
-		<mkdir dir="${test.build.dir}"/>
-	</target>	
-
-	<!-- compile everything -->
-	<target depends="init" name="compile">
-		<javac deprecation="off"
-			destdir="${build.dir}"
-			encoding="ISO-8859-1"
-			srcdir="${src.dir}"
-			target="1.7">
-			<classpath>
-				<path refid="compile.classpath"/>
-			</classpath>
-		</javac>
-		<copy todir="${build.dir}">
-			<fileset dir="${src.dir}">
-				<exclude name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<!-- build the jar file -->
-	<target depends="compile" name="jar">
-		<jar basedir="${build.dir}" jarfile="${dist.dir}/${jarfile}"/>
-		<jar basedir="${build.dir}" jarfile="${dist.dir}/2p.jar">
-			<manifest>
-				<attribute name="Main-Class" value="alice.tuprologx.ide.GUILauncher"/>
-				<attribute name="Class-Path" value="."/>
-			</manifest>
-			<zipgroupfileset dir="lib" includes="*.jar"/>
-		</jar>
-	</target>
-
-	<!-- generate javadocs -->
-	<target depends="init" name="javadoc">
-		<javadoc
-			author="false"
-			destdir="${docs.dir}"
-			encoding="ISO-8859-1"
-			breakiterator="yes"
-			packagenames="alice.*"
-			sourcepath="${src.dir}"
-			use="true"
-			version="true"
-			verbose="no"
-			windowtitle="${ant.project.name} API">
-			<classpath>
-				<path refid="compile.classpath"/>
-			</classpath>
-		</javadoc>
-	</target>
-
-	<!-- clean up -->
-	<target name="clean">
-		<delete dir="${build.dir}"/>
-		<delete dir="${dist.dir}"/>
-		<delete dir="${docs.dir}"/>
-		<delete dir="${test.build.dir}"/>
-	</target>
-
-	<!-- run testsuite -->
-	<target name="test">
-		<path id="dist.classpath">
-			<fileset dir="${dist.dir}">
-				<include name="*.jar"/>
-			</fileset>
-		</path>
-		<javac classpathref="dist.classpath"
-			deprecation="off"
-			destdir="${test.build.dir}"
-			encoding="ISO-8859-1"
-			srcdir="${test.dir}/unit"
-			target="1.7"/>
-		<junit haltonfailure="on" showoutput="no" printsummary="yes">
-			<classpath>
-				<path refid="dist.classpath"/>
-				<pathelement path="${test.build.dir}"/>
-			</classpath>
-			<formatter type="xml"/>
-			<batchtest todir="${test.build.dir}">
-				<fileset dir="${test.build.dir}">
-					<include name="**/*TestCase.class"/>
-				</fileset>
-			</batchtest>
-		</junit>
-	</target>
-</project>
diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch
deleted file mode 100644
index 0416258e9e14..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tuprolog-2.9.2.orig/test/unit/alice/tuprolog/JavaLibraryTestCase.java	2015-02-27 14:02:49.000000000 +0100
-+++ tuprolog-2.9.2/test/unit/alice/tuprolog/JavaLibraryTestCase.java	2016-02-17 15:24:47.000000000 +0100
-@@ -39,7 +39,7 @@
- 		SolveInfo goal = engine.solve(new Struct("demo", t));

- 		assertFalse(goal.isSuccess());

- 	}

--

-+/*

- 	public void testDynamicObjectsRetrival() throws PrologException {

- 		Prolog engine = new Prolog();

- 		JavaLibrary lib = (JavaLibrary) engine.getLibrary("alice.tuprolog.lib.JavaLibrary");

-@@ -53,7 +53,7 @@
- 		TestCounter counter = (TestCounter) lib.getRegisteredDynamicObject(id);

- 		assertEquals(2, counter.getValue());

- 	}

--

-+*/

- 	

- 	public void test_java_object() throws PrologException, IOException

- 	{

diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch
deleted file mode 100644
index d94dc66bbac5..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -urN tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java
---- tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java	2014-09-29 18:14:21.000000000 +0200
-+++ tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java	2015-01-11 14:48:57.000000000 +0100
-@@ -9,11 +9,11 @@
- import java.net.URL;
- import java.net.URLClassLoader;
- import java.util.*;
--import cli.System.Reflection.Assembly;
-+//import cli.System.Reflection.Assembly;
- 
- import alice.tuprolog.event.LibraryEvent;
- import alice.tuprolog.event.WarningEvent;
--import alice.util.AssemblyCustomClassLoader;
-+//import alice.util.AssemblyCustomClassLoader;
- 
- /**
-  * @author Alex Benini
-@@ -179,31 +179,7 @@
- 				} else
- 				// .NET
- 				{
--					Assembly asm = null;
--					boolean classFound = false;
--					className = "cli."
--							+ className.substring(0, className.indexOf(","))
--									.trim();
--					for (int i = 0; i < paths.length; i++)
--					{
--						try
--						{
--							asm = Assembly.LoadFrom(paths[i]);
--							loader = new AssemblyCustomClassLoader(asm, urls);
--							lib = (Library) Class.forName(className, true, loader).newInstance();
--							if (lib != null)
--							{
--								classFound = true;
--								break;
--							}
--						} catch (Exception e)
--						{
--							e.printStackTrace();
--							continue;
--						}
--					}
--					if (!classFound)
--						throw new InvalidLibraryException(className, -1, -1);
-+					throw new InvalidLibraryException(className, -1, -1);
- 				}
- 			}
- 
-@@ -462,4 +438,4 @@
- 		return optimizedDirectory;
- 	}
- 
--}
-\ No newline at end of file
-+}
-diff -urN tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java
---- tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java	2014-09-29 18:14:21.000000000 +0200
-+++ tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java	2015-01-11 14:46:23.000000000 +0100
-@@ -18,7 +18,7 @@
- package alice.tuprologx.ide;

- 

- import alice.tuprolog.*;

--import alice.util.AssemblyCustomClassLoader;

-+//import alice.util.AssemblyCustomClassLoader;

- 

- import java.io.File;

- import java.net.URL;

-@@ -26,7 +26,7 @@
- import java.util.ArrayList;

- import java.util.Hashtable;

- import java.util.StringTokenizer;

--import cli.System.Reflection.Assembly;

-+//import cli.System.Reflection.Assembly;

- 

- /**

-  * A dynamic manager for tuProlog libraries.

-@@ -155,10 +155,7 @@
- 	        	// .NET

- 	        	if(System.getProperty("java.vm.name").equals("IKVM.NET"))

- 	        	{

--	        		Assembly asm = Assembly.LoadFrom(file.getPath());

--	        		loader = new AssemblyCustomClassLoader(asm, new URL[]{url});

--	        		libraryClassname = "cli." + libraryClassname.substring(0, 

--	        				libraryClassname.indexOf(",")).trim();

-+	        		throw new InvalidLibraryException(libraryClassname,-1,-1);

- 	        	}

- 	        	// JVM

- 	        	else

-diff -urN tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java
---- tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java	2014-09-29 18:14:21.000000000 +0200
-+++ tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java	1970-01-01 01:00:00.000000000 +0100
-@@ -1,21 +0,0 @@
--package alice.util;

--

--import java.net.URL;

--

--public class AssemblyCustomClassLoader extends java.net.URLClassLoader

--{

--  public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls)

--  {

--    super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm));

--    // explicitly calling addURL() is safer than passing it to the super constructor,

--    // because this class loader instance may be used during the URL construction.

--    for (URL url : urls) {

--    	addURL(url);

--	}    

--  }

--  

--  public void addUrl(URL url)

--  {

--	  addURL(url);

--  }

--}
-\ No newline at end of file
diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch
deleted file mode 100644
index 660b22c79341..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -urN tuprolog-3.0.1.orig/src/alice/tuprolog/LibraryManager.java tuprolog-3.0.1/src/alice/tuprolog/LibraryManager.java
---- tuprolog-3.0.1.orig/src/alice/tuprolog/LibraryManager.java	2017-09-27 12:31:06.689334505 +0200
-+++ tuprolog-3.0.1/src/alice/tuprolog/LibraryManager.java	2017-09-27 12:50:04.193286931 +0200
-@@ -9,11 +9,11 @@
- import java.net.URL;
- import java.net.URLClassLoader;
- import java.util.*;
--import cli.System.Reflection.Assembly;
-+//import cli.System.Reflection.Assembly;
- 
- import alice.tuprolog.event.LibraryEvent;
- import alice.tuprolog.event.WarningEvent;
--import alice.util.AssemblyCustomClassLoader;
-+//import alice.util.AssemblyCustomClassLoader;
- 
- /**
-  * @author Alex Benini
-@@ -179,31 +179,7 @@
- 				} else
- 				// .NET
- 				{
--					Assembly asm = null;
--					boolean classFound = false;
--					className = "cli."
--							+ className.substring(0, className.indexOf(","))
--									.trim();
--					for (int i = 0; i < paths.length; i++)
--					{
--						try
--						{
--							asm = Assembly.LoadFrom(paths[i]);
--							loader = new AssemblyCustomClassLoader(asm, urls);
--							lib = (Library) Class.forName(className, true, loader).newInstance();
--							if (lib != null)
--							{
--								classFound = true;
--								break;
--							}
--						} catch (Exception e)
--						{
--							e.printStackTrace();
--							continue;
--						}
--					}
--					if (!classFound)
--						throw new InvalidLibraryException(className, -1, -1);
-+					throw new InvalidLibraryException(className, -1, -1);
- 				}
- 			}
- 
-@@ -462,4 +438,4 @@
- 		return optimizedDirectory;
- 	}
- 
--}
-\ Manca newline alla fine del file
-+}
-diff -urN tuprolog-3.0.1.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-3.0.1/src/alice/tuprologx/ide/LibraryManager.java
---- tuprolog-3.0.1.orig/src/alice/tuprologx/ide/LibraryManager.java	2017-09-27 12:31:06.696334504 +0200
-+++ tuprolog-3.0.1/src/alice/tuprologx/ide/LibraryManager.java	2017-09-27 12:50:04.194286931 +0200
-@@ -18,7 +18,7 @@
- package alice.tuprologx.ide;

- 

- import alice.tuprolog.*;

--import alice.util.AssemblyCustomClassLoader;

-+//import alice.util.AssemblyCustomClassLoader;

- 

- import java.io.File;

- import java.net.URL;

-@@ -26,7 +26,7 @@
- import java.util.ArrayList;

- import java.util.Hashtable;

- import java.util.StringTokenizer;

--import cli.System.Reflection.Assembly;

-+//import cli.System.Reflection.Assembly;

- 

- /**

-  * A dynamic manager for tuProlog libraries.

-@@ -155,10 +155,7 @@
- 	        	// .NET

- 	        	if(System.getProperty("java.vm.name").equals("IKVM.NET"))

- 	        	{

--	        		Assembly asm = Assembly.LoadFrom(file.getPath());

--	        		loader = new AssemblyCustomClassLoader(asm, new URL[]{url});

--	        		libraryClassname = "cli." + libraryClassname.substring(0, 

--	        				libraryClassname.indexOf(",")).trim();

-+	        		throw new InvalidLibraryException(libraryClassname,-1,-1);

- 	        	}

- 	        	// JVM

- 	        	else

-diff -urN tuprolog-3.0.1.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-3.0.1/src/alice/util/AssemblyCustomClassLoader.java
---- tuprolog-3.0.1.orig/src/alice/util/AssemblyCustomClassLoader.java	2017-09-27 12:31:06.699334504 +0200
-+++ tuprolog-3.0.1/src/alice/util/AssemblyCustomClassLoader.java	1970-01-01 01:00:00.000000000 +0100
-@@ -1,21 +0,0 @@
--package alice.util;

--

--import java.net.URL;

--

--public class AssemblyCustomClassLoader extends java.net.URLClassLoader

--{

--  public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls)

--  {

--    super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm));

--    // explicitly calling addURL() is safer than passing it to the super constructor,

--    // because this class loader instance may be used during the URL construction.

--    for (URL url : urls) {

--    	addURL(url);

--	}    

--  }

--  

--  public void addUrl(URL url)

--  {

--	  addURL(url);

--  }

--}
-\ Manca newline alla fine del file
-diff -urN tuprolog-3.0.1.orig/src/alice/util/proxyGenerator/Generator.java tuprolog-3.0.1/src/alice/util/proxyGenerator/Generator.java
---- tuprolog-3.0.1.orig/src/alice/util/proxyGenerator/Generator.java	2017-09-27 12:31:06.700334504 +0200
-+++ tuprolog-3.0.1/src/alice/util/proxyGenerator/Generator.java	2017-09-27 12:50:04.195286931 +0200
-@@ -1,7 +1,7 @@
- package alice.util.proxyGenerator;

- import javax.tools.*;

- 

--import cli.System.Reflection.Assembly;

-+//import cli.System.Reflection.Assembly;

- 

- import java.lang.reflect.*;

- import java.util.*;

-@@ -29,7 +29,7 @@
-     }

-     

-     if(System.getProperty("java.vm.name").equals("IKVM.NET"))

--    	ikvm.runtime.Startup.addBootClassPathAssemby(Assembly.Load("IKVM.OpenJDK.Tools"));

-+    	throw new UnsupportedOperationException("IKVM.NET not supported!");

-     

-     jc = ToolProvider.getSystemJavaCompiler();

-     if (jc == null) {

diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch b/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch
deleted file mode 100644
index 9d09ff202b08..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur tuprolog-3.0.1.orig/test/unit/alice/tuprolog/PrologTestCase.java tuprolog-3.0.1/test/unit/alice/tuprolog/PrologTestCase.java
---- tuprolog-3.0.1.orig/test/unit/alice/tuprolog/PrologTestCase.java	2017-09-27 12:31:12.908334244 +0200
-+++ tuprolog-3.0.1/test/unit/alice/tuprolog/PrologTestCase.java	2017-09-27 19:30:31.813282027 +0200
-@@ -32,7 +32,7 @@
- 		assertNotNull(engine.getLibrary("alice.tuprolog.StringLibrary"));
- 		Library javaLibrary = new alice.tuprolog.lib.OOLibrary();
- 		engine.loadLibrary(javaLibrary);
--		assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.JavaLibrary"));
-+		assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.OOLibrary"));
- 	}
- 	
- 	public void testGetLibraryWithName() throws InvalidLibraryException {
diff --git a/dev-lang/tuprolog/tuprolog-2.9.2.ebuild b/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
deleted file mode 100644
index ee49fbe50a3c..000000000000
--- a/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://tuprolog.unibo.it/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jdk-1.7:=
-	 dev-java/javassist:3"
-
-DEPEND="${RDEPEND}
-	dev-java/ant-core
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/junit:4
-		dev-java/hamcrest-core:1.3
-	)"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist:3"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-ikvm.patch
-	epatch "${FILESDIR}"/${P}-no-dynamic-object-test.patch
-
-	cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_test() {
-	cd "${S}"/dist
-	java-pkg_jar-from junit:4
-	java-pkg_jar-from hamcrest-core:1.3
-	cd "${S}"
-	ANT_TASKS="ant-junit4" eant test || die "eant test failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dojar dist/2p.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r docs/* || die
-		dodoc doc/tuprolog-guide.pdf
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins doc/examples/*.pl
-	fi
-}
diff --git a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild b/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
deleted file mode 100644
index 411a1f875b0e..000000000000
--- a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://tuprolog.unibo.it/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-3 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jdk-1.8:=
-	 dev-java/javassist:3
-	 dev-java/commons-lang:3.1"
-
-DEPEND="${RDEPEND}
-	dev-java/ant-core
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/junit:4
-		dev-java/hamcrest-core:1.3
-	)"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.1"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-ikvm.patch
-	epatch "${FILESDIR}"/${P}-oolibrary-unit-test.patch
-
-	cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_test() {
-	cd "${S}"/dist
-	java-pkg_jar-from junit:4
-	java-pkg_jar-from hamcrest-core:1.3
-	cd "${S}"
-	ANT_TASKS="ant-junit4" eant test || die "eant test failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dojar dist/2p.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r docs/* || die
-		dodoc doc/tuprolog-guide.pdf
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins doc/examples/*.pl
-	fi
-}
diff --git a/dev-lang/tuprolog/tuprolog-3.1.0.ebuild b/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
deleted file mode 100644
index d22edc7d11f3..000000000000
--- a/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://tuprolog.unibo.it/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-3 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jdk-1.8:=
-	 dev-java/javassist:3
-	 dev-java/commons-lang:3.1"
-
-DEPEND="${RDEPEND}
-	dev-java/ant-core
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/junit:4
-		dev-java/hamcrest-core:1.3
-	)"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.1"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-ikvm.patch
-
-	cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_test() {
-	cd "${S}"/dist
-	java-pkg_jar-from junit:4
-	java-pkg_jar-from hamcrest-core:1.3
-	cd "${S}"
-	ANT_TASKS="ant-junit4" eant test || die "eant test failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dojar dist/2p.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r docs/* || die
-		dodoc doc/tuprolog-guide.pdf
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins doc/examples/*.pl
-	fi
-}
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index acfb9dae9921..55c87fa42ec1 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -1,11 +1,4 @@
-DIST XSB360.tar.gz 12842882 BLAKE2B 734d17a05eb9cb79906a98a77a6562a9445603a884523689c1f2e5e5f9cd4ebfc7182e9ecde9bf9f97c18a90bc4d0d35a2344ac92193d9ee43eb733530571836 SHA512 2ac2f4d4c7501479648b7f618815d4cd996969791a617f2148ef7498cf08bacd67eab298136303b6804cb689129ae3365e1490ec693f2232f9c9f1ad515d9c6c
-DIST XSB370.tar.gz 12322913 BLAKE2B 64db80704ce656bfaa402d161a94c7b1cd3119a363e848b2c7768665df580b25f1fc43b49b381960d9049d947590b7eb3c846c1a2d6b8a1233d8eb2c4de04f7e SHA512 e2c11b0e5fbbffc2fb6d493e39b7dd74de43509ea1c844f1b3e5d1002c116d6fb8b245905b7b512499e40765a6603d4bef883052bdeec4a3078011c305f85a9f
 DIST XSB38.tar.gz 13830570 BLAKE2B 60a6ab38435348d09e2d08bc65ca62c06b38495b72f40a6f3f10fe8d23949bfed0c580c9be0c8304d8a88a53b227bb695870b558d67f33a47543de6c1529180f SHA512 457c691450afcf3ed4e2fffc28deaef0949ef4bbf6fd69b504acc6507fbb144f2c6e427a25da2b6346b15b82e803c02d1b6962af698d16c1fcb9a3d56160ea30
-DIST xsb-3.6.0-gentoo-patchset-4.tar.gz 7513 BLAKE2B cf846dc94e0f1194f5da381b888f4ce6476a4e861cb23e6dca87b0cd2c0ea24c4290ea080432d2c5440f7350cf0862c7fc34e303a8dfe824e2e3e06f29aa4815 SHA512 bb7ba7836fa2df7a54fd2837b4cb760f7ae0e9511bc0a4b2be8cba89ed4aeedda6712937a4748bd9e9ee16366d442fd962a121dbf83017e2199eb3a287efb1d5
-DIST xsb-3.7.0-gentoo-patchset-3.tar.gz 5636 BLAKE2B f7b66131d3f02fd75e8b6019f8e64cb6f531155116364da432df41a8f7b3ba2b8d300f7b64bbcae7a755478c6aeb637b36457b491998c88457a96b64e5ecb46e SHA512 bee6d62b900c9ee3a373dfa0ad7362b18c748bb9e0559a878534ed517067d753e1fa79277b0588133a1eeceafcd56b4dcc9ff81892309f6c6666150baaaaf047
 DIST xsb-3.8.0-gentoo-patchset-3.tar.gz 7297 BLAKE2B b3da3b4458e6e97c32fc6318bfa95d9755398572b85fe10a00af327c7cf940e18b8ae49cd2543544b363daf39bdc9db3963487e134c3a1b3a31c05344ed927fd SHA512 96064c2a27c4570b213613b97386bed1dac8082881794b7e18e5ae9ee9c28af78412c793b1fe26a293664ba88236257fbb3804cdda63799fff6fb72ca498b4a4
-EBUILD xsb-3.6.0-r1.ebuild 3719 BLAKE2B 3f9ad681420e551346f3d75172e5a1c1bafce0a232d3c5fe2eca73e2c39ed01e82768bac93b6ca79712fe362a9f4c48c4a44daf3461d0aa1a0658a521bd89494 SHA512 52d15ea7b41a1dfca4b12a559a90ba0dab170eb40ec9ac7f6f4cc290396ecb4276b85866fef9dc5fefe20b680a5f282193e876bf1f08ff713d29fbe31064b5d2
-EBUILD xsb-3.6.0.ebuild 3701 BLAKE2B 4654f47cf403163d1893f8b2d7d7276d86fae58e15f77143b360787ab5dfd8769165c980cef1d1e4c4a12db3fbba0133bf134fb3db0975d6877367ec959ef8e9 SHA512 ccf6c318f3615a7efa28582c33a79bc27b039821fba01152873eb7e759ab271e8e5c6c3ee0ec335af96bcc6692f489294cd4ed4d990eeac12c366599105b8983
-EBUILD xsb-3.7.0-r1.ebuild 3662 BLAKE2B 51219153887a0702feac12dae98ef326a65ec524a32395ec55576c3c1c1ba08031d068b268bf787863b1d2961a82ee15610d4d6dbdf1aa83a0b442c44a604c28 SHA512 146fc16485c95f4b4bcd7ee8735edec39ee76347b9f6b5b8d7690e545ebdfcac141b3cb1ee08067597f815fde6c3c4deee0faffc8e99431a253ab10802420010
 EBUILD xsb-3.8.0.ebuild 3684 BLAKE2B 7c80f0e041e0ed06e2f8a6d14a4aae6ea63875182865bf46afc6c6871399c6554329eb91e71f8c1ffd90e6398eb835748a1ab99b8718f25fdb8c4fa3b0ece609 SHA512 17281a3bbecf9750c7491dba0ce97d375485376668246e2df0a24754f363fa17c46753d2ae0ee5c6efd7438d28d9196a89fbfca73846894163073f2273287ba6
 MISC metadata.xml 313 BLAKE2B e6feaeb68ae7144def50a0dff4671b3a9ff070be4d447d45e5b8fbab61940026a5ea9d13c54fb21a808ed67630debf2f55e44d9186e83ea094b26dccab3bf1e6 SHA512 e271dc66bb407abe43ebc5b1fc27c318cc8082b4b14f43f1c33f3453e4a248c83ba2fcc73ba32a63828e172093a00b507f81c629d022799c4cd5a14417fc5ef0
diff --git a/dev-lang/xsb/xsb-3.6.0-r1.ebuild b/dev-lang/xsb/xsb-3.6.0-r1.ebuild
deleted file mode 100644
index b33ce06c15cd..000000000000
--- a/dev-lang/xsb/xsb-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="XSB${PV//./}"
-
-PATCHSET_VER="4"
-
-inherit autotools java-pkg-opt-2
-
-DESCRIPTION="XSB is a logic programming and deductive database system"
-HOMEPAGE="http://xsb.sourceforge.net"
-SRC_URI="http://xsb.sourceforge.net/downloads/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl debug iodbc java mysql odbc pcre threads xml"
-
-RDEPEND="curl? ( net-misc/curl )
-	iodbc? ( dev-db/libiodbc )
-	java? ( >=virtual/jdk-1.4:= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/XSB
-
-PATCHES=( "${WORKDIR}/${PV}" )
-
-src_prepare() {
-	default
-	cd "${S}"/build
-	eautoconf
-}
-
-src_configure() {
-	cd "${S}"/build
-
-	econf \
-		--prefix=/usr/$(get_libdir) \
-		--disable-optimization \
-		--without-smodels \
-		$(use_with odbc) \
-		$(use_with iodbc) \
-		$(use_enable threads mt) \
-		$(use_enable debug)
-
-	if use curl ; then
-		cd "${S}"/packages/curl
-		econf
-	fi
-
-	if use mysql ; then
-		cd "${S}"/packages/dbdrivers/mysql
-		econf --with-mysql-libdir=$(mysql_config --variable=pkglibdir)
-	fi
-
-	if use odbc ; then
-		cd "${S}"/packages/dbdrivers/odbc
-		econf
-	fi
-
-	if use pcre ; then
-		cd "${S}"/packages/pcre
-		econf
-	fi
-
-	if use xml ; then
-		cd "${S}"/packages/xpath
-		econf
-	fi
-}
-
-src_compile() {
-	cd "${S}"/build
-
-	default
-
-	# All XSB Packages are compiled using a single Prolog engine.
-	# Consequently they must all be compiled using a single make job.
-
-	cd "${S}"/packages
-	rm -f *.xwam
-	emake -j1
-
-	if use curl ; then
-		emake -j1 curl
-		emake -j1 sgml
-		if use xml ; then
-			emake -j1 xpath
-		fi
-	fi
-
-	if use mysql ; then
-		emake -j1 mysql
-	fi
-
-	if use odbc ; then
-		emake -j1 odbc
-	fi
-
-	if use pcre ; then
-		emake -j1 pcre
-	fi
-}
-
-src_install() {
-	cd "${S}"/build
-	default
-
-	local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
-	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
-
-	cd "${S}"/packages
-	local PACKAGES=${XSB_INSTALL_DIR}/packages
-	insinto ${PACKAGES}
-	doins *.xwam
-
-	insinto ${PACKAGES}/chr
-	doins chr/*.xwam
-
-	insinto ${PACKAGES}/clpqr
-	doins clpqr/*.xwam
-
-	insinto ${PACKAGES}/gap
-	doins gap/*.xwam
-
-	insinto ${PACKAGES}/justify
-	doins justify/*.xwam
-	doins justify/*.H
-
-	insinto ${PACKAGES}/regmatch
-	doins regmatch/*.xwam
-	insinto ${PACKAGES}/regmatch/cc
-	doins regmatch/cc/*.H
-
-	insinto ${PACKAGES}/slx
-	doins slx/*.xwam
-
-	insinto ${PACKAGES}/wildmatch
-	doins wildmatch/*.xwam
-	insinto ${PACKAGES}/wildmatch/cc
-	doins wildmatch/cc/*.H
-
-	if use curl ; then
-		insinto ${PACKAGES}/curl
-		doins curl/*.xwam
-		insinto ${PACKAGES}/curl/cc
-		doins curl/cc/*.H
-		insinto ${PACKAGES}/sgml
-		doins sgml/*.xwam
-		insinto ${PACKAGES}/sgml/cc
-		doins sgml/cc/*.H
-		insinto ${PACKAGES}/sgml/cc/dtd
-		doins sgml/cc/dtd/*
-		if use xml ; then
-			insinto ${PACKAGES}/xpath
-			doins xpath/*xwam
-			insinto ${PACKAGES}/xpath/cc
-			doins xpath/cc/*.H
-		fi
-	fi
-
-	if use mysql || use odbc ; then
-		insinto ${PACKAGES}/dbdrivers
-		doins dbdrivers/*.xwam
-		doins dbdrivers/*.H
-		insinto ${PACKAGES}/dbdrivers/cc
-		doins dbdrivers/cc/*.H
-		if use mysql ; then
-			insinto ${PACKAGES}/dbdrivers/mysql
-			doins dbdrivers/mysql/*.xwam
-			insinto ${PACKAGES}/dbdrivers/mysql/cc
-			doins dbdrivers/mysql/cc/*.H
-		fi
-		if use odbc ; then
-			insinto ${PACKAGES}/dbdrivers/odbc
-			doins dbdrivers/odbc/*.xwam
-			insinto ${PACKAGES}/dbdrivers/odbc/cc
-			doins dbdrivers/odbc/cc/*.H
-		fi
-	fi
-
-	if use pcre ; then
-		insinto ${PACKAGES}/pcre
-		doins pcre/*.xwam
-		insinto ${PACKAGES}/pcre/cc
-		doins pcre/cc/*.H
-	fi
-
-	cd "${S}"
-	dodoc FAQ README
-}
diff --git a/dev-lang/xsb/xsb-3.6.0.ebuild b/dev-lang/xsb/xsb-3.6.0.ebuild
deleted file mode 100644
index 033bb06053d6..000000000000
--- a/dev-lang/xsb/xsb-3.6.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="XSB${PV//./}"
-
-PATCHSET_VER="4"
-
-inherit eutils autotools java-pkg-opt-2
-
-DESCRIPTION="XSB is a logic programming and deductive database system"
-HOMEPAGE="http://xsb.sourceforge.net"
-SRC_URI="http://xsb.sourceforge.net/downloads/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl debug iodbc java mysql odbc pcre threads xml"
-
-RDEPEND="curl? ( net-misc/curl )
-	iodbc? ( dev-db/libiodbc )
-	java? ( >=virtual/jdk-1.4:= )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/XSB
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	cd "${S}"/build
-	eautoconf
-}
-
-src_configure() {
-	cd "${S}"/build
-
-	econf \
-		--prefix=/usr/$(get_libdir) \
-		--disable-optimization \
-		--without-smodels \
-		$(use_with odbc) \
-		$(use_with iodbc) \
-		$(use_enable threads mt) \
-		$(use_enable debug)
-
-	if use curl ; then
-		cd "${S}"/packages/curl
-		econf
-	fi
-
-	if use mysql ; then
-		cd "${S}"/packages/dbdrivers/mysql
-		econf
-	fi
-
-	if use odbc ; then
-		cd "${S}"/packages/dbdrivers/odbc
-		econf
-	fi
-
-	if use pcre ; then
-		cd "${S}"/packages/pcre
-		econf
-	fi
-
-	if use xml ; then
-		cd "${S}"/packages/xpath
-		econf
-	fi
-}
-
-src_compile() {
-	cd "${S}"/build
-
-	emake
-
-	# All XSB Packages are compiled using a single Prolog engine.
-	# Consequently they must all be compiled using a single make job.
-
-	cd "${S}"/packages
-	rm -f *.xwam
-	emake -j1
-
-	if use curl ; then
-		emake -j1 curl
-		emake -j1 sgml
-		if use xml ; then
-			emake -j1 xpath
-		fi
-	fi
-
-	if use mysql ; then
-		emake -j1 mysql
-	fi
-
-	if use odbc ; then
-		emake -j1 odbc
-	fi
-
-	if use pcre ; then
-		emake -j1 pcre
-	fi
-}
-
-src_install() {
-	cd "${S}"/build
-	emake DESTDIR="${D}" install
-
-	local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
-	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
-
-	cd "${S}"/packages
-	local PACKAGES=${XSB_INSTALL_DIR}/packages
-	insinto ${PACKAGES}
-	doins *.xwam
-
-	insinto ${PACKAGES}/chr
-	doins chr/*.xwam
-
-	insinto ${PACKAGES}/clpqr
-	doins clpqr/*.xwam
-
-	insinto ${PACKAGES}/gap
-	doins gap/*.xwam
-
-	insinto ${PACKAGES}/justify
-	doins justify/*.xwam
-	doins justify/*.H
-
-	insinto ${PACKAGES}/regmatch
-	doins regmatch/*.xwam
-	insinto ${PACKAGES}/regmatch/cc
-	doins regmatch/cc/*.H
-
-	insinto ${PACKAGES}/slx
-	doins slx/*.xwam
-
-	insinto ${PACKAGES}/wildmatch
-	doins wildmatch/*.xwam
-	insinto ${PACKAGES}/wildmatch/cc
-	doins wildmatch/cc/*.H
-
-	if use curl ; then
-		insinto ${PACKAGES}/curl
-		doins curl/*.xwam
-		insinto ${PACKAGES}/curl/cc
-		doins curl/cc/*.H
-		insinto ${PACKAGES}/sgml
-		doins sgml/*.xwam
-		insinto ${PACKAGES}/sgml/cc
-		doins sgml/cc/*.H
-		insinto ${PACKAGES}/sgml/cc/dtd
-		doins sgml/cc/dtd/*
-		if use xml ; then
-			insinto ${PACKAGES}/xpath
-			doins xpath/*xwam
-			insinto ${PACKAGES}/xpath/cc
-			doins xpath/cc/*.H
-		fi
-	fi
-
-	if use mysql || use odbc ; then
-		insinto ${PACKAGES}/dbdrivers
-		doins dbdrivers/*.xwam
-		doins dbdrivers/*.H
-		insinto ${PACKAGES}/dbdrivers/cc
-		doins dbdrivers/cc/*.H
-		if use mysql ; then
-			insinto ${PACKAGES}/dbdrivers/mysql
-			doins dbdrivers/mysql/*.xwam
-			insinto ${PACKAGES}/dbdrivers/mysql/cc
-			doins dbdrivers/mysql/cc/*.H
-		fi
-		if use odbc ; then
-			insinto ${PACKAGES}/dbdrivers/odbc
-			doins dbdrivers/odbc/*.xwam
-			insinto ${PACKAGES}/dbdrivers/odbc/cc
-			doins dbdrivers/odbc/cc/*.H
-		fi
-	fi
-
-	if use pcre ; then
-		insinto ${PACKAGES}/pcre
-		doins pcre/*.xwam
-		insinto ${PACKAGES}/pcre/cc
-		doins pcre/cc/*.H
-	fi
-
-	cd "${S}"
-	dodoc FAQ README
-}
diff --git a/dev-lang/xsb/xsb-3.7.0-r1.ebuild b/dev-lang/xsb/xsb-3.7.0-r1.ebuild
deleted file mode 100644
index 983c93a7be46..000000000000
--- a/dev-lang/xsb/xsb-3.7.0-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="XSB${PV//./}"
-
-PATCHSET_VER="3"
-
-inherit autotools java-pkg-opt-2
-
-DESCRIPTION="XSB is a logic programming and deductive database system"
-HOMEPAGE="http://xsb.sourceforge.net"
-SRC_URI="http://xsb.sourceforge.net/downloads/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl debug iodbc java mysql odbc pcre threads xml"
-
-RDEPEND="curl? ( net-misc/curl )
-	iodbc? ( dev-db/libiodbc )
-	java? ( >=virtual/jdk-1.4:= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/XSB
-
-PATCHES=( "${WORKDIR}/${PV}" )
-
-src_prepare() {
-	default
-	cd "${S}"/build
-	eautoconf
-}
-
-src_configure() {
-	cd "${S}"/build
-
-	econf \
-		--prefix=/usr/$(get_libdir) \
-		--disable-optimization \
-		--without-smodels \
-		$(use_with odbc) \
-		$(use_with iodbc) \
-		$(use_enable threads mt) \
-		$(use_enable debug)
-
-	if use curl ; then
-		cd "${S}"/packages/curl
-		econf
-	fi
-
-	if use mysql ; then
-		cd "${S}"/packages/dbdrivers/mysql
-		econf
-	fi
-
-	if use odbc ; then
-		cd "${S}"/packages/dbdrivers/odbc
-		econf
-	fi
-
-	if use pcre ; then
-		cd "${S}"/packages/pcre
-		econf
-	fi
-
-	if use xml ; then
-		cd "${S}"/packages/xpath
-		econf
-	fi
-}
-
-src_compile() {
-	cd "${S}"/build
-
-	default
-
-	# All XSB Packages are compiled using a single Prolog engine.
-	# Consequently they must all be compiled using a single make job.
-
-	cd "${S}"/packages
-	rm -f *.xwam
-	emake -j1
-
-	if use curl ; then
-		emake -j1 curl
-		emake -j1 sgml
-		if use xml ; then
-			emake -j1 xpath
-		fi
-	fi
-
-	if use mysql ; then
-		emake -j1 mysql
-	fi
-
-	if use odbc ; then
-		emake -j1 odbc
-	fi
-
-	if use pcre ; then
-		emake -j1 pcre
-	fi
-}
-
-src_install() {
-	cd "${S}"/build
-	default
-
-	local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
-	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
-
-	cd "${S}"/packages
-	local PACKAGES=${XSB_INSTALL_DIR}/packages
-	insinto ${PACKAGES}
-	doins *.xwam
-
-	insinto ${PACKAGES}/chr
-	doins chr/*.xwam
-
-	insinto ${PACKAGES}/clpqr
-	doins clpqr/*.xwam
-
-	insinto ${PACKAGES}/gap
-	doins gap/*.xwam
-
-	insinto ${PACKAGES}/justify
-	doins justify/*.xwam
-	doins justify/*.H
-
-	insinto ${PACKAGES}/regmatch
-	doins regmatch/*.xwam
-	insinto ${PACKAGES}/regmatch/cc
-	doins regmatch/cc/*.H
-
-	insinto ${PACKAGES}/slx
-	doins slx/*.xwam
-
-	insinto ${PACKAGES}/wildmatch
-	doins wildmatch/*.xwam
-	insinto ${PACKAGES}/wildmatch/cc
-	doins wildmatch/cc/*.H
-
-	if use curl ; then
-		insinto ${PACKAGES}/curl
-		doins curl/*.xwam
-		insinto ${PACKAGES}/curl/cc
-		doins curl/cc/*.H
-		insinto ${PACKAGES}/sgml
-		doins sgml/*.xwam
-		insinto ${PACKAGES}/sgml/cc
-		doins sgml/cc/*.H
-		insinto ${PACKAGES}/sgml/cc/dtd
-		doins sgml/cc/dtd/*
-		if use xml ; then
-			insinto ${PACKAGES}/xpath
-			doins xpath/*xwam
-			insinto ${PACKAGES}/xpath/cc
-			doins xpath/cc/*.H
-		fi
-	fi
-
-	if use mysql || use odbc ; then
-		insinto ${PACKAGES}/dbdrivers
-		doins dbdrivers/*.xwam
-		doins dbdrivers/*.H
-		insinto ${PACKAGES}/dbdrivers/cc
-		doins dbdrivers/cc/*.H
-		if use mysql ; then
-			insinto ${PACKAGES}/dbdrivers/mysql
-			doins dbdrivers/mysql/*.xwam
-			insinto ${PACKAGES}/dbdrivers/mysql/cc
-			doins dbdrivers/mysql/cc/*.H
-		fi
-		if use odbc ; then
-			insinto ${PACKAGES}/dbdrivers/odbc
-			doins dbdrivers/odbc/*.xwam
-			insinto ${PACKAGES}/dbdrivers/odbc/cc
-			doins dbdrivers/odbc/cc/*.H
-		fi
-	fi
-
-	if use pcre ; then
-		insinto ${PACKAGES}/pcre
-		doins pcre/*.xwam
-		insinto ${PACKAGES}/pcre/cc
-		doins pcre/cc/*.H
-	fi
-
-	cd "${S}"
-	dodoc FAQ README
-}