gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /dev-lang
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
46 files changed, 409 insertions, 507 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 3fbbee5b49e0..f9582817e1f6 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 221695d4edd6..a67f2c4b8389 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -8,7 +8,7 @@ DIST R-3.6.0.tar.gz 30449618 BLAKE2B 2fb2f1252f5ead97ab42eb1f71fa0be1e8aec2f6cce
 DIST R-3.6.2.tar.gz 33311930 BLAKE2B 53f344e80e017064a275c271d98be714e210193931a120e7ebc79ee6cf0ebc0c24c090acc25560998f26600c05305147816ab782632d99beaea83b3a9b5e2a21 SHA512 17513e9f4dd27c61c11f7aa45227aeeeefb375bf5d4e193b471724f379a1b2da33e127cbe91aa175cbbbb048b892047e2f610280585c8159242a6c94790b07f9
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
 EBUILD R-3.4.1.ebuild 6283 BLAKE2B 87469504881749122a9db87b227ec4be47439fef0080d872ce9c395e4168e06bbf92725f79c4cc36c81c0a0ae9dc7a99eeab2e92eb779575f394924bcc94cffc SHA512 dc3833f5e0312728c7b9c55e07c83533da0f97d76a0769d78d1146b9576b92b1a130571f6b2b02f841474e1110d1624458855e354e6e1b14688cebc458ee9f7a
-EBUILD R-3.5.3.ebuild 6289 BLAKE2B a298e4c489687a7f085ae912d8c3cd2f828507a75cf1de6e6ccc96070e266bac44410241058be1d89b8cf7554e546fd85bd7b9df615c4d1080fcd7dafd17ec0e SHA512 53b5a749a55e8fb82ff1aa160d79ec50bac06fb7978aee3376bddf7a57f6826a964b938ec53775b8744dbeea3990ffa77f7a33e91c4dfa44304e71683ac41d71
-EBUILD R-3.6.0.ebuild 6289 BLAKE2B a298e4c489687a7f085ae912d8c3cd2f828507a75cf1de6e6ccc96070e266bac44410241058be1d89b8cf7554e546fd85bd7b9df615c4d1080fcd7dafd17ec0e SHA512 53b5a749a55e8fb82ff1aa160d79ec50bac06fb7978aee3376bddf7a57f6826a964b938ec53775b8744dbeea3990ffa77f7a33e91c4dfa44304e71683ac41d71
-EBUILD R-3.6.2.ebuild 6370 BLAKE2B 0a703870c07c856a130f04a6d6b4c34e7d45d8104b7b78a95a176c327d7a6cef5d8fc36972c693f65f5a2f08cfe8f41c1b333bd21bfe48ef87686935d40a1438 SHA512 43654976d259bbdcb67d9b5356899ffd27e54b7e5ea240804b2a51a33df98abc8f29e00758dc929d8e9bd742d61f545cbfcb2fe65c887d21f579bcec1b3557d6
+EBUILD R-3.5.3.ebuild 6279 BLAKE2B 4674b9336e123bc78652603d203dee6a9a09c2a59648216874c8c0a7e214a85709900eacb92e28bece20ea8c9d890e6126150b458b697495c54ab321b714272f SHA512 c9ab6e44de46d6fd9f4b5f043b2a38ca4aeda997eb56715c14159c3d58c3d579755689ce102025a300389db46ac95f74f5ead9b50156085d16ff1ed9547a2b6c
+EBUILD R-3.6.0.ebuild 6279 BLAKE2B 4674b9336e123bc78652603d203dee6a9a09c2a59648216874c8c0a7e214a85709900eacb92e28bece20ea8c9d890e6126150b458b697495c54ab321b714272f SHA512 c9ab6e44de46d6fd9f4b5f043b2a38ca4aeda997eb56715c14159c3d58c3d579755689ce102025a300389db46ac95f74f5ead9b50156085d16ff1ed9547a2b6c
+EBUILD R-3.6.2.ebuild 6360 BLAKE2B aea82d4f0d13a3e7f6bfab0ae3e701713cb0e98ce1fed38c5a079280d2d7197e8502363ac5988439babea3b0a6a6f0bf3de158b94b3e78a4e3de8cca8de2f8cb SHA512 367d56e7f151b99adaef004616caf13e3ce12be0faa61e9fa1795b2ebe184d56e8657b9015cca187ed9aecf13b0fa582595e492195b85e411eb5c8ad5956bbda
 MISC metadata.xml 1140 BLAKE2B 774221eb531b4e80f0650b627b9ce53d9a2daf6342b1f19579d2d046e1c83aa497cc764870406b7ea3cf6cbae899cb6d460af92991d62bc6aea8da026a441822 SHA512 297c7e17998f92fb836b0599ce5221aee1ba1e7b1504edb348a602b695faf381d51f32f6118f5ef4bb353f02e92ffc5b3520b8d317d3e30a68a3cce0254fa6b1
diff --git a/dev-lang/R/R-3.5.3.ebuild b/dev-lang/R/R-3.5.3.ebuild
index df86d7063895..35f7ce8af6b0 100644
--- a/dev-lang/R/R-3.5.3.ebuild
+++ b/dev-lang/R/R-3.5.3.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
 		-i src/library/tools/R/Rd.R || die
 
 	# fix Rscript path when installed (gentoo bug #221061)
-	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" \
+	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \
 		-i src/unix/Makefile.in || die "sed unix Makefile failed"
 
 	# fix HTML links to manual (gentoo bug #273957)
@@ -116,10 +116,10 @@ src_prepare() {
 				-e "/SHLIB_EXT/s/\.so/.dylib/" \
 				-i configure.ac || die
 			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
 				-i src/nmath/standalone/Makefile.in || die
 		else
-			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+			append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
 		fi
 	fi
 	AT_M4DIR=m4
@@ -175,8 +175,8 @@ src_install() {
 	fi
 
 	cat > 99R <<-EOF
-		LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
-		R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
+		LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+		R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
 	EOF
 	doenvd 99R
 	newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
diff --git a/dev-lang/R/R-3.6.0.ebuild b/dev-lang/R/R-3.6.0.ebuild
index df86d7063895..35f7ce8af6b0 100644
--- a/dev-lang/R/R-3.6.0.ebuild
+++ b/dev-lang/R/R-3.6.0.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
 		-i src/library/tools/R/Rd.R || die
 
 	# fix Rscript path when installed (gentoo bug #221061)
-	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" \
+	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \
 		-i src/unix/Makefile.in || die "sed unix Makefile failed"
 
 	# fix HTML links to manual (gentoo bug #273957)
@@ -116,10 +116,10 @@ src_prepare() {
 				-e "/SHLIB_EXT/s/\.so/.dylib/" \
 				-i configure.ac || die
 			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
 				-i src/nmath/standalone/Makefile.in || die
 		else
-			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+			append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
 		fi
 	fi
 	AT_M4DIR=m4
@@ -175,8 +175,8 @@ src_install() {
 	fi
 
 	cat > 99R <<-EOF
-		LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
-		R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
+		LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+		R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
 	EOF
 	doenvd 99R
 	newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
diff --git a/dev-lang/R/R-3.6.2.ebuild b/dev-lang/R/R-3.6.2.ebuild
index b428a1112711..f3312585e0cc 100644
--- a/dev-lang/R/R-3.6.2.ebuild
+++ b/dev-lang/R/R-3.6.2.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
 		-i src/library/tools/R/Rd.R || die
 
 	# fix Rscript path when installed (gentoo bug #221061)
-	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" \
+	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \
 		-i src/unix/Makefile.in || die "sed unix Makefile failed"
 
 	# fix HTML links to manual (gentoo bug #273957)
@@ -118,10 +118,10 @@ src_prepare() {
 				-e "/SHLIB_EXT/s/\.so/.dylib/" \
 				-i configure.ac || die
 			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
 				-i src/nmath/standalone/Makefile.in || die
 		else
-			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+			append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
 		fi
 	fi
 	AT_M4DIR=m4
@@ -177,8 +177,8 @@ src_install() {
 	fi
 
 	cat > 99R <<-EOF
-		LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
-		R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
+		LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+		R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
 	EOF
 	doenvd 99R
 	newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index b853b8c57382..6e7737edbcd8 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -19,6 +19,8 @@ DIST erlang-22.2.1.tar.gz 55742915 BLAKE2B cfb49a07289f66ee8bcdc37452c88ec60c90b
 DIST erlang-22.2.2.tar.gz 55743605 BLAKE2B f316b78f33d81f05d22eb4eab52756a46c39df31ce93bf57ddbc6d663d0165f6cdcb4de2e4a70308024e7648a54267364ec19c94c425d643d03dc741112acaff SHA512 c38ecfcbc7ca66d45b5a2dad9a03d9c2a3a504d9ac85635de93975b03056a3d59edf462c296349f657534d935bcc1ea4321b771fb216f54f723d9db438437e42
 DIST erlang-22.2.3.tar.gz 55742102 BLAKE2B 85c1f9a2f6ae05e8e3c0f4c71c0dc4f1dd14f5a91e35070f20631b9349fd5d884a9c5390a0159bafcfda8464253bb3636a735f05f4d286ce2bf0518bdb3f3b50 SHA512 4ec29abfba875ddff700ed19095bf5709e75083530216ac8f3b24147e06d098675d1b4e5c0674aef44bc7391fe8e3fbcfc2e17d8083cd006e5ddb5c910010e44
 DIST erlang-22.2.4.tar.gz 55746886 BLAKE2B 2132ab12789c98259f284cd0188109eb1bdbac63c3f6c5bb7a79572dd99586bdf9b741b3b2c87965f5794c3d41df1f0b713e9b89ebff0707ab9fa079dd20a9d2 SHA512 b73bb94c0172635cc4843958a62959c42085e63916423cebbb094cef9684ffd0491874a12338c7066cc94b660ac8b6f6aae73cc0eedcf5517ba1c85cf1b80258
+DIST erlang-22.2.5.tar.gz 55745622 BLAKE2B 3bc0ef57dfedd46f3ab870622c5daa5424a0b1bc9669cb46e7d59a15d485cac9228896cb75883eb6c92b509e193ae484dee6ad2792a959c78cb74c6e18507083 SHA512 56252d7da1e42c27378ae3a1d587446554443207e9bbe2381f74626bf0fbb1c37d3117ed81a01b5c5e01eb76bfa4fb04159813f4df52ae5b8f5dfd261f555b02
+DIST erlang-22.2.6.tar.gz 55746963 BLAKE2B ebd1e11dc817285307add4147fc4f3c1bba4e9b8a19fa3dd61ec321aa4dfdb056406d76216185a39316787efc9bd766a1e7441b8c261bcb98c4b642c87a27357 SHA512 6da4b25340a37daa30d3a27081b782f24a53edfca0070f6c02ca0332bc8db9b3bad917c43d63470a15a86a44a439072f3ee1472b23ff8163730443e4a811c66b
 DIST erlang-22.2.tar.gz 55736930 BLAKE2B bcd67ea4ef5c358d4f0bcbec977e2c60a3b0f1ccccb2d38c35ba1908ed9d96727c83ab6cb6dc69ce90ffc6772e34de68014cc66ec8c3bfcda852844a4f6b1548 SHA512 a192da8ee02588c44e5c04bf2933c95672f596ca10f485c2c41d0c97563c90b5ea24fa02da61e007595f25a80557e6513372db3059bb7e394647a4c11f4cd41e
 DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
 DIST erlang_doc_html_22.1.tar.gz 33824830 BLAKE2B 2d50802fff81eba8bcf5f630da49d68d7cb2098175012e12f13941e69949a109c9f601c3cfaa2700b669415cd0c6c15961d8e4dd94b9b228cee17b661fe5400a SHA512 cc24927a4ff98b04d8f93fbc46bb36ffb34570521e4f31154b778dc17cf1cff60869239c26c327d7a9360c06528f9b380a302b39fa47285e50dfd4656b508202
@@ -33,5 +35,7 @@ EBUILD erlang-22.2.1-r1.ebuild 4409 BLAKE2B ad23a960bf847324e20a0aed506839848335
 EBUILD erlang-22.2.2.ebuild 4450 BLAKE2B d077fa20d38850d1fd9c8f29a0f4b22e82129af1f21a635f45437e6b841e250e15493f943203756e9746739041dff2476fc36ee92f559c6b1a2eb661bc10f119 SHA512 c7d811297276e91fa327d34023474a28e5fcf056af9da63486f0f589c7582d2f47ae62d255dfac79cfbd8ab8c5a8661beb2a595597f88558fc405e77d8563a2e
 EBUILD erlang-22.2.3.ebuild 4450 BLAKE2B d077fa20d38850d1fd9c8f29a0f4b22e82129af1f21a635f45437e6b841e250e15493f943203756e9746739041dff2476fc36ee92f559c6b1a2eb661bc10f119 SHA512 c7d811297276e91fa327d34023474a28e5fcf056af9da63486f0f589c7582d2f47ae62d255dfac79cfbd8ab8c5a8661beb2a595597f88558fc405e77d8563a2e
 EBUILD erlang-22.2.4.ebuild 4450 BLAKE2B d077fa20d38850d1fd9c8f29a0f4b22e82129af1f21a635f45437e6b841e250e15493f943203756e9746739041dff2476fc36ee92f559c6b1a2eb661bc10f119 SHA512 c7d811297276e91fa327d34023474a28e5fcf056af9da63486f0f589c7582d2f47ae62d255dfac79cfbd8ab8c5a8661beb2a595597f88558fc405e77d8563a2e
+EBUILD erlang-22.2.5.ebuild 4450 BLAKE2B d077fa20d38850d1fd9c8f29a0f4b22e82129af1f21a635f45437e6b841e250e15493f943203756e9746739041dff2476fc36ee92f559c6b1a2eb661bc10f119 SHA512 c7d811297276e91fa327d34023474a28e5fcf056af9da63486f0f589c7582d2f47ae62d255dfac79cfbd8ab8c5a8661beb2a595597f88558fc405e77d8563a2e
+EBUILD erlang-22.2.6.ebuild 4450 BLAKE2B d077fa20d38850d1fd9c8f29a0f4b22e82129af1f21a635f45437e6b841e250e15493f943203756e9746739041dff2476fc36ee92f559c6b1a2eb661bc10f119 SHA512 c7d811297276e91fa327d34023474a28e5fcf056af9da63486f0f589c7582d2f47ae62d255dfac79cfbd8ab8c5a8661beb2a595597f88558fc405e77d8563a2e
 EBUILD erlang-22.2.ebuild 4409 BLAKE2B ad23a960bf847324e20a0aed506839848335257a9317af46decfb4c4ab7a811f954a0eb2ad16897df323d80d33febc4b371208d466322ac880763300332f4060 SHA512 8ecec73e1cf697ed7e5a7970526466e21e746d64e0c97844c167680a33b44896448125758e2311bcbd53de4c80ae3a697b1a691de59c4df75cc7db4123a02f7d
 MISC metadata.xml 905 BLAKE2B c1277904d14789138212ad1c83291d30301558aba707d1eb43765573c32617bfcb0eea43acc80225870cf2fbab011920b64bbecbdd28d414d73eb3c86a00937c SHA512 f79228f075fc6ac58785bc8a6c574546674b7ddd6c4f7420cb616414cf5178c2fa08284668b0d863ae3638891567184d1e8a490e31c4e093724ebff5c177a461
diff --git a/dev-lang/erlang/erlang-22.2.5.ebuild b/dev-lang/erlang/erlang-22.2.5.ebuild
new file mode 100644
index 000000000000..c52ed00f231a
--- /dev/null
+++ b/dev-lang/erlang/erlang-22.2.5.ebuild
@@ -0,0 +1,155 @@
+# 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 )
+	tk? ( dev-lang/tk:0 )
+	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"
+	"${FILESDIR}/${PN}-22.2.2-gcc-10.patch"
+	"${FILESDIR}/${PN}-22.1.4-asn1-dep.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
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
+		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/erlang/erlang-22.2.6.ebuild b/dev-lang/erlang/erlang-22.2.6.ebuild
new file mode 100644
index 000000000000..c52ed00f231a
--- /dev/null
+++ b/dev-lang/erlang/erlang-22.2.6.ebuild
@@ -0,0 +1,155 @@
+# 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 )
+	tk? ( dev-lang/tk:0 )
+	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"
+	"${FILESDIR}/${PN}-22.2.2-gcc-10.patch"
+	"${FILESDIR}/${PN}-22.1.4-asn1-dep.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
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
+		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/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index 03d0bfe879ac..65ab36b2776c 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -1,6 +1,5 @@
 AUX jsonnet-0.12.1-dont-call-make-from-setuppy.patch 387 BLAKE2B 8c0223b10cf1b61707b10361cfb96a01f492d234b3318554628dfc51a49728022db2f6573cf78d66a38cae0f59e2054e985e189268254563c0bf9e6854b3c129 SHA512 287a17a6b3aaf8c9a971874ff2a507c8d301caf84d243bd1d063d58e21e93bbecc2b417767e0d56d87f300cef9811f7aec0caa8616292950b11eb3103f7bebbb
 AUX jsonnet-0.14.0-makefile.patch 752 BLAKE2B 5acf8e07cd0f1b9af658015e6ee560f31a25b4b17402e0516bc8a861db4f31d9cb23e86943389d36f0885f4afc179b433764a331aea7a0164368e3561490da61 SHA512 18230b761ec3d3d106e06d02680b54229eb20c681b7591209dbb7d5ee138edc3a5015d1e53d3238dd9c86753bcc3f5ef3352a733e9a950fca4b37af8d83c9888
-DIST jsonnet-0.14.0.tar.gz 21857157 BLAKE2B 93de74fa07efa300097ccb9503b41543beb749d5aff130ad9a6139a3ceb0a07b404aa50877d4cbacd9eb26b2194d8cd9bf578521f17f84a3480655b179525663 SHA512 e09fb27202a34e88134d98d59fdccd4f1ee777e7c8090c3687cb5c11b9ada3bfe7b878322e0274743694ff77457215484470ccf90d03d9d36159288e5a18ab0b
-EBUILD jsonnet-0.14.0-r1.ebuild 1362 BLAKE2B 9ee289a3802cac0f51b3b4e8e57a0a2f02a65d693ae15b9f58eca243948f96d4c40af416b3e9d27872f69a9d3893a259172bb23444cb5425358ca66c66336512 SHA512 066de4f82c9a415291f7bf3f2f9721ea49a5a00aecc51ac8ab2afc1751546bb665d19235d76759fe923dbc4b919e6c50127ced0505b005b37b4705f152748208
-EBUILD jsonnet-0.14.0.ebuild 1367 BLAKE2B 488583ee08348f1bb75fe187574db7d3f5c3fa6142252dfa730ddd0936115ea5550cb93cb95e31d1a6de55b538374aa68034ed2dd91d2eb938a612347cb15b92 SHA512 3ac0c8e6ef1a75382a21fb15e00ee93c03886d37214f8dd102c59e61f1d81a46032f7ce4ec1330ca165e2b4957665e27e4c9f6d4381c1a7b1e42f5500b24f17f
+DIST jsonnet-0.15.0.tar.gz 21826038 BLAKE2B 722a844c00ec31b662d932a4481a71197adad680181c6a56a49dfa3e9b63696d29320c5278024d44c0ab3d7d80569514792f815ac7fa3a3cc08c7756fb6f08ad SHA512 b63c1bf82e4fc9ba3f1009ed4e4ba1010e3e7f81bd816a234e48d35607eae3cba95cab57813d35daa9f024e316bae5256340a6f8d6d884f9136cdbf062a2b351
+EBUILD jsonnet-0.15.0.ebuild 1362 BLAKE2B c964f25e046778eebe7b12a3a9f72e057849c33a61b2bdfbc8e188000b4ecd81529000cc88abe04a69b440ced1ab9453bb1db462e5ae4ed7a72426e4d4f0ad3b SHA512 a4a3610b032b23d3a1344813233f174d90096a26d2fc13742b9509899267038bef5833b7c8f74ac4da7756e40378ca2def4fccde72144971b4edb63dea2f9f55
 MISC metadata.xml 621 BLAKE2B cf9e06f9981b454578c1769425dc15a7a271063b2a95c296db1326c4b4ce0f93ff96a2df42143d9d6fb8e1e196039a26119c35a4881c7d6b2241b58b01cdc948 SHA512 ea583ea6df7d0994e13bf01fff4b99b65ac288e734d41f52bffa4ae8a83d27196622074a6a29bfbbf190125a9cf29e6602f5b4a55ccec76c6324f3ac0b1f50ef
diff --git a/dev-lang/jsonnet/jsonnet-0.14.0.ebuild b/dev-lang/jsonnet/jsonnet-0.14.0.ebuild
deleted file mode 100644
index 6c941fab0926..000000000000
--- a/dev-lang/jsonnet/jsonnet-0.14.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit toolchain-funcs flag-o-matic distutils-r1
-
-DESCRIPTION="A data templating language for app and tool developers "
-HOMEPAGE="https://jsonnet.org/"
-SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="custom-optimization python"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-BDEPEND="python? ( ${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/jsonnet-0.14.0-makefile.patch"
-	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
-)
-
-src_prepare() {
-	default
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	use custom-optimization || replace-flags '-O*' -O3
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		jsonnet \
-		libjsonnet.so \
-		libjsonnet++.so
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" test
-	use python && distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test || die
-}
-
-src_install() {
-	dolib.so libjsonnet*.so
-	dobin jsonnet
-
-	use python && distutils-r1_src_install
-}
diff --git a/dev-lang/jsonnet/jsonnet-0.14.0-r1.ebuild b/dev-lang/jsonnet/jsonnet-0.15.0.ebuild
index ea949946fb6a..376e4e886d5c 100644
--- a/dev-lang/jsonnet/jsonnet-0.14.0-r1.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index d504fffe0858..da07149c9e7e 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -10,7 +10,7 @@ DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B
 DIST julia-utf8proc-454f60150c7f023526d353e1e6b386f93ee0b116.tar.gz 154318 BLAKE2B 6173490aa458f300f29d6fc0f22b80ccff436f4c52df2ac54786a3f518a140ab6624cef0a7221c8e3800307c9b8490a604215fcb028001b1b95e7630b62ed85d SHA512 50a19aa56edc5c023611c40e75862f4c9c08e1bfad0bac9ec64413406cff8f409ff106a37f8c66202e563cbe3ae1d5a40036b14fd309651b50c30d3f205f08f5
 DIST julia-utf8proc-5c632c57426f2e4246e3b64dd2fd088d3920f9e5.tar.gz 154973 BLAKE2B 9696fae33c408abbddd2c5741a0c98b11474c7615d6610e53be919a3cce4a58f129de4ae36bb02636e94d1e57504103e8dd3a3faad3ce7c38e1dba0f513d2d47 SHA512 dec5d7e976bd808bc8edc39dda62b85ecb462b98b6059ace4acee27ec75f6839e0a2899a9baa225379ae5ffb5b568c63a666f52c9958075e5af0376f8a284534
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
-EBUILD julia-1.2.0.ebuild 5340 BLAKE2B 232ad7e980b3c402b8cde90d704b21e0a8814c28f188b99d0b5457551d79dea4c2036678e00cf75872b33772c80b2c221cb696e207040113bc8ca44e6a59675f SHA512 8418b1c0b368f464d7a22ee0314d68b7af5c65d47e918960d879a857fccb20f77752ac5f289b292ec129f70e40b8a6ba6e3a7c6c4ddaf7799aeedaa832157ddd
-EBUILD julia-1.3.0.ebuild 5336 BLAKE2B f7f5c462ebc0a7430aa62b8660110b28a45af088496353e2a2f321f355cbf627fa88cc72a584d6ad2774edb30e6ffe626ff1c14207227ac40740cc2c1aa74a6a SHA512 35e024b18e4aeb95079de6015c84bbab4f1cba4662cf1a41cb47f1564d60a8ce4ca290235deb5830991b42658e80a1c0c181c9c61248194d85681b72f1192308
-EBUILD julia-9999.ebuild 4084 BLAKE2B 35f568105c97830c95c5f90bb7a513ef50d26eef7dd7592b3a64d1f0374aa8463b7f3cd903764b6bf0e9aae37424806d90bb8fd22a6a223c2bd4f8e1deb701eb SHA512 22d8991bf50a73d7d63f79badaa676809d221694c5a2728f3296a52bd8b4c8fda34e7b63e15abb664fed8759c0e3da4d61d5bf64d17053b8f27ed4a4f04ebba7
+EBUILD julia-1.2.0.ebuild 5338 BLAKE2B 5ad03968e4c82858711ac77e8716ee8239be0762c38422b421f9003bc9226ecb4b10aecf2454519a4d250ea66cdbb1fc1a2d7c0af0119b0409ed09e2a79b8bb0 SHA512 9e2194250cf4f1b12446d499f37e43711b9b9ebb239ae315bae50c5e1d28eecf121c4ae5bd4370ee745815c14cfbb31f9ead31283b570c0e07bff0bd6af40298
+EBUILD julia-1.3.0.ebuild 5334 BLAKE2B 7c6ba0ddc56992e25651da2d2714753b5462b59e4bed87c6e277f84d32dee2c92dbe6366dbcf76316ead85889b70c8d85ec51303ab12f6ba63f9d468c21253ed SHA512 e1de17587ecc01734dacaa941145ce10414aa5043d43cc3c4937f2e0cd6266dbe778f56ac0a4766c9f59cfc1633b56d4a1538e6dffbff29204acf4acf15e9e4b
+EBUILD julia-9999.ebuild 4082 BLAKE2B f92bf0f8ac5d56ca1f8c3f23a9460387560632e5099ae671ee2f52745cd77a3ae7747c0377ce694153bb4fab78c14ce0d2cc7ca076d4cc3ed983aad4036d1dcb SHA512 22c5387edabcc0b24e5c78fc44869855d037adad591a6529d4e2dcbef5b45c27df392aab3f0766aec92a9f5e30d9ee935cb0cd460ca98ee10f941e4c7411149e
 MISC metadata.xml 1291 BLAKE2B 98782d71b9f74e628e4e6dc5264b7bcddfb61f4ce42c4e3baa0a2ec0cc6e2ef6368d1c2b1d755972b214823533c3935b4558c79bd920072649d9072b985efcd4 SHA512 0bbe350eef4d0daaa4a971b843b4359d2513dea5e2dc9e8a3b6241ff403c043f605634615c39a3fdb2a4d090851a19d6b20ebd5c7b3886f009ade3b5c16dfaaf
diff --git a/dev-lang/julia/julia-1.2.0.ebuild b/dev-lang/julia/julia-1.2.0.ebuild
index f38f2aa63633..088ce53300e4 100644
--- a/dev-lang/julia/julia-1.2.0.ebuild
+++ b/dev-lang/julia/julia-1.2.0.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
 	sed -i \
 		-e 's|git submodule|${EPREFIX}/bin/true|g' \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+		-e "s|/usr/include|${EPREFIX}/usr/include|g" \
 		deps/Makefile || die
 
 	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
diff --git a/dev-lang/julia/julia-1.3.0.ebuild b/dev-lang/julia/julia-1.3.0.ebuild
index 07d84380fe7c..c3e62fe9d541 100644
--- a/dev-lang/julia/julia-1.3.0.ebuild
+++ b/dev-lang/julia/julia-1.3.0.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
 	sed -i \
 		-e 's|git submodule|${EPREFIX}/bin/true|g' \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+		-e "s|/usr/include|${EPREFIX}/usr/include|g" \
 		deps/Makefile || die
 
 	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 7105dfb500b4..ec42a1aa9c9d 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -63,7 +63,7 @@ src_prepare() {
 
 	sed -i \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+		-e "s|/usr/include|${EPREFIX}/usr/include|g" \
 		deps/Makefile || die
 
 	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index 2b9d875b2154..5e8462e497ba 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -6,5 +6,5 @@ DIST lazarus-2.0.2-python.tar.gz 1060859 BLAKE2B 4d6f7dc275aacd0f70d9f7c85aba99a
 DIST lazarus-2.0.2.tar.gz 67092332 BLAKE2B 12fdca5b0d7c8bcad4f1c6a70c2ebb1d0974b0884cf89135be069744f01527fcd5b2a4b4c898cb500519ec3518025da453087954722cab43a60c1cdb164371d4 SHA512 0d2bf26afa3128104181fbe57b1adeaba3bb589b0a3b72598507825a3f08201d4480c6cff510a6f866dca4d49417fac3a2f68ca7e58fabe4f4e3bad97323c071
 EBUILD lazarus-1.0.12.ebuild 2353 BLAKE2B 92b70e8ac8a040c9128547c343fdd0f751b5cb72c6cd59c87724151bec4c8b593ea1a04587784f368d8d16e71f13ea13d7ce2256bbd4a9a6018c6869a04a0524 SHA512 93e90953cd2d4390bb1317c3e15094f8fb11f9e000f37f46a58362a71995c6b37643056c254a05baba3294cd6067b18d2016219ae0dba6bcea4be809dc6090ac
 EBUILD lazarus-1.8.4-r2.ebuild 3530 BLAKE2B 98ad3bf609155c9171b0911812c2cbf9bb7286ab3eee9c1d6c010dec5f0fd694409eb35f0a4d67d5e27f1abe8959129c87ef13f01e9491480d44a339c976db32 SHA512 767e7a9961425daefb834eb4cec25ce9ea537eb1ed50a44fefa11be4fd703fe3747c18158b81799f7cedad25d27e26b2bef3513a9f8f7fa6eba5b21f1bb01dc4
-EBUILD lazarus-2.0.2.ebuild 3532 BLAKE2B 58c6638d6b56ae1cbe073ca05d39e480da7526818a1d1623abbc560a41e793d4d348a1009852ee87889be11d098359c31464310d5a6ab5ae039b33c31fd0bc8a SHA512 6ef47f780e9fe5aa4b49c02c9a1e3048ee5488c14ddb4bcbdc9873d1be1bd53258d414402d9ba0466a0c975f3013ff70e166e05e857f1f1ec46eb35e9a945009
+EBUILD lazarus-2.0.2.ebuild 3526 BLAKE2B 3934b5669b97b47e4dff6b5fa7ad7fa62f8793d3f5f2baac95febac1fc4be4f9e543c58aafc7ec6406748e6bfb41883d8e191e90d0dd845e6d93417675502218 SHA512 a1fdb9b116bad9aca2ae7de73ec1b27df96a7386df6fa66653a14e716f9a61e4b388fe64c1e93ad51976bac2e9481a576ae8f825258c6d1727d78aabf164c589
 MISC metadata.xml 516 BLAKE2B b4023336c3271703bc3912f9ab02eed6b57178d1f468194bdac5ac9b01027c5f7c847e776e9b1048a9ce29a4939055e3c00e289868a740c76bb2b7c0e6ff9085 SHA512 991dd36587eaa2412af0fccac7664c72a1d9153d12b313ae151943d7c66ac095b3d2cbe61fe4d84c4566e196ff11e1c16c6ffe2ab6e00fa40fc2fdfe23cee524
diff --git a/dev-lang/lazarus/lazarus-2.0.2.ebuild b/dev-lang/lazarus/lazarus-2.0.2.ebuild
index 8724ffdb8bac..0a38db636893 100644
--- a/dev-lang/lazarus/lazarus-2.0.2.ebuild
+++ b/dev-lang/lazarus/lazarus-2.0.2.ebuild
@@ -84,7 +84,7 @@ src_install() {
 		--exclude="killme*" --exclude=".gdb_hist*" \
 		--exclude="debian"  --exclude="COPYING*" \
 		--exclude="*.app" \
-		"${S}" "${ED%/}"/usr/share \
+		"${S}" "${ED}"/usr/share \
 		|| die "Unable to copy files!"
 
 	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
@@ -97,9 +97,9 @@ src_install() {
 		diropts -m0755
 		dodir /etc/lazarus
 		cp -rf ../lazarus-package-config/* \
-			"${ED%/}"/etc/lazarus || die
+			"${ED}"/etc/lazarus || die
 		cp -rf ../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus \
-			"${ED%/}"/etc/lazarus || die
+			"${ED}"/etc/lazarus || die
 	fi
 
 	make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
diff --git a/dev-lang/mlton/Manifest b/dev-lang/mlton/Manifest
index e139bf56b893..dd9dd8eb305a 100644
--- a/dev-lang/mlton/Manifest
+++ b/dev-lang/mlton/Manifest
@@ -9,5 +9,5 @@ DIST mlton-20130715.src.tgz 25606142 BLAKE2B 3fa3e8cf4991faef98e23ae4cbe9e0db5ca
 DIST mlton-20180207-1.amd64-linux.tgz 18772644 BLAKE2B 7fe2d9db7edfb2d3e301be88e90b7dffe1441ff315ddac1464ef42fb436be1a9dc4e2c03fdb93880779360aed04cb7662a1a5a733f2d4158082d228f718d8b93 SHA512 74ab847ff567cde365a113f8819bae69cc18df20c441a6c6666b600980d2687faf143311f42be21a261b2493dc5c45fbecb4737c599cf767c3680afec06c2e0c
 DIST mlton-20180207.src.tgz 25003695 BLAKE2B 8cddfe83c76e05fda446917ddc85035b3d74534fe4bc597a839cd13cb59a15538f40a3f68bb8f7136f9cf8cb27a582e88ca0d14b8f7a4582a202b3bd075f3c9a SHA512 3599159950e857d257abce92abf5c548dd9c0b0cdc4ba0d7cdf9badb5d997f73386cd1ff79f563221b394dd831cb344e287927f90683b0715678edb3ca0ae15a
 EBUILD mlton-20130715.ebuild 3920 BLAKE2B 327347ad498c3b70d8d108c9ee2decf54fa3812bbec0bbc8d7eb0802edcb52b0881e8e538763334a853296e63fdc6b70c3adb23616f6b6a1a7bd95bfe789dfb3 SHA512 f5d40634f59e41015970599b3c6bf8812acb92aa21411a0a692cdef9bb6eb0de01c0bd079060c7b86a5922d9fbb4335f4ff132741b13eeba5c3aa71a9f7475c4
-EBUILD mlton-20180207.ebuild 7024 BLAKE2B 2d0c9379e5c62c4037cf1e5af55ca9da9d4948418567fbf24d15f52804143e310a31d6f80c8a75e4a06f839b9dbef40df16cb602f2cc1ad2d84d709b8261e88e SHA512 cfa3415c31a527b9274376c6cd0bcb6317a93007b0766a98ccc574696badbe2dbf2a9da31113310a532777dafba69fca232a52a9c9bd297c03befb09ebb90491
+EBUILD mlton-20180207.ebuild 7020 BLAKE2B 0ff3248b3b6b189ea02829b93aca5e3d14137a9379326d9d11501edcf91041657348717910acfb0879404f7e77e38d91bf006a15fad102e770f534e91497e377 SHA512 ebe7bbdb64af6c353df689dd00a876370ef53ea196c30be5538efa95f820d7fdcd75fc12e61524e7cd67934ffeacee1f1e4cd3462d4e936e55a0b702f55747a7
 MISC metadata.xml 672 BLAKE2B 1fd22f7212a973039a94dc14bc3f2853a7b56968d3b4a106605018ec53b45926b11cd8ee6b9ea187ea863ad5a43f8a094dc9baced81cdc57927d213ee587af6e SHA512 fa72f182a62140658bdbcc67268fd42ffe979d8370473af755fd691a156b3027002e3a80f341a4d9c2a8840d99e5140b8d4f6efb604c99bed2d6042ac811cfcf
diff --git a/dev-lang/mlton/mlton-20180207.ebuild b/dev-lang/mlton/mlton-20180207.ebuild
index b8df540a09ff..c4ff66ee2e6f 100644
--- a/dev-lang/mlton/mlton-20180207.ebuild
+++ b/dev-lang/mlton/mlton-20180207.ebuild
@@ -46,7 +46,7 @@ mlton_subdir() {
 }
 
 mlton_dir() {
-	echo "${EPREFIX%/}"/usr/$(mlton_subdir)
+	echo "${EPREFIX}"/usr/$(mlton_subdir)
 }
 
 mlton_memory_requirement() {
@@ -137,7 +137,7 @@ mlton_create_bin_stubs() {
 	for i in ${BIN_STUBS[*]}; do
 		cat <<- EOF >> ${i}
 			#!/bin/bash
-			exec ${EPREFIX%/}/usr/${SUBDIR}/bin/${i} \$*
+			exec ${EPREFIX}/usr/${SUBDIR}/bin/${i} \$*
 		EOF
 		chmod a+x ${i} || die
 	done
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index ba6732ba65db..3a47961d8356 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -3,9 +3,9 @@ DIST MoarVM-2019.03.tar.gz 5136086 BLAKE2B 695e5528934002b17f547a281482dc0015b39
 DIST MoarVM-2019.07.1.tar.gz 5189731 BLAKE2B 3dde716f6911fb8392346b34763439c37866da34361875e7bf1d9d15a4e2b1d9c1dbb668c42611172dcfd6c9060f9c95ec4bac0e5ac614af3038cc4752d9b6d9 SHA512 c8ffaf962191a60f643e6e1b765ec700664988ffc629765c273baf32d2748763480f9fd7a2d978b7f99d3ba4bf962775f4dca40053ace2ddd8cd0bffbd977d84
 DIST MoarVM-2019.07.tar.gz 5187102 BLAKE2B a9c56453edf5b5834d33187aea6eabacac9a721e7a27471a02b82585560ffbb5bb8807ae8c738f3138c5b0453217ad101aab23bef2c8b727cd2f8a56574abfd5 SHA512 ff5370cb2c7dc4357825f02387757e36a5e03b711021c896043ba5f68e573308146a0d94c7855ec9b4860906a3b0720d316d119ca5bbda908f17d3f4f14f4999
 DIST MoarVM-2019.11.tar.gz 5709053 BLAKE2B 5214a041d02fa9feebf50996460b4a73634bf69dc24edbda72d29fe3045504dde809143ba6edf57602a5207e45a02e9a69cfecd2dca0bb5922e5560dca4e5861 SHA512 d7d7d21ff0e3896b7cb869ea1298f9ff1b041b68062ac509d4571246f96985de0ad48d881f7c988e1ed470c4c5f859f36916bfd764cbc0e988c249682b0b8b41
-EBUILD moarvm-2019.03-r1.ebuild 1500 BLAKE2B df181c41d8056d8de35d81b6e51f75733fb2c66ae90e1a4a134f45021a5a244162be11691df40988b755d4fd17ef9d2b35416fa394836493100ac4c5ad422afc SHA512 a6680f07bd2f048fcf3ad99d4ab4980a6259924ae271674d31b4b8296687a174870f1b839307cffdaa8329d8219aba4a8cec5d3f8cf1c0f407026ac0bb90b0f9
-EBUILD moarvm-2019.07-r1.ebuild 1515 BLAKE2B 55b2ffc73338a82251bc4b51b4399bf210c72eb1b26aa953e548111db85d0215b24c223d02bc316d8dea2cc422d07e62f70d8a3ff7e9c5245e8e42c0e987fd16 SHA512 e2da2b2e6fc0ddf405e2692facb8e544fa54d94d98c25216406c74d9dcf1990c70b363b4b6fa1a32b8b5d2b34e1e3060028fdf179825b6ab90abe288fb86d9df
+EBUILD moarvm-2019.03-r1.ebuild 1496 BLAKE2B dd7acb8efa824ca516d7d7bf3fd425bab95bb358d818e9d028be5dfbad2afd4b20741b11373c421836e1a25c56e6a4019424b30132ffe7794aa0b56a3a0ba309 SHA512 b84932ff260a2d2ab42233bd94059a8b79c6e1ffef741ae10a6caec06dd1fdeef9d53099b34560e93752afd4dcc35c2000e530412c1f66917c2c25134e77d239
+EBUILD moarvm-2019.07-r1.ebuild 1511 BLAKE2B 2468e19fbb973990426f22b4f2535e183e6c5746f060e0df25111dd154e9c63380b4f4c6ab1f9449983e58d21e69f422b235f0860c997a55779b221b4539b2e9 SHA512 47b1270295acc936b3abba458c170df4965ef50d3f3b7f05ad64465ab9f68b17889a3a93a865b6392302c23fd26efea908d0f591b48b2f49b8536109ef664531
 EBUILD moarvm-2019.07.1-r1.ebuild 1765 BLAKE2B c961aadfb1fc6bc4cf4c73821a86f65e7f3ec82025701541bc55dcbe9449c4e7e15eed7be28992b75fad058b65d936e1248a9668e1b0619e9dc53f9306db419b SHA512 3845ff95d15475502a5c9541463d767e1e00875d53589209bb02ae24e494d6ebdfed393080935d592275a8c73e73cd2f889381298b85c93abe08089e67a41b4b
-EBUILD moarvm-2019.11.ebuild 1452 BLAKE2B 332ec11c368b9859dfa0761d7efa6cce35e06c089c032f0938122c254423c52796ccf03a89663abe39529331b50c0d16439c096879a27a4c34d8ceb07d618976 SHA512 70a8cdcad28b08c530f686e33272393913250ed670b7e9980dd03ad5299578f0d0cd564ebccf8b4d465dfd28c939a8d7a93f663dcbcfe5adf7fcc4bf274bc6d4
+EBUILD moarvm-2019.11.ebuild 1448 BLAKE2B 9f59bb9a393d456f200b6919ff432c9ef205e21a5107ea61dbec92f793bab135dc6e8095caaf37ff67ee0805f3f934158ef41d482b714af49e048896297c13f2 SHA512 4c58ef20dc0c86a5ca6823adfe5d97f01d81db1dcab6914ad591540bf350a62e6340d64091d39ba810d2bbd0b62a8bbadd1c09e2ef527519a9261a21c335ab1e
 EBUILD moarvm-9999.ebuild 1765 BLAKE2B c961aadfb1fc6bc4cf4c73821a86f65e7f3ec82025701541bc55dcbe9449c4e7e15eed7be28992b75fad058b65d936e1248a9668e1b0619e9dc53f9306db419b SHA512 3845ff95d15475502a5c9541463d767e1e00875d53589209bb02ae24e494d6ebdfed393080935d592275a8c73e73cd2f889381298b85c93abe08089e67a41b4b
 MISC metadata.xml 920 BLAKE2B dc15290595649a4f4c514f26cd219c3d8a97bb589fedac8cca202b64abe49f6851fe50d24f95f82c0dd61d183ed1f4091a4fb0f500e8f89a9b91dd7e932cc1ff SHA512 9250682955318d688f59e27b740e1b04095a85f036578d8fe2a2eeb31e159e34845a191734ba4997034dca80a32e29c8f4a0658b9a76ea78ff5fb4479124696b
diff --git a/dev-lang/moarvm/moarvm-2019.03-r1.ebuild b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
index 70a0082df833..2357769a5f1b 100644
--- a/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
@@ -39,8 +39,8 @@ RESTRICT=test
 src_configure() {
 	MAKEOPTS+=" NOISY=1"
 	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX%/}/usr"
-	local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+	local prefix="${EPREFIX}/usr"
+	local libdir="${EPREFIX}/usr/$(get_libdir)"
 	einfo "--prefix '${prefix}'"
 	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
diff --git a/dev-lang/moarvm/moarvm-2019.07-r1.ebuild b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
index fd84dc9ac68c..6b94964a1fd4 100644
--- a/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
@@ -44,8 +44,8 @@ PATCHES="${FILESDIR}/fix-quoting.patch"
 src_configure() {
 	MAKEOPTS+=" NOISY=1"
 	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX%/}/usr"
-	local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+	local prefix="${EPREFIX}/usr"
+	local libdir="${EPREFIX}/usr/$(get_libdir)"
 	einfo "--prefix '${prefix}'"
 	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
diff --git a/dev-lang/moarvm/moarvm-2019.11.ebuild b/dev-lang/moarvm/moarvm-2019.11.ebuild
index 7ca933ccf7b4..732ff5144878 100644
--- a/dev-lang/moarvm/moarvm-2019.11.ebuild
+++ b/dev-lang/moarvm/moarvm-2019.11.ebuild
@@ -41,8 +41,8 @@ RESTRICT=test
 src_configure() {
 	MAKEOPTS+=" NOISY=1"
 	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX%/}/usr"
-	local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+	local prefix="${EPREFIX}/usr"
+	local libdir="${EPREFIX}/usr/$(get_libdir)"
 	einfo "--prefix '${prefix}'"
 	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index f17010dcc340..8dd4a2e5ffd1 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,8 +1,8 @@
 DIST nqp-2019.03.official.tar.gz 3951058 BLAKE2B 237b8cc0105396fc96349a0dd34502ab45fb7d02089dd2ef5aad2554610b4090adf11679271869e5ae06abfa509210959ae8762fbee30dfe6190d6a74ce32591 SHA512 248768c1b1c0f5e5bd19183404e2a1aa28ab488b05db0b1ed0f0bcceca8b9830885762e763ea38cdd2b54d975d2663e1defe236907096aabc5b668818d293533
 DIST nqp-2019.07.1.tar.gz 3937612 BLAKE2B 71f5ddadaa70d7eeadc122ef50f90c13bf7e3a1a4262069ee8564f739e99dfb780359e1155a28f61f90dd1cc419379e366d7274c9567a4319bd841005c3a51a9 SHA512 90c9cfbc3de165ba8c0b4653a849a6faafef9e3862743c3675277c25bc4578522a97a663a4ed7529831fa0b617c7412fcfe67b3e3ff1fc5994f6c42cdf7a4bc5
 DIST nqp-2019.11.tar.gz 3942494 BLAKE2B 241c4131fc94d7055b51a44b7be824fb53a00fc51370f59dcba1d92655de66e2db536c622084bf9466d9d753d5ad804411b4af07b2767ad1a4f09e065c6693f8 SHA512 3b9fea9d9c4d2ae2ca065536bcca5b483067f9e723c3a89c7e238199c0f52ea6ba23ae4429dacbd42bea69dccbbc836efe5046d1691185d5452f30912f4e6a40
-EBUILD nqp-2019.03-r1.ebuild 3652 BLAKE2B 98256f4c5d360e3702c9afccb52fb2deafb0acc00e734498f279a624ea369b409dd1a703e80a2c3e864c50cbce722c5a7f19baa510b44f44cc3e6f6485d0e55c SHA512 b26d0662ee6c72592052b89abe6cdd6d2509f9a8b917c19fd695f1b2fef42860b7331637356e1e61e2325b0a4ce69a5892acc901cea9d43e9937ddfc202e35cb
-EBUILD nqp-2019.07.1.ebuild 3649 BLAKE2B 61c3ee8cb3bf94c237f88983827101e382d3ad917f3b9420320dd6dd084c58948bcc67065c63aad7a7526838234489d4488010e102915d69e7b97f45a6051806 SHA512 0d44d1b29f60588a01b48990411eb1a3c3878e34760137d3c64c96311d5f2f2405b2d8dba467fa7feefa392557f6fdfcb2edfbdcf714b809ffdd555f648281e6
-EBUILD nqp-2019.11.ebuild 3649 BLAKE2B 61c3ee8cb3bf94c237f88983827101e382d3ad917f3b9420320dd6dd084c58948bcc67065c63aad7a7526838234489d4488010e102915d69e7b97f45a6051806 SHA512 0d44d1b29f60588a01b48990411eb1a3c3878e34760137d3c64c96311d5f2f2405b2d8dba467fa7feefa392557f6fdfcb2edfbdcf714b809ffdd555f648281e6
-EBUILD nqp-9999.ebuild 3649 BLAKE2B 61c3ee8cb3bf94c237f88983827101e382d3ad917f3b9420320dd6dd084c58948bcc67065c63aad7a7526838234489d4488010e102915d69e7b97f45a6051806 SHA512 0d44d1b29f60588a01b48990411eb1a3c3878e34760137d3c64c96311d5f2f2405b2d8dba467fa7feefa392557f6fdfcb2edfbdcf714b809ffdd555f648281e6
+EBUILD nqp-2019.03-r1.ebuild 3650 BLAKE2B be60bab3e971b9b09353137f5b33499e581dfee0226af432b457bec3b0577c841b931f7bdb2dbec19f0a3c45a80ae34afb12a89c7861f9ed9df104b1b1958a08 SHA512 d2d1f4e2aeed46bce88b8921a5dc4aa5a2e5a1edfe92bf9ea9860beec0ad99b1a1e415d000ed800143907e37cf46c4ef62f7bd626e64dc2df5b3c6cfabf97875
+EBUILD nqp-2019.07.1.ebuild 3647 BLAKE2B 4fc52fad82ab690c4aa2b875db7b39ade3b7008a457b16e4af7a32a6fd4d8fb471e025e3c7e4901a0b5347d8dd6abd08f4bfa3907164229707333d17b44d24c5 SHA512 06301416e81ab6963bd4e3fdca4fd925f83f0e090f6ba7357eb463ac05e7f02c3b1c1a985adb6e004cb0cb85b9c3dc8d07191ddd6d7a279e73ea85f6c3e371c5
+EBUILD nqp-2019.11.ebuild 3647 BLAKE2B 4fc52fad82ab690c4aa2b875db7b39ade3b7008a457b16e4af7a32a6fd4d8fb471e025e3c7e4901a0b5347d8dd6abd08f4bfa3907164229707333d17b44d24c5 SHA512 06301416e81ab6963bd4e3fdca4fd925f83f0e090f6ba7357eb463ac05e7f02c3b1c1a985adb6e004cb0cb85b9c3dc8d07191ddd6d7a279e73ea85f6c3e371c5
+EBUILD nqp-9999.ebuild 3647 BLAKE2B 4fc52fad82ab690c4aa2b875db7b39ade3b7008a457b16e4af7a32a6fd4d8fb471e025e3c7e4901a0b5347d8dd6abd08f4bfa3907164229707333d17b44d24c5 SHA512 06301416e81ab6963bd4e3fdca4fd925f83f0e090f6ba7357eb463ac05e7f02c3b1c1a985adb6e004cb0cb85b9c3dc8d07191ddd6d7a279e73ea85f6c3e371c5
 MISC metadata.xml 634 BLAKE2B 1ef5daf7c995ddad1df4b2c7d33ecfc7a4cd146cb518314f88d58e370ede9e986bb47747b10952cf0ee6d587fe5925ba5b0086006182f3e16bd114d49e1a0f3a SHA512 a093877d22e76bbbced97c7752ed76d6aa110eb8d0676f97ae3d38ad79ab7b8ba770243b64e618b588faebf179713813fe6fc8ec7371c695c9f0979f6bce3dc0
diff --git a/dev-lang/nqp/nqp-2019.03-r1.ebuild b/dev-lang/nqp/nqp-2019.03-r1.ebuild
index 663242f61de6..9e1f45775e4c 100644
--- a/dev-lang/nqp/nqp-2019.03-r1.ebuild
+++ b/dev-lang/nqp/nqp-2019.03-r1.ebuild
@@ -70,7 +70,7 @@ nqp_configure() {
 	pushd "${BUILD_DIR}" > /dev/null || die
 	local myconfargs=(
 		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX%/}/usr" )
+		"--prefix=${EPREFIX}/usr" )
 
 	perl Configure.pl "${myconfargs[@]}" || die
 	popd || die
diff --git a/dev-lang/nqp/nqp-2019.07.1.ebuild b/dev-lang/nqp/nqp-2019.07.1.ebuild
index c6689cf62d83..4ff2af45cef6 100644
--- a/dev-lang/nqp/nqp-2019.07.1.ebuild
+++ b/dev-lang/nqp/nqp-2019.07.1.ebuild
@@ -71,7 +71,7 @@ nqp_configure() {
 	pushd "${BUILD_DIR}" > /dev/null || die
 	local myconfargs=(
 		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX%/}/usr" )
+		"--prefix=${EPREFIX}/usr" )
 
 	perl Configure.pl "${myconfargs[@]}" || die
 	popd || die
diff --git a/dev-lang/nqp/nqp-2019.11.ebuild b/dev-lang/nqp/nqp-2019.11.ebuild
index c6689cf62d83..4ff2af45cef6 100644
--- a/dev-lang/nqp/nqp-2019.11.ebuild
+++ b/dev-lang/nqp/nqp-2019.11.ebuild
@@ -71,7 +71,7 @@ nqp_configure() {
 	pushd "${BUILD_DIR}" > /dev/null || die
 	local myconfargs=(
 		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX%/}/usr" )
+		"--prefix=${EPREFIX}/usr" )
 
 	perl Configure.pl "${myconfargs[@]}" || die
 	popd || die
diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild
index c6689cf62d83..4ff2af45cef6 100644
--- a/dev-lang/nqp/nqp-9999.ebuild
+++ b/dev-lang/nqp/nqp-9999.ebuild
@@ -71,7 +71,7 @@ nqp_configure() {
 	pushd "${BUILD_DIR}" > /dev/null || die
 	local myconfargs=(
 		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX%/}/usr" )
+		"--prefix=${EPREFIX}/usr" )
 
 	perl Configure.pl "${myconfargs[@]}" || die
 	popd || die
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 05ea977653db..853dc435c8b9 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -9,5 +9,5 @@ DIST ocaml-patches-8.tar.bz2 1803 BLAKE2B 5e76a198c2f5ca9f231d4e80499d784cf061ec
 DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
 EBUILD ocaml-4.04.2-r1.ebuild 3534 BLAKE2B 7b1c23d8a4476a5ddd836119182e94f0407a6e66e3b38fc7e1474cf1b6c94142b0d0f1cd460d02bd6e990d9ecd7c91d8daf85e6594d884e2f0716d328fa781eb SHA512 4226e995d65e48c2d0ceb5836273e777dbabc072042f5771ae8acc4f3520326d88dd3c6706a6940fc65cac571e80c24973c780226c58a499bff921967cce595d
 EBUILD ocaml-4.05.0-r1.ebuild 3692 BLAKE2B f8f81b2c8127e5e3b8fc4b37ce9e0e01bf63e4b09c0727d20dfe36dd038ff4261f3383d7f63710eb73405d5eb6b6ab348bd88bc62665b8be7aee34b9a89c1802 SHA512 ab7bc8419507ff59eed35628183a0ea79319648adee66ec42313ad74df8b5a0c1e87db273cbe87d9e67b19a900eba0c473d3e167afc9c97490cb496b4c529cb4
-EBUILD ocaml-4.09.0.ebuild 2193 BLAKE2B b2073368e0c56d8c863ead457d79027cf17cc9bf74c59d9abff80486792991851f16a6cff0d2f4c887718aa67b58d2baf7c3063b36bb05bf2b675715186378de SHA512 4ad10bb3e1a07475eaef4664dd59cf4b377ef7c9942a3222f2405d7e4e4acd582b463a3468501076cf0ec00d382b38f7934be1b0e9e17999b54a1f8911deb9a4
+EBUILD ocaml-4.09.0.ebuild 2190 BLAKE2B 6875ad0d7d302913d414ac00499a3cdf9f63553445bdb9cefeb80c78ac0196368efa034014f6e4a2fb6770d9bda13baeb3eed447d98d71db4b305a978a1f825a SHA512 f397d49371d05cd66fa5693a37ffddc67f40012dd1c27fca79946838b8caa7953f478eacbffd1e2fc7d08a9c7e1e83725020a2a4871806a6ea21f03d43dd96d5
 MISC metadata.xml 605 BLAKE2B 30bf74c9300280f432ca8ae675b756e9b95a8e683c56eebae7fab890071c616bcc2a2fae516e31c593c0e626061aba603909b073ff6c3fea4d09e7fce40f3f83 SHA512 298d96d5685b1e79e1baab1e393ef083fa270d147a24ae2a35fa424b311dbf45931673dbf44974a946cd3423d62ce66df6d36017dcf6cb3275770c1cf6215c10
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index 5fb59fc6617a..04659b733643 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
 
 RDEPEND="sys-libs/binutils-libs:=
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index ccdc4b17dc52..8f56c7739f9f 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -24,7 +24,7 @@ EBUILD python-2.7.17-r1.ebuild 10497 BLAKE2B c4007d0d091dc763664cac39d4f47dad659
 EBUILD python-2.7.17.ebuild 10793 BLAKE2B 8e177e52f5c0e00f1f0706b7546de6ca45ad0620567c3bdf510d0116490690c5b478a13af5fd99c236ca853e50084ef8b5903f83120319ddd6a7d8fca4cf3a4b SHA512 83836dd7dfc8cd96bd197baf26c328ac19a13bda8c18936820f47199f334b07c083c72a2144994733b1f481d9da158070fe3d09e669bd48d8dfae0228bb5e793
 EBUILD python-3.6.10.ebuild 10252 BLAKE2B 04910bc0dbf490aec1d21c7038264d2c2691cf9cffc5cb5534c14d6c5e4c04580acc19af99d19b25c81f184052a6945618110afa50123d8e81518d3f485d34ae SHA512 0cfc0d7d36d431cd8c127e59cf04679268b579d45607ab41e6383c8074e4c4741ca626ae453d6774f13dcec137128072182c8c1132be791ff65f368a7bee51e7
 EBUILD python-3.6.9.ebuild 10161 BLAKE2B 9c93e878bfeec83b33b0234882310bf6097ac6102c120ea71f2a9b31e7c6c1960d5a2223db22eb559f2d47e614b5c2b8355c79d35cce64b20ae30fd024997bfc SHA512 ec747b255d4a7ca6165301314294c8dd5f811849b99e1157aa99402a308ed3447342951229f4393a6ef8e7db0831dc4604d1c7bb8084f48689f0c813b27fb57a
-EBUILD python-3.7.5-r1.ebuild 9781 BLAKE2B c1da8b6b8ad94904c04a46d041ede5fa5ea01118d25372e688ddc796507ef1346956ab1b8f5e8181f1687f877f779c9c250229b36ce8612c1207e277df0ed1c9 SHA512 585096c63e3748d024afb1d5ed6367890d49ef3801286f568ad31bd9b4d5914884be11728e6d0a15449c410a4656250a692eb0ac0ade6dfb167b1f627d862d77
+EBUILD python-3.7.5-r1.ebuild 9739 BLAKE2B c1af21f063ff4565358d3fdf91192d10e4248d782376e08913dea711840c83d1a39becf1fc446da2c81ac4f118fb68fdecad32d6e6580efb369475eb22f07348 SHA512 11c197ce4609bf5c98bb7938cb30d3a9e9da2d4bb183f113cc6b356e90b58e9eca472912dcc92271ea9e0839dafe8c94c4c53c34543c7eae83dbe32afaba9864
 EBUILD python-3.7.6.ebuild 9799 BLAKE2B bfa59f2a845fcf21fdb0c5e14267a681630525ceb15ba0f327043f428849f986e1dbd97a94d37180b643d38da9210d37b0bbe6788ed2571869da2dd8852e5ebf SHA512 e1fe9798ed68542bf5a704560ed871446b4b8b06ef0d92542fe7a18f85f081047a072650de554139fbbe5ce4fcb4ffa93458aade81f99a1e9d685adf1c29dd9a
 EBUILD python-3.8.1.ebuild 9839 BLAKE2B 2b411d16fa95019629fd91851c19375c2c8a729e24a77020c2c26f4f6d5e09bf88f8f1577c7e82f29d363e17214979fa393b1af94f6c8a6f98674b56b904237e SHA512 3121a9fad103e086e76d8885ac0094a0667a2f586b5715214b6b2c02b1f8bc247378d1397c7e8b7daf14b7004a7ebbbb7cc43405e523c99c34e1f6bbf413e27a
 EBUILD python-3.9.0_alpha2.ebuild 9333 BLAKE2B 95107bf9aefccf8156a7ada79d1dadc2834d4a162b5fbbff8d01e479172816a719556f52f3c1dbaeb579d075447c80013a5a63915b1ca9ce264117ef2978f28b SHA512 aa9b91ca9285c47cb65bc55c3067c2a77ed176cd74a0e41b23348ca7ffc9dc8367b6e8a8fd8e816369a215a16186c6f3d135ef8279a70fbc4beae6a94bfc9893
diff --git a/dev-lang/python/python-3.7.5-r1.ebuild b/dev-lang/python/python-3.7.5-r1.ebuild
index aca8d41b662c..b28c4a75d3f9 100644
--- a/dev-lang/python/python-3.7.5-r1.ebuild
+++ b/dev-lang/python/python-3.7.5-r1.ebuild
@@ -201,7 +201,7 @@ src_test() {
 }
 
 src_install() {
-	local libdir=${ED%/}/usr/lib/python${PYVER}
+	local libdir=${ED}/usr/lib/python${PYVER}
 
 	emake DESTDIR="${D}" altinstall
 
@@ -211,13 +211,13 @@ src_install() {
 		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
 
 	# Fix collisions between different slots of Python.
-	rm -f "${ED%/}/usr/$(get_libdir)/libpython3.so"
+	rm -f "${ED}/usr/$(get_libdir)/libpython3.so"
 
 	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED%/}/usr/include"; echo python*)
+	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
+		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"
@@ -228,13 +228,13 @@ src_install() {
 	# 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}"
+		pax-mark E "${ED}/usr/bin/${abiver}"
 	else
-		pax-mark m "${ED%/}/usr/bin/${abiver}"
+		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 tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
 
 	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
 
@@ -255,7 +255,7 @@ src_install() {
 	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"
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
 	# for python-exec
 	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
@@ -274,26 +274,26 @@ src_install() {
 
 	# python-exec wrapping support
 	local pymajor=${PYVER%.*}
-	mkdir -p "${D%/}${PYTHON_SCRIPTDIR}" || die
+	mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
 	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${D%/}${PYTHON_SCRIPTDIR}/python" || die
+	ln -s "../../../bin/${abiver}" "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${D}${PYTHON_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 > "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
+	cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
 		#!/bin/sh
 		exec "${abiver}-config" "\${@}"
 	EOF
-	chmod +x "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${D%/}${PYTHON_SCRIPTDIR}/python-config" || die
+	chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${D}${PYTHON_SCRIPTDIR}/python-config" || die
 	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pydoc" || die
-	ln -s "../../../bin/pyvenv-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pyvenv" || die
+	ln -s "../../../bin/2to3-${PYVER}" "${D}${PYTHON_SCRIPTDIR}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+	ln -s "../../../bin/pyvenv-${PYVER}" "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
 	# idle
 	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/idle" || die
+		ln -s "../../../bin/idle${PYVER}" "${D}${PYTHON_SCRIPTDIR}/idle" || die
 	fi
 }
 
@@ -304,11 +304,11 @@ pkg_preinst() {
 }
 
 eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT%/}/usr/bin/$(eselect python show)" ]]; then
+	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
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
 		eselect python update --python${PV%%.*}
 	fi
 }
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index d9c3e78d0d14..0c5186ca2464 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -81,10 +81,9 @@ DIST rustc-1.38.0-src.tar.xz 96163304 BLAKE2B 1e900b44db64727477ccf8e58e0ebb9ec2
 DIST rustc-1.39.0-src.tar.xz 96495140 BLAKE2B 6df6bf0c3b38c28753713acdc477ea6929740c32893171dd9b8620992439e45730ef6f9489a6fc411ff5884c661ac4c07b7b93f5a4174207ed53351d2dea09bf SHA512 8610b2ec77722087c572bd84ac562a5b7c5f1a644aea58c5d5daa07a9aed242703b7816e73e2eaa049f773d5907859e259744a0de700622df005584fd798dab0
 DIST rustc-1.40.0-src.tar.xz 92306352 BLAKE2B 762b9592414e5c816540f6fd37d07b3b0ffe97a151968cc8ae77be2fda03a6d66905192985edc65055cc7811dbd90faa2b2c056481f72161c6f7ccbcce13671a SHA512 b5ac3079acefb62d3c985b77f624d7fb68de23a59396fed9ccb292db61641c064f3146ee54d3cf59067b17ebfaadd14a6b2b466def60316bb5b13ba3aef01e1f
 DIST rustc-1.41.0-src.tar.xz 93763052 BLAKE2B a68524fb6e3abb43d52ae6676a1e9de1c5d33606eaea6e93bb518f10b196d620f2f370c631c32e39a624af71a3bf6911662a9df7eecb8dde78a20c8054a349fc SHA512 0e30fe53b77860085bea0f1f60315eb835b00dd796c5d1b98ed44fe6fc27336dfb064908c86e1669a9cbe81c9ca1495e1c259a8a268bef23b23805a719cef0dd
-EBUILD rust-1.37.0.ebuild 9491 BLAKE2B cb0b7ce4ca176553f2c95e8a6882c094859cbafdd0ceae500881439b009509c8ab53937a9d0046a9e917b84b723d1c88ff1a5fefe67415bbf4e8e539a7458e24 SHA512 aed6a69c6aa64477454ebb4117ceb71d6459464bbbdacd3848a894b1d3e529a8b2f0ac905aa1273eade42363cb2f4896cf49ad6951716b4be1926229c3bb8ce3
-EBUILD rust-1.38.0.ebuild 9449 BLAKE2B ad10ea725f4f9c1f778abe1109a15cf2e7b78a3086be542aa62a392243def613524de76689a2a3e12e5ff1b7a72443d4233821c749dc6572d08f95b4be3646b8 SHA512 6fc125a09a5ff3c550f6ca8346324fa6ff9b4a5b5e9afa50ce2922cb2fb8372e7465c668f51d9ed52bfcfd122212da67e3af2e133fa66cbebb9d617eeb6f1926
-EBUILD rust-1.39.0.ebuild 9597 BLAKE2B 4c7569cebc1f93cd694e98a2e9e94fec83198053097f5c08d0cf70009afcd1a1eb2c22ae8b81b731ea0ab726f02350d6959f817bd82027c72595fa1f0e176d42 SHA512 2dffa0a453283248a6c898312fd3be84d541db7ff4783f4328fcb8ac6eef9b6417df194a64fad15327c7bd373e8639230fc6b2335d52611fde69fb6e12e032a3
-EBUILD rust-1.40.0-r1.ebuild 9872 BLAKE2B 8769ee796ec010b377e08c8e31035ab8da964821424b9bb9b6c4b897a045cf7c8fa5162e3d27368bafc2f27403ce31d47c5d0beb363d04df4cfe7c3d19f29d10 SHA512 b1f8282f9d72471e6619065e3da400e4959853a491688b6aba653d388cdaa2211f62876cd201b48eceff07f7d6d62422c9ca131d7a85c711c3beb73e581e7772
-EBUILD rust-1.40.0.ebuild 9583 BLAKE2B a1bd9b055aba6a304c31bca24218e1618ff21649fd15f098de0891b18efe580b34edaac4f03ec7f0cb32c3928bfa15ae5d99b25b1f603178dbe1e5fae789c6a3 SHA512 bc9d7cd58a2ef161517061a1790c0cc4dd40ff54a206e62d9481cc449997ef8d96ea36dc496a0ea0efed0cc51463ca086ee1bbfdc94066f2b13ed5a757bb5249
-EBUILD rust-1.41.0.ebuild 10133 BLAKE2B 5f25e84d4723a17da328684bf4642653812d21eabf8e81ecf263c2c658c422f568a26027269779e9dafe54432f9b26c20b2e4ce47efd1b9abe8110520d2952b2 SHA512 3afce1b354e918a00529b6ec90f70acd043f0595fa7b8a1332ec22fc88fab9c6a0fbaec2849ba582b918907f0485791391d0cfd13b8e30d024407f33ab76a5df
+EBUILD rust-1.37.0.ebuild 9481 BLAKE2B a5348fff749d7ec0e36fdb49aac73af9ab0b838bd72c57e76c475705afedebf515f553dcf7fd36680266a8a8601abdc04ccd93b1881c4d39a2bf86b8e7077f1b SHA512 38ac15f899841ef3e59293bf8a26242825c0a73cbba255a86f3d83ecd609497538ad86ed1fa8533975db183a9d6e38408f7c960a7c9c20882ddec60a42668d1c
+EBUILD rust-1.38.0.ebuild 9439 BLAKE2B 6e9f86c2dbd9a31df3f8203b239da85ab2dcf702609c4c189ed9ac1a319dc8630691e21e64873cb99ac1bd8521cf20b4731938492dbbce5121f613e8b7f64cd9 SHA512 d7f3d0bc258d0acb66cc6552c1da21a441399ff3249a380d6e835e1423763daa3e6c7e29c886f3f51d9017b44c9abf4c96912d8472ced46c748d57be4a6afbf8
+EBUILD rust-1.39.0.ebuild 9587 BLAKE2B 14aaadef0d43324ce8f530a93ac651a7e98e3e5014ac62bda1a860ae2f71f65a8a6f3cdb0ccc7662f7f63d9bb7f5afd5a8d388a16022b8114ab7ccce15ba119a SHA512 d83a106687255aaa099d352e389f6dc788f0aaec424b7558058222bd608949e890c6e6885968e01f65376b3633f4e48e7327369ebbbfb49f71bcd46afce585be
+EBUILD rust-1.40.0-r1.ebuild 9862 BLAKE2B 9db4fcdee5d3d87b6ab651575d7c5039c41eda95c32cc12623ff70cb02b16c228a727767048252ff9daed49ee611101044fba00ec3df5e99a26643397bfc9f3b SHA512 8ad7759e2786169836bb4f96416ea7bf1faf0fa24feae0772823ef75198b7463396b30460a47025200d91d5ebb1562c550965cff0a06410ac8a8aaf17ba9384a
+EBUILD rust-1.41.0.ebuild 10123 BLAKE2B bd79623ea59f8437b905cd6ef55d65d2d69a2513d11ee6dbc8798e795872c40da850074b7437818e96ef0e32d75df6f9ab3de097257160894e1758a2ebb1785a SHA512 55d74141bddab804764e7a77e0464255777025aad5fd3c98c5ae5d262935fb39c45f4f224493ef178eb11e5a6fbc39fefffedc4054b0e2204854f5d24eeace40
 MISC metadata.xml 885 BLAKE2B 0c22dd218172717e47fba5c3294746470a9adcba729a3585937748ef8e4b8ea118e036753c332eace3dbc6ce82406c15f35948d1857485abe7761c7e4f299c1b SHA512 56f1535f91d2d0126ee70d42ef0ac3ac0e491ce1c539a159db6c429104881227676f6e29412f090631e728093b0902d330c00a8d4d8027c1a07e3632c8e36435
diff --git a/dev-lang/rust/rust-1.37.0.ebuild b/dev-lang/rust/rust-1.37.0.ebuild
index 542c7dc00d17..f7294f8494a0 100644
--- a/dev-lang/rust/rust-1.37.0.ebuild
+++ b/dev-lang/rust/rust-1.37.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.38.0.ebuild b/dev-lang/rust/rust-1.38.0.ebuild
index 23b7ca132b18..c4e9d3cf9ee9 100644
--- a/dev-lang/rust/rust-1.38.0.ebuild
+++ b/dev-lang/rust/rust-1.38.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.39.0.ebuild b/dev-lang/rust/rust-1.39.0.ebuild
index d369e43890ff..caf6bb4b5809 100644
--- a/dev-lang/rust/rust-1.39.0.ebuild
+++ b/dev-lang/rust/rust-1.39.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.40.0-r1.ebuild b/dev-lang/rust/rust-1.40.0-r1.ebuild
index 8be040d0227c..8ac9b0156ead 100644
--- a/dev-lang/rust/rust-1.40.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.40.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.40.0.ebuild b/dev-lang/rust/rust-1.40.0.ebuild
deleted file mode 100644
index c4338e1d3c5e..000000000000
--- a/dev-lang/rust/rust-1.40.0.ebuild
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
-	betaver=${PV//*beta}
-	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-	MY_P="rustc-beta"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-else
-	ABI_VER="$(ver_cut 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
-	$(rust_all_arch_uris rust-${RUST_STAGE0_VERSION})"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="clippy cpu_flags_x86_sse2 debug doc libressl nightly rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling more than one slot
-# simultaneously.
-
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 9.
-# 3. Specify LLVM_MAX_SLOT, e.g. 8.
-LLVM_DEPEND="
-	|| (
-		sys-devel/llvm:9[llvm_targets_WebAssembly?]
-		wasm? ( =sys-devel/lld-9* )
-	)
-	<sys-devel/llvm-10:=
-"
-LLVM_MAX_SLOT=9
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libssh2
-	net-libs/http-parser:=
-	net-misc/curl[ssl]
-	elibc_musl? ( sys-libs/libunwind )
-	system-llvm? (
-		${LLVM_DEPEND}
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	dev-util/cmake
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-eselect/eselect-rust-20190311
-	!dev-util/cargo
-	rustfmt? ( !dev-util/rustfmt )
-"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
-	wasm? ( llvm_targets_WebAssembly )
-	x86? ( cpu_flags_x86_sse2 )
-"
-QA_FLAGS_IGNORED="usr/bin/* usr/lib*/${P}"
-
-PATCHES=(
-	"${FILESDIR}"/1.36.0-libressl.patch
-)
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-pre_build_checks() {
-	CHECKREQS_DISK_BUILD="9G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="14G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-	python-any-r1_pkg_setup
-	use system-llvm && llvm_pkg_setup
-}
-
-src_prepare() {
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
-
-	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
-
-	default
-}
-
-src_configure() {
-	local rust_target="" rust_targets="" arch_cflags
-
-	# Collect rust target names to compile standard libs for all ABIs.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
-	done
-	if use wasm; then
-		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
-	fi
-	rust_targets="${rust_targets#,}"
-
-	local extended="true" tools="\"cargo\","
-	if use clippy; then
-		tools="\"clippy\",$tools"
-	fi
-	if use rls; then
-		tools="\"rls\",\"analysis\",\"src\",$tools"
-	fi
-	if use rustfmt; then
-		tools="\"rustfmt\",$tools"
-	fi
-
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	rust_target="$(rust_abi)"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
-		link-shared = $(toml_usex system-llvm)
-		[build]
-		build = "${rust_target}"
-		host = ["${rust_target}"]
-		target = [${rust_targets}]
-		cargo = "${rust_stage0_root}/bin/cargo"
-		rustc = "${rust_stage0_root}/bin/rustc"
-		docs = $(toml_usex doc)
-		submodules = false
-		python = "${EPYTHON}"
-		locked-deps = true
-		vendor = true
-		extended = ${extended}
-		tools = [${tools}]
-		verbose = 2
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "$(get_libdir)/${P}"
-		docdir = "share/doc/${P}"
-		mandir = "share/${P}/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debug = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		default-linker = "$(tc-getCC)"
-		channel = "$(usex nightly nightly stable)"
-		rpath = false
-		lld = $(usex system-llvm false $(toml_usex wasm))
-	EOF
-
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
-		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
-		cat <<- EOF >> "${S}"/config.env
-			CFLAGS_${rust_target}=${arch_cflags}
-		EOF
-
-		cat <<- EOF >> "${S}"/config.toml
-			[target.${rust_target}]
-			cc = "$(tc-getBUILD_CC)"
-			cxx = "$(tc-getBUILD_CXX)"
-			linker = "$(tc-getCC)"
-			ar = "$(tc-getAR)"
-		EOF
-		# librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
-		if use elibc_musl; then
-			cat <<- EOF >> "${S}"/config.toml
-				crt-static = false
-			EOF
-		fi
-		if use system-llvm; then
-			cat <<- EOF >> "${S}"/config.toml
-				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-			EOF
-		fi
-	done
-
-	if use wasm; then
-		cat <<- EOF >> "${S}"/config.toml
-			[target.wasm32-unknown-unknown]
-			linker = "$(usex system-llvm lld rust-lld)"
-		EOF
-	fi
-}
-
-src_compile() {
-	env $(cat "${S}"/config.env)\
-		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
-		--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
-}
-
-src_install() {
-	local rust_target abi_libdir
-
-	env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \
-	--exclude src/tools/miri || die
-
-	# bug #689562, #689160
-	rm "${D}/etc/bash_completion.d/cargo" || die
-	rmdir "${D}"/etc{/bash_completion.d,} || die
-	dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo
-
-	mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
-	mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die
-	mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
-	mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
-	if use clippy; then
-		mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
-		mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
-	fi
-	if use rls; then
-		mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
-	fi
-	if use rustfmt; then
-		mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
-		mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die
-	fi
-
-	# Copy shared library versions of standard libraries for all targets
-	# into the system's abi-dependent lib directories because the rust
-	# installer only does so for the native ABI.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		if [ ${v##*.} = ${DEFAULT_ABI} ]; then
-			continue
-		fi
-		abi_libdir=$(get_abi_LIBDIR ${v##*.})
-		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
-		mkdir -p "${ED}/usr/${abi_libdir}/${P}"
-		cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \
-		   "${ED}/usr/${abi_libdir}/${P}" || die
-	done
-
-	dodoc COPYRIGHT
-
-	# FIXME:
-	# Really not sure if that env is needed, specailly LDPATH
-	cat <<-EOF > "${T}"/50${P}
-		LDPATH="${EPREFIX}/usr/$(get_libdir)/${P}"
-		MANPATH="${EPREFIX}/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-EOF > "${T}/provider-${P}"
-		/usr/bin/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-gdbgui
-		/usr/bin/rust-lldb
-	EOF
-	echo /usr/bin/cargo >> "${T}/provider-${P}"
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use rls; then
-		echo /usr/bin/rls >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB and LLDB,"
-	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
-	ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
-	ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
-	ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
-
-	if has_version app-editors/emacs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if use elibc_musl; then
-		ewarn "${PN} on *-musl targets is configured with crt-static"
-		ewarn ""
-		ewarn "you will need to set RUSTFLAGS=\"-C target-feature=-crt-static\" in make.conf"
-		ewarn "to use it with portage, otherwise you may see failures like"
-		ewarn "error: cannot produce proc-macro for serde_derive v1.0.98 as the target "
-		ewarn "x86_64-unknown-linux-musl does not support these crate types"
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust/rust-1.41.0.ebuild b/dev-lang/rust/rust-1.41.0.ebuild
index 0139d999763d..064abcea32b3 100644
--- a/dev-lang/rust/rust-1.41.0.ebuild
+++ b/dev-lang/rust/rust-1.41.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/smlnj/Manifest b/dev-lang/smlnj/Manifest
index 30064862181e..5880aff4522f 100644
--- a/dev-lang/smlnj/Manifest
+++ b/dev-lang/smlnj/Manifest
@@ -25,5 +25,5 @@ DIST smlnj-110.82-smlnj-c.tgz 10544 BLAKE2B 6c096fbb8a8f135ac0fac1b4be6c4e4521dd
 DIST smlnj-110.82-smlnj-lib.tgz 449307 BLAKE2B aa6d21c608d89fc8696075ad13fa5179ee9a80a54f8dd8a446fa148065807a4094048b6da3537c222ff59cf0a6f837706cb6797d0873ac126ca0a3d743b5c7c7 SHA512 9e85b09e8bb4b253da7f0bea44bed55792a022967aa550e3ab0203566b84c6b8e126d91d4a0365c9bdb618d8e5bc1643ecd74ae30d750ff002d81dfea1c809ed
 DIST smlnj-110.82-system.tgz 240758 BLAKE2B 0903bd45a042c4cc5d327a88680f33f44128c1c9c929699813e3c7ba9b88975407b0b7b37b9048090c043485e8f144207529b7575904aa197122851d877b42b9 SHA512 b39fd42fd7418dee86accba9759dc3bb61234ff66ff695a2487c0e98b5640d5256e14edb7e23c8541e17ae35f7c9b27c7c1551d448c1383f61c33b20585a7662
 DIST smlnj-110.82-trace-debug-profile.tgz 3911 BLAKE2B c025b55430519123f4fe7907d45184cd31d0d72d89e1c5f0b8793fa4c59089b7e10f73c740b0eba3bfb39d2ec0e709a9f43482a6143d93b5128239833ca18619 SHA512 47af805b930d0c540139062c3ce3d1ba504e918c2f7817cad52bbae9e16ddc1dfea96f3058ae74afd247113101d59617d2098bfab8e38c701616c12f4610855e
-EBUILD smlnj-110.82.ebuild 4204 BLAKE2B 44b04a0b1836c33d7f7a039e807834b7299e0b25daa3616dada6e3619ba8ba5f597d10582f5aa80dc6c20010ae32df820b493729739332e13361f63ed8ead3d5 SHA512 25d8c7a2cd75c559cf2c10b0b8d9f58563f0d572e70d3d93c3bf2548bb847a0e1c6a3268960eae35d367ab04af8ba2ccc9bdd706d85a14bdf06ea28aed2cdc26
+EBUILD smlnj-110.82.ebuild 4200 BLAKE2B 4f5da1f765c700bf31e3584e47a483afbaf41d6a85209618152eb374e829c959dc7a11c3e3d2810c52d954741efa26f1724e8d76625cbae66cd79cfbd99b089f SHA512 d1f060601805bd94facd7aef8a29878bf75f34fef99b2c529f5765bdaec6d5d426c1e72393f0700fcf4f16548ff527621ef5c813fb6cee34b92357e9c7154c1a
 MISC metadata.xml 296 BLAKE2B b960974c19f1a7f63d9755b65e9a319ad98e63fa23856d1f7b09ce80e9208cd629b639c9151c66d93c3199fb27036aa66bb996bd6e5a1d64e04c8e70dab958e5 SHA512 58fd1a4bf8d782d051b535d080c218594953d6c8231d3424e32fd051939f3febbb4678d69109950eff746b5012b941189858aa00b5181fcfb31876bc3f9d09b5
diff --git a/dev-lang/smlnj/smlnj-110.82.ebuild b/dev-lang/smlnj/smlnj-110.82.ebuild
index 1df1108e8973..1f7c23a57126 100644
--- a/dev-lang/smlnj/smlnj-110.82.ebuild
+++ b/dev-lang/smlnj/smlnj-110.82.ebuild
@@ -137,8 +137,8 @@ src_install() {
 	SUBDIR=$(smlnj_get_libdir)/${PN}
 	DIR=/usr/${SUBDIR}
 	for file in bin/{*,.*}; do
-		[[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX%/}/${DIR}" \
-								-e "s:${WORKDIR}:${EPREFIX%/}/${DIR}:" -i ${file}
+		[[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX}/${DIR}" \
+								-e "s:${WORKDIR}:${EPREFIX}/${DIR}:" -i ${file}
 	done
 	dodir ${DIR}/bin
 	exeinto ${DIR}/bin
diff --git a/dev-lang/snobol/Manifest b/dev-lang/snobol/Manifest
index c692aedb0075..1147a5204043 100644
--- a/dev-lang/snobol/Manifest
+++ b/dev-lang/snobol/Manifest
@@ -1,5 +1,5 @@
 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 1302 BLAKE2B eb28b53e6a4071bbec2f66f850413175095d045b9e17b8366ac29b322b5a87563a678797f718ca83369a7cb8e9e76c8e23aef7f4a658d905f037fa517fff0a55 SHA512 bcb949cba285031b7c4198b84c8db713305aba2c02640c13b802e4a624a837999da0c21d29f79afe50e406ddb6543ffcfd698bc74dda05f1ba79b3c3eb30d14a
+EBUILD snobol-1.4.1.ebuild 1296 BLAKE2B 5f572a43fe4650c78939c1b60688b8946ef0032586d8126703528b4960b43d565b916241c68bbe6dd86fd5e43bf8a84691870e88ead10bcd712dd80f80ea0da2 SHA512 770c5ee6ba5b5a215b193173f13682bfe815cb52165356ac78a17fd8fc25bdfe48dfdce11900db89dfc1f3ba679e4d000561d2c5187d001672188ccc31562804
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/dev-lang/snobol/snobol-1.4.1.ebuild b/dev-lang/snobol/snobol-1.4.1.ebuild
index 3e9ecb949052..0a29b17c94d9 100644
--- a/dev-lang/snobol/snobol-1.4.1.ebuild
+++ b/dev-lang/snobol/snobol-1.4.1.ebuild
@@ -35,9 +35,9 @@ src_prepare() {
 }
 
 src_configure() {
-	./configure --prefix="${EPREFIX%/}/usr" \
-		--snolibdir="${EPREFIX%/}/usr/lib/snobol4" \
-		--mandir="${EPREFIX%/}/usr/share/man" \
+	./configure --prefix="${EPREFIX}/usr" \
+		--snolibdir="${EPREFIX}/usr/lib/snobol4" \
+		--mandir="${EPREFIX}/usr/share/man" \
 		--add-cflags="${CFLAGS}"
 }
 
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 49e995614022..58330257f7c9 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -23,8 +23,8 @@ EBUILD spidermonkey-1.8.5-r6.ebuild 4449 BLAKE2B 3d50207c4360110927f6c733e2fa71a
 EBUILD spidermonkey-1.8.5-r7.ebuild 3809 BLAKE2B df2d3780b076fd188b9d55a8c702fa436097c1c01aa03321c2c33e57f2dfb0dfafcaf1926f3823c885e2d4b0cc03c68244a6baf2b0f843fb49ea7c2f40222a04 SHA512 2ee2e5f9e94e55354cb75a976e1dd7a737c7bc676202ebbac353afd616d5ac1cf221aab0897bb6135ebbdfaaddfdd9d8ca63c7e35cec8e6d478640a9d92e509f
 EBUILD spidermonkey-1.8.5-r9.ebuild 4013 BLAKE2B 5cc1b137f41e08eafda73b3006b617b0b99fbdce2052aa6949a84e3b09b4fcea995a50a3782c1cb8aa3e01588ecc74796e582b2d44fa16cf38a2ba30ae1b3d74 SHA512 853e2429bb08f91f13e60371eee227e89e629f28de7c269779c543534801a31ddedc410fb0b48b52b17668cf1d3d0f9b5e178c53a58415988ea41ca10a99fe81
 EBUILD spidermonkey-17.0.0-r5.ebuild 3567 BLAKE2B 0a7ba31cb4a586e001a723bad03f4da059bc51576cd3f14a63391e0d66ce9a41d4c44cb4ebc540544ea4d73d7dbff8ea591d16673c39d9560b33f7d4c970f42e SHA512 adcdb926324e4feac59a4d01cbd29937fdf16d9c1b2e2e045a44105903d7e7d757b7f69f80fd67ac00504f5d99705ce3394d0c2965d72f544c751c16e7e74be7
-EBUILD spidermonkey-38.3.0.ebuild 3876 BLAKE2B 68310401f93a81b7e6e9df9aabbf526577fcbb0fcde132663ea35b5344e3d946d3aff19d5dd0bca8618baaa8661d59d38a1e836a8398296ec595a0af3507f79c SHA512 fb5c0f45a208d12bf51eb9c1b8a1e0a508a422588c61e5c37d5068169032f08d5cf707438d3564ffbb3ed839412d099ab2af84745c09e0b579391d362eef0cd0
-EBUILD spidermonkey-45.0.2.ebuild 3983 BLAKE2B ed9eb590c9d7102a54b9955e5bda766e18faace2d99d3aa64b4179322ddc68cf6b3d7a485d2617ef16a115f7c5c4a690fa4bbf371ee1d0ca41453ff849302dd9 SHA512 315b6b541a4751b053181f9b7d8a8b27d4275edf06c66aea124d3c357d14ee62b4523195f9f8529222afc62c30bcbb42d0c5abe49f24896514259420abe1a0a4
+EBUILD spidermonkey-38.3.0.ebuild 3874 BLAKE2B 71132d1e37e0f1403fa9ec36214cce59c0fb0c095defe8cbf85c9597d955a4125ca473e40bc8da105ba4256b6ed41d6dabb6aa2c30064706ed2408385c41287e SHA512 dbb24289a11e25cb0d2e64e4234f714288930a65ff0e00dcdb3a7292f03848fe91782a30519077f512286b69ba8bdc4dbc542403b999d8ab36c1e4479a399232
+EBUILD spidermonkey-45.0.2.ebuild 3981 BLAKE2B 5d29c793046bc88a91168c3f8b62bb6bc737e9fb0282e956bbb3c7fcc5257313364f679335f20603ee9879f36a024cd0103b01a6ea8e1d7a976158bc89389a1c SHA512 02dfb222c10edff54232dc9b03751fe755e8d9a22579b6b4f89458a816103e89376e2acffb3ca5d3eb2b6ef67e07884e92b55399c48a41986e43889f45fc367e
 EBUILD spidermonkey-52.9.1_pre1-r1.ebuild 4467 BLAKE2B 4b3ed44e84091307c8bb4808fa189ccdfe354a7dbdef211d36f57ccd38cf565cd28a70035f3e5aaec1fe56fd9bceeaf5ec304aa4f588aa8ee111387f1a655ba7 SHA512 f52ec253b80d31d04549f4ce977fe208030e0c3c1de9ab0a88c6425a36a810bf2a5d35f6137734175dbc7927f827a58cb4e9a511ab2a80cc8c3fde4cb27864a2
 EBUILD spidermonkey-52.9.1_pre1.ebuild 4294 BLAKE2B c275e8067867c292f74a0e72131fc276d3cbc232610eeff094f2ef92ccc3ae8b820d6c4ee8a4ca6f6db69709376b45ea51965e526b05940165dea8cdc3bdb5d2 SHA512 698cb5849d258ecbd53d53e4179fedb0e56c894c7530417395166247c88657e0ae50c9237f366e176bf14dd31ad6575810c05c1815e40f03ec043766a29ae84f
 EBUILD spidermonkey-60.5.2_p0-r2.ebuild 3867 BLAKE2B 3469155f45a404d1af26b66382a7bf1bd02a814aa3397ffa5765a8c2a2e5ad858dd6f55f57e81991aa3e67d53880b0aa67e411172d9257813b8e1c28ba7d95bd SHA512 82af9d80474bd3c1eb7c73ed54f9791c877e35b36833bb83861965c3074ab13c2b987e6319554743ead6c2bc4207c3a31b39a4fd25659254851174874f190b90
diff --git a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
index a0c8d08062f1..30082712a0d8 100644
--- a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
@@ -57,7 +57,7 @@ src_prepare() {
 }
 
 src_configure() {
-	export SHELL="${SHELL:-${EPREFIX%/}/bin/bash}"
+	export SHELL="${SHELL:-${EPREFIX}/bin/bash}"
 
 	cd "${BUILDDIR}" || die
 
diff --git a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
index 1c936015960e..ced690db1ef3 100644
--- a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
 }
 
 src_configure() {
-	export SHELL="${SHELL:-${EPREFIX%/}/bin/bash}"
+	export SHELL="${SHELL:-${EPREFIX}/bin/bash}"
 	cd "${BUILDDIR}" || die
 
 	econf \
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /dev-lang
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)