gentoo resync : 30.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-30 08:49:38 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-30 08:49:38 +0100
commit: b2be182d49eea46686b5cf2680d457df61e89dc4 (patch)
tree: c66442ced2011c5ca81c3114cc51041e314c6d33 /dev-lang
parent: e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff)
43 files changed, 715 insertions, 1252 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 0e519a1992a5..9fd0c563719d 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 516585f8e882..1874f8846ccb 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -23,5 +23,5 @@ EBUILD erlang-19.1.ebuild 4482 BLAKE2B 36a4249649473f50cce66f542c98dbefee41a56d5
 EBUILD erlang-19.3.ebuild 4535 BLAKE2B 248bcab46bc6830e6ffcc626d8170b99f5705c7955fd7184e2f8b8799e0ab4fc97c9741bf4ad9413da479c703b585589e2eae63c9fb298d7e36750fadcb1b56b SHA512 c1b60ca3420d5a3cb1561376c6622d346dbd483e8ff5965f2823a6b1e1e3b0146b32a805307d0a7563ae5171d005cfc27a6662ae2ba8fff0511c5db221851b14
 EBUILD erlang-20.2.ebuild 4586 BLAKE2B e3eed51b916285c87e212446047d07d47492410580464a2c800642be36426848f859573387204afd7ab67d72bbfaefec4189b973525f23829bed9f7a365d436b SHA512 80d5567d6233c7d9fcd53ca64814dd8cf188094decc6f8708563c22bef77b0b85bd23623df825f085f738547bf64b68fdde160b2ca9389b743a2c56259bf37b6
 EBUILD erlang-20.3.2.ebuild 6607 BLAKE2B d25ae5f93fc21e7304beeeecc99cd39516d52685d13003b5c9458272e1e6a9301a028009f746be53c20d20d1d896ec4177d9f06ed1d608ad4c466f1497226046 SHA512 dc6f1228f0f0b9a852f0d8cae149476b44f6069ec647340d259e8cb016a54c80265234e97e49686b33a3948cff485a2a30d276e03c1186749ecdc724e9cbefe2
-EBUILD erlang-20.3.ebuild 4696 BLAKE2B 7e39591f8d3fe4b8efb139e67f5f0506462430af4d6451caecb4296c6f8340998652e2c1ae5718fb51ad924638c0d4e300ba3fc21d104bb14c3e7a7c1154456d SHA512 52d968ec17d95f6e9ae55fe8c7f1b48e3bed8e4df8ceeb98b9a5e44df0eb178a0a27e6a21c38e68bd204bb7b8d6ff432bc6760fa4e979f2551285534caa7762c
+EBUILD erlang-20.3.ebuild 4694 BLAKE2B 5d66f16b192c72d5890dc656530a743fd4ffd1f5e7a4770e8a2dbd0f69b631ade821163bdda3dfdf579fbddaa723d10564a4990f0c2c272fcc0455c45277154d SHA512 f059ffc739cbe0026c50d1a9019aef3bd63b8da887d755b3cbf6673ee208f294125ff38d261ce27e6b7f884a9a8156ca3bfe57da3bf3794f149b592ea905ed2a
 MISC metadata.xml 700 BLAKE2B f71879bdfc301ed27bd8212f074e5dbb176b29bcdab9edeb5ce0ba3dab3d8cb888977a140e91b0a50fbe35960799ab487afa3cd26a7b3b52d01909c678c1f30c SHA512 cada8e7cf719a6f0249c9f8538452d599e9ea938b2d57a9083e728c8f9d1c259871cc0f32c4f01c725692dd5e8270f0f67d84335593bdfe5ae31a54f117b1b84
diff --git a/dev-lang/erlang/erlang-20.3.ebuild b/dev-lang/erlang/erlang-20.3.ebuild
index f4cdb176f3f5..80c077ee54b3 100644
--- a/dev-lang/erlang/erlang-20.3.ebuild
+++ b/dev-lang/erlang/erlang-20.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
 REQUIRED_USE="dirty-schedulers? ( smp )" #621610
diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index c9028584d8f9..15e0ee5523e1 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -32,5 +32,5 @@ DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a969
 DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
 EBUILD gnat-gpl-2016.ebuild 5681 BLAKE2B d1c5db2018a8e8d5c9dbb10caf800aa2b3ea220ed7276fa77c43bdef541e523377ea6024d89db75277a68c28796d8fc5d339bdac52802682cc33e6cb458b3922 SHA512 3a6180130b11c3fc9c417f6cfb0303ee21b6e5c183a547e23e9510ea119d3a5becb31a4a073d5b160f9b7146b35c82ab12ea7bb7cdb53b899e89ca1177c3aebf
 EBUILD gnat-gpl-2017.ebuild 4916 BLAKE2B 63c46822894529952dec8f45723b09e590c69269bfc4b3408dc6d720fa72b574956aa3e2a8adc51c400baf02414454d3153022e59cb69ebb4c5c9214fefcc40f SHA512 3d7d6b8fac5e9d0be36df050451a959437796d63f30a678d756af7e9aa5a036d13d2a25a2dcbd16aee799c44cb41ade35ca5771a43dc779ec74d341cd835d99b
-EBUILD gnat-gpl-2018.ebuild 5026 BLAKE2B e468826394be52048741343b2aca88c8fa87744fe269cf16d98d328b451e98e745e18648625674131cf452632b20b66c0d92f93cbe4d34ad0130122d13f39728 SHA512 2305378e9f49489a54b27d76d126419c82b8a7788368b6e8eda277e958ab03ec7c986fa26e1c18ecbb7cebc034ebb7e92a5c3713be86634faa478c4d2e74d43c
+EBUILD gnat-gpl-2018.ebuild 4976 BLAKE2B 198f9ff727c90a76d9f83a12b01901efafa7087660d212371880dc740926058a8dead2bacc8c08a764bc4be69b4f53550e178a221881a78591a89f2ab49f60ec SHA512 11a8823c4c9615a0a3ab51f510e175fc310521e9ef71cb27ad04ad17ec7b389ba20eaf06758c44f6d6927a81916f2a08a4eb56be4a3e74e617753501588f80c8
 MISC metadata.xml 1960 BLAKE2B e66552f4c0655619e736b6af14822d84e6c49aa6c019cb8c8b0e215629f9c8ab68aa55758639e35107120a39c578d82e1036bc0be82ff67728104f44c875d107 SHA512 04f14bcdd96ae4f6e285abfd07de89828eb989ce779aa59decf689920a179d859ffe809d7960e9c3599c2f6fff6ab2aafbb54458da07fa91841c61e0dfca47ab
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018.ebuild
index ad01178879b5..e2bd431e0835 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2018.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018.ebuild
@@ -6,6 +6,7 @@ EAPI="5"
 PATCH_VER="1.4"
 
 TOOLCHAIN_GCC_PV=7.3.0
+GCC_CONFIG_VER=7.3.1
 
 inherit eutils toolchain-funcs toolchain
 
@@ -35,11 +36,10 @@ SRC_URI+="
 	)"
 
 LICENSE+=" GPL-2 GPL-3"
-SLOT="${TOOLCHAIN_GCC_PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bootstrap"
 
-RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
+RDEPEND="!sys-devel/gcc:${GCC_CONFIG_VER}"
 DEPEND="${RDEPEND}
 	elibc_glibc? ( >=sys-libs/glibc-2.13 )
 	>=sys-devel/binutils-2.20"
@@ -114,8 +114,6 @@ src_prepare() {
 	ln -s $(which ${GNATLINK}) bin/gnatlink || die
 	ln -s $(which ${GNATLS}) bin/gnatls || die
 
-	echo ${TOOLCHAIN_GCC_PV} > gcc/BASE-VER
-
 	cd ..
 	mv ${P}-src/src/ada ${MYP}/gcc/ || die
 	mv gcc-interface-${REL}-gpl-${PV}-src ${MYP}/gcc/ada/gcc-interface || die
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 1d4a98575465..65a7e77d514e 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -11,9 +11,13 @@ DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324
 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d
 DIST go1.10.1.src.tar.gz 18305765 BLAKE2B 61b8db22c50b9a4653244dc18267f405607755932d84ea2c475338a9f4a5421da2bb8cc808dbd166aa35c3c8778180bf47d6e51ebe303bc62e582516919058f9 SHA512 13f6b0643a4f92eeca04444b9fa10de38fc3427daea9aa3227cf9a5738ffee1a3f2e355ba5faf711b8506f7de118bdcd3b9064b65407a22613523e29ffd73415
 DIST go1.10.2.src.tar.gz 18308678 BLAKE2B 5f16757f879e9be9d2e936bc5e3cefcfd32914dbe7def8252b20ac647c90cfae09dfd7ff782f55cee4b3fecda6cc88c547f20087b571dbd06bc7600510c788bc SHA512 754e60bce1ea3479ebb57bbbb625e3d7875a151e7a6d7a1067478a9e45bde5423f47123d084832bb838acf7675a9d05057b76c1d773e43cae0fb4e7a52acf4a9
+DIST go1.10.3.src.tar.gz 18323736 BLAKE2B f07ea774378eb25e28fc29ce6d8d7ed84227d4b93bfa93d38a071fe294da30c3cdc3a559d643e7379873df56b0e2731dbd772e385ffcb4b2e93819db3b4e33f2 SHA512 fd2bd5fcb5c6d0a5336c4b1d2cacb368edbb01359297a83bdedc53f6018642598232f00633fc60fde879050f5f26a810c828d46b5d6626cbcc0702d93ad33fbb
 DIST go1.9.6.src.tar.gz 16397247 BLAKE2B 36c9077177bd7bbe9b40c422c5faf7aa83fdd8a2360051cb026346a9fea35297d892d6c677962c498ea8531c1748d58a55bbb1db7c1cf323a1d65c0b9b8573fd SHA512 f7863a4fe586414c91465a6a82a47097b2593384688a7c68ad3e9981559047b4faf2c134104ad09a64125576dac557809884d9f125d91108dd51746620a368a2
+DIST go1.9.7.src.tar.gz 16401688 BLAKE2B f6fa7b7171595f6bb2b1860c10a34c386b781504b772a37b60ccd613850f916a463bdb1e2bf299c3d8e78e38cbdf0b59e1ee8dfc3597ef888450efb3eb6afc49 SHA512 1ed3375870223a73c9cf94839bfd8894b92f44f9a3ba3b2bec1e9cd8d2212519344c8afcb87a516d6ad3e1ccdc74d9dba225a222bdc5e60f6d73cb474d5f7664
 EBUILD go-1.10.1.ebuild 5653 BLAKE2B 4807f630943168bc970ee2f94acdd82b7619c55d0ea7fd33fbc5f5f0107342f1edf18edfe8e4c6f1a75063755c67a8b0c5d578ca3de275d8c960315dead33c5a SHA512 f51d57aa2a504ae77b3f117f2a3f1d088d534a3dcf9ec16d102e71b42a479618a18b495b6aacf967f90d7cbaf47f3e7c39e16d65fa120be1bba7726c552d1e48
 EBUILD go-1.10.2.ebuild 5656 BLAKE2B 1a140da0f482e46eaf80aa9836e934440fb309a61519c164999e75340614b383fc18dcc4cf3d70addd42f5ef289c9b167dfdc99abf52159aedb163c7426684e2 SHA512 630d6003c12c9f512f4c259be18e5c5716627968cc4725ed6d016076984aae3f90b30ce542ed8407f95a9db377502265e30b6a36d5725ce36ca3005d2c00535a
+EBUILD go-1.10.3.ebuild 5656 BLAKE2B 1a140da0f482e46eaf80aa9836e934440fb309a61519c164999e75340614b383fc18dcc4cf3d70addd42f5ef289c9b167dfdc99abf52159aedb163c7426684e2 SHA512 630d6003c12c9f512f4c259be18e5c5716627968cc4725ed6d016076984aae3f90b30ce542ed8407f95a9db377502265e30b6a36d5725ce36ca3005d2c00535a
 EBUILD go-1.9.6.ebuild 5650 BLAKE2B ad97b072bf73db28d60b1afb3bc3fea2159d87edc3ed0433b3e010979b01568caf81f7d6f22959ed854b7870ca5e0397a0f71e2e9488c4bb277ce0bc0a591a9f SHA512 a5a1c5037c52422d98b42c5688ba88918e548c8679d722d7d85dc3c51228ac944400a339a8e6a4018f2f438afec8365cd3550b35e6b595b097eecdec08befc84
+EBUILD go-1.9.7.ebuild 5650 BLAKE2B ad97b072bf73db28d60b1afb3bc3fea2159d87edc3ed0433b3e010979b01568caf81f7d6f22959ed854b7870ca5e0397a0f71e2e9488c4bb277ce0bc0a591a9f SHA512 a5a1c5037c52422d98b42c5688ba88918e548c8679d722d7d85dc3c51228ac944400a339a8e6a4018f2f438afec8365cd3550b35e6b595b097eecdec08befc84
 EBUILD go-9999.ebuild 5650 BLAKE2B ad97b072bf73db28d60b1afb3bc3fea2159d87edc3ed0433b3e010979b01568caf81f7d6f22959ed854b7870ca5e0397a0f71e2e9488c4bb277ce0bc0a591a9f SHA512 a5a1c5037c52422d98b42c5688ba88918e548c8679d722d7d85dc3c51228ac944400a339a8e6a4018f2f438afec8365cd3550b35e6b595b097eecdec08befc84
 MISC metadata.xml 538 BLAKE2B 78502c369a490804b2c69eef864276c2be5d0ee84ec189b6cc8584f8f42668a35f3c74bd25ceb53c469716337cbab908c576ca880c492f5961fedafc74cc346f SHA512 514a441a522218fdca543a22370e965a2bfc1f1f2c37e77431143329bb3d3f4f53e99ad5d7f7d7c61877f77387a777f7b4f339b9a3e45322d01d39d3d0ea1309
diff --git a/dev-lang/go/go-1.10.3.ebuild b/dev-lang/go/go-1.10.3.ebuild
new file mode 100644
index 000000000000..8c2ff8874012
--- /dev/null
+++ b/dev-lang/go/go-1.10.3.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_URI="
+amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz )
+arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz )
+arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz )
+ppc64? (
+	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+)
+s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz )
+x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz )
+amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz )
+x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz )
+x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz )
+x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz )
+"
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		# The upstream tests fail under portage but pass if the build is
+		# run according to their documentation [1].
+		# I am restricting the tests on released versions until this is
+		# solved.
+		# [1] https://golang.org/issues/18442
+		RESTRICT="test"
+		;;
+	esac
+esac
+SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo"
+
+DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/escapeinfo.gox
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox
+	"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
+	if use gccgo; then
+		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
+		[[ -x ${go_binary} ]] || go_binary=$(
+			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+				sort -V | tail -n1)
+		[[ -x ${go_binary} ]] ||
+			die "go-$(gcc-major-version): command not found"
+		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+	fi
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+	einfo "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+}
diff --git a/dev-lang/go/go-1.9.7.ebuild b/dev-lang/go/go-1.9.7.ebuild
new file mode 100644
index 000000000000..503bf3c4a123
--- /dev/null
+++ b/dev-lang/go/go-1.9.7.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_URI="
+amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz )
+arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz )
+arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz )
+ppc64? (
+	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+)
+s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz )
+x86? ( ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz )
+amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz )
+x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz )
+x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz )
+x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz )
+"
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		# The upstream tests fail under portage but pass if the build is
+		# run according to their documentation [1].
+		# I am restricting the tests on released versions until this is
+		# solved.
+		# [1] https://golang.org/issues/18442
+		RESTRICT="test"
+		;;
+	esac
+esac
+SRC_URI+="!gccgo? ( ${BOOTSTRAP_URI} )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo"
+
+DEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/escapeinfo.gox
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/unicode.gox
+	usr/lib/go/src/go/internal/gccgoimporter/testdata/time.gox
+	"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+}
+
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
+	if use gccgo; then
+		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
+		[[ -x ${go_binary} ]] || go_binary=$(
+			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+				sort -V | tail -n1)
+		[[ -x ${go_binary} ]] ||
+			die "go-$(gcc-major-version): command not found"
+		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+	fi
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+	einfo "GOROOT_BOOTSTRAP is ${GOROOT_BOOTSTRAP}"
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+}
diff --git a/dev-lang/hy/Manifest b/dev-lang/hy/Manifest
index 193c697d9598..7740f1e5b679 100644
--- a/dev-lang/hy/Manifest
+++ b/dev-lang/hy/Manifest
@@ -13,5 +13,5 @@ EBUILD hy-0.12.0.ebuild 1074 BLAKE2B 4b5dcb068fe68fa368818baae7d432c9699bd43ae2b
 EBUILD hy-0.12.1.ebuild 1080 BLAKE2B 54a1eb432f10c82d461cc1568696c17d81ab4bcc985782f93477b6563342eea63226a8c37e0706ed929f9a828dc2f199f13f7e30da79a7983a774ae5a6347000 SHA512 241fae912c048907fccf4a9321a082df4f2c379ecddb64f7747862cefea9a2ca6f65175d585e9720630877c8399583d2f2c42ca44a87ae1bcf5152a81ef28df1
 EBUILD hy-0.13.0.ebuild 1036 BLAKE2B f818641b2cd4792715b677baf83f3e13fc5098774297fbc93f1d8c3a006637fcd8c6db549da65b2debd0fdd242e4ab933c087f13d42a82be33660df38c144ce1 SHA512 9c2605a00ec3ccbdcb6d5a5fde924f9a72b386d126469e38434c2eaccc9791b48a19cb92c2e84b32eadf6d99225d59aacbdc8c809643120fac61fbd85b89a35c
 EBUILD hy-0.13.1.ebuild 1036 BLAKE2B f818641b2cd4792715b677baf83f3e13fc5098774297fbc93f1d8c3a006637fcd8c6db549da65b2debd0fdd242e4ab933c087f13d42a82be33660df38c144ce1 SHA512 9c2605a00ec3ccbdcb6d5a5fde924f9a72b386d126469e38434c2eaccc9791b48a19cb92c2e84b32eadf6d99225d59aacbdc8c809643120fac61fbd85b89a35c
-EBUILD hy-0.14.0.ebuild 1036 BLAKE2B 949ae9ff0886b6d2a3d39e9d317c786cfb076cf822f40e42d46e46b42a2a5627ea4fe72f1d03c9618b5019a770aa2fc019f0bb66f28f3051f9be716248130ba9 SHA512 299b45ed9317cd11fea3df6369bcf9905870e87fd0bd5c709b29aebb9f3d8f43825287ff7cc9d115aa5fd5ad8b637ad101c662522ae705f69eaeadbf82075dd3
+EBUILD hy-0.14.0.ebuild 1040 BLAKE2B a84df9761053ab573b20a8d47f229338a4137857cc3e7952c9b02fb552f40adfe56a5773eb31460d6904a40e19590caf8a628fa083c27fc3ff9b9ed459a9d3d1 SHA512 412c9bf2c00713ea9c59b9a66479729c43e4370f69c7e98aec266c7feca3b203a7157ec49eead4b088b41d20905704bee5b9671725140b2a246d833c4519f8f4
 MISC metadata.xml 331 BLAKE2B 1377771edc92d3cd1ea685b43816a4ffd6c84d06245f00414df594d9d1aee498ca2a5ede2d92c2f0607fd26127730a8f7e1e6eadf6fd916325967b282e32f092 SHA512 97afa7992933d5088e939afd4005e188fd2979ccf7fc21561561b14e1eecfee61e867288c21b4a396fc5ca4926fd3d62c9d8c5be217b9392a5208371fa3aa719
diff --git a/dev-lang/hy/hy-0.14.0.ebuild b/dev-lang/hy/hy-0.14.0.ebuild
index 7cfd04466eba..0d11fe04da02 100644
--- a/dev-lang/hy/hy-0.14.0.ebuild
+++ b/dev-lang/hy/hy-0.14.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 RESTRICT="test" # needs some pointy sticks. Seriously.
-PYTHON_COMPAT=(python{2_7,3_4,3_5})
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
 
 inherit distutils-r1 eutils
 DESCRIPTION="A LISP dialect running in python"
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index 9f3730a17071..eb1538eade2b 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -6,6 +6,6 @@ EBUILD luajit-2.0.2.ebuild 1701 BLAKE2B efab2a2a1353da44875c08337d617c41669fe71b
 EBUILD luajit-2.0.3-r1.ebuild 1359 BLAKE2B 7636abf7dc42fa1d7c0c791339718308ca2d4b3e08d4e1f132669bb8d0354e2cb106614dda5642785bb8050a6280fa1adf825e7d78ab166184489aa9ac9af6f3 SHA512 4d49cd2b1666c56ad86f63b20660846cc0d2b85bb430177adee0a059f09ee9337f979f04f27262eb8e54081dca2bbade2a13969dfed30f4a7ddde77c14a284d4
 EBUILD luajit-2.0.3.ebuild 1704 BLAKE2B 64a61522a1488c13178dffad3114f900b27aacf2c8b00971f83edb8312744cc045d03567beebbadfdf97bc0f7b8043826db3f9f71ddde5071b7d3abcfdc93556 SHA512 dde1467f89f2feac5123d2f63f1e305925fdca04f09fb4725cf5e0da3ff29ad0ce894fadce71fb1937a5954f14017000cf20175ba639c520cc868a7800577528
 EBUILD luajit-2.0.4.ebuild 1358 BLAKE2B 3dd160052c29cb09107ee75a1650f20959d192b74e2fe1dc4dafb7db0159366ebf264adc1aa078a45691e2cf62892994dbca695abf2a3ef56d4a49c2ba4ad174 SHA512 94f00d88a15725f285061b6d2f5be4d565bfa004776115f7625bfe6aa60ac08c7dd5797b1766de4a225e35938771f297d592f7a230ffc2bf948084bc4ed4631c
-EBUILD luajit-2.0.5-r1.ebuild 1421 BLAKE2B f85de84c908b701b13dae694ba613eac26361a7bdca41fd795570b9fdd23e759e971d0ddc56bda2e85b64c07fad41ad623c336d3f576496d6a905d979e16c735 SHA512 c12a283364efa0f6356244a76b1be6f066c6eb74044215d65b67e74addc28d49965fc9cdc7b2b725477dc791bf79a6cb0f536c9fee833716dd963c91e2ba1bd1
+EBUILD luajit-2.0.5-r1.ebuild 1418 BLAKE2B fa1f0582422be0937eb365a9287a9012bcec7a37174114df78089575e743bcc359931e093c1fb9b6e3fa8cb7127406fea64d701cc1ccf0804441e12742a431e5 SHA512 b4cf62a31fe3b0419ac88904c5f7b69a055caa4c2296657a888615d69941ce0d8cf39342a2f52d1148658df8c82a5fe9fd33970a3c290cd72afb8fab2f25a8c8
 EBUILD luajit-2.0.5.ebuild 1362 BLAKE2B b182f5afae6fb12e66c1cab40921bb1f81c712f25820e1e40eb82bcc8e3d0596af2a173b71e981acf92eb035375877369ad23d44065ebbc278926f487b30929d SHA512 ad29a171d9798cf7713a1480141ca29e5a38d25eb68c8345d7969b21502bdd60b30b1279e1e294ade12f3de8f6e40685aaa1b5f64a5ffbef0a48e94018caab9e
 MISC metadata.xml 552 BLAKE2B 50666bd08bb7c06c52a28652c0a87988e815c1d3c10cc1425cc7979689fd4738f56aaa6478aaa616a0b76122e42f790b3b415a60078dcc256499019912f0c4d4 SHA512 9d6ef1cb9acf52db52ec192bc51cbab6a7aa198dbf108ed76b25b0e258491b2f8d5ec0981c538546cc96de490c8c1ac852e337ef09ab5898ad4f2c48f5670f07
diff --git a/dev-lang/luajit/luajit-2.0.5-r1.ebuild b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
index a60c5c127574..0560634cb156 100644
--- a/dev-lang/luajit/luajit-2.0.5-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-lang/mmix/Manifest b/dev-lang/mmix/Manifest
index 18a80582abee..f820dc9f309e 100644
--- a/dev-lang/mmix/Manifest
+++ b/dev-lang/mmix/Manifest
@@ -2,6 +2,6 @@ AUX mmix-20110420-makefile.patch 1636 BLAKE2B f4acfc952dea9671ec5507f4d86a146213
 AUX mmix-20131017-format-security.patch 2256 BLAKE2B 2481c33c024d84af03b289ec9f22c9b98cb27537c32ea9ef020943aa424efac5267d81326241b2d764eb292f373ed51cc30c3ddbdb55f8fa444154cf6cc5fe0d SHA512 e77cdf3d196356cc0cb09f322cc979e4c603592c8f9421764d6830df27fe627958badbd6726021f97bc42a0d9551e4d3b39ca7b1d677b44a543ffcc04028eaea
 DIST mmix-20131017.tgz 308016 BLAKE2B 195c4945c61584842af08af891dc2e26672194aef66ff71ba6dfa18bab4e7349de013aa1c3ae195d9d6a69ee4ebc61403acf558a06af86393d5b053920ebad55 SHA512 e816b1ee9205b9f4a2e25ff183c48736ea66e63721a49f0b574850c5872ae85a6e847d802a01b5aa120ac969638d5d05e9b3135512d9362a4d672564f1228922
 DIST mmix-20160804.tgz 308410 BLAKE2B 8bbde51921fe23f016e35bd51346e6445d530815e5e87bff44cf17e081c6b8e55dd6bd24f1ce1621851d2eac309fa44d71aa33d93d3ddfce5213c6643181d38c SHA512 35c518227a4ee40d0aa3be02eda2ab8b2a27696fa789f5007a978419d07b3deebb7f391895e63e3556aeb38dc1ded3bddf2b860125ebf8f7848375e90dc7af75
-EBUILD mmix-20131017.ebuild 934 BLAKE2B 3fd9110ee82e22163f8451c0a261491bccbdb70822d3338aa13507b4a1d3d4cb23011d7e87f83445bbd1895192ea3c98bfc5dca0a0996a00e833fc710a6df821 SHA512 d80fb9fd6b187903dbb2c748c4bfb242d46ab167d07625c6c4171bfa25c2c4defaf5689a0854c68b76bca592c3ebf5c3f29eb28aaac8eed4732c65bf8bfc93cc
-EBUILD mmix-20160804.ebuild 912 BLAKE2B 7453f728b2f55f39299ef183a67690deb422e08941ebcf61a96dc630790f7b7061420aa57e6cb65e64e107317d390d172ed6068352ef962534f10b2dd1d71c43 SHA512 0d59dbdfefee9ee855ca653f14cfcc84edc103d276a4e23c2cd9363bcd86fc43dd521671e9623237cd22224184912528460664b848f33f3c9f80391eb8f146ae
+EBUILD mmix-20131017.ebuild 965 BLAKE2B 763f9fc6d769748bf3fbb25ea5a5498117e70cb8607f34fb1572086d578a1190ef17fa542059d3c3e61782aeb560060d68c4f787ba5570860d3187b77de618ad SHA512 de03b2b80759be4b10fe1edd06f71178ece2c759d73d3c554d5ce8e0860f4d8e1b7cda2adefecb81514c06fcdcc0b1553afc81151d141d9eae924c21fa0209ac
+EBUILD mmix-20160804.ebuild 943 BLAKE2B ad1449d7bbdb88c066e85ac309f10ef37b78fca045a294a28583b9eb708fc18c19cf6083437878f97d35d0de8ba5ba6d6c8ac9fc0e788f95df004e3ece9bc116 SHA512 bd43985e64160e0847643e7731213265aa9d51ac8141b3637ff9373fa58f2f0182436645867f73b7188e20cbc9370b461cdaab11c4f39111316edeabc992a390
 MISC metadata.xml 247 BLAKE2B 9d65f58a46596a4c23d009a2d776c25c5a9dd76ac91ec6f6f548f5f786e43f0be694628bc528dc24d2fcb5efcf7cf95643aea633f12eda3d482d2d03a952d388 SHA512 44f366af35524b7fc87b2eb6c7241918d2afc9b30f1a28289d803ed0125e9099588a2bd99a75e34e3c70fde30765050e62ef5b47975e2a1860dd7a560709459d
diff --git a/dev-lang/mmix/mmix-20131017.ebuild b/dev-lang/mmix/mmix-20131017.ebuild
index aa8ccecb430e..0b8bf06064e6 100644
--- a/dev-lang/mmix/mmix-20131017.ebuild
+++ b/dev-lang/mmix/mmix-20131017.ebuild
@@ -26,6 +26,7 @@ src_prepare() {
 }
 
 src_compile() {
+	export VARTEXFONTS=${T}/fonts
 	emake all \
 		CFLAGS="${CFLAGS}" \
 		CC="$(tc-getCC)"
diff --git a/dev-lang/mmix/mmix-20160804.ebuild b/dev-lang/mmix/mmix-20160804.ebuild
index b1cbaa53f456..b98e3aafec43 100644
--- a/dev-lang/mmix/mmix-20160804.ebuild
+++ b/dev-lang/mmix/mmix-20160804.ebuild
@@ -26,6 +26,7 @@ PATCHES=(
 )
 
 src_compile() {
+	export VARTEXFONTS=${T}/fonts
 	emake all \
 		CFLAGS="${CFLAGS}" \
 		CC="$(tc-getCC)"
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 9d99783cd2c2..c721b8013ae1 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -2,11 +2,13 @@ AUX mono-4.4.1.0-x86_32.patch 839 BLAKE2B bd0fc2ff2bc16cb0aa260e94f2f0a304348bf8
 AUX mono-4.8.0.371-makedev.patch 900 BLAKE2B 9e79240ce38a06c375674123d8182f9b9db646f85b2140b1420ac465b19639b910674a1d6e5ce0cb1e9e74d099d338cf3395e95015de4bdf1c4a0dd1ccf63f68 SHA512 afdcb69c2de195bcc6d0a47cc5bad6b6679de6d1c8f0577f8a2f5716610f131e71a327540ba7e23353f35dfe7c552f16b98c9e88c3ecf91f2225a68a6d034971
 AUX mono-4.8.0.371-x86_32.patch 1033 BLAKE2B cfcd8163180de91aec85841ce6c129faba242aa54db0d99b45195b8474e83ce96da4c5111fbb28cf0cb23d2a9a4be6a3856a18ef8bfda35fd7365f87c88509ae SHA512 f12ffda9eddb8fbd51844a6cc7bd3d4d147a97ddde9e4a4435051da88eb72603303ba7d21124747ab23033eacb70ae75ee8e96bc5887d898cc21ac1904c36aab
 AUX mono-5.0.1.1-x86_32.patch 751 BLAKE2B 1a19219c5667715a9afb7dc74ba9714893eea684a0c48945bcb70bdd83e34138a77ca029bcc8341b58af93617b4eab3251885affb3d129e8bf072a0279b8d29b SHA512 8c3d3a65f9d9a9a51c4a01dfd14e32e01bcc7cb98bd4f6a196a2a166968521ff859ccb1efd689c612c8bab5d6a384b148039de5033235a2c0552bc455dd636b7
+AUX mono-5.12-try-catch.patch 1267 BLAKE2B e33836d53fd4c9a4e64614d3f309058b2009487a853aee48fae99cd0326095b6dc26e7fbdd178e25f9fc3901f74f937ce5e9d3bb4322ca50e139d13f66c209a5 SHA512 3a82d4bed31b212e23fe24647fc5b9c4788be5f4966377a3bef9f92a51d16181e77e19ca1ec4736792da6a18206986bbb54d967499e2ca7e224201cf811f91b5
 DIST mono-4.4.1.0.tar.bz2 85897587 BLAKE2B 79651189e696aa7352704e1ac659302423b1212c88337da8d522aad8e8a49855b74c43020f506b3455ce1a99566e96ae464fecced584b14470d0c8dfe605c5b6 SHA512 d9b6c57c2d9327ea551083b81a2e6cc222ded9a04862056b0dfded1c5df56efbfc4960097df034595012231fe50d172174ab7b3e3f2d8c4c6953ab2106b1cb6a
 DIST mono-4.6.1.5.tar.bz2 83174665 BLAKE2B ce4586af882c6592d1615156d009e496b8405dcf3a2b59e53bb58d1949c33d68645506378eab272a6ef340194582333c515b38f635e961edc64767078905a2df SHA512 1d0c1ec2930ecea3faf1be572bc045300ef4a90d3fe7519f2a9c797be79298c61528d83baa5a24a57143a35be80f78297196556c33cd0f345d9907a973fe625a
 DIST mono-4.8.0.425.tar.bz2 87955541 BLAKE2B dd3c7d26d9818c0512ddbbea6c0980ce5411904c93d5aff8aef581016268594ea1a887dc51332afc225db25d735ef3ef379a5f7b72acd95892e9efe399fb9df9 SHA512 7bab64adbebc277d3fc10301fa6af6cd64ea0836e2d74dfdd9b59684d9402689f9a4e397f3d36f519c7a892c14dcf8f8867d40a5119891874dfd10f9bbce2ac4
 DIST mono-4.8.0.495.tar.bz2 87540431 BLAKE2B c067054c27e61fbd46cae962876afdf65fa4660db41482a7931436009d986ffd25cd9120f9d61f1db5e16b95423fb6cb81abf6be8eada408a9ed2e812f112e6d SHA512 0052b7b04ae25e7cb5970d742369b74c83a10c6c82da591e8d26ad9e13e8b2590a1cde27ca99e43aebc622c7a2a590b9e6c7ce519ac4185b0b6cf7134527cc9d
 DIST mono-4.8.0.524.tar.bz2 87392723 BLAKE2B ac17c3da6d6c08c4cb72c4fa300ded92625bd8c14c1e45ea9539efa42c8d085759f7bb298fe5df57bd41f18abf83f293d26a9e6272944933fcff0a3c16a7e4f3 SHA512 eb77b768a4a26e6a2a872f4845769cdc83f01af3377ecd6d932437d2a1b54bfd1ce727563906146195a54997b4b624fb75449a6f0bcfe818cbc4e6544841bf2b
+DIST mono-5.12.0.226.tar.bz2 213373240 BLAKE2B 6aa8d9962aa51d6a7f8f6106835cef6a4eb626d7af56a09ca185736db2535dbaffd5d97d5d0eef39001b11d41d868706be4788496c8d0036bdbad24c5f6fcc46 SHA512 f4ab3066c9a3545ace0c4af50ddbe58cf5d9ffe4895cc546669f329b91988fcfebab91a070ea46b27536040823a3bbc1bd7e5552a49769988e8271d52662c583
 DIST mono-5.4.1.6.tar.bz2 204934321 BLAKE2B 7aa3450a9bc4033f8084c4271b215af636e0df72d6349c97e0acd110d91e276d22b735d19bac2fb1e995ec34fa9e041831358a01d5c098b9c5e8b567d98350fe SHA512 d3618e9f127bc95b15feba5bf73317574872208770d83b8b545a9888df81a629e6fb14160db8a38526ffeb005f682e8dd9b8ced84bdb0cbb36dc9e7b28c240a4
 EBUILD mono-4.4.1.0.ebuild 3384 BLAKE2B fd16089b151c1666ceda7d05285fa8a10143a4157e46b75a3412b42dec80c0929f9ba8d9523ac65b64fb827ea8d1ad88fbe98a5e7d0d12423b970912d0ae50e4 SHA512 6c9c9ce5e19a33e4dbc1b0cdb2d17804a67eed5061e422358c971de5a2eb95b2848c4515312a4b082087c50040c1e7f9c687a134ca30354d8f4bde796432b126
 EBUILD mono-4.6.1.5-r1.ebuild 3486 BLAKE2B 6f041f91dce9157a3df0805760355d2b2e2025fdd3b99a2f3413e232aa109d311605fa389a282cb62de7aafebb47a52b6a789957ae965ed42d2e85e6ab3f2e27 SHA512 a242a3a79ba0b671dd77d1b607583c0ea30977d6b5753b55015b5caed6a2754469a9deae115f0a3a4c0e3632bddf7fd0859c2b2712cfd1059a26c5262bfe234f
@@ -14,5 +16,6 @@ EBUILD mono-4.6.1.5.ebuild 3346 BLAKE2B 014dd6acd44c7ae53a919e3c7efc39b782705e8c
 EBUILD mono-4.8.0.425.ebuild 3019 BLAKE2B af5ceb5808209e42126f3f2ad6062c19a33f352456d4e623694b730215a8add8030907a0632da4390042c7816e7454ae02890827b157b4e748c032cde8ceecb2 SHA512 e3b31207d8e42509b0a8a3711f9b2d9c97cbeac4807e109ed9be11254cd8cc87948f91e647e6c73133448ad5c7a8f140943de62d95e6fe1505f9b7165b8683af
 EBUILD mono-4.8.0.495.ebuild 3019 BLAKE2B af5ceb5808209e42126f3f2ad6062c19a33f352456d4e623694b730215a8add8030907a0632da4390042c7816e7454ae02890827b157b4e748c032cde8ceecb2 SHA512 e3b31207d8e42509b0a8a3711f9b2d9c97cbeac4807e109ed9be11254cd8cc87948f91e647e6c73133448ad5c7a8f140943de62d95e6fe1505f9b7165b8683af
 EBUILD mono-4.8.0.524.ebuild 3023 BLAKE2B 8b23acde97ed8ebe05eb7e4c3fab9f1c9b43ee775a460629a122eba13c56120d139c8732267c1fb2cb7ba9d96c3a9943a03c1c9894286205392dac8fd19a467c SHA512 0a229fdcbb0051e96e227f1a2bc2c85eea55f2277b549e866744c650a0c42172f5727abe2b1cf38660254757201b8f577401fb072814d266012058da3a2418ab
+EBUILD mono-5.12.0.226.ebuild 2988 BLAKE2B e47b4d9601bbf8ac0490b1fe0634df0a63cab795e5889bc5a367e57560785c9d5260c2ccf80a1d780377898c5ad46441da9ffe343cace3918081434b1b1eb2df SHA512 ce71bde55309325510506f5679db22a6094be79b524905e0cd15faf28213e2aa88270f5e20cf9da66c9b906260f0d16487934e882e6b6ff00c5349a772209510
 EBUILD mono-5.4.1.6.ebuild 2981 BLAKE2B 0fa2e8a0574502869542c87491575b084e1a14eeb3eedc635e2c7f103f492086bf61f6bf4f9fe25d7d5abd80070bbdc6f742dd823c393fa6fb96f6c7a341cd93 SHA512 211b45145d9e37a302b0d0afcfbdc5676be2cbc3e39f5c51d171a3614de96bde1ea29658a95ef6d45da7c2a5d189da90c6f84a52eec20222a5dbb3428b050d02
 MISC metadata.xml 507 BLAKE2B 91655de22fc1ff309c36ecef9d77aa8cada0b8f13ae30677665de837e99b7b43622a1dc0c677b0f5455c06b8e8a295c3c4f39753f66e749163a4f002ee481016 SHA512 e072a1abbf66276b0d139c3e918593010312c2059a0c6feba7b324689cdf90efe28bef0286ad9888125acfdd1fed2dee3e05e79a0aeb7f9ec1809bd128cf8a20
diff --git a/dev-lang/mono/files/mono-5.12-try-catch.patch b/dev-lang/mono/files/mono-5.12-try-catch.patch
new file mode 100644
index 000000000000..051c72be6859
--- /dev/null
+++ b/dev-lang/mono/files/mono-5.12-try-catch.patch
@@ -0,0 +1,31 @@
+diff -ur mono-5.9.0.398/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs mono-patched-5.9.0.398/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
+--- mono-5.9.0.398/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs	2017-11-17 18:12:57.000000000 +0300
++++ mono-patched-5.9.0.398/mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs	2017-12-06 06:24:45.067519852 +0300
+@@ -2810,14 +2810,21 @@
+ 
+ 		internal override object ClipboardRetrieve(IntPtr handle, int type, XplatUI.ClipboardToObject converter)
+ 		{
+-			XConvertSelection(DisplayHandle, handle, (IntPtr)type, (IntPtr)type, FosterParent, IntPtr.Zero);
++			try
++			{
++				XConvertSelection(DisplayHandle, handle, (IntPtr)type, (IntPtr)type, FosterParent, IntPtr.Zero);
+ 
+-			Clipboard.Retrieving = true;
+-			while (Clipboard.Retrieving) {
+-				UpdateMessageQueue(null, false);
+-			}
++				Clipboard.Retrieving = true;
++				while (Clipboard.Retrieving) {
++					UpdateMessageQueue(null, false);
++				}
+ 
+-			return Clipboard.Item;
++				return Clipboard.Item;
++			}
++			catch (Exception ex)
++			{
++				return null;
++			}
+ 		}
+ 
+ 		internal override void ClipboardStore (IntPtr handle, object obj, int type, XplatUI.ObjectToClipboard converter, bool copy)
diff --git a/dev-lang/mono/mono-5.12.0.226.ebuild b/dev-lang/mono/mono-5.12.0.226.ebuild
new file mode 100644
index 000000000000..bdaa577ec627
--- /dev/null
+++ b/dev-lang/mono/mono-5.12.0.226.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm64"
+RESTRICT="mirror"
+SLOT="0"
+
+IUSE="nls minimal pax_kernel xen doc"
+
+inherit autotools eutils linux-info mono-env flag-o-matic pax-utils multilib-minimal
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.mono-project.com/Main_Page"
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
+
+SRC_URI="http://download.mono-project.com/sources/mono/${P}.tar.bz2"
+
+COMMONDEPEND="
+	!minimal? ( >=dev-dotnet/libgdiplus-2.10 )
+	ia64? ( sys-libs/libunwind )
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMONDEPEND}
+	|| ( www-client/links www-client/lynx )
+"
+DEPEND="${COMMONDEPEND}
+	sys-devel/bc
+	virtual/yacc
+	pax_kernel? ( sys-apps/elfix )
+	dev-util/cmake
+	!dev-lang/mono-basic
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch
+	"${FILESDIR}"/mono-5.12-try-catch.patch
+)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	if use kernel_linux; then
+		if linux_config_exists; then
+			linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel"
+		else
+			# https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
+			ewarn "kernel config not found"
+			ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
+			ewarn "See https://bugs.gentoo.org/261869 for more info."
+		fi
+	fi
+}
+
+pkg_setup() {
+	mono-env_pkg_setup
+}
+
+src_prepare() {
+	# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
+	# get killed in the build proces when MPROTECT is enable. #286280
+	# RANDMMAP kill the build proces to #347365
+	# use paxmark.sh to get PT/XT logic #532244
+	if use pax_kernel ; then
+		ewarn "We are disabling MPROTECT on the mono binary."
+
+		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
+		sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
+	fi
+
+	# mono build system can fail otherwise
+	strip-flags
+
+	#TODO: resolve problem with newer binutils
+	#bug: https://bugs.gentoo.org/show_bug.cgi?id=600664
+	#append-flags -fPIC
+
+	default
+	# PATCHES contains configure.ac patch
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-silent-rules
+		$(use_with xen xen_opt)
+		--without-ikvm-native
+		--disable-dtrace
+		$(use_with doc mcs-docs)
+		$(use_enable nls)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	cd mcs/tests || die
+	emake check
+}
+
+multilib_src_install() {
+	default_src_install
+
+	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
+	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
+	# for reference.
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 6e92b6216a58..2606d2517b2f 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -11,19 +11,17 @@ DIST php-5.6.36.tar.xz 12467560 BLAKE2B 8badaabc668ff3a4b1129f03605a1570729f8196
 DIST php-7.0.29.tar.xz 12400192 BLAKE2B 0bd1bd9450b87437e539ec5131cb4f7e4dbf76d5fd5212bdf34c4f022dd8f2d357e9a845d83b485d89469e20675c031bcf382a8ca348161dfd082d7a389ffcb2 SHA512 ea5a2fbcfc875dd2621e3f67038c1e00f43b53bc7079ae2127fcefbf116db0f32e34d4435f8211305402a4eccdaa5dfd6b96cf9416e68700f2c1f438d74a0af8
 DIST php-7.0.30.tar.xz 12030228 BLAKE2B cc4c50d108fca68ee98b70a3007893d912d2343dd255faf52e41c1de04f590f427d9edad7b637177ccf1d9c62212ee6060baca13931c0aa14532df548ef159aa SHA512 1f0914ebda79247aa65ace63f6c8c4fcd850b21a82704f7b6482760259239cc5fee4cfd5aa2ed590b56822b4d69330ac472f46537e7f25d59e73ba63a48827c5
 DIST php-7.1.16.tar.xz 12211512 BLAKE2B bf242e2438b2dc363368a9ef4478349a291f483477ccedf988abd0fbb78a6f1b31e3b86dcb39ed9a9a8151674a8373ae77d8420e77efd6a2e05d5cfc778ed40f SHA512 98e96f06a4912cfa6926be2f292ce7120ca893c9b779b2efef4120c1df3580fa427cd58f5e4977edb01a0ae3b85660d6ca79b2bd79b6cd830cd77f6c6588b5ea
-DIST php-7.1.17.tar.xz 12213536 BLAKE2B bf358bc4920d38f74e4bdbc53f4744274071b4cea057452bfafbbc5760eb1ae0878f8cc92cf5337b883e17769cc6a490d0e64d3969aa1769cec92bf14f9101ea SHA512 2ac81b5ec898d366dc60f2dae4b07094457c6b8b110615e0fcc3af1e680708ed0e9c89728b95e453110eec41198cb8a0416b4aeadc017d4a2b6bf25ce624cac1
 DIST php-7.1.18.tar.xz 12213396 BLAKE2B f851c6eb261b8b532e84e73e6f173deb6ac00cd5168a02db9811843540aeadc390a4c5416eb17749cc950bbb1eda1045f538e2b80e4734ea2c0c4e264776bffb SHA512 7eacbc3b98d8b668c90d5c93030263f47ba2e0d4d7820594662590b8b68670f734a2274ae476e3aeac7e030c4ef10411a80da3523383e87a6757e87597caee90
-DIST php-7.2.5.tar.xz 12034928 BLAKE2B 36c9ec413b5332a1ef138a5724fd1718f5a8ffa8873dbe27ae7b6ca9a55ecfa0de7f7504a20581edb48605c2afcc799784eb3d94e08236222f6de2094d1921d0 SHA512 1d49fc6e47d2e86d4fd62396e558965502f44cc8f72459bb0d406e157298cac67703b219837952da11122722d9fa8cb4cda8ef66ddf063cb063859db34110f58
-DIST php-7.2.6.tar.xz 12113028 BLAKE2B 8b46ea6153cd12e7aa977978892c0842e5fa096bdead9ad6c6358d37d446e2f61fe09213a4de6864707ce0935823eb8b514be9e79f2095dda44fa22a51cb0c45 SHA512 da86b1ff2df3b9e2d46e59a80296b940d81132975b621bdec9602f8b4c8d91a3fdcd4ffd7cb982d63d3ec974b3a12a7854e42a73b7f2cc8eefade14335aa7c71
+DIST php-7.1.19.tar.xz 12215112 BLAKE2B 13f39fa258b5257e00b300d9488dc53caac8b005a01c4db98a05681334ab0dfade713116581da3f150dc20f4428fb249e00d705696d12b1daa13fc16fdaeedb9 SHA512 af966ef8d4172bbdac84bebbf6bf5cfd04376564307e925d3eecd1ba8f23b84dbb55f653d21adad120605d015ea4d15898e0a9154c85f4fc974b6ef695f6c566
+DIST php-7.2.7.tar.xz 12115168 BLAKE2B 787621d6bfcfa2f8f7176e3fab5b1f521f82169d5d8367664404eda4503e477a16233c6b155170e8a0c76c1d67674bc9bb0922ea65c3694977df0c6c2aba6a04 SHA512 fe9d632f190e62d97848035584f387987856348c6ca288a8bdf85bc2c48de73c20e774776a1a8928a470a6108121c993c032529836a8ffe6bcfe45724d432829
 DIST php-7.3.0alpha1.tar.xz 11746836 BLAKE2B 14feb7a31652d2f4cf3d34f0f0450fbcc597d026177b60455887657213acd6d5a8a11f96df30e9d18f51a95409bb944ba287aaee0b84ef1b66ffd61aeb8821d5 SHA512 5fedb7716bd194bd9692de9d2ac88b4bac876b74e463a43ae5bc5fd4f63bbf85d02c9d2f1f1e952c45b7867ccb2bd80b99dc77c9f2051967b9efe9fdcc5862ae
-EBUILD php-5.6.35-r1.ebuild 22709 BLAKE2B a8c2c5fe84d4849f2ad5cf96ae1896185e905f93c6c5fa1ae75c169d8ec3c267741931f59eef2fc6add4562a4a6bceed33181a315d949181c0e0df26c7635642 SHA512 f5b2a64129a4a8bab850ab0278bbf45829cf5fca35ad989715c5aceefac2bb27d69bf4de10498a1e04eb46273628e1830b689a06fac67e97a81fb40923c33e5a
-EBUILD php-5.6.36.ebuild 22761 BLAKE2B f2cdb63d4eaecd8e332e78c86e8dd757cf27f6547dc24c9abc144531ba09b46fbb63261cd13615115bae555a3f55cb67f84e4967ae00cae53c8cca765e08d501 SHA512 30a2fd376f0b601f40a63027b474459cb16e813c629dd2069b4aae342d1845a57a9edf82a752a930b087027a9407c78edbb239698fd5568f40a9edb09c8ec974
-EBUILD php-7.0.29.ebuild 21967 BLAKE2B e0339d5bba0ff95a5d9222fb09cd06876a3f646e221f1447f28ad822c8e2e101e18b2af1da2164459988fc980a8e8aa1da8ac77220512cfb512c4ed6243213d6 SHA512 a03cdfcd12f54d87ac75d9a2b103c0ce875389854bde66a709852ef5f43c0bd6a04096e7d779e721abb8d1209b3394c7c0a016433a2519d53132cd89200ba9b9
-EBUILD php-7.0.30.ebuild 21971 BLAKE2B edcbcf4e3f1250428028c19ed21510e33e16486887dc98d47d16015533ed418786479f862fdbf8760ad9709b4c791d960153c423348849c39dd8f7bb8f5f4363 SHA512 c9049a128fc81d1592fc603039bfa77e22331dcb01262a50f358a3cc0aacff1530f969bedd7a9e84910092d7f0e3383ac1ab420aa15c7565de24b46d58064762
-EBUILD php-7.1.16.ebuild 21855 BLAKE2B a5ea02c60695ae4085da75888102418f511922d2a9360bd466ce31248d30f1131fdd1eb5e30229ab1566a7fde2c659b434639181c03764cc57c290391971fc31 SHA512 b147467417ef28bc7a4845897c1aa891e13dfa69d1fdc0cbebccc9206e86b1fe2e57ee4af18bc5c3ed744c5579137fae4a6a6323209e58eb25ce15f93069bcc5
-EBUILD php-7.1.17.ebuild 21818 BLAKE2B ce339e941dadb1672c866a94e611fa8c329c95c7fafbbd4f135e4ea734f77120c6b06e6b204b59b46c930e440aac1308d209749576024265b04ced1fac7ad451 SHA512 0dbb7ddac39a1d02532edda4fd5caccc42cf9a25c1bf7b33e795f86b7bd8a2020a4c8f911d6881989b7aa11eba2c0d638be2aa94c519405e54decdf30abd41fa
-EBUILD php-7.1.18.ebuild 21814 BLAKE2B d5836fb2bd58b1de7fc61f0123c6c966dfb176c558639ee5abc2b292293b36e09c1a670ad01a7d40ecbba3c3f7fce321ddebccc8767417943c6163749d0e3042 SHA512 302c977ae6ee07bcf8cb1c03d9436435eb67ff2390650ab98b324f970b3e51e0d79dc57ff147a65af1c36ed8f95d8c0daebbc92ec99baa28f6ebc951f8afcdc5
-EBUILD php-7.2.5.ebuild 22349 BLAKE2B ade2a77aa0ebdb57085266b89f2b1e3f893acaf8f738944e5b1cc55512e6d27eb517ec7d01da359a1f84848ec6d014e14d8155861ea71b0d0397374e946ad63c SHA512 e3c62327d81ce1e40c7a790243b7549cf0d3881fa8b25e2fa1af8d21bc1912553adffa7b5f35e0ab84b77e531bd0879fff4fb14f931fc695d21cc014ad672c7a
-EBUILD php-7.2.6.ebuild 22349 BLAKE2B ade2a77aa0ebdb57085266b89f2b1e3f893acaf8f738944e5b1cc55512e6d27eb517ec7d01da359a1f84848ec6d014e14d8155861ea71b0d0397374e946ad63c SHA512 e3c62327d81ce1e40c7a790243b7549cf0d3881fa8b25e2fa1af8d21bc1912553adffa7b5f35e0ab84b77e531bd0879fff4fb14f931fc695d21cc014ad672c7a
-EBUILD php-7.3.0_alpha1.ebuild 22287 BLAKE2B cdb6302942261264007d7d8662f6255b81be903136eb6ad3977f3d9b879a326514585bae162772e0fb404bbda98619a2bdbfac3a19c99ed8481d824b2f7cc86a SHA512 cbff95a78e50e3550cb64fd081d4e92492dd6bbd9d4937dae4a5a8b5634721d718149319985485452944d4b4e31a1796b7d981dbf02ef1b7139b8451ebbf902e
+EBUILD php-5.6.35-r1.ebuild 22749 BLAKE2B 5f7c9b7f459781568948a34f73e9153e252bb42c37a3ab028a7f8cfdcfc430c28cbb615d4a193330bdbb373385002b453437754e18be2c9042bafe6bed141a22 SHA512 45538caa8ac17ec46110f55c4a22f3e23e2277da49a48f9bef1b6f44a99bc3db57ae148562dcbe0f689b088e3fef22c01a6462eac27661f104876e853ef6bced
+EBUILD php-5.6.36.ebuild 22797 BLAKE2B ed16c850486f309c4ebc83fa1345f787452cbb2aee4716db5af6fc484c396f379cb475afab8e53279e522ec83a3edaa703549cb9054cd10d46373bf5c1956d48 SHA512 86ddca5f0a4806e5e1635eb1825c946d43426e1465a8902c9bd6c25c156abc856bb617e6232264cbacc16eac67a581229c1c82c329d645379e6115155aa2e559
+EBUILD php-7.0.29.ebuild 22007 BLAKE2B 402536b872143cbe5157ef0cd5afd93ae18d98bd6c097a6f0c55795fa6c039a77fd183186e85e502f6ee7b51f3dfdf42d66418bceb8e981e1025379533f1505a SHA512 94398ad107dfbfd5daad2cc1afd43d4f5225431e7c8c772dcf9c91477da21394a528fcf2c4919a1e684628826f7a08987c1ad7806d3f5aa90d1193fbff7ee8bb
+EBUILD php-7.0.30.ebuild 22008 BLAKE2B c6c9459d316e0a002de1eab337ecb010a543eb1a9dbeaf30bcbaa57368cf4197792243e1939e357a80b01f21fc3b81331ba11203305559d4a88dc71e9473c339 SHA512 ce14aae5dbe741df62d593bcc0f562d77bdfcf01058328d50985dd107201f5f812229722978b44bc912a35251b7991e8ac9e46383a2e33bf1b98bf4229e1a511
+EBUILD php-7.1.16.ebuild 21895 BLAKE2B 63ee40d49bad190791b2c07fcf3e4a08fd3aa5b53a02120e1e4b998614ca867f80c4418f5ef23fc318c8b598fcd91e09d4bf0b9c3536209aca53df42ea895ada SHA512 0c32c7570e67dbdf397da50940f34d94788843a9ea82e1bef265e3ed6a60a366f9f1a45f2b2f842dc9382977a0d301a52c0d136873b56c8e60649221cd338df2
+EBUILD php-7.1.18.ebuild 21851 BLAKE2B 6cbdae0dc872c9613249343aab00ce0dca50ca433091dd16479a06ca7a935adfaa9cc590fab3e1175a80679c4a165f73c454720bdd129d25db3d5e0e5a9a099a SHA512 67231960f12f75c2711d47b35b89d91275edfba7f443e4b94491c2a54c82c4a525ed45cdde10ed45bae9be26640a1e8117634598ffe2d6c2a5c50c43adb7583d
+EBUILD php-7.1.19.ebuild 21705 BLAKE2B 030c85144ac9f22ff31cdad2b30946b7b05dae10908ceda32f6a9eccc9cb3ead02f830571d05f819dbdaabf09c8f22b659f19180859ab5b893af1d12585161ee SHA512 6154f220def10f403293025448d2703cdd3b4d9fcb7f4ddad94a91ec0844746221da01f44acf26da7f60ef4aa06c3bb5517a957be440c6c60e0c278707e06306
+EBUILD php-7.2.7.ebuild 22236 BLAKE2B a211a96418b58a56d2eac6b586b681b28da34877a0c8011cbdd70caa82bf7c0b73d9dc5942ee1e7504e4271495e86cb8f72fef8a1238078c54f690b30d16b1d1 SHA512 73d1e7e7459cbea57dc45f5101f49756c9165dd5af809099314a876afec25b6d48d98e4b8186cdf48b67526a920f84172a4fbb8e9a479fc6c99fcb551a836d2a
+EBUILD php-7.3.0_alpha1.ebuild 22327 BLAKE2B 4b6c25fdf510e9cae4bedba67e1af0ab47215ac632184a5738536dda58951e41c250182cf6f1a915765ce7489af9a75ebd70b141e76fdda0791efb191a5bb4a4 SHA512 b73c9c88dd0fe430da6be45c51c61334fe470b5846fc85f27e04c606f3c4d7bde9038b7ff7b4872c3842d848fc1ed1cf0b794e72a6c2f14515559f00b2e9fdef
 MISC metadata.xml 2577 BLAKE2B 9b15d6073181a5f5ff7b00ef8b68d24c7ea8763171ae84895ebc4a6925f589d2a02e4e29116c2741b3502b35d32aa58e7ed909e144c0e694f8cce5b4d26ecd3b SHA512 14e6daa693325b8a27157cff22d0b0cae9d89e4dada775f39188f7f36546b78a8b19efedb2f7b6f64ee1375bf29d3af32a8f7d6e7bf0d04cf2a7241abd154afa
diff --git a/dev-lang/php/php-5.6.35-r1.ebuild b/dev-lang/php/php-5.6.35-r1.ebuild
index bb5bbdaecb06..56d281890cd8 100644
--- a/dev-lang/php/php-5.6.35-r1.ebuild
+++ b/dev-lang/php/php-5.6.35-r1.ebuild
@@ -272,8 +272,8 @@ src_prepare() {
 }
 
 src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
@@ -530,8 +530,8 @@ src_configure() {
 
 src_compile() {
 	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	for sapi in ${SAPIS} ; do
 		if use "${sapi}"; then
@@ -544,7 +544,7 @@ src_compile() {
 
 src_install() {
 	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
+	addpredict /usr/share/snmp/mibs/.index #nowarn
 
 	# grab the first SAPI that got built and install common files from there
 	local first_sapi=""
diff --git a/dev-lang/php/php-5.6.36.ebuild b/dev-lang/php/php-5.6.36.ebuild
index f38ce11cfa9c..5b743906a993 100644
--- a/dev-lang/php/php-5.6.36.ebuild
+++ b/dev-lang/php/php-5.6.36.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
@@ -273,8 +273,8 @@ src_prepare() {
 }
 
 src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
@@ -531,8 +531,8 @@ src_configure() {
 
 src_compile() {
 	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	for sapi in ${SAPIS} ; do
 		if use "${sapi}"; then
@@ -545,7 +545,7 @@ src_compile() {
 
 src_install() {
 	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
+	addpredict /usr/share/snmp/mibs/.index #nowarn
 
 	# grab the first SAPI that got built and install common files from there
 	local first_sapi=""
diff --git a/dev-lang/php/php-7.0.29.ebuild b/dev-lang/php/php-7.0.29.ebuild
index 0c32a2cff737..a57432146374 100644
--- a/dev-lang/php/php-7.0.29.ebuild
+++ b/dev-lang/php/php-7.0.29.ebuild
@@ -244,8 +244,8 @@ src_prepare() {
 }
 
 src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
@@ -498,8 +498,8 @@ src_configure() {
 
 src_compile() {
 	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	for sapi in ${SAPIS} ; do
 		if use "${sapi}"; then
@@ -512,7 +512,7 @@ src_compile() {
 
 src_install() {
 	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
+	addpredict /usr/share/snmp/mibs/.index #nowarn
 
 	# grab the first SAPI that got built and install common files from there
 	local first_sapi=""
diff --git a/dev-lang/php/php-7.0.30.ebuild b/dev-lang/php/php-7.0.30.ebuild
index 90a7930b7ac0..cfcbd02ee740 100644
--- a/dev-lang/php/php-7.0.30.ebuild
+++ b/dev-lang/php/php-7.0.30.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
@@ -244,8 +244,8 @@ src_prepare() {
 }
 
 src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
@@ -498,8 +498,8 @@ src_configure() {
 
 src_compile() {
 	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	for sapi in ${SAPIS} ; do
 		if use "${sapi}"; then
@@ -512,7 +512,7 @@ src_compile() {
 
 src_install() {
 	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
+	addpredict /usr/share/snmp/mibs/.index #nowarn
 
 	# grab the first SAPI that got built and install common files from there
 	local first_sapi=""
diff --git a/dev-lang/php/php-7.1.16.ebuild b/dev-lang/php/php-7.1.16.ebuild
index ca595ad6fcaf..0adf8fe59a01 100644
--- a/dev-lang/php/php-7.1.16.ebuild
+++ b/dev-lang/php/php-7.1.16.ebuild
@@ -226,8 +226,8 @@ src_prepare() {
 }
 
 src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
@@ -480,8 +480,8 @@ src_configure() {
 
 src_compile() {
 	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	for sapi in ${SAPIS} ; do
 		if use "${sapi}"; then
@@ -494,7 +494,7 @@ src_compile() {
 
 src_install() {
 	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
+	addpredict /usr/share/snmp/mibs/.index #nowarn
 
 	# grab the first SAPI that got built and install common files from there
 	local first_sapi=""
diff --git a/dev-lang/php/php-7.1.18.ebuild b/dev-lang/php/php-7.1.18.ebuild
index b2aacdbf7c7d..f53642ef9653 100644
--- a/dev-lang/php/php-7.1.18.ebuild
+++ b/dev-lang/php/php-7.1.18.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
@@ -224,8 +224,8 @@ src_prepare() {
 }
 
 src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
@@ -478,8 +478,8 @@ src_configure() {
 
 src_compile() {
 	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	for sapi in ${SAPIS} ; do
 		if use "${sapi}"; then
@@ -492,7 +492,7 @@ src_compile() {
 
 src_install() {
 	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
+	addpredict /usr/share/snmp/mibs/.index #nowarn
 
 	# grab the first SAPI that got built and install common files from there
 	local first_sapi=""
diff --git a/dev-lang/php/php-7.1.17.ebuild b/dev-lang/php/php-7.1.19.ebuild
index 39336570acbd..1432a2ae457c 100644
--- a/dev-lang/php/php-7.1.17.ebuild
+++ b/dev-lang/php/php-7.1.19.ebuild
@@ -145,9 +145,6 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 "
 PATCHES=(
-	# hopefully upstream will include the same version check fixes in upcoming releases
-	# patch added 20180429
-	"${FILESDIR}/libressl-compatibility.patch"
 	"${FILESDIR}/php-freetype-2.9.1.patch"
 )
 
@@ -224,8 +221,8 @@ src_prepare() {
 }
 
 src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
@@ -478,8 +475,8 @@ src_configure() {
 
 src_compile() {
 	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	for sapi in ${SAPIS} ; do
 		if use "${sapi}"; then
@@ -492,7 +489,7 @@ src_compile() {
 
 src_install() {
 	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
+	addpredict /usr/share/snmp/mibs/.index #nowarn
 
 	# grab the first SAPI that got built and install common files from there
 	local first_sapi=""
diff --git a/dev-lang/php/php-7.2.6.ebuild b/dev-lang/php/php-7.2.6.ebuild
deleted file mode 100644
index f781eb4d8033..000000000000
--- a/dev-lang/php/php-7.2.6.ebuild
+++ /dev/null
@@ -1,743 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic versionator systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	session-mm? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	sodium? ( dev-libs/libsodium:= )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd )
-	webp? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	zip-encryption? ( zip )
-"
-PATCHES=(
-	# hopefully upstream will include the same version check fixes in upcoming releases
-	# patch added 20180429
-	"${FILESDIR}/libressl-compatibility.patch"
-	"${FILESDIR}/php-freetype-2.9.1.patch"
-)
-
-PHP_MV="$(get_major_version)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sodium sodium "${EPREFIX}/usr")
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zip-encryption libzip "${EPREFIX}/usr")
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	# --with-pcre-valgrind cannot be enabled with system pcre
-	# Many arches don't support pcre-jit
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-		--without-pcre-valgrind
-		--without-pcre-jit
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.2.5.ebuild b/dev-lang/php/php-7.2.7.ebuild
index f781eb4d8033..ecf193ae0d19 100644
--- a/dev-lang/php/php-7.2.5.ebuild
+++ b/dev-lang/php/php-7.2.7.ebuild
@@ -150,9 +150,6 @@ REQUIRED_USE="
 	zip-encryption? ( zip )
 "
 PATCHES=(
-	# hopefully upstream will include the same version check fixes in upcoming releases
-	# patch added 20180429
-	"${FILESDIR}/libressl-compatibility.patch"
 	"${FILESDIR}/php-freetype-2.9.1.patch"
 )
 
@@ -229,8 +226,8 @@ src_prepare() {
 }
 
 src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
@@ -490,8 +487,8 @@ src_configure() {
 
 src_compile() {
 	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	for sapi in ${SAPIS} ; do
 		if use "${sapi}"; then
@@ -504,7 +501,7 @@ src_compile() {
 
 src_install() {
 	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
+	addpredict /usr/share/snmp/mibs/.index #nowarn
 
 	# grab the first SAPI that got built and install common files from there
 	local first_sapi=""
diff --git a/dev-lang/php/php-7.3.0_alpha1.ebuild b/dev-lang/php/php-7.3.0_alpha1.ebuild
index 2fcf528ff923..27d2d493ca14 100644
--- a/dev-lang/php/php-7.3.0_alpha1.ebuild
+++ b/dev-lang/php/php-7.3.0_alpha1.ebuild
@@ -229,8 +229,8 @@ src_prepare() {
 }
 
 src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
@@ -490,8 +490,8 @@ src_configure() {
 
 src_compile() {
 	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
 	for sapi in ${SAPIS} ; do
 		if use "${sapi}"; then
@@ -504,7 +504,7 @@ src_compile() {
 
 src_install() {
 	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
+	addpredict /usr/share/snmp/mibs/.index #nowarn
 
 	# grab the first SAPI that got built and install common files from there
 	local first_sapi=""
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 4c069452cb18..fa09b9b24764 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -4,13 +4,13 @@ DIST rust-1.24.0-x86_64-unknown-linux-gnu.tar.gz 199663002 BLAKE2B 2373637eb4410
 DIST rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz 83752132 BLAKE2B a0d49238ccaa3547764c07a215a0e02c813ae18cd6aca3baae1d9a10dee87d73526552b7ff6e4936ec414794d1143041aa8f92d244e2e4fe5aaefcb12a6dcb0a SHA512 404ecd4dc1e49fba41d7ade947877f621aa762e43eb5a8f604823fe297e8023f095cd449610240ed235723baaac96064eb38445794e27708edcdbca998d939e3
 DIST rust-1.25.0-i686-unknown-linux-gnu.tar.xz 102453124 BLAKE2B 8986ebab6a7a9d00f716541484e0cfd4f33ca592880097217e718cb79cae77aad8ecaf6856f72386d2419b4dcc0d99425fb37f72b4830d6a20a74166f2c534d0 SHA512 75ad5cb5e00fabc24aaa46236cc6f2193a7543fd0944c0717c11a56d9c420d20463ad683558d86f5d42abacfb89d15f9cabf404c912a5e24a28e6716c8003e8f
 DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz 111059260 BLAKE2B ae982976a735c2b5226722207a983bb638cb7c0cb0ceb6b438456d54fac86a5d1892b535f01ac463157205c0ae27ae876482f6ac1fa269a9ec3e1177be0cef2e SHA512 aea93ff64f620a1dd6b48d07ec3dcbc126b2f5c17b4697c096ec8cd02a3c7dfec7ae7d5df70a55eceb372897ad12f3d01c67d5aaea0167a80270931c61323f78
+DIST rust-1.26.2-aarch64-unknown-linux-gnu.tar.xz 90964988 BLAKE2B 7e5de737ff2b4711e0a5b3085f10c3f2918fc5823dcb52bc5f897a5617b65d648d5e59664dbfaa904ff08923d1bbd11aae21349760fefef6ff18ea0e45391e07 SHA512 b565ec988d3b946dabc8902eba60b446070e77b7c27aa98d981b7ba5e9285bda95565627600e6be057970de5006d9640ef77fa920849160f5cf98508b48d1673
+DIST rust-1.26.2-i686-unknown-linux-gnu.tar.xz 143090096 BLAKE2B 7871fa4e4d0f320ff949cd31cefa116bc7b741927626958e1d10197f05fc9a662b8d6c21ddd4d2910700e6f7273e4fc18738e6ff58cd85b9af4ed25eceea31d9 SHA512 859b5b72c78cca8cd473012599ca12539ef9a5ee38d1aaaad024019fd84220e344e1cd0efd2b027ef333555b158b23529f35ceb5d59d76c35e7946b5fe4a8a52
+DIST rust-1.26.2-x86_64-unknown-linux-gnu.tar.xz 138609432 BLAKE2B 54507a8ce3ab2676e6e66852b6d3f1a47ca07ad4b56383f6247149309a0f60f67fbf0a6ba27d968c24340c07d7d5074942c6eaccbc1207c5e75fd9a6f47b2481 SHA512 29e474b0eab4dd2ffa0b964d83f52ffce530e75c4193e307410ef6d20ef9ad2b300a4f467bdf06b3311157340e9295cb9b1efdcf08dafee66979b076c2afba7e
 DIST rustc-1.25.0-src.tar.gz 98639156 BLAKE2B 1408d5dd0611d4830de3b6b3d00e3fad4198a47599b639d0ac0bd05aaba401f743056a942e9df04a4d192c6b12e8cfe9a9cdf8cd26e48b72104ce9b423df049e SHA512 7d8886f4d5a621eb794e814deb60be681fa38cf086f87ffa14e5a3500c640b237c549a632de1331a0f1b71963de41f6d31a4df3866b7e597424002316fed81ce
-DIST rustc-1.26.0-src.tar.xz 54613664 BLAKE2B 798985e4060c28828066118f39fc296e52b3796ae02f3917912680154047eb6f91806b3d45f3a0e9afcef55d95cea3079debae12d2ddf2d9c46f992e12519094 SHA512 563b910ecf4b2a0d798a1201177f733333e64efad49e5aceec5adc66a8c6903df391c9afc0fdd8284348c08082e0c4de1e5cb68efe6797594de43ca93e4ad7a2
-DIST rustc-1.26.1-src.tar.xz 54604108 BLAKE2B 73e14d835812a42f32342732db448294c98e5cfdcb76b4a5d11085bef6302ae340abadba564c38319882b558df6dbe826ed73347229599f2f8718085a6cdbe10 SHA512 219b8d4dbc1aa087422d8227de8a6be10c0579fd9d1aae83af0a0305baf2c3a72222c6bdca8635c550b5b754d08a7a5b03b81b8b28019b23250327be1c7f8b00
 DIST rustc-1.26.2-src.tar.xz 54613640 BLAKE2B f361b7a0ed40ccb026750b4a70b99931f1abf52024e907b588e339902de2fbbd15501d237ac048d0537005834b0a2f49935f654a8c75d40ed95c65894f611481 SHA512 a598858ddce0e05d1d431be383400f44fc551eb2e368f37b01670c0b65ea5da6a7d5b2b68bb6ef806d2107cfa0d5007008442ad4d5ddb17d18d04e0ab31600b0
+DIST rustc-1.27.0-src.tar.xz 55455772 BLAKE2B 5c1b26a3e8c6e45aaa43b3ccb5819089cf03c32807ac1adc46ec4f9ff8cf803ec444587ccb737b5d701c4ef5fa634fc4c89de3d71e6202b64ec125f986e54ffd SHA512 b80af48c637741add1d2846e6e3153b0125fb22ed587036fb9d27ad3961419af64802aa91a79258277b1be20718281558989ea0283db0c482fe1512354ba79d8
 EBUILD rust-1.25.0.ebuild 4602 BLAKE2B ef12c22219b70843d6132e07dc0df131502ba441a750c86f1863bd55c708df992a8d359fd62da11ff473806998673fbe0db11ff8129d4af42295ad6d849be511 SHA512 737a3f8469cac36442f11260de811294ab38faa23c515c78159288f340e51bafbb64b7c6354e8409f5b7093e65907aaebcc787493779f70f56a5bb02535574c3
-EBUILD rust-1.26.0-r3.ebuild 6166 BLAKE2B decd03f26e860e35617cfc3468429f479e45fbc11a7420e393b603faf0a4f4efa72c5317c9bf773429984532cd4e1c787823cf45c57b4965d0c85a3952350f6d SHA512 d268829a1a195b11e8f807249dd8d7f179e9b4c309ef37bf1aa6f7ab72d23bbfacbeba9b35dce51852b6a9955b7c348329909116cb11c538289fa900c5d275c8
-EBUILD rust-1.26.0.ebuild 4928 BLAKE2B ee453f381c1fccb83625bce8e083555e9090bb83ab625a70c61e30fcc95ef1f96431afeac03c41b425211ddd54ddc6135790f941e7bc346fcdee0395c07b9a79 SHA512 d599d878b22e58c7644f25108c2b80835cbc97036021eaa74347e92b39f92ae5efcb8b246fe57280fd22b4376efbea2ba2d264fa2b35b43121ae69248ae09dce
-EBUILD rust-1.26.1.ebuild 6166 BLAKE2B decd03f26e860e35617cfc3468429f479e45fbc11a7420e393b603faf0a4f4efa72c5317c9bf773429984532cd4e1c787823cf45c57b4965d0c85a3952350f6d SHA512 d268829a1a195b11e8f807249dd8d7f179e9b4c309ef37bf1aa6f7ab72d23bbfacbeba9b35dce51852b6a9955b7c348329909116cb11c538289fa900c5d275c8
 EBUILD rust-1.26.2.ebuild 6405 BLAKE2B 42ba958bf51ca06863a7daf33af65edf6ca9a8661403c3790beb0767275ef351c624bab40eec7d6b191f9ff366a00ffe9b9419edf6ad95093adc130e1c3c8c27 SHA512 5475113b82ae3d5406a41a2ad1d37dd0997be401dbe5f61a3f50234b208b23f6b3bb465baffc0e05b3c667416dcd870d61b918f36ef3e41ae30009b600eb7524
+EBUILD rust-1.27.0.ebuild 6502 BLAKE2B 7c00b39b5db8347085ec6060019ce20f0914aed7c1f62da31d7d3114451253a076f11b60c4615f7b5f1afb0cd7bd25e0e89f328b29fe4c041bad242f69e9cb36 SHA512 57c6ac383e47aec3d86b7d1ec198c843b89498c2f2fea17f1e1ce07ec4a9405ec48add0e3e683a378f74650582ded64a3d610c7d1014295ca9e141bd7d0961a6
 MISC metadata.xml 567 BLAKE2B ba37cc554e05535739292d3c69155bb53bf0c99260dd60b4e7cab0eae13edee8c7e66204e3aaf9d917153714651486370db64bcda5200d6302bd8bee8eff989c SHA512 57384c3ef2f103b20d64854e5c3e50237be7f1af57687abae6a067d452b10a16ead4534b8302beb782273a8bf353adb3da90c5c140bd5394eac2ce0d3dbcc1e3
diff --git a/dev-lang/rust/rust-1.26.0-r3.ebuild b/dev-lang/rust/rust-1.26.0-r3.ebuild
deleted file mode 100644
index 2508fbe3ee31..000000000000
--- a/dev-lang/rust/rust-1.26.0-r3.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit multiprocessing multilib-build python-any-r1 versionator 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"
-	KEYWORDS=""
-else
-	ABI_VER="$(get_version_component_range 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-CHOST_amd64=x86_64-unknown-linux-gnu
-CHOST_x86=i686-unknown-linux-gnu
-CHOST_arm64=aarch64-unknown-linux-gnu
-
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
-RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
-RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
-RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 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
-	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
-	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
-	arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
-"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ 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="debug doc extended +jemalloc ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-		jemalloc? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	dev-util/cmake
-"
-PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-src_prepare() {
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	local rust_stage0_name="RUST_STAGE0_${ARCH}"
-	local rust_stage0="${!rust_stage0_name}"
-
-	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
-
-	default
-}
-
-src_configure() {
-	local rust_target="" rust_targets="" rust_target_name arch_cflags
-
-	# Collect rust target names to compile standard libs for all ABIs.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target_name="CHOST_${v##*.}"
-		rust_targets="${rust_targets},\"${!rust_target_name}\""
-	done
-	rust_targets="${rust_targets#,}"
-
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	rust_target_name="CHOST_${ARCH}"
-	rust_target="${!rust_target_name}"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		targets = "${LLVM_TARGETS// /;}"
-		[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
-		verbose = 2
-		extended = $(toml_usex extended)
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "$(get_libdir)"
-		docdir = "share/doc/${P}"
-		mandir = "share/${P}/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debuginfo = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		use-jemalloc = $(toml_usex jemalloc)
-		default-linker = "$(tc-getCC)"
-		rpath = false
-	EOF
-
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target=$(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
-	done
-}
-
-src_compile() {
-	env $(cat "${S}"/config.env)\
-		./x.py build --verbose --config="${S}"/config.toml -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	local rust_target abi_libdir
-
-	env DESTDIR="${D}" ./x.py install || die
-
-	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
-	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
-	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
-
-	# 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=$(get_abi_CHOST ${v##*.})
-		mkdir -p ${D}/usr/${abi_libdir}
-		cp ${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib/*.so \
-		   ${D}/usr/${abi_libdir} || die
-	done
-
-	dodoc COPYRIGHT
-
-	# FIXME:
-	# Really not sure if that env is needed, specailly LDPATH
-	cat <<-EOF > "${T}"/50${P}
-		LDPATH="/usr/$(get_libdir)/${P}"
-		MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-		/usr/bin/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-lldb
-	EOF
-	dodir /etc/env.d/rust
-	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}."
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; 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 has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust/rust-1.26.0.ebuild b/dev-lang/rust/rust-1.26.0.ebuild
deleted file mode 100644
index c9210192141e..000000000000
--- a/dev-lang/rust/rust-1.26.0.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit multiprocessing python-any-r1 versionator 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"
-	KEYWORDS=""
-else
-	ABI_VER="$(get_version_component_range 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-CHOST_amd64=x86_64-unknown-linux-gnu
-CHOST_x86=i686-unknown-linux-gnu
-CHOST_arm64=aarch64-unknown-linux-gnu
-
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
-RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
-RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
-RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 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
-	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
-	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
-	arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
-"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ 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="debug doc extended +jemalloc ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-		jemalloc? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	dev-util/cmake
-"
-PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-src_prepare() {
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	local rust_stage0_name="RUST_STAGE0_${ARCH}"
-	local rust_stage0="${!rust_stage0_name}"
-
-	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
-
-	default
-}
-
-src_configure() {
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	local rust_target_name="CHOST_${ARCH}"
-	local rust_target="${!rust_target_name}"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		targets = "${LLVM_TARGETS// /;}"
-		[build]
-		build = "${rust_target}"
-		host = ["${rust_target}"]
-		target = ["${rust_target}"]
-		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
-		verbose = 2
-		extended = $(toml_usex extended)
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "$(get_libdir)"
-		docdir = "share/doc/${P}"
-		mandir = "share/${P}/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debuginfo = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		use-jemalloc = $(toml_usex jemalloc)
-		default-linker = "$(tc-getCC)"
-		rpath = false
-		[target.${rust_target}]
-		cc = "$(tc-getBUILD_CC)"
-		cxx = "$(tc-getBUILD_CXX)"
-		linker = "$(tc-getCC)"
-		ar = "$(tc-getAR)"
-	EOF
-}
-
-src_compile() {
-	./x.py build --verbose --config="${S}"/config.toml -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	env DESTDIR="${D}" ./x.py install || die
-
-	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
-	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
-	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
-
-	dodoc COPYRIGHT
-
-	cat <<-EOF > "${T}"/50${P}
-		LDPATH="/usr/$(get_libdir)/${P}"
-		MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-		/usr/bin/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-lldb
-	EOF
-	dodir /etc/env.d/rust
-	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}."
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; 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 has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust/rust-1.26.1.ebuild b/dev-lang/rust/rust-1.27.0.ebuild
index 2508fbe3ee31..46186c32ca15 100644
--- a/dev-lang/rust/rust-1.26.1.ebuild
+++ b/dev-lang/rust/rust-1.27.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
 
-inherit multiprocessing multilib-build python-any-r1 versionator toolchain-funcs
+inherit multiprocessing multilib-build python-any-r1 toolchain-funcs versionator
 
 if [[ ${PV} = *beta* ]]; then
 	betaver=${PV//*beta}
@@ -26,12 +26,14 @@ CHOST_amd64=x86_64-unknown-linux-gnu
 CHOST_x86=i686-unknown-linux-gnu
 CHOST_arm64=aarch64-unknown-linux-gnu
 
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
+RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).2"
 RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
 RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
 RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
 
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+# there is no cargo 0.28 tag, so use 0.27
+#CARGO_DEPEND_VERSION="0.$(($(version_get_comp 2) + 1)).0"
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2))).0"
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="https://www.rust-lang.org/"
@@ -49,7 +51,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 
-IUSE="debug doc extended +jemalloc ${ALL_LLVM_TARGETS[*]}"
+IUSE="debug doc extended +jemalloc wasm ${ALL_LLVM_TARGETS[*]}"
 
 RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
 		jemalloc? ( dev-libs/jemalloc )"
@@ -90,6 +92,9 @@ src_configure() {
 		rust_target_name="CHOST_${v##*.}"
 		rust_targets="${rust_targets},\"${!rust_target_name}\""
 	done
+	if use wasm; then
+		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
+	fi
 	rust_targets="${rust_targets#,}"
 
 	local rust_stage0_root="${WORKDIR}"/rust-stage0
@@ -128,6 +133,7 @@ src_configure() {
 		use-jemalloc = $(toml_usex jemalloc)
 		default-linker = "$(tc-getCC)"
 		rpath = false
+		lld = $(toml_usex wasm)
 	EOF
 
 	for v in $(multilib_get_enabled_abi_pairs); do
@@ -146,6 +152,13 @@ src_configure() {
 			ar = "$(tc-getAR)"
 		EOF
 	done
+
+	if use wasm; then
+		cat <<- EOF >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "lld"
+		EOF
+	fi
 }
 
 src_compile() {
@@ -172,9 +185,9 @@ src_install() {
 		fi
 		abi_libdir=$(get_abi_LIBDIR ${v##*.})
 		rust_target=$(get_abi_CHOST ${v##*.})
-		mkdir -p ${D}/usr/${abi_libdir}
-		cp ${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib/*.so \
-		   ${D}/usr/${abi_libdir} || die
+		mkdir -p "${D}/usr/${abi_libdir}"
+		cp "${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib"/*.so \
+		   "${D}/usr/${abi_libdir}" || die
 	done
 
 	dodoc COPYRIGHT
diff --git a/dev-lang/scala-bin/Manifest b/dev-lang/scala-bin/Manifest
index 21c3cc726944..a28b992dc618 100644
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@@ -1,5 +1,5 @@
 DIST scala-2.11.8.tgz 28678231 BLAKE2B 3e75e941112afb094e99be76fa7d039b27a32b1cedd645bad43b776ee9136f6ac3951eabe7c7182280f442050a3c7c658d49906b42004965128dd048d2ad73d2 SHA512 c00a0eaa4317c3ffbdbbd9c817f06c5262f0549f22bd7f1886cc22643e34e8909648bbfb58f3a63c453baf045381a52128ff0b18b7a39274ef03aad7daea9fdf
 DIST scala-2.12.4.tgz 19741785 BLAKE2B e782a4ac000ffcebc2faaac077cbb3cc13f8cc56deb9b3a78f1bddd3d0e6fd282d70f10cfef0780e4ab6a13e8d51b0401f84829b7974bd8823aecab54476ab02 SHA512 e6a9e11974d3bacc5f5dcdfdb379bdd1b430b1682141bed688f02f8b49395aff7c55cdb8da3319dff55da7bd7cfe7545e9b26db9558316ac8b3e29f6bb2c6d74
 EBUILD scala-bin-2.11.8.ebuild 1865 BLAKE2B e089d8a18f217868eb2c063ff237a6eb80aa32f13a5f919248451a02af617c32acdc6468f5f8d7147c0c61477c678d93dd2348a6cc1cdcc8553cb46a2efcdd90 SHA512 84067265c0ae7f7b7edb92994f56b0e25bc889d5f44ec00dab32497d34a84707cce6a46685c46613cc872748080ee782b139258caf3f1ab5c8463c64fbfa81eb
-EBUILD scala-bin-2.12.4.ebuild 1484 BLAKE2B 17c64f103294ece327c8ae0e10578c3451e3e0ece76c42801d740cc477480567a6ab8140926c38b7750042f8af9644179df45510c08e0e714153563f4430a568 SHA512 97a69472285a2090b3e914858ade1b3a80e7f45105f3f1a89dd2411b9f552b4d104538a9ca919c502bf4a8ba60d9916f92aad9c60d1c1cb62370e9f6996d438f
+EBUILD scala-bin-2.12.4.ebuild 1482 BLAKE2B 1f08b7ae9966682e14958090b42f5b45efcf1e80593fdc31aaeda09a100b46041a5b2a5d601feb52a829188ada9eef20038207fb028c8ab61adb7a51988bbbad SHA512 95bdf1e5108e90739d464d26c45b3c3a6c8949bbe8c8ae82afef56c583b4ef3e65571d798ca6786bea05ee45d8932471e1789cd4df5cbaa420fafbe8be1a9c37
 MISC metadata.xml 317 BLAKE2B 47b0d918ff9d4f2287fc0c43a022b978a816aa0d96362cf449210cd6b13810ed1352dbe69c5bea8281cdd3f3d03f4dcf714589e414b27abd5cd8c648e3d64994 SHA512 506fab7ebaa9e1caf96f239d6d85978171b98282ebe22a4948f61df62ce05a4c22772d81159cec9a99dd9a127b602e7593615204142e295d88835f9385a64bc8
diff --git a/dev-lang/scala-bin/scala-bin-2.12.4.ebuild b/dev-lang/scala-bin/scala-bin-2.12.4.ebuild
index 40d1bd762124..a434c4ee6280 100644
--- a/dev-lang/scala-bin/scala-bin-2.12.4.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.12.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index 4434745be3f3..e843c8694d0e 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -203,7 +203,7 @@ DIST scala-2.12.4-sbt-deps.tar.xz 34841672 BLAKE2B 0f1577bba65eb5863013014b16627
 DIST scala-2.12.4-vizant.jar 15910 BLAKE2B 393ddd38ff2528b9c54fbb2b79111858a2dfeab66e4b10daf4e23d113963edb3002db8c9415fe47557736a63ecef4b198bd90b87a54240a9a43823fdab0f3082 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390
 DIST scala-2.12.4.tar.gz 5999529 BLAKE2B 5dfeadb9ac9562dd825f6a41f9cabdd353f669a58dc3aaec714d6155e9e598296c1e31dcc8956a24a97103e3449fb8f8c3a9ebe5e52dd405572d59ccae89c5e6 SHA512 cad6d54777a3ad4d26df5b4d5cecbbdb4a91ecb17cbf791fe259735221d33f9dd17a14e86f5e3520464078ad9ef68581e722e3c0d7494436bf356c79a9d31697
 EBUILD scala-2.11.1-r2.ebuild 7608 BLAKE2B 8bf202a892071f2392a0a07854145317b7c768619287ca1e4be0b3fcf5aae4ca31f16944791b017e751ba5faa8ccfe2a42a9a84dd92dd25febfe81bb395a99c5 SHA512 bed490fb58b2d882c6c8905416fc5366b1626de013faeda455878064d57c4c7b283e94b7e7b3c92ac63de5cdbaafbd38c44afd9bda9dd22bc07e4bbf419cc521
-EBUILD scala-2.11.11.ebuild 7836 BLAKE2B 451ae5848c76ffe7fa330f3f7307ec3750a07ebaad50b6ee76798e28f6d58e10bdbe796979d9232cd3156103caa8b73a22f2b05190e0e9c4b0e5aa7aac1585b0 SHA512 a33a615bd6dc944453430ca0a0ba93d3711c11bf9475797c08735ddf986a7c8ddb6ceaac03f24f8ad023c3eb61de4ccad76e542a83ecf1aeffde69f4df052d74
+EBUILD scala-2.11.11.ebuild 7834 BLAKE2B 924beb59c89a63bb4c41c4fdb249a9089e71f8deb693e248b55f7effa381cf2274ca7a7b0839cfe98097a59de4ebeb0a29fb0d5865c5cc0363e96d1d7a037d3b SHA512 931fdfcfafd543caa8100bd0acd7222cadfec4ef1bae79d165a2040a173dac45a910e415700442ec7ca7b3bdf936b68a271e389a377844a7ee22953e60401f2a
 EBUILD scala-2.11.2-r2.ebuild 7693 BLAKE2B 067c5ecdc422b2971b54b12b87c7eee674e0e07a98252946d3e5461dfaf2544796fc931668a614c33804dd257bb1d1cfafb93b7bcd4499800c8c53994f0e5e77 SHA512 4410f23191285f1421297c27ce2a08dd10be00d6cc86f5110e6d3f1687c72f510bbde51b19df3473f0b0867635e3ac192914ee179306244bfe9d9268effc09f9
 EBUILD scala-2.11.4-r1.ebuild 7673 BLAKE2B 99b3ea92ff426f2d154438812af32b261f4ff0ef383e04ab055107fa1864cd154051349b47001445358b1291ff1b5100525323ac31803649151c5d3f03aa6848 SHA512 25b6ad67483d4fba45c7613220b1920c887bbd6865b1818290b4fb529cae69491be6aa85aef74b47e8880b805719c38aef94eb0ffa6e05157f588f0a0b6f81e2
 EBUILD scala-2.11.4-r2.ebuild 7657 BLAKE2B f0229634e3d987fba291f89297f52f5513654357de6f0f582b79be4ade4e56306579f1cec6feb72e63415567aadcf6759fbe9bc7c8fa1059061a371edc0c81ef SHA512 07b86645e7e3aad9dd81d9c1233166b23f3f3aa2094148f229fb3640dee416c451b4d50b2b17c9e788bb65214613cca6a2b76ff9d2a1c01d71dedff790e89230
@@ -212,5 +212,5 @@ EBUILD scala-2.11.7-r1.ebuild 7847 BLAKE2B 90a0fe6f856c62a96965d9a46bdfff57cd73f
 EBUILD scala-2.11.8.ebuild 7847 BLAKE2B 55f1ae01e1b4265ad52855de5350527512da10a1898f29da41304370b8c5e48741630efa91b2bdf1bad02f5ecf1dc51425010fee72a787d2acc284455aae6d08 SHA512 7ae265e05b3f0cf4300590247bcb92065a6c79a3c1c54f27e1e69481235fb2f57ff3b57b6fd8ad59ca18adcec453a48770f9c274b70cc92def9aee8e4fe9943c
 EBUILD scala-2.12.1.ebuild 7356 BLAKE2B 8b84cb6d082f86b2999e6af29dff5581d671cb9ebb73605c9dfdcfaf5e5feca93a1e7d9a6f26fa9a47bfdeba531af70b3df590dcc00489a7cf0661de79b89362 SHA512 e3ce17cc76e0726241187bff85275f45d1b7645b636ea97c61723f66921a5277410138865c8b8672a7ccf4e60d0bf3c88a3b65c3137d4afebf45edf86452282a
 EBUILD scala-2.12.2.ebuild 7268 BLAKE2B 45b1c9cde361d9a9ed8c8cc24e6471c5e3d6db140794f3fec3a1e45681df620e9d35b9ff40a1dc40af6c311683ebba462975473c0682ee73e8987aca29f703de SHA512 9e4be16fcdc8b774f7e3bf32b0559ff2c0490646fa6a73d64c2af75013fd66624a5560d0bffa298745cd51c763ff18ef6010b6ba2ccd89a75f0391c49d2922c0
-EBUILD scala-2.12.4.ebuild 7277 BLAKE2B 65b20d93fd5e6fe36834161041cb4492e5366ac2b817f8cf17b1e228db24876f1e17ed23ca71da8f1611d854cf21192208d66a4c779d8f0e6535a716c50e434f SHA512 20adffc5b5d159bbd74968a2886b3c4aee56508cdcc761952c0356ec0a67a8e056e5312b4755fe0b92704053d577413cd7a568526ad6996d4e6e9fad0a604f7f
+EBUILD scala-2.12.4.ebuild 7275 BLAKE2B 0d0fd9b3598c5e02d6d23180ed2eb3f5297c1f11f6afed71d9248495cbc0fccbfbb16ed06865718e0897bd4003d3c77e741fbbd34a7d647584d43c2aed762eec SHA512 c7d313adc7580a6aed48b1b04ecdc15a1a0698c9568b4dca1039660921c6b47781d54b52cae588c63d1bf6a8598c884094276d61978c2aa77fc43d963d23a139
 MISC metadata.xml 478 BLAKE2B d23bdb99144c333f9ae563a08a78c2ccabdefc22e88207f89c0492c444b574677eeec648a38f105fa8e114a8a8a373dc9487cc36e1eb825cdf814bc1d76d402a SHA512 cca0d7d9cb94bfaad3f93382456248626e83ed8358798ff4b11c600cadee3b88b28b89e914fe5d42c16e170969ded1b35efd1af61953476347f620b9a973d718
diff --git a/dev-lang/scala/scala-2.11.11.ebuild b/dev-lang/scala/scala-2.11.11.ebuild
index 9809a7fcfcb2..40bafa3a7db5 100644
--- a/dev-lang/scala/scala-2.11.11.ebuild
+++ b/dev-lang/scala/scala-2.11.11.ebuild
@@ -64,7 +64,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="binary emacs"
 
diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild
index 767fdd498239..b36402420d49 100644
--- a/dev-lang/scala/scala-2.12.4.ebuild
+++ b/dev-lang/scala/scala-2.12.4.ebuild
@@ -70,7 +70,7 @@ SRC_URI="
 		https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz )"
 LICENSE="BSD"
 SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="binary emacs"
 
diff --git a/dev-lang/spark/Manifest b/dev-lang/spark/Manifest
index 6335acacdfca..ded6ec1d1271 100644
--- a/dev-lang/spark/Manifest
+++ b/dev-lang/spark/Manifest
@@ -1,5 +1,5 @@
 AUX spark-2017-gentoo.patch 379 BLAKE2B 33907d6cd9099071cd04f687b05ab33da89bbd9a1d15e8282ae7791786c5638f977b39d482dfc15d07377ed2b06937a1d3f9ca18a6eb745ac7c3ec4d7cffa5ee SHA512 b4db9b56ab003dff8aec28248ea32af6fb4067c1824b0f6d115d66d1f3c8d180a17a2fa52a5f2ebc3605b549e0b38aafa15e9f238b079d5366d5375d851d84d1
 DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
 DIST spark-gpl-2017-src.tar.gz 19750595 BLAKE2B 840eb9044b732aad16d2b6be9972e4805caf1e1b521ba40cc2a234871775d0212153ed9e9f84b4a2ddbeefc2b9c7d7556db943153655df6051cf4dc3f1be2e01 SHA512 90e7644daa6a935c839da9799c6dc5fe0a566f29c5f5d0a964ef5c888581f18c11adf6aa0151ae72437b91430fae06604dab8c3f1fd3222d749cfd330293ff6e
-EBUILD spark-2017.ebuild 1601 BLAKE2B 4ec7e0036177dfbce9b40d524b598b9b62d92bbef59f77b584f03ca5e03fb92485fec981aae8dad323f449c3d34acee33f62db3222857a31bac32757d9e7dc88 SHA512 418479b9de11e9d7170e34e65b2472c4b089e9d15817d8d2aafc5bb4f89205e91ed38f810282e7705a91989373913a594a9d526a9acd2e4ec310b7b4a91955f4
+EBUILD spark-2017.ebuild 1628 BLAKE2B ec15a84af3a0bc1417cec1db937f21e74797d2959047f6f8e07b816a4078caa283d48665917590ce8da707d16c27e0c05d4c168f6f1f1bfba2c500bd336698e4 SHA512 d9a230596c29e6ccd09aee78326904f21676bb736546df40df2ed41d93b0b4015f739d00c868d8deaa54274127b18b69c979b8deeffe6db979518d833bebd0e7
 MISC metadata.xml 702 BLAKE2B 26ae203d09cb80c4c75ca368651aa24da08657142d7e84e4dbdac335b501e98d6646e59b90b71706c8521e8e9c0692550615ef15f373f5d8d26e48ec74c2e72b SHA512 bd30717cad1bceeef722cf8a27cd3902ad636f088f64cc41f1be5d356a7def55e426bd62fd7a3e7d9272f61a6fad96bec423e7529660c8061650af72faeaeb57
diff --git a/dev-lang/spark/spark-2017.ebuild b/dev-lang/spark/spark-2017.ebuild
index e63d7069015f..47ad4e812b0f 100644
--- a/dev-lang/spark/spark-2017.ebuild
+++ b/dev-lang/spark/spark-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,8 +20,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND="dev-lang/gnat-gpl:6.3.0
-	>=dev-ada/gnatcoll-2017[gnat_2017,projects]
-	|| ( dev-ada/gnatcoll[shared] dev-ada/gnatcoll[static] )
+	>=dev-ada/gnatcoll-2017[gnat_2017,projects,shared]
 	sci-mathematics/alt-ergo
 	sci-mathematics/why3-for-spark"
 DEPEND="${RDEPEND}
@@ -43,7 +42,8 @@ src_prepare() {
 }
 
 src_compile() {
-	emake gnat2why gnatprove
+	emake GPRARGS="-XLIBRARY_TYPE=relocatable" gnat2why
+	emake PROD="-XLIBRARY_TYPE=relocatable" gnatprove
 }
 
 src_install() {
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index f903168b45de..6398296fbaa6 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -5,9 +5,9 @@ DIST vala-0.36.11.tar.xz 2862788 BLAKE2B e6355669e1f70812ba3db12f3f9fa4f9eb7f8cf
 DIST vala-0.36.13.tar.xz 2869616 BLAKE2B adb22fa45e34c2be2accde2bc928148d3115dc0757338d66feb111b4225879f21f2af5f49511eff53697127d3431d22736be827d3663ed8a5de6d8ac718b0cee SHA512 7c9bb2e50f660ec28d55f755019ba81eb0358327967d8046a14691b5fe9c805f731c6277cbb732fc19af60322e2293bb25176387944ca2de709cde0c22b44d1f
 DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee26580132c052554a3d021fea32c0cee6dc6e8c6419f88798f5066a70d54084757893b2d46e3b286b441a51a4169c92 SHA512 7a6daac5be72240ae998b2c26e240a8b6bbc44c8bb6a036357fc0419cd7b40e14ea76c8125eb49a8d252627425613512410ba7868eb579b13d299e2ff0f4082b
 EBUILD vala-0.32.1.ebuild 790 BLAKE2B 5fbcb72d246591c9ab0e0609b6b09be7422a31422344d4ca1cdce7b7ca250421f09b3899bc986b9a34b1ff697271e25ccec53af3b1980d294755022cf3a40dd4 SHA512 7e2215c42c25a890ac37ee471753987cf98767f186cf2e9cd3a7104bfb03a7d4425c61cf12f2bec91511559edcc276a38fb37b58c74e3152988e4f120bc425fb
-EBUILD vala-0.34.16.ebuild 792 BLAKE2B b2c7e572a8cfe2f1d2447e215752e22361b0367d2804dbf8df00bbc3e3b8901f50dc60b8c197f92dddc0d737fd637f89bbb24370abc91431cb6994241f6f09fb SHA512 87f84871923f38a7b2d61a95aeabb28fe01df037470467dabf6b904f69c610f420961103cd628c74aad01a2214241e730d307de8627d7634e9e47762602a4f17
+EBUILD vala-0.34.16.ebuild 791 BLAKE2B b6a92cae7a84404f3257c62d97154b87d8c28e6ab0391df167c4a17fc0a4e9c0c274d795271ac6e12ac27456d12620774f3b9a6b105cc4c4323631a1cfce6f29 SHA512 4f49135c82b174b183d8d6547f1cec19d7b2432ea2807410cf81f61e42ac6e26867d2a0360b2e8f8244e91445f5547324e2eac50658af37e5b05addedfd19201
 EBUILD vala-0.34.9.ebuild 790 BLAKE2B b33d0f4822581785cb045304b209146daf494cf7b9917628f8127f6994576a076a375a06d60106e3c7aa88e4e6830cf73998d372d2d8b274271dc100f6427094 SHA512 39a137ec6e618d7bb19340846a026955ccaa3f4a77f0cc84e24c96cf9a4da0354a6504c3d44a734c709e5586ba8fe675c569b48edaf5877cd01d45f51a017cfd
 EBUILD vala-0.36.11.ebuild 882 BLAKE2B 9b3b0be67f7e1fad290caec4e7e29fb6d841d8e171a64f790857b905164ad3ff2c29c7e010d11becfa2d7a2d4687de314589f084af29ee9947dccbb91a29ba5d SHA512 7aef7342b8cad68c744f2c5039dd6bfb4ccd02d6a9f7287e531b730b5b6bbb15e862175bae297f6e025ab6ce50788a92d51b83cbece1889ef66c386e44402393
-EBUILD vala-0.36.13.ebuild 875 BLAKE2B 14ef5e33aee22fa1e0fb9c0351886a8c81ce71548867c5010be8b4f66a9dc95545c81416640e6b432425e4e4aa6e278e20cc92585056483ae759c5adf5a4b1dc SHA512 14d61af669f178a66de4809c2ce08159186a75c698152e71bb80cfc4e3483d7f4c55d7a99a8a1d1fde2be4ecfc34b3a43982afc7cd0d1029a8a1b0872f2cba30
+EBUILD vala-0.36.13.ebuild 874 BLAKE2B fac3c1a7156f8e1fbf81bdd6ca20b1fafa2d76e99aa5cffa83bc2dad9a22fbcf9e5bc8d69c058d22043e1052e1eb80f126c4ccef03ebd2b5cb0c73324f6712ea SHA512 1ea34baef09331a4871da45ab9ee412e4348a36b4892ea5e0893658602aa1e0a80770e308f5a7316418e863358edb0f8d9ce677d12baef4fe61910d20af98cb6
 EBUILD vala-0.36.7.ebuild 874 BLAKE2B fac3c1a7156f8e1fbf81bdd6ca20b1fafa2d76e99aa5cffa83bc2dad9a22fbcf9e5bc8d69c058d22043e1052e1eb80f126c4ccef03ebd2b5cb0c73324f6712ea SHA512 1ea34baef09331a4871da45ab9ee412e4348a36b4892ea5e0893658602aa1e0a80770e308f5a7316418e863358edb0f8d9ce677d12baef4fe61910d20af98cb6
 MISC metadata.xml 255 BLAKE2B 51dc9e0030d68ac68f075bb4a7b4c5f42122c16f354e10463d7338e652b272b26fa1eb12a144ed4a00d29a020af4df19029d909b4591162347184b1684402c94 SHA512 1970039db79f50391650a9fea933485c6102d1165946ab8efe9395403a02f49d4b17c2942795282469ac7c0306e7353002dcbaa797fb1060982b31ea3540b98b
diff --git a/dev-lang/vala/vala-0.34.16.ebuild b/dev-lang/vala/vala-0.34.16.ebuild
index 446d4e8033c9..ca029860139c 100644
--- a/dev-lang/vala/vala-0.34.16.ebuild
+++ b/dev-lang/vala/vala-0.34.16.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.34"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-lang/vala/vala-0.36.13.ebuild b/dev-lang/vala/vala-0.36.13.ebuild
index 9cd322cba8a6..ff5ba10c5832 100644
--- a/dev-lang/vala/vala-0.36.13.ebuild
+++ b/dev-lang/vala/vala-0.36.13.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.36"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-30 08:49:38 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-30 08:49:38 +0100
commit	b2be182d49eea46686b5cf2680d457df61e89dc4 (patch)
tree	c66442ced2011c5ca81c3114cc51041e314c6d33 /dev-lang
parent	e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff)