gentoo resync : 15.05.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-05-15 13:19:56 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-05-15 13:19:56 +0100
commit: d302a5d7fc9caafba5c8a404f2891bb6ccdec311 (patch)
tree: 2a3ee43f080d1d0086964de8c29ccf1021fdfda7 /dev-lang
parent: ea31ad0ed5501d0bf92267c35beaf06ac016bad2 (diff)
47 files changed, 568 insertions, 1081 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 42886f23423b..22742daf5bd3 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 166b8f6b509c..1d4a98575465 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -10,6 +10,10 @@ DIST go-linux-ppc64le-bootstrap-1.8.tbz 52211575 BLAKE2B 7a28ec5a381369c4e9415c8
 DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324bbb30a383d599e31a0d2093d24797dbcd0e799a662a3589dbb87d2f5dd16df07c4cf8f1e444e87b540ec732746bb025dc9271f8 SHA512 d429cae870d66217ab2e07c74209d3031d97baa4f899b4d70ae6283a1a5b1434b037904c4cfca0b2bc798d5ba0b358c3739e000eccbc74809baf564c5686df5a
 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.9.6.src.tar.gz 16397247 BLAKE2B 36c9077177bd7bbe9b40c422c5faf7aa83fdd8a2360051cb026346a9fea35297d892d6c677962c498ea8531c1748d58a55bbb1db7c1cf323a1d65c0b9b8573fd SHA512 f7863a4fe586414c91465a6a82a47097b2593384688a7c68ad3e9981559047b4faf2c134104ad09a64125576dac557809884d9f125d91108dd51746620a368a2
 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.9.6.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.2.ebuild b/dev-lang/go/go-1.10.2.ebuild
new file mode 100644
index 000000000000..8c2ff8874012
--- /dev/null
+++ b/dev-lang/go/go-1.10.2.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.6.ebuild b/dev-lang/go/go-1.9.6.ebuild
new file mode 100644
index 000000000000..503bf3c4a123
--- /dev/null
+++ b/dev-lang/go/go-1.9.6.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/icon/Manifest b/dev-lang/icon/Manifest
index 131c6719d10d..4740123f323a 100644
--- a/dev-lang/icon/Manifest
+++ b/dev-lang/icon/Manifest
@@ -8,6 +8,6 @@ DIST icon.v943src.tgz 3218627 BLAKE2B 50ac22659a74adaf8462b75272592465d7bd78d23e
 EBUILD icon-9.4.3-r5.ebuild 2790 BLAKE2B 313f4ef488cb89b96863dfd7475693a5a6b8f1f91c59ffb4c208c3cfa8cbaf1210edb17755b239a787cd0edf398e691563990266baeecf885228561d3b0ccb06 SHA512 61e8030ad78fb1ec90c027c5e858348271bfdaf1c56ab85b1e56b683cd3ee20737d332ba439379571b467342e51107f7828a991c708146f75019a946d61e737f
 EBUILD icon-9.5.0-r1.ebuild 2641 BLAKE2B 6701969c4c8cf6ee45aa016a10e2885b5698c9e29722c3f6120f5ffa9c5a8b6b925d86d2e0d6d923319fba4f6ae07749b75ffedd9efa728d20f088837d9bc67d SHA512 2b3033947d33ebb2af7e2f946d5e40906513584fddd1f1a60f821513cd16b588bcb40e5cc06f52707428601c80be5276c58a99d7c5f481231790c0a3a73ee1fd
 EBUILD icon-9.5.0.ebuild 2568 BLAKE2B 28c0750d3554bbf5d286292857a98397f2e2c281e939eac824456d3f420fd1639f13b32c3c127bb807413037b34d104ac598bfe3264ceca225eb3d970c28f244 SHA512 cbc24b452baf9266886d6697b46c2243f9b40114fc45251e4841ec69e754c90d6b2b6b8e8e7f8e1479b3f95aaf9847b8ce86840cb9075591aa75355d2c34df6a
-EBUILD icon-9.5.1-r1.ebuild 2522 BLAKE2B 41921c0c1d482793009bc5fa1ababae82d8a4db8af4ce7c335c2d8299134b4635c77d2dfeda5f5ae1b510678cfd70cdfabf76702b58121104dbd9d62363396df SHA512 60739b75bf5816eb1faea298bdbb3d7aefaf72364431e7dad3caaabc8c033b5aeb5f9130d5de0f184de0d499230abbf4fff87d3e61da627c32fb0d28742199e4
+EBUILD icon-9.5.1-r1.ebuild 2520 BLAKE2B f0edb62f9cd24f7fe62ee99d34d3bb83219112b37180526727e17ae261546ab4cac5ec637cb3eca49e553650d2ad28849d037f1ec11775602d9053a0b1be9e53 SHA512 d2d750c02b4d654422fbfa5c504c5ad8f2b1daf05ee0e605e8c589e639b2da06e19092d9fa8e3b72f5b118ea63d5dbee0ccec74a2c338014ac6f6531cef13e57
 EBUILD icon-9.5.1.ebuild 2636 BLAKE2B e86542fe410a9dd118e13c69e74d3b42f01b0bf344e6a4d04c555da6b393c57ac896145191b298f4b4c38c3699e40000830f170782abee88f56c19ac35cc0738 SHA512 7bf879a32fa6c163ba4b554b54afc7c4b33374ca7e1686b07f3d13460cb1af00e3d2064acd14b14e746b95d0eaa5cb5520509d4053bfe1a139ba99f89002101d
 MISC metadata.xml 467 BLAKE2B b480285505dec662f62038d22a88323f01f21b100de7ee652f2e3d5f5f4cdf4345ad7d303f2713b1a2816157c46610c2f5287cb385c61998f68fd95d09bf9d5b SHA512 1a77000b72ae453ecb2bd4452e32ea917328a61bb882e107b96f013ddaa218e951743569e38e97210a341755bd7c891324123d96e56da9a5a7caa93ad4dbb93a
diff --git a/dev-lang/icon/icon-9.5.1-r1.ebuild b/dev-lang/icon/icon-9.5.1-r1.ebuild
index 58f208b59afb..0da6159b5139 100644
--- a/dev-lang/icon/icon-9.5.1-r1.ebuild
+++ b/dev-lang/icon/icon-9.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon-v${MY_PV}src.tgz"
 
 LICENSE="public-domain HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X iplsrc"
 
 S="${WORKDIR}/icon-v${MY_PV}src"
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index cb82610170a5..5101afc70d98 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1,5 +1,6 @@
 AUX nasm-2.13.01-fix-docdir.patch 5536 BLAKE2B 4eac268b54b33bbf058562ec15870df57af1997530ddf98940abfa67da4e1241a5cf9597261ae9bf7e65c502ce70d0a60834d12dfa9979ac647b9f04fe56c21e SHA512 22bbfac66b75451345a1f3d19816ecc35397c9b95f16f7dffdf8dbde9055bb035880f5cb081686c42ce3f448e250a29c9440775aad929a7e36c1325e6bbc88d7
 AUX nasm-2.13.01-gcc-8.patch 817 BLAKE2B ffe883fa68f9fe29e909df2226fdcc6603b739335051ca43740504b7af75798036b19ce647daaf146ab976bce3e645b3cca65b972adbf29e737c8e6f2c32e026 SHA512 eb1b8a4d0d122a7bc797962aea24eb858ad4f1876981496546059155cdc4fcb719b849f692f003706c623c27d116c9188598ea482d33bf091d59964410fd0e15
+AUX nasm-2.13.03-bsd-cp-doc.patch 357 BLAKE2B 2611aa3e7f817530c8012f1849d5d80f47105a2e35950795826b3b9d128493ab7e8c1da106b9d22e24a025f8bf24f142cad385c5fca13e09423168bc2fc69f65 SHA512 6562f98e08953b5ac667df4f89f401cc520cf24dfaf112121ca0f7a039b96a328316afd62d118ae98ec9d2c1c3f2c1c9b88d2d66f19197637b7b785a48964f9c
 DIST nasm-2.11.08.tar.xz 764872 BLAKE2B 2120a95065152b85d938811a1aa7c79eee9d3b9094f8bd2ed40eee7027de8b128a12552573bebcad6098e01b490ee21cffef3e04faf43263086b7e5ba81e4f6a SHA512 f7caf42d0fe1b850de13180a1f363e34a6d44a02696312dd8f12f4116ad1c1f3d01e6606c3a79fb881e76fc70d20894d85b333c84a75d60265ff9551f7b8cde4
 DIST nasm-2.12.01.tar.xz 780112 BLAKE2B 2464c40016072b82db1f3895e22cca27ad6052c22d7671e1bf36508335a140f728f36876205ca6ae01396f396ff03dc51cb5fd0f628cc7936ed461ff1f90b1d8 SHA512 c016b2b26f2ef00fe8de673dc7b2effa55ddd23d1f15145380c2767a2cd4a5c60c77732faebcd5868b325f780c0bf76a5e0c49eb6189609b21e2493d2af9347c
 DIST nasm-2.13.01.tar.xz 800244 BLAKE2B 23a42d9e6c66577cee0e3b6cdff8da7b7b49286011f2d9e2319bd229ca0a1ab5b89a27d71a591777430e577175c935ba2a34b7ba0ca6086853f84fa5f0f648ab SHA512 6561a2efb3ffea77a1a8cd364edf1ecedb2c14e1902469d7c59d743f25ca612529113d1099818abbe0a9f2592f12604f1810855bbdf8dc9de3648094a83529ae
@@ -7,6 +8,6 @@ DIST nasm-2.13.03.tar.xz 806636 BLAKE2B 36187dac080dac17efbc1a2319d989bcb0f883fe
 EBUILD nasm-2.11.08.ebuild 823 BLAKE2B 64af7fad9db5b624979c00c8f2216b9f2e605fc17f97c47b12a59fed64a1e9b7dd6b98bd4a48e101e91dc334d030ab3ce8b28556ffdbbb005a0353dfad9c74dd SHA512 d91efdd2f128087650e692210f2f6b50caae8b1364d255854b1592d0cd2e411859d66e2ed2d698de8e4550e8b0c306d73261fa23d344b4b472b241d5928f4ff5
 EBUILD nasm-2.12.01.ebuild 826 BLAKE2B ebd3bd03148dd4612e8f0615fa82809d8826e749a7af456b31cce8d5c48ff41bda9a52b5bea38617be2be78f4ea3730d5fc25fa8e1665f3bb94aefbf0ee58704 SHA512 011a6594157b7bd2df8203dd523edf2bd9159e8c606ba0e59a9ebf75a127c0b6c32be00e95f989b274714ab4cdef881b36e9151d475aac7c882806045333671f
 EBUILD nasm-2.13.01.ebuild 859 BLAKE2B 9e66ae05b81672299dee18933e85ad0f3da471a04561500fddbb6f8b58ebe2d5d432082eb0b17d058ba62331b49735ae609169e393884105176bd8fac0fc5bd9 SHA512 92d299438a47fe68ca92cc584fecf89c492d17cb6d41937245232b924dea3f4cd3e21155e44b77ec522105f50a8150350a495ada9d4ac37db84a099fc757aeaf
-EBUILD nasm-2.13.03-r1.ebuild 1066 BLAKE2B a430e6e66bd1425b1145a0ff96da56b10575bade7e515524e8354156f3824e8676524aa6479e31e638e473b8a1da99e2687aa5de0c51e626399b49200f20ec9b SHA512 bc95785f7f3d1763f6c3d2f5b9b194d146452095f0536f4c80c4f9a8714c868431ac9a1613ea2d9b0f04f852bc1786f0d84901a458e1ba281d3f200f38f2f4b9
+EBUILD nasm-2.13.03-r1.ebuild 1112 BLAKE2B 798e33246deae2ad60f79555d6907ec094d4cbc59fa89797cf98ba459c65464de209774e75996e0b56441f5feeadf9f36c11dd65f827d85ccb3bd23b5f142d2d SHA512 d2b4ae91036b876423b159e7dd2a7e8d73b176266135f63f96d3579ffe10b27b1f12d4c56b390766f0147f676cd18fbe86f3b565b28dd3454363ba0d0fa3e1da
 EBUILD nasm-2.13.03.ebuild 861 BLAKE2B 88b267d30f1236cd8eb4a48e3ae3010559dcc75f60721e226ae8e744e7403869ffc1c9f797683db92b766a4f25bef0d6ca10b75273eff463ee16ef782d93eb9e SHA512 c303a574124afffbef1ab71ce8185c60f4f597c241582bda93dedc7eed9dcd9a08b997a91a08e58c5c0b39a96fcf27d044a33da4898311c1ec4b3613d23a8a25
 MISC metadata.xml 869 BLAKE2B 6acbe39b23e071849e6afd42da7ec5a56f017b708745e5efd09a288775da944fbb1185cead3ceaa573398f5874115139834584323e5b4cff360cf6cd9cca4ccd SHA512 a6bf522dfa6c43ea58a432577fbc31bcc9d262f7262c16d165b3cbacf8394a6d9e6d1eea9480cdb27b692cacada0c5fba3906e913259c2809a48159bce53e5bf
diff --git a/dev-lang/nasm/files/nasm-2.13.03-bsd-cp-doc.patch b/dev-lang/nasm/files/nasm-2.13.03-bsd-cp-doc.patch
new file mode 100644
index 000000000000..76c1790da208
--- /dev/null
+++ b/dev-lang/nasm/files/nasm-2.13.03-bsd-cp-doc.patch
@@ -0,0 +1,15 @@
+Avoid 'cp -u' as it's not portable.
+
+In this case we can unconditionally copy files.
+
+Reported-by: Michał Górny
+Bug: https://bugs.gentoo.org/655444
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index 261a791..bc9da1e 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -28,3 +28,3 @@ RM_RF		= rm -rf
+ CP_F		= cp -f
+-CP_UF		= cp -ufv
++CP_UF		= cp -fv
+ 
diff --git a/dev-lang/nasm/nasm-2.13.03-r1.ebuild b/dev-lang/nasm/nasm-2.13.03-r1.ebuild
index e050fffc1e94..91d5ea480067 100644
--- a/dev-lang/nasm/nasm-2.13.03-r1.ebuild
+++ b/dev-lang/nasm/nasm-2.13.03-r1.ebuild
@@ -32,6 +32,7 @@ S=${WORKDIR}/${P/_}
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.13.01-fix-docdir.patch
 	"${FILESDIR}"/${PN}-2.13.01-gcc-8.patch
+	"${FILESDIR}"/${PN}-2.13.03-bsd-cp-doc.patch
 )
 
 src_configure() {
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index abe4f6752bca..dd83dd0d164d 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -3,10 +3,10 @@ DIST nqp-2018.02.tar.gz 3759551 BLAKE2B 48713a0d300ec2e296b426784bb22f7859693710
 DIST nqp-2018.03.tar.gz 3778268 BLAKE2B 16e8e3924daa3aecf9987e9c39173fb32a769cd668add4b62bf04feb09755e5442224357610189ae8184c8c5c6fa35b2ce0d29cb708e8c5c0218963e2f918022 SHA512 d90fc8c933c31f1013bfdda5a02699c1c668ed5466167d58355c6baa65c294269cb4dbe072452bd14a9bbf180d83e61fedd3354b4404d590304be04e28489460
 DIST nqp-2018.04.1.tar.gz 3783660 BLAKE2B b596163b4d4a8d4b708d59dba586713e50edf3d5d1dc400960464e9528cefbf9867508712b74ee7014f4ad0badb742ca483816c6efff5909c8c52bf48d5fa85a SHA512 01211c8535873f26f1eb144033bbee318948dfaf2988f9f737002e41ad745294a6fe193e15d997e7d9297fcd2632fc71f9c9a6960c3af7606946c23e49d284de
 DIST nqp-2018.04.tar.gz 3782652 BLAKE2B 0d36363956a3b150c5dbd7e9c094281680bfe2b87fa509e5a27ffc8be1df8ab82cd89276d9392c11b0912cf4d00d5a668dd6f497f4cfdf4914c40de2b0443c5c SHA512 5cb749577c5e985174c0721b92a00af7a93a5a7b3833718718b825d71d135ba14150b8a6bb065cf21356a37ea082431eacbff8ca63bce6f0ddeaf200494fe646
-EBUILD nqp-2018.01.ebuild 3607 BLAKE2B 8e4d2a9791c1b23d5adc335f4899032624854d95f80e6bd27a708d878e838949c7575fe4dce83a94918643af189dd6bcaa0667e9ab4a45b95543e70f18cf7af7 SHA512 c40b50d7beef6e1f1e94d4bda6d84c201a783ed13c35c34f98cc6069c227b93c56274b55c009591ba835ee8b87abd1480c373b0077956fff69a1cf3b2606df4d
-EBUILD nqp-2018.02.ebuild 3607 BLAKE2B 8e4d2a9791c1b23d5adc335f4899032624854d95f80e6bd27a708d878e838949c7575fe4dce83a94918643af189dd6bcaa0667e9ab4a45b95543e70f18cf7af7 SHA512 c40b50d7beef6e1f1e94d4bda6d84c201a783ed13c35c34f98cc6069c227b93c56274b55c009591ba835ee8b87abd1480c373b0077956fff69a1cf3b2606df4d
-EBUILD nqp-2018.03.ebuild 3607 BLAKE2B 8e4d2a9791c1b23d5adc335f4899032624854d95f80e6bd27a708d878e838949c7575fe4dce83a94918643af189dd6bcaa0667e9ab4a45b95543e70f18cf7af7 SHA512 c40b50d7beef6e1f1e94d4bda6d84c201a783ed13c35c34f98cc6069c227b93c56274b55c009591ba835ee8b87abd1480c373b0077956fff69a1cf3b2606df4d
-EBUILD nqp-2018.04.1.ebuild 3607 BLAKE2B 8e4d2a9791c1b23d5adc335f4899032624854d95f80e6bd27a708d878e838949c7575fe4dce83a94918643af189dd6bcaa0667e9ab4a45b95543e70f18cf7af7 SHA512 c40b50d7beef6e1f1e94d4bda6d84c201a783ed13c35c34f98cc6069c227b93c56274b55c009591ba835ee8b87abd1480c373b0077956fff69a1cf3b2606df4d
-EBUILD nqp-2018.04.ebuild 3607 BLAKE2B 8e4d2a9791c1b23d5adc335f4899032624854d95f80e6bd27a708d878e838949c7575fe4dce83a94918643af189dd6bcaa0667e9ab4a45b95543e70f18cf7af7 SHA512 c40b50d7beef6e1f1e94d4bda6d84c201a783ed13c35c34f98cc6069c227b93c56274b55c009591ba835ee8b87abd1480c373b0077956fff69a1cf3b2606df4d
-EBUILD nqp-9999.ebuild 3607 BLAKE2B f4c87264d989c591b3ae834e455b7bb84d14bffdf667a553ae5709d4a2340eb9450331f6077956460c94095f211dd7af33431e6c6fc8bec7f19bec7555c86e4e SHA512 c0be49582eb04c3a80b4a9191ee121018adb177fbd379083231c9157eb8fb051d447f0e1c5a05214f40d52c30fabedb7d2a72dfca7625239822f1a6119dba68e
+EBUILD nqp-2018.01.ebuild 3607 BLAKE2B e7ccbd696d6dbe35b6a1c6ed99b1013aac46deb0631e6258a909144594fd143e760ca47dad422c9056686cc5dcdd07782847aa0a14da61d6b1577accf4997435 SHA512 76efc1ed63882e483414e49747c5d15524afdf39d45c5013189fbd9463aba177b3cae73c403480d6e81a65a436ce806e2c41204dffa2cbcc220fc58aa5cddac4
+EBUILD nqp-2018.02.ebuild 3607 BLAKE2B e7ccbd696d6dbe35b6a1c6ed99b1013aac46deb0631e6258a909144594fd143e760ca47dad422c9056686cc5dcdd07782847aa0a14da61d6b1577accf4997435 SHA512 76efc1ed63882e483414e49747c5d15524afdf39d45c5013189fbd9463aba177b3cae73c403480d6e81a65a436ce806e2c41204dffa2cbcc220fc58aa5cddac4
+EBUILD nqp-2018.03.ebuild 3607 BLAKE2B e7ccbd696d6dbe35b6a1c6ed99b1013aac46deb0631e6258a909144594fd143e760ca47dad422c9056686cc5dcdd07782847aa0a14da61d6b1577accf4997435 SHA512 76efc1ed63882e483414e49747c5d15524afdf39d45c5013189fbd9463aba177b3cae73c403480d6e81a65a436ce806e2c41204dffa2cbcc220fc58aa5cddac4
+EBUILD nqp-2018.04.1.ebuild 3607 BLAKE2B e7ccbd696d6dbe35b6a1c6ed99b1013aac46deb0631e6258a909144594fd143e760ca47dad422c9056686cc5dcdd07782847aa0a14da61d6b1577accf4997435 SHA512 76efc1ed63882e483414e49747c5d15524afdf39d45c5013189fbd9463aba177b3cae73c403480d6e81a65a436ce806e2c41204dffa2cbcc220fc58aa5cddac4
+EBUILD nqp-2018.04.ebuild 3607 BLAKE2B e7ccbd696d6dbe35b6a1c6ed99b1013aac46deb0631e6258a909144594fd143e760ca47dad422c9056686cc5dcdd07782847aa0a14da61d6b1577accf4997435 SHA512 76efc1ed63882e483414e49747c5d15524afdf39d45c5013189fbd9463aba177b3cae73c403480d6e81a65a436ce806e2c41204dffa2cbcc220fc58aa5cddac4
+EBUILD nqp-9999.ebuild 3607 BLAKE2B e7ccbd696d6dbe35b6a1c6ed99b1013aac46deb0631e6258a909144594fd143e760ca47dad422c9056686cc5dcdd07782847aa0a14da61d6b1577accf4997435 SHA512 76efc1ed63882e483414e49747c5d15524afdf39d45c5013189fbd9463aba177b3cae73c403480d6e81a65a436ce806e2c41204dffa2cbcc220fc58aa5cddac4
 MISC metadata.xml 634 BLAKE2B 1ef5daf7c995ddad1df4b2c7d33ecfc7a4cd146cb518314f88d58e370ede9e986bb47747b10952cf0ee6d587fe5925ba5b0086006182f3e16bd114d49e1a0f3a SHA512 a093877d22e76bbbced97c7752ed76d6aa110eb8d0676f97ae3d38ad79ab7b8ba770243b64e618b588faebf179713813fe6fc8ec7371c695c9f0979f6bce3dc0
diff --git a/dev-lang/nqp/nqp-2018.01.ebuild b/dev-lang/nqp/nqp-2018.01.ebuild
index 558b645a275b..6adbdc268327 100644
--- a/dev-lang/nqp/nqp-2018.01.ebuild
+++ b/dev-lang/nqp/nqp-2018.01.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="http://rakudo.org/"
+HOMEPAGE="https://rakudo.org"
 
 LICENSE="Artistic-2"
 SLOT="0"
diff --git a/dev-lang/nqp/nqp-2018.02.ebuild b/dev-lang/nqp/nqp-2018.02.ebuild
index 558b645a275b..6adbdc268327 100644
--- a/dev-lang/nqp/nqp-2018.02.ebuild
+++ b/dev-lang/nqp/nqp-2018.02.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="http://rakudo.org/"
+HOMEPAGE="https://rakudo.org"
 
 LICENSE="Artistic-2"
 SLOT="0"
diff --git a/dev-lang/nqp/nqp-2018.03.ebuild b/dev-lang/nqp/nqp-2018.03.ebuild
index 558b645a275b..6adbdc268327 100644
--- a/dev-lang/nqp/nqp-2018.03.ebuild
+++ b/dev-lang/nqp/nqp-2018.03.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="http://rakudo.org/"
+HOMEPAGE="https://rakudo.org"
 
 LICENSE="Artistic-2"
 SLOT="0"
diff --git a/dev-lang/nqp/nqp-2018.04.1.ebuild b/dev-lang/nqp/nqp-2018.04.1.ebuild
index 558b645a275b..6adbdc268327 100644
--- a/dev-lang/nqp/nqp-2018.04.1.ebuild
+++ b/dev-lang/nqp/nqp-2018.04.1.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="http://rakudo.org/"
+HOMEPAGE="https://rakudo.org"
 
 LICENSE="Artistic-2"
 SLOT="0"
diff --git a/dev-lang/nqp/nqp-2018.04.ebuild b/dev-lang/nqp/nqp-2018.04.ebuild
index 558b645a275b..6adbdc268327 100644
--- a/dev-lang/nqp/nqp-2018.04.ebuild
+++ b/dev-lang/nqp/nqp-2018.04.ebuild
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="http://rakudo.org/"
+HOMEPAGE="https://rakudo.org"
 
 LICENSE="Artistic-2"
 SLOT="0"
diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild
index 5361a230c0c4..6adbdc268327 100644
--- a/dev-lang/nqp/nqp-9999.ebuild
+++ b/dev-lang/nqp/nqp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="http://rakudo.org/"
+HOMEPAGE="https://rakudo.org"
 
 LICENSE="Artistic-2"
 SLOT="0"
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 0e6d2f35501d..528fc2dc3240 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -5,11 +5,11 @@ DIST rakudo-2018.02.tar.gz 3478799 BLAKE2B 36f50a38c26e9b96a31d63566337315bed41b
 DIST rakudo-2018.03.tar.gz 3492524 BLAKE2B be2d9fbc8789e78025e18da873873d99872984815a56c0e255487b4250c900e142dbcdb5ce8eede496504401ca37c0e433fb9060fc5f4e8ac0b2778fc35cff62 SHA512 b644f333f6b9501631ee95949017b9e39416311853880a71bc714bb36f2da448fc57147f819d876f6d7ab207c2921474f94e25a4df90c735ba15f270f0c1fd7b
 DIST rakudo-2018.04.1.tar.gz 3511991 BLAKE2B 9d87e10664ebe59e258e12166bf12390c52a09f32e07adabe30454169016f4ea1649cf215bbb0a093dc5cb332cae9c4adc9cdc87f5276a5006cd84d8c9731b04 SHA512 e57d34c08e32e7ace5ab681f4472409bb9a2eb74361784b4ef43aa1a4b6adeed903219a1810063a10b5c0baf113a9cf88b00c989347c0c395a041a018fd9a626
 DIST rakudo-2018.04.tar.gz 3512276 BLAKE2B 9d9bb4070a27ce3185c5ebc2627a5f05359d23fc9377954c30edac7f36bbe4089d3b35da0e2ec17a20c155d857219aa962baa058e393bc6690e2ba30731cfa73 SHA512 5a549113583ce94c2606b7aa5fad2089f1ccebd50f503ce0eb24163599ed3aacd26dd876c6ace675798d577b8063ba260c1b4553c382cf4d13041d692a5bdf6a
-EBUILD rakudo-2018.01.ebuild 1616 BLAKE2B b83769b34c5694702fafce86c5d78e2ae0a9afc1f4834c33b78500851ff99c83a3b5e72653a2108911a89b9386683948ff813edaa5cf1f7455065370860671b2 SHA512 7226e37e3c2299582065d8b9a06211bc7f69c5b1ee824cdf2cccc843f5be7d76a50aa3e00506f99d01db4d32d0ef617c2ed4ec324eccd3ed3fd1ae9053f0d392
-EBUILD rakudo-2018.02.1.ebuild 1618 BLAKE2B f5bfbddc3c6bebbb2aec4eb5fc86ba4b8c77be85306a7898bf8bd5f77f0f8cf18a1a5b0e32a26da69f5b074b2d1cff6045db21b5ed5521f45c7e15aa61e40d1e SHA512 a545dacdd25a65dbb2425cab2487fed5fbcd71d76b24bf9fa9cdff59c8fa5beecec8a95d5f0791faec8565918d0f0904015fe88c4c5c76747bc56ba8763b5980
-EBUILD rakudo-2018.02.ebuild 1616 BLAKE2B b83769b34c5694702fafce86c5d78e2ae0a9afc1f4834c33b78500851ff99c83a3b5e72653a2108911a89b9386683948ff813edaa5cf1f7455065370860671b2 SHA512 7226e37e3c2299582065d8b9a06211bc7f69c5b1ee824cdf2cccc843f5be7d76a50aa3e00506f99d01db4d32d0ef617c2ed4ec324eccd3ed3fd1ae9053f0d392
-EBUILD rakudo-2018.03.ebuild 1616 BLAKE2B b83769b34c5694702fafce86c5d78e2ae0a9afc1f4834c33b78500851ff99c83a3b5e72653a2108911a89b9386683948ff813edaa5cf1f7455065370860671b2 SHA512 7226e37e3c2299582065d8b9a06211bc7f69c5b1ee824cdf2cccc843f5be7d76a50aa3e00506f99d01db4d32d0ef617c2ed4ec324eccd3ed3fd1ae9053f0d392
-EBUILD rakudo-2018.04.1.ebuild 1616 BLAKE2B b83769b34c5694702fafce86c5d78e2ae0a9afc1f4834c33b78500851ff99c83a3b5e72653a2108911a89b9386683948ff813edaa5cf1f7455065370860671b2 SHA512 7226e37e3c2299582065d8b9a06211bc7f69c5b1ee824cdf2cccc843f5be7d76a50aa3e00506f99d01db4d32d0ef617c2ed4ec324eccd3ed3fd1ae9053f0d392
-EBUILD rakudo-2018.04.ebuild 1616 BLAKE2B b83769b34c5694702fafce86c5d78e2ae0a9afc1f4834c33b78500851ff99c83a3b5e72653a2108911a89b9386683948ff813edaa5cf1f7455065370860671b2 SHA512 7226e37e3c2299582065d8b9a06211bc7f69c5b1ee824cdf2cccc843f5be7d76a50aa3e00506f99d01db4d32d0ef617c2ed4ec324eccd3ed3fd1ae9053f0d392
-EBUILD rakudo-9999.ebuild 1714 BLAKE2B e74244497b591e490e774d82492e16c05e61546cc7071a776d7002e22f32608f138456423edab6c7aabde9dd6c84b414c42343c4dcf45725a8ae021b5eb1d5c0 SHA512 06451f51ced45674984aada066a94a268bafdb858172330a041b47196c2caae91af4263cee68171f34a8f89933f59b5517d54c456ff24a2b7e76b61e238bf56d
+EBUILD rakudo-2018.01.ebuild 1617 BLAKE2B 3311d96005a0653c4fb6618dc2df0e5081422909bf9185f6b90fafe9fbbf80463156788594de08993947bc9578e11ec1075d5172eb59e4a4574966100dd7497b SHA512 5aa9b3a7b2f94540399f8112b70ae2bd6879ae99e0ec51bf66821ef42c4a26bebcb7ec053b4e76d31591c52f96bee97b896db34b169519570e28a5c70da9d7ea
+EBUILD rakudo-2018.02.1.ebuild 1619 BLAKE2B 5fd004e5d2013b1c6da8df7cfa8e094ff484c46425d7b5f63da57894cf9fb4c5b6aaf7409992706a23aec011a7998d55e919ad03eb7137d3e741d989cdd93b4e SHA512 5a4b643413002435b83087454676ccd590fa04ca634e4be2d5cecd37ed74972ded26b834b6a6c1d8e10891b9157dde9a610e12e4bf706423cadb70b1ae7a00b0
+EBUILD rakudo-2018.02.ebuild 1617 BLAKE2B 3311d96005a0653c4fb6618dc2df0e5081422909bf9185f6b90fafe9fbbf80463156788594de08993947bc9578e11ec1075d5172eb59e4a4574966100dd7497b SHA512 5aa9b3a7b2f94540399f8112b70ae2bd6879ae99e0ec51bf66821ef42c4a26bebcb7ec053b4e76d31591c52f96bee97b896db34b169519570e28a5c70da9d7ea
+EBUILD rakudo-2018.03.ebuild 1617 BLAKE2B 3311d96005a0653c4fb6618dc2df0e5081422909bf9185f6b90fafe9fbbf80463156788594de08993947bc9578e11ec1075d5172eb59e4a4574966100dd7497b SHA512 5aa9b3a7b2f94540399f8112b70ae2bd6879ae99e0ec51bf66821ef42c4a26bebcb7ec053b4e76d31591c52f96bee97b896db34b169519570e28a5c70da9d7ea
+EBUILD rakudo-2018.04.1.ebuild 1617 BLAKE2B 3311d96005a0653c4fb6618dc2df0e5081422909bf9185f6b90fafe9fbbf80463156788594de08993947bc9578e11ec1075d5172eb59e4a4574966100dd7497b SHA512 5aa9b3a7b2f94540399f8112b70ae2bd6879ae99e0ec51bf66821ef42c4a26bebcb7ec053b4e76d31591c52f96bee97b896db34b169519570e28a5c70da9d7ea
+EBUILD rakudo-2018.04.ebuild 1617 BLAKE2B 3311d96005a0653c4fb6618dc2df0e5081422909bf9185f6b90fafe9fbbf80463156788594de08993947bc9578e11ec1075d5172eb59e4a4574966100dd7497b SHA512 5aa9b3a7b2f94540399f8112b70ae2bd6879ae99e0ec51bf66821ef42c4a26bebcb7ec053b4e76d31591c52f96bee97b896db34b169519570e28a5c70da9d7ea
+EBUILD rakudo-9999.ebuild 1715 BLAKE2B 7cbe373b0e54218018db5845484502f6f922ff397da6d949709f980210f1edb541132f7dc21704ace7c992f6637247da0726ada4f74a7380bf1113f49204e26c SHA512 1dbb9387b42f05f0d39bca302b350cf4c7f9f14409231f200f6d0cdaf4d85e87f365132a8acc8b4dba7578797bf26ecc116e64b9b1d65ace62791e3eba514178
 MISC metadata.xml 513 BLAKE2B 90fdc5cdf5182b707681ce28a7e4b06c1e8e1a05f848e072de4abc5e8f074ec9becd41c117880bba60e00eebe69a4ab1639b39b0a29307d65d6be09784ee6a18 SHA512 d0144523717581bc13a12b8b8edff0ec03800fe1bda313725a4db37bc70e26c3cf566426e48eb6ecf58f8653f6c51f375ea31d915d75bcf37fc0772251047e7a
diff --git a/dev-lang/rakudo/rakudo-2018.01.ebuild b/dev-lang/rakudo/rakudo-2018.01.ebuild
index b442d4008798..0b5a669c60d0 100644
--- a/dev-lang/rakudo/rakudo-2018.01.ebuild
+++ b/dev-lang/rakudo/rakudo-2018.01.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit java-pkg-opt-2
 
 DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
+HOMEPAGE="https://rakudo.org"
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
diff --git a/dev-lang/rakudo/rakudo-2018.02.1.ebuild b/dev-lang/rakudo/rakudo-2018.02.1.ebuild
index 610d16095c70..916922b699bc 100644
--- a/dev-lang/rakudo/rakudo-2018.02.1.ebuild
+++ b/dev-lang/rakudo/rakudo-2018.02.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit java-pkg-opt-2
 
 DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
+HOMEPAGE="https://rakudo.org"
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
diff --git a/dev-lang/rakudo/rakudo-2018.02.ebuild b/dev-lang/rakudo/rakudo-2018.02.ebuild
index b442d4008798..0b5a669c60d0 100644
--- a/dev-lang/rakudo/rakudo-2018.02.ebuild
+++ b/dev-lang/rakudo/rakudo-2018.02.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit java-pkg-opt-2
 
 DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
+HOMEPAGE="https://rakudo.org"
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
diff --git a/dev-lang/rakudo/rakudo-2018.03.ebuild b/dev-lang/rakudo/rakudo-2018.03.ebuild
index b442d4008798..0b5a669c60d0 100644
--- a/dev-lang/rakudo/rakudo-2018.03.ebuild
+++ b/dev-lang/rakudo/rakudo-2018.03.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit java-pkg-opt-2
 
 DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
+HOMEPAGE="https://rakudo.org"
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
diff --git a/dev-lang/rakudo/rakudo-2018.04.1.ebuild b/dev-lang/rakudo/rakudo-2018.04.1.ebuild
index b442d4008798..0b5a669c60d0 100644
--- a/dev-lang/rakudo/rakudo-2018.04.1.ebuild
+++ b/dev-lang/rakudo/rakudo-2018.04.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit java-pkg-opt-2
 
 DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
+HOMEPAGE="https://rakudo.org"
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
diff --git a/dev-lang/rakudo/rakudo-2018.04.ebuild b/dev-lang/rakudo/rakudo-2018.04.ebuild
index b442d4008798..0b5a669c60d0 100644
--- a/dev-lang/rakudo/rakudo-2018.04.ebuild
+++ b/dev-lang/rakudo/rakudo-2018.04.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit java-pkg-opt-2
 
 DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
+HOMEPAGE="https://rakudo.org"
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
diff --git a/dev-lang/rakudo/rakudo-9999.ebuild b/dev-lang/rakudo/rakudo-9999.ebuild
index 22cc6ec22582..070e46942a8d 100644
--- a/dev-lang/rakudo/rakudo-9999.ebuild
+++ b/dev-lang/rakudo/rakudo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit java-pkg-opt-2
 
 DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
+HOMEPAGE="https://rakudo.org"
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 3950f3700813..b32d72b6d7f0 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -1,16 +1,7 @@
-DIST rust-1.15.1-i686-unknown-linux-gnu.tar.gz 103889253 BLAKE2B 7b922eb9aa3dcab0b791764b328d2758912e7f932f9a4ea802793544c6f7e2d3945aa74be936a2bd6e9e9fc650a19119028bc36422fb656abd6a4e5d590ba056 SHA512 13d602842e7a2ef360c80d3ec84ecd5d6c742ea6dad642394a2a57b28554a7758905b37daaf2bcc549428c5f9383307270f8508e8685748b906fc2b9230bc4ad
-DIST rust-1.15.1-x86_64-unknown-linux-gnu.tar.gz 101140146 BLAKE2B dd6508b52ffdfe59a833a0280dfc9999c146eca8dbb9649c3655f7b15d5d7323f2897ee1483f65bff3fad195f539ea58078bcd345c69632a2630cd5549c03182 SHA512 e089c455b1a7507aeed4652f05c0672c4e996e708c46f4405191f4b3a9d08403cab27f1a5a63f865d9a8f099f6ca980d2d2eef37aaa5e7e5bd751a3224e88b84
-DIST rust-1.16.0-i686-unknown-linux-gnu.tar.gz 106129219 BLAKE2B ea549c33e4a4be9ce5aaaa4204535134ffab325e9976d1984c478105774c1d5684a684ad1f3e4d6784b8ce90cdfb1631807b8c60322d2417fc8319ebb4b3729a SHA512 7a780a107d98c6a8883f95dbb5a5ec95bad52fb1e735afba29b47411b450d464cbc8dfe73d35de1eb18b9a1f9ea727daa1ca9d3042e2a98c67ad570d328e139d
-DIST rust-1.16.0-x86_64-unknown-linux-gnu.tar.gz 103142459 BLAKE2B 6fadb77e75c11ede8eb4dd7eced4d19c3405f81fe072cb9170d798a114da71f3cdb538ba69d4d20c2d42074dacb54dbf9a9c5dfd44dd3b8b441843ebc88c22b9 SHA512 f3d381c0e47e0af02eb116376422c3e48295c2854c6ad8c03d4c13e662f3cc1fdddf25923f7b3ef358c5cf670ed67d75e2197162434a81d5f9499e6e0e2d1054
-DIST rust-1.19.0-i686-unknown-linux-gnu.tar.gz 143010900 BLAKE2B fd47fc710f151d76d5421377c1bd571c635e42ed812af34bbde368cdbc1c4927efa2c63dce0c7e2a8e160d463b6e3812aa1e5e4ca87f1ef632d7be0e0ff2c8bb SHA512 a41bc6b576e04e4ced66c69524eedca6528b8a559c4877408be590d48ce4c77f6157f9adbc9e87e209f3e2d21ae105305195dbbfbf519f8df88a1615b49b3b0e
-DIST rust-1.19.0-x86_64-unknown-linux-gnu.tar.gz 151087058 BLAKE2B 796bd295393669cd55cf0a0b25f28a85b2d86394cb637b4de468c1095c5757212dda52f7d5d5ca30cfb69c0b5719d6bdce71c0ad7ed8f9ed7a40f7705f8ba550 SHA512 fc98ad7728a72c9bc93505458f7558405cc6a608eb19aa6c609e0155e7c081123f116cf023d19af2f0cd9cb81b8e1bbe69efd88f7bb61cca2d258d5fa2ed6bba
-DIST rust-1.23.0-i686-unknown-linux-gnu.tar.gz 180646185 BLAKE2B 1f4653141722baffdfc9114979ac7b3abd01a8d3bf879c1e57e26daef28af39d2d64f2eea1bfadfee37f7ec9d91be06251a0dccdac1bf817f850b60bb6a1eec4 SHA512 b4b5a26b6416ceb81cbb7202c42481bfa10ef2afabfa46c2eefc89d58f87b1b4785c1f65e2f58ea863ae3d3e794aa06e101f9097d5aa757e6749d891006a7542
-DIST rust-1.23.0-x86_64-unknown-linux-gnu.tar.gz 187313088 BLAKE2B eaef537506106b4cdb4c26652cc322ca7cc5f47fe15bd8551c07334bdaccdd98b14c1f91153e96ca79c22c88dfb69d2a7823fc3ac90e27b0a2c36c6559cda04b SHA512 71c0a893b25f6498bfd73104f006b79b5d6a31e4a4bcc6dcbe1b48183120afca28c12404b436417e010e3c449845c98e27e76d2b0f33498bcb35d2434b1fa821
 DIST rust-1.25.0-i686-unknown-linux-gnu.tar.gz 169267482 BLAKE2B 8fb18c95adf7edd74cd305683ab2ee33d59cce1a0f515e9ba63dfd105ffaf9150444e281502747856fa5164f24707b4bbbe110a2b1b7a1cf65c96b883a6f2ede SHA512 76bcd978b9b23b0fc6315f91bed153e59616aa62f520aae8e8d3587b5f5fae74fef15f8b0a749b02a69be56fad4df9a413019438135481917bca1fb1a7704de7
 DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.gz 178696930 BLAKE2B 0f82e837494d394c86462583f3d65f1ad839a97eda00fbc00476d06255831088cb7e554cc14edbf9dd23fbebf75078dc78204bdbec4795781f7fae0cbb6de63d SHA512 544e85bb69359d8ff6059d0f470b5995822f73e6d361be43f69f87d394b7252a11686f835336930bc257ba4347c0498abf5b1fbd751180d96bd9ca872b76d65c
-EBUILD rust-bin-1.15.1.ebuild 2644 BLAKE2B 8f9385f989ab24be0acc71c1803c1f620a75e845babe95a80dc737e820a21b651779d8080a1996db75812707d29537820a48ebfaefb85be7cb65839334ed37fd SHA512 d742a0b69ccdcee54ea71366ea219210d93441d10ed0c1463f4be99a3e67e696a046989194382102d5738117b3ac46e9602d4423cc10251f9657a10180e39ff0
-EBUILD rust-bin-1.16.0.ebuild 2644 BLAKE2B 8f9385f989ab24be0acc71c1803c1f620a75e845babe95a80dc737e820a21b651779d8080a1996db75812707d29537820a48ebfaefb85be7cb65839334ed37fd SHA512 d742a0b69ccdcee54ea71366ea219210d93441d10ed0c1463f4be99a3e67e696a046989194382102d5738117b3ac46e9602d4423cc10251f9657a10180e39ff0
-EBUILD rust-bin-1.19.0.ebuild 2644 BLAKE2B 8f9385f989ab24be0acc71c1803c1f620a75e845babe95a80dc737e820a21b651779d8080a1996db75812707d29537820a48ebfaefb85be7cb65839334ed37fd SHA512 d742a0b69ccdcee54ea71366ea219210d93441d10ed0c1463f4be99a3e67e696a046989194382102d5738117b3ac46e9602d4423cc10251f9657a10180e39ff0
-EBUILD rust-bin-1.23.0.ebuild 2695 BLAKE2B 6200ecac0f8d1327cb4a12fcc5e5f1ac0c1b4375f9a91d115a390c056994045bca5d2e5a4fdbea97034c0fee42437ae3a9f56ca22e4830f1f46753130552fe56 SHA512 c9846fcf8a5be0ddf5b950039b5c25d5c1379e72e32156d692644bfe4e7143425c2389ff8b6b774e78338c035c8c9b45e86d8c96508d5d48ce763307ade927fe
-EBUILD rust-bin-1.25.0.ebuild 2695 BLAKE2B 6200ecac0f8d1327cb4a12fcc5e5f1ac0c1b4375f9a91d115a390c056994045bca5d2e5a4fdbea97034c0fee42437ae3a9f56ca22e4830f1f46753130552fe56 SHA512 c9846fcf8a5be0ddf5b950039b5c25d5c1379e72e32156d692644bfe4e7143425c2389ff8b6b774e78338c035c8c9b45e86d8c96508d5d48ce763307ade927fe
+DIST rust-1.26.0-i686-unknown-linux-gnu.tar.xz 143003764 BLAKE2B 4c0b1872196c21bf9bc9d927455b4c8eb379e40281ef9fdd8a440b702b919628a00bf2e7b392084e8f41f30119c93bfa6e57ba47ee1adecb1d5cdda43778f821 SHA512 1257f9edefc49ee1742c3acd666d15f077c4d999a82dfe0d574df5c41981c3f716adf86b23d96cf9a6757508aea92abcbe06ad9e3bec2cb4ac19512d60ebba31
+DIST rust-1.26.0-x86_64-unknown-linux-gnu.tar.xz 139246408 BLAKE2B dc386c7b9e016bdcb8b2475d789b100922defc0bcd400476e4e618f51c338338edfc463428c9fa0fdcf8f051465a126d1c61030c5881d5c21888e80b8068bad8 SHA512 457503fea324251a92f25d0d45f1e2ac7d342a6a8f52d1abe93a579c7ae9b7f453a707d353e82614b37790747e8551f9762188ee25ff883495598cbf17b3f97e
+EBUILD rust-bin-1.25.0.ebuild 2694 BLAKE2B 2318cdebfc6d26d33d85c3deff5b274ed116d1a08fedf730d8a58a1b912076db047c7ed8bf90b080d61f97aeadbf07c8b7d11a069c6c7d3bcd8fd54e7c8e2af1 SHA512 48779116eb242568b6f68ff1a329a106bc87dc242e27db983f8266af21d1678d229759cdbc5abfcbbbcc7a7ab2a7785a2ab382290e162cb219e6f8e05b31137a
+EBUILD rust-bin-1.26.0.ebuild 2828 BLAKE2B 0cb9e6c214dbec3aefb112ec8d266fe5f9b07af225107912425ddb68b6f89cb8430fa626e599822aec79d1255901c49e555518551d1eb161eb9a27ba4080677f SHA512 667f127494ec6d3e81c0064b631ec818488da25fa5e828e5df3187bd33aa5fe48da8098ed9fb257d7334ef95ea7fa4bdf4244e455f72c537ead4355235e6096b
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/dev-lang/rust-bin/rust-bin-1.15.1.ebuild b/dev-lang/rust-bin/rust-bin-1.15.1.ebuild
deleted file mode 100644
index 319576f891af..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.15.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1
-
-MY_P="rust-${PV}"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
-	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	!dev-lang/rust:0
-"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="
-	opt/${P}/bin/rustc-bin-${PV}
-	opt/${P}/bin/rustdoc-bin-${PV}
-	opt/${P}/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.so
-"
-
-src_unpack() {
-	default
-
-	local postfix
-	use amd64 && postfix=x86_64-unknown-linux-gnu
-	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
-}
-
-src_install() {
-	local std=$(grep 'std' ./components)
-	local components="rustc,${std}"
-	use doc && components="${components},rust-docs"
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${D}/opt/${P}" \
-		--mandir="${D}/usr/share/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	local rustc=rustc-bin-${PV}
-	local rustdoc=rustdoc-bin-${PV}
-	local rustgdb=rust-gdb-bin-${PV}
-
-	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
-	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
-	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
-
-	dosym "/opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "/opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "/opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/opt/${P}/lib"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	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 now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${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-bin/rust-bin-1.16.0.ebuild b/dev-lang/rust-bin/rust-bin-1.16.0.ebuild
deleted file mode 100644
index 319576f891af..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.16.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1
-
-MY_P="rust-${PV}"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
-	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	!dev-lang/rust:0
-"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="
-	opt/${P}/bin/rustc-bin-${PV}
-	opt/${P}/bin/rustdoc-bin-${PV}
-	opt/${P}/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.so
-"
-
-src_unpack() {
-	default
-
-	local postfix
-	use amd64 && postfix=x86_64-unknown-linux-gnu
-	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
-}
-
-src_install() {
-	local std=$(grep 'std' ./components)
-	local components="rustc,${std}"
-	use doc && components="${components},rust-docs"
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${D}/opt/${P}" \
-		--mandir="${D}/usr/share/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	local rustc=rustc-bin-${PV}
-	local rustdoc=rustdoc-bin-${PV}
-	local rustgdb=rust-gdb-bin-${PV}
-
-	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
-	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
-	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
-
-	dosym "/opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "/opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "/opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/opt/${P}/lib"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	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 now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${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-bin/rust-bin-1.19.0.ebuild b/dev-lang/rust-bin/rust-bin-1.19.0.ebuild
deleted file mode 100644
index 319576f891af..000000000000
--- a/dev-lang/rust-bin/rust-bin-1.19.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1
-
-MY_P="rust-${PV}"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
-	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="stable"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	!dev-lang/rust:0
-"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="
-	opt/${P}/bin/rustc-bin-${PV}
-	opt/${P}/bin/rustdoc-bin-${PV}
-	opt/${P}/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.so
-"
-
-src_unpack() {
-	default
-
-	local postfix
-	use amd64 && postfix=x86_64-unknown-linux-gnu
-	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
-}
-
-src_install() {
-	local std=$(grep 'std' ./components)
-	local components="rustc,${std}"
-	use doc && components="${components},rust-docs"
-	./install.sh \
-		--components="${components}" \
-		--disable-verify \
-		--prefix="${D}/opt/${P}" \
-		--mandir="${D}/usr/share/${P}/man" \
-		--disable-ldconfig \
-		|| die
-
-	local rustc=rustc-bin-${PV}
-	local rustdoc=rustdoc-bin-${PV}
-	local rustgdb=rust-gdb-bin-${PV}
-
-	mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
-	mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
-	mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
-
-	dosym "/opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
-	dosym "/opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
-	dosym "/opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/opt/${P}/lib"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-	/usr/bin/rustdoc
-	/usr/bin/rust-gdb
-	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 now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${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-bin/rust-bin-1.25.0.ebuild b/dev-lang/rust-bin/rust-bin-1.25.0.ebuild
index 9e2dadd1a193..e8b07c4bba4b 100644
--- a/dev-lang/rust-bin/rust-bin-1.25.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.25.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc"
 
 DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
diff --git a/dev-lang/rust-bin/rust-bin-1.23.0.ebuild b/dev-lang/rust-bin/rust-bin-1.26.0.ebuild
index 9e2dadd1a193..4ee6eb84f3bc 100644
--- a/dev-lang/rust-bin/rust-bin-1.23.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.26.0.ebuild
@@ -3,24 +3,27 @@
 
 EAPI=5
 
-inherit eutils bash-completion-r1
+inherit eutils bash-completion-r1 versionator
 
 MY_P="rust-${PV}"
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
-SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
-	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
+SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz )
+	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+
 DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
 	!dev-lang/rust:0
 "
 RDEPEND="${DEPEND}"
+PDEPEND=">=dev-util/cargo-${CARGO_DEPEND_VERSION}"
 
 QA_PREBUILT="
 	opt/${P}/bin/rustc-bin-${PV}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 55772c27eddf..95b73aef97b6 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,25 +1,11 @@
-AUX 1.23.0-separate-libdir.patch 7268 BLAKE2B 9bd685bb53a98329826da86335bc9524c8969b8bc529eb98c14889d42edc32fd7ac85446f5a6dc68c4262461c32d01f11d093945833714a93376c5acab9000c0 SHA512 7bb0975706f6b6e47a3145bee895bd3ef648c2478f265e82dfccb745d968277dc499ec480ccf29d99093f395d48cd86d55dd15fe613fb73a062c5f3836893634
-DIST cargo-0.19.0-i686-unknown-linux-gnu.tar.gz 5068212 BLAKE2B 4fd16e33b220ae496603cd5a16055557d96cbbf04943040c36f6121eb3b7e53d5644a6e0cd8794d3485bb323f0a719e921be8a944f466cd4dc317d82b1b8deea SHA512 bfe5df682eb566c91995b8c00b5e8edb5d2c3410d1baa5be2ede2e39260b653d34b7723c6c3e8f07d8102ffab50b13e62f9f2d816dad8fba9f39b7bec984181e
-DIST cargo-0.19.0-x86_64-unknown-linux-gnu.tar.gz 5133993 BLAKE2B 39eed4905b06a9f28340b1ca0362dd9d592b5ab6a11ceb8a749069827b65b25c34b8020ca434b3174733dcdda2c38b460c7c0d9b877ff2fed1a790f5f70d9c5a SHA512 6fedb8f83d70dc4fb93a29d400577a5578ceed1448f4e85e8a9509b98b037a125532ebfb6a7e6bc9411501ea74774d2c47ac7e2bcb7ac82baeb925abc46609e8
-DIST rust-1.22.0-aarch64-unknown-linux-gnu.tar.gz 144904402 BLAKE2B d9b4349fa11c673130d9a9ecc9d3ac0653c20d2a2582118377c5a0e612d98db70457d8c5baa07e01a5aa65858aad1759f6fc8927dd4dfcfdcca4fca11179d529 SHA512 3a21f7b29c15ab54270be303e4ee053c944d04b971ad4c73243e1c44bbe5fe245170e80ca9617f77648e0e957c1faf0c7e59b7d9d9303bbf5017215b888e5e05
-DIST rust-1.22.0-i686-unknown-linux-gnu.tar.gz 151889962 BLAKE2B cf2f30fdc01cbcf45de427b5a5a226b8482f3fc13e122cc4f021a75f648678b23a789706b54b6425346bdba57224898809102d97bfee8b143f90763ea985b6c3 SHA512 b46eb37f918833f1dbf3700fe156f26eff19dc90534434add5aa2d86b8ccc02aef273cba6a8291deaa89d27d2bd4af1529655b6463f44736a9f521a67cccc4f0
-DIST rust-1.22.0-x86_64-unknown-linux-gnu.tar.gz 160427151 BLAKE2B f56a8205023ec39a5569e443f1c7954c55c9b2fe94126c03bcf9eadf4d26cb60d8ae9e8c6638550e79acc5906d865bdaaa5e0e61a63c9b23383afef673018638 SHA512 30206d5ccec432a6a92aeffb34170290109d65973a6d1cd91e7e1aa82781a0da00023275b5a3a3effad79d539d2f4829d1eea5fc3d0c1c58a7f3a4855a84785c
 DIST rust-1.24.0-aarch64-unknown-linux-gnu.tar.gz 184157362 BLAKE2B 68b1b9471b6d26dbb2c3bf897d2bffc15d2fcd1fde774d4f23389e9ccb96fc60d8ec8c343b5f93651bced05bdf228d549c747f3f3d4de9c8232e99aa1b6bef6a SHA512 d15548a7b21ca4605ff24d098a59414548a315acd736ac4d8ac845399c9febdd810ba76fdf2dd9336325bd749866ee72f3d8c7c573b04a4d932d00cd7cac34c0
 DIST rust-1.24.0-i686-unknown-linux-gnu.tar.gz 193631843 BLAKE2B f19e9f717f5626b2267da4e661b53f45f7948a83a25156239af3cadb1184bf39669171364754f1787cdb78c3b62bd145bff1e3f4c3c7890f0dd52839bd8ae923 SHA512 3806bee5dccc080fae437bbc7f2e2062803244eb57c25e5e591e46279810c661bf016a4043e0af991b49b9e09a5d81ec275a852c3647a474507b03846d76aac0
 DIST rust-1.24.0-x86_64-unknown-linux-gnu.tar.gz 199663002 BLAKE2B 2373637eb4410c07328b3cbaecb56ca465956ec1a2f14786e00922d74c4e68760538383960080348be003bee656761f5bbd0aa871ea21e22d029b3f8ab5344a7 SHA512 63ecb84b31f586c85e25229fb673892567edc2f557ac2ca1958caf3e26aa4e6c9a55b410aeeeadf1a61a5ebd66a517106e942f923a2884ce69ee92aec622187b
-DIST rust-std-1.18.0-i686-unknown-linux-gnu.tar.gz 66316236 BLAKE2B 64712595bd979b7eadb626198df1c43951cf040dd94e9b18821d5cc9807d6b3135c62129d89b8cbebe2aabb28e7fcbe22454cc7c4a66ef1a16db899f30e91671 SHA512 0649743437f15d80f7fe08ae32177b36e2a89e87db8062433cfa6d0f62fe7e8fdbc109a025c02dc110d8abdf4b74ddfe80ba8fb895992b0f5ac6a880bbbdf051
-DIST rust-std-1.18.0-x86_64-unknown-linux-gnu.tar.gz 75723132 BLAKE2B 1a0407be9f65db914dd5573daf4ca47804bd3254a3ef51b244c1952e91b5f1395f712dd2c82eb73623ad7da79bffcc8ac9b5e6e0404b3ffa300fe0292189caec SHA512 98f50016cf6f7c89f90830e1c9f41b5413adf2eaa5e2874ca117ffe84ee59fe77cb461ca3601ee65c5c5c884eb42e22509a94c00544527c727f2e3d6d0adb530
-DIST rustc-1.15.1-i686-unknown-linux-gnu.tar.gz 39314075 BLAKE2B 59e79324807d92d57e71588f82983457cd6f3fbbf7eb2bd9b63a84c16d15e30679bc7625dbd20b20da62a80ccdeed58825bee1357b3b7af9b4a5aa83ba5f3a60 SHA512 138a4a893a70860650da1636f734977c215e32b1f9b15b957bfc31575d2662ea6c2c65a130bd13647ec1f2366fe0deb26a94ea09aaec7cbda8e466fa295a0c42
-DIST rustc-1.15.1-x86_64-unknown-linux-gnu.tar.gz 37650863 BLAKE2B 15ad871d0c23c662d63093e372b730ea02c79e35bbe4e7cbad64d2ae4d3e43f94edabaa3ab7b0f18f198d22830754a1271a55b283a423d155b6274b9d17b9409 SHA512 97f2fd905b1c2c9ee1fb9a9604a931154aa928692e6334af5a60f1853e49246b13af26afb6342f085cf77e624f23e90c409f05b81983408cf0538ba1401ef7cb
-DIST rustc-1.16.0-src.tar.gz 28470372 BLAKE2B 0b1f5156e97d8b6ecca086a818a9a15b667badcaf15a86e4ff9212c9f1e641e67ad82788008b3059d380e83fede7e7347f54209d9e85644decf6614c7d12f4ac SHA512 096b1b7406be9bc61161bb7cdd2061f2bc2174c161a31f4ed6ceecf7fc379f315fc2f7cb9f6c134ea4f8519c27bf6e5a3f712cf1e56d5785831d8c8374eb0ba5
-DIST rustc-1.18.0-i686-unknown-linux-gnu.tar.gz 47281118 BLAKE2B 96dbd061a048d74a4054356bc4073dc538aa0799dae362885909fc9fbd30e25ebe7da8215231a049ff83b6696d0e76a5741bc337c86a4b8d34fd0d4abc4e6170 SHA512 e270a314fb326fb226226741a5a15f237846ffb7ae6e0ab349f56328f5b3557d8b3dfdcfbc168f3ed4d9875806434537ce7bd5fb97b2c3078f7d03fd6ce65d2d
-DIST rustc-1.18.0-x86_64-unknown-linux-gnu.tar.gz 45281645 BLAKE2B 3034a693aa808d1d489ce36db5a00ce7d239bef8265f322c6fe4f1f5a9d77cf8f9e447e2ca539f6d3e758214dd01224957d8c662eeedd76ffccad3ad4f341f3c SHA512 7d8865a43b979150c3dc3abaa852921f46bebb54659bb0f14bc9b82b367f94ec031da4d03242cb6aae8bd11167402b9e166a14aa3c4a141413be54e9a685af31
-DIST rustc-1.19.0-src.tar.gz 50108626 BLAKE2B ae6016f816f2c41b81668764e2892d7846226ff944be9f173d9d8818c22aeb21cc7457e346bd4c985f41d3d22df1dad009d1977a733bbf40ff6fb8a6f0854254 SHA512 080a8625fc15bc4fc17ab910bdcc0d9a88ce8922f1a3eb241d0f956b5799e4db6df45ebabb5497295c198be08686e5a94dff65569582fc6a5ecb9200cfee5c24
-DIST rustc-1.23.0-src.tar.gz 60010149 BLAKE2B 64bba97fd1a16d3162b65b0d8dd2024ca07166a4fb3d541a96216a27a392baac5f5addd9b3b223ce935df9437a0789cd5c3d8328957f983cc3317a63f13a4dcd SHA512 a1dbb1a625c6d8dfe9708e1cf478a49154b1eb0aba5ba67ac85518a8c7d1c70d2d86ac4d441156e9bfd0fd77ca241fb5491a2bd68aefcf0b3c2e164c3cc29e4e
+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 rustc-1.25.0-src.tar.gz 98639156 BLAKE2B 1408d5dd0611d4830de3b6b3d00e3fad4198a47599b639d0ac0bd05aaba401f743056a942e9df04a4d192c6b12e8cfe9a9cdf8cd26e48b72104ce9b423df049e SHA512 7d8886f4d5a621eb794e814deb60be681fa38cf086f87ffa14e5a3500c640b237c549a632de1331a0f1b71963de41f6d31a4df3866b7e597424002316fed81ce
-EBUILD rust-1.16.0.ebuild 3840 BLAKE2B 163ebba85b39e44406fd8b7dc9e5c1f9e929702a167f8ccb00605dd7e97f3e57101bc04ceb13887c3bfe1a79bd80f52f26f9f98727b1b2ceddb7a69bfd0c7924 SHA512 8c661074f6a53f6d8397d712c8236dfc34f18c386e699a1ab1db9a9eceba9e776c09c733ad615a1897916f1268c46e58a56c5f80cd2efe787fca5f8fdc8591e4
-EBUILD rust-1.19.0.ebuild 4145 BLAKE2B 0a8abe73955900466c432df65d77d18bc7d01fa570f5b3c7876f4cf465f2c1cc5821d554352343a62fd0e1330cb97735665821ed8cc8223d98667292e05a00d0 SHA512 0da72a60a704d7215a3dea336e780c81473253ea3ccbfc41c1cef4cf2b2f86a791a41f42356a8958088d6522e6c3a917cfa196d14556feef5f56667b92012739
-EBUILD rust-1.23.0-r1.ebuild 4650 BLAKE2B c637315babceb455d76dc125030976d6baa7261314d916c68d4bbdbfc7b1f3fce8b0bfb722178663635603de6e699b1440c77358b9ec916dcb01a42097f09cad SHA512 96b1f2f3ba1d1bac71a1ae6feca980c856c637af475d954a82ac547934a57d64e3328556ffd36b6ba57c5952cdc36dd615524f167060571151d5a77258a723ae
-EBUILD rust-1.23.0.ebuild 4494 BLAKE2B 10bb2d2bf83471ef0e78887265ec8fed165decf68034a1760d8ae6400dc93c8eb02d7e5cd36c096e1b11ee63eeca672fe4d609f49941fe42e4e8a72e0a549b8e SHA512 07dddcee213e0c655e4308f7702b9e8f447ae91fa9dfc5e2ecbaa0cd5c9dc2ebe9ec8406d553f33940ad09fb7bc7a122e385916e273e25b170ce6a11e419fb0c
-EBUILD rust-1.25.0.ebuild 4594 BLAKE2B 8ba0e744e8772318809fb9c9973d61cc2868143aac3629811164b625efb83030d87ee678ba90080803b1a365939315dcafedf10c8e1d97bbb9cb2742f35b19bb SHA512 f074a04d7889b98fc0a2414c7b1c034fd6f862d11d2b1b872f8eaa5721da5cac5521562b11b56153282f8ecbc6c828d554209630fb22ef2ce17ad3f4eaada7e2
-MISC metadata.xml 688 BLAKE2B 73d221f770fac85ee6d96cea52932c5022c545643bf140e3b0dfae6e9fb55c1b4031825fc877fe653a359abcf725016fda4aacf78fc758ac8d9b24bb394dc4e1 SHA512 fae633297179568dab653bd54221d3195d40c077778712c019e55eca546610f62f0cceab22ec5e11a6e1532c84a7717bb50f83a28623e33806ed8cf460867a7e
+DIST rustc-1.26.0-src.tar.xz 54613664 BLAKE2B 798985e4060c28828066118f39fc296e52b3796ae02f3917912680154047eb6f91806b3d45f3a0e9afcef55d95cea3079debae12d2ddf2d9c46f992e12519094 SHA512 563b910ecf4b2a0d798a1201177f733333e64efad49e5aceec5adc66a8c6903df391c9afc0fdd8284348c08082e0c4de1e5cb68efe6797594de43ca93e4ad7a2
+EBUILD rust-1.25.0.ebuild 4596 BLAKE2B 365767b5415ec7c48142e021af736c12a3b67c34eeab5e3644b43ffdef9b4c9fbd793c26743d615d2b3386f92dfe08640ca545e5fb9d3c12e6c9796d0e68ab47 SHA512 108765cc809c5988b12b702dd4f06df4bce78e2796a31bc4cdca8d5f9a7da82e534d9f501060eb014afb79af81f15b035c3d650d772341d3eaef5ea825b93b31
+EBUILD rust-1.26.0.ebuild 4927 BLAKE2B 3d7dda33101e9a1b934340bd8b001c8c9312d3f02b56ae6c7e6c5535eadf04d396e215891ccfd211b2d07c4962e9e33a080dcf225b2d73c4f77392695fe77c51 SHA512 73ca0ec6179fc4445636f2899b7cd7062d8840a72c12647cbaba9311c03c48fdaab116414e9bdcb8f316551b383920eee1a68873f40e99c46883ae47a71cae15
+MISC metadata.xml 482 BLAKE2B c75f5749d7c3b17c9ea4c811809448dbaea4723e74da9e0a9ba4e492c3275875c95ae4d209a0129c24f3e692c00c77e36f16b23e2b3d6ea22c05f50b0de7d054 SHA512 5e9ea6d3db22676701c132298ea8b03453a53aa3b79f564f2cc021735b60329f1201c871541dde362315e938543e89afc6f0c3629218744ddca75d95deeb4a88
diff --git a/dev-lang/rust/files/1.23.0-separate-libdir.patch b/dev-lang/rust/files/1.23.0-separate-libdir.patch
deleted file mode 100644
index dcf1762d2fa5..000000000000
--- a/dev-lang/rust/files/1.23.0-separate-libdir.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From c520b2dd277f13dc09e8e72c486e5c58fb97017d Mon Sep 17 00:00:00 2001
-From: O01eg <o01eg@yandex.ru>
-Date: Wed, 29 Nov 2017 12:32:03 +0300
-Subject: [PATCH] Fix #45345.
-
-Re-implement
-
-```bash
-CFG_LIBDIR_RELATIVE=`echo ${CFG_LIBDIR} | cut -c$((${#CFG_PREFIX}+${CAT_INC}))-`
-```
-
-from old `configure` script.
-
-Accept verbosity in rustdoc.
-
-Stage 1 and later use relative libdir.
-
-Build all stages with relative libdirs.
-
-Add library path for real rustdoc with `RUSTDOC_LIBDIR` environment variable.
-
-Remove unused argument `rustc_cargo`.
-
-Remove unused configuration parameter `libdir_relative`.
----
- src/bootstrap/bin/rustdoc.rs | 13 ++++++++++++-
- src/bootstrap/builder.rs     |  9 ++++++---
- src/bootstrap/check.rs       |  2 +-
- src/bootstrap/compile.rs     | 13 ++++---------
- src/bootstrap/config.rs      |  1 -
- src/bootstrap/doc.rs         |  2 +-
- 6 files changed, 24 insertions(+), 16 deletions(-)
-
-diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
-index 4e975adc97..24312b50ec 100644
---- a/src/bootstrap/bin/rustdoc.rs
-+++ b/src/bootstrap/bin/rustdoc.rs
-@@ -23,10 +23,17 @@ use std::path::PathBuf;
- fn main() {
-     let args = env::args_os().skip(1).collect::<Vec<_>>();
-     let rustdoc = env::var_os("RUSTDOC_REAL").expect("RUSTDOC_REAL was not set");
--    let libdir = env::var_os("RUSTC_LIBDIR").expect("RUSTC_LIBDIR was not set");
-+    let libdir = env::var_os("RUSTDOC_LIBDIR").expect("RUSTDOC_LIBDIR was not set");
-     let stage = env::var("RUSTC_STAGE").expect("RUSTC_STAGE was not set");
-     let sysroot = env::var_os("RUSTC_SYSROOT").expect("RUSTC_SYSROOT was not set");
- 
-+    use std::str::FromStr;
-+
-+    let verbose = match env::var("RUSTC_VERBOSE") {
-+        Ok(s) => usize::from_str(&s).expect("RUSTC_VERBOSE should be an integer"),
-+        Err(_) => 0,
-+    };
-+
-     let mut dylib_path = bootstrap::util::dylib_path();
-     dylib_path.insert(0, PathBuf::from(libdir));
- 
-@@ -59,6 +66,10 @@ fn main() {
-            .arg("--crate-version").arg(version);
-     }
- 
-+    if verbose > 1 {
-+        eprintln!("rustdoc command: {:?}", cmd);
-+    }
-+
-     std::process::exit(match cmd.status() {
-         Ok(s) => s.code().unwrap_or(1),
-         Err(e) => panic!("\n\nfailed to run {:?}: {}\n\n", cmd, e),
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index c76900882b..1927a604c5 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -357,8 +357,8 @@ impl<'a> Builder<'a> {
- 
-             fn run(self, builder: &Builder) -> Interned<PathBuf> {
-                 let compiler = self.compiler;
--                let lib = if compiler.stage >= 2 && builder.build.config.libdir_relative.is_some() {
--                    builder.build.config.libdir_relative.clone().unwrap()
-+                let lib = if compiler.stage >= 1 && builder.build.config.libdir.is_some() {
-+                    builder.build.config.libdir.clone().unwrap()
-                 } else {
-                     PathBuf::from("lib")
-                 };
-@@ -416,7 +416,7 @@ impl<'a> Builder<'a> {
-         let compiler = self.compiler(self.top_stage, host);
-         cmd.env("RUSTC_STAGE", compiler.stage.to_string())
-            .env("RUSTC_SYSROOT", self.sysroot(compiler))
--           .env("RUSTC_LIBDIR", self.sysroot_libdir(compiler, self.build.build))
-+           .env("RUSTDOC_LIBDIR", self.sysroot_libdir(compiler, self.build.build))
-            .env("CFG_RELEASE_CHANNEL", &self.build.config.channel)
-            .env("RUSTDOC_REAL", self.rustdoc(host))
-            .env("RUSTDOC_CRATE_VERSION", self.build.rust_version())
-@@ -496,6 +496,9 @@ impl<'a> Builder<'a> {
-         if let Some(target_linker) = self.build.linker(target) {
-             cargo.env("RUSTC_TARGET_LINKER", target_linker);
-         }
-+        if cmd != "build" {
-+            cargo.env("RUSTDOC_LIBDIR", self.rustc_libdir(self.compiler(2, self.build.build)));
-+        }
- 
-         if mode != Mode::Tool {
-             // Tools don't get debuginfo right now, e.g. cargo and rls don't
-diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
-index 4d69b19c73..d926c2b901 100644
---- a/src/bootstrap/check.rs
-+++ b/src/bootstrap/check.rs
-@@ -1171,7 +1171,7 @@ impl Step for Crate {
-             }
-             Mode::Librustc => {
-                 builder.ensure(compile::Rustc { compiler, target });
--                compile::rustc_cargo(build, &compiler, target, &mut cargo);
-+                compile::rustc_cargo(build, target, &mut cargo);
-                 ("librustc", "rustc-main")
-             }
-             _ => panic!("can only test libraries"),
-diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index db013691bb..d60feb1aff 100644
---- a/src/bootstrap/compile.rs
-+++ b/src/bootstrap/compile.rs
-@@ -485,7 +485,7 @@ impl Step for Rustc {
-         build.clear_if_dirty(&stage_out, &libtest_stamp(build, compiler, target));
- 
-         let mut cargo = builder.cargo(compiler, Mode::Librustc, target, "build");
--        rustc_cargo(build, &compiler, target, &mut cargo);
-+        rustc_cargo(build, target, &mut cargo);
-         run_cargo(build,
-                   &mut cargo,
-                   &librustc_stamp(build, compiler, target));
-@@ -500,7 +500,6 @@ impl Step for Rustc {
- 
- /// Same as `std_cargo`, but for libtest
- pub fn rustc_cargo(build: &Build,
--                   compiler: &Compiler,
-                    target: Interned<String>,
-                    cargo: &mut Command) {
-     cargo.arg("--features").arg(build.rustc_features())
-@@ -514,13 +513,9 @@ pub fn rustc_cargo(build: &Build,
-          .env("CFG_VERSION", build.rust_version())
-          .env("CFG_PREFIX", build.config.prefix.clone().unwrap_or_default());
- 
--    if compiler.stage == 0 {
--        cargo.env("CFG_LIBDIR_RELATIVE", "lib");
--    } else {
--        let libdir_relative =
--            build.config.libdir_relative.clone().unwrap_or(PathBuf::from("lib"));
--        cargo.env("CFG_LIBDIR_RELATIVE", libdir_relative);
--    }
-+    let libdir_relative =
-+        build.config.libdir.clone().unwrap_or(PathBuf::from("lib"));
-+    cargo.env("CFG_LIBDIR_RELATIVE", libdir_relative);
- 
-     // If we're not building a compiler with debugging information then remove
-     // these two env vars which would be set otherwise.
-diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index 35e62f17f2..1ca19187cf 100644
---- a/src/bootstrap/config.rs
-+++ b/src/bootstrap/config.rs
-@@ -119,7 +119,6 @@ pub struct Config {
-     pub docdir: Option<PathBuf>,
-     pub bindir: Option<PathBuf>,
-     pub libdir: Option<PathBuf>,
--    pub libdir_relative: Option<PathBuf>,
-     pub mandir: Option<PathBuf>,
-     pub codegen_tests: bool,
-     pub nodejs: Option<PathBuf>,
-diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
-index 3c12cfc4c7..1314d967d8 100644
---- a/src/bootstrap/doc.rs
-+++ b/src/bootstrap/doc.rs
-@@ -616,7 +616,7 @@ impl Step for Rustc {
-         t!(symlink_dir_force(&my_out, &out_dir));
- 
-         let mut cargo = builder.cargo(compiler, Mode::Librustc, target, "doc");
--        compile::rustc_cargo(build, &compiler, target, &mut cargo);
-+        compile::rustc_cargo(build, target, &mut cargo);
- 
-         if build.config.compiler_docs {
-             // src/rustc/Cargo.toml contains a bin crate called rustc which
--- 
-2.13.6
-
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 96224d872b4f..78ed62129557 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -6,11 +6,8 @@
     <name>Rust Project</name>
   </maintainer>
   <use>
-    <flag name="clang">Use <pkg>sys-devel/clang</pkg> for building</flag>
     <flag name="extended">Build and install rls, rustfmt and cargo
     alongside the compiler and stdlib</flag>
-    <flag name="libcxx">Use <pkg>sys-libs/libcxx</pkg> as standard
-    library when building with <pkg>sys-devel/clang</pkg></flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> as the
     standard memory allocator</flag>
   </use>
diff --git a/dev-lang/rust/rust-1.16.0.ebuild b/dev-lang/rust/rust-1.16.0.ebuild
deleted file mode 100644
index e13e960aba12..000000000000
--- a/dev-lang/rust/rust-1.16.0.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit 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.gz"
-	KEYWORDS=""
-else
-	ABI_VER="$(get_version_component_range 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-CARGO_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).1"
-RUST_STAGE0_amd64="rustc-${STAGE0_VERSION}-x86_64-unknown-linux-gnu"
-RUST_STAGE0_x86="rustc-${STAGE0_VERSION}-i686-unknown-linux-gnu"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
-	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
-	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
-"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="clang debug doc libcxx"
-REQUIRED_USE="libcxx? ( clang )"
-
-RDEPEND="libcxx? ( sys-libs/libcxx )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.0
-	clang? ( sys-devel/clang )
-"
-
-PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	>=dev-util/cargo-${CARGO_VERSION}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-src_prepare() {
-	find mk -name '*.mk' -exec \
-		 sed -i -e "s/-Werror / /g" {} \; || die
-
-	default
-}
-
-src_configure() {
-	export CFG_DISABLE_LDCONFIG="notempty"
-
-	local stagename="RUST_STAGE0_${ARCH}"
-	local stage0="${!stagename}"
-
-	"${ECONF_SOURCE:-.}"/configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)/${P}" \
-		--mandir="${EPREFIX}/usr/share/${P}/man" \
-		--release-channel=${SLOT%%/*} \
-		--disable-manage-submodules \
-		--disable-rustbuild \
-		--default-linker=$(tc-getBUILD_CC) \
-		--default-ar=$(tc-getBUILD_AR) \
-		--python=${EPYTHON} \
-		--disable-rpath \
-		--enable-local-rust \
-		--local-rust-root="${WORKDIR}/${stage0}/rustc" \
-		$(use_enable clang) \
-		$(use_enable debug) \
-		$(use_enable debug llvm-assertions) \
-		$(use_enable !debug optimize) \
-		$(use_enable !debug optimize-cxx) \
-		$(use_enable !debug optimize-llvm) \
-		$(use_enable !debug optimize-tests) \
-		$(use_enable doc docs) \
-		$(use_enable libcxx libcpp) \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	unset SUDO_USER
-
-	default
-
-	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
-
-	dodoc COPYRIGHT
-
-	dodir "/usr/share/doc/rust-${PV}/"
-	mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die
-	rmdir "${D}/usr/share/doc/rust/" || die
-
-	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
-	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 now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-${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.19.0.ebuild b/dev-lang/rust/rust-1.19.0.ebuild
deleted file mode 100644
index 402db0937fa3..000000000000
--- a/dev-lang/rust/rust-1.19.0.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit 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.gz"
-	KEYWORDS=""
-else
-	ABI_VER="$(get_version_component_range 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-if [[ ${ARCH} = "amd64" ]]; then
-	TRIPLE="x86_64-unknown-linux-gnu"
-else
-	TRIPLE="i686-unknown-linux-gnu"
-fi
-
-CARGO_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
-STAGE0_VERSION_CARGO="0.$(($(get_version_component_range 2))).0"
-BOOTSTRAP_DATE="2017-06-08" # found in src/stage0.txt
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-
-SRC_URI="amd64? (
-			https://static.rust-lang.org/dist/rustc-${STAGE0_VERSION}-x86_64-unknown-linux-gnu.tar.gz
-			https://static.rust-lang.org/dist/rust-std-${STAGE0_VERSION}-x86_64-unknown-linux-gnu.tar.gz
-			https://static.rust-lang.org/dist/cargo-${STAGE0_VERSION_CARGO}-x86_64-unknown-linux-gnu.tar.gz
-		)
-		x86? (
-			https://static.rust-lang.org/dist/rustc-${STAGE0_VERSION}-i686-unknown-linux-gnu.tar.gz
-			https://static.rust-lang.org/dist/rust-std-${STAGE0_VERSION}-i686-unknown-linux-gnu.tar.gz
-			https://static.rust-lang.org/dist/cargo-${STAGE0_VERSION_CARGO}-i686-unknown-linux-gnu.tar.gz
-		)
-		https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="clang debug doc libcxx"
-REQUIRED_USE="libcxx? ( clang )"
-
-RDEPEND="libcxx? ( sys-libs/libcxx )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.0
-	clang? ( sys-devel/clang )
-	>=dev-util/cmake-3.4.3
-"
-
-PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-	>=dev-util/cargo-${CARGO_VERSION}"
-
-S="${WORKDIR}/rustc-${PV}-src"
-
-src_unpack() {
-	unpack ${A##* }
-}
-
-src_configure() {
-	echo "No configure step for rust"
-}
-
-src_compile() {
-	local stage0="rust-${STAGE0_VERSION}-${TRIPLE}"
-	if use debug ; then
-		local optimized="false";
-		local debug="true";
-	else
-		local optimized="true";
-		local debug="false";
-	fi
-
-	cat <<- EOF > config.toml
-	[llvm]
-	optimize = ${optimized}
-	assertions = ${debug}
-	[build]
-	docs = false
-	submodules = false
-	python = "${EPYTHON}"
-	vendor = true
-	[install]
-	prefix = "${EPREFIX}/usr"
-	libdir = "$(get_libdir)/${P}"
-	mandir = "share/${P}/man"
-	docdir = "share/${P}/doc"
-	[rust]
-	optimize = ${optimized}
-	default-linker = "$(tc-getBUILD_CC)"
-	default-ar = "$(tc-getBUILD_AR)"
-	channel = "${SLOT%%/*}"
-	rpath = false
-	optimize-tests = ${optimized}
-	EOF
-
-	local cache_dir="build/cache/${BOOTSTRAP_DATE}"
-	mkdir -p ${cache_dir}
-	for i in ${A}; do
-		cp "${DISTDIR}/${i}" $cache_dir/
-	done
-	${EPYTHON} x.py build || die
-}
-
-src_install() {
-	default
-
-	local obj="build/${TRIPLE}/stage2"
-	dobin "${obj}/bin/rustc" "${obj}/bin/rustdoc"
-	dobin src/etc/rust-gdb src/etc/rust-lldb
-	insinto "/usr/$(get_libdir)"
-	doins -r "${obj}/lib/"*
-	dodoc COPYRIGHT
-	doman man/*
-
-	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
-	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 now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-${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.23.0.ebuild b/dev-lang/rust/rust-1.23.0.ebuild
deleted file mode 100644
index eb5a124a96e1..000000000000
--- a/dev-lang/rust/rust-1.23.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit 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.gz"
-	KEYWORDS=""
-else
-	ABI_VER="$(get_version_component_range 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-CHOST_amd64=x86_64-unknown-linux-gnu
-CHOST_x86=i686-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}"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
-	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
-	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
-"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="debug doc +jemalloc"
-
-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=">=dev-util/cargo-${CARGO_DEPEND_VERSION}"
-
-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)
-		[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
-		[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 || 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
-
-	if use doc ; then
-		dodir "/usr/share/doc/rust-${PV}/"
-		mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/" || die
-		rmdir "${D}/usr/share/doc/rust/" || die
-	fi
-
-	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.25.0.ebuild b/dev-lang/rust/rust-1.25.0.ebuild
index acfbcd1213ae..36e1b6540077 100644
--- a/dev-lang/rust/rust-1.25.0.ebuild
+++ b/dev-lang/rust/rust-1.25.0.ebuild
@@ -13,13 +13,13 @@ if [[ ${PV} = *beta* ]]; then
 	MY_P="rustc-beta"
 	SLOT="beta/${PV}"
 	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.gz"
-	KEYWORDS=""
+	KEYWORDS="x86"
 else
 	ABI_VER="$(get_version_component_range 1-2)"
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 x86"
 fi
 
 CHOST_amd64=x86_64-unknown-linux-gnu
diff --git a/dev-lang/rust/rust-1.23.0-r1.ebuild b/dev-lang/rust/rust-1.26.0.ebuild
index 8167a26c4d99..db3e0046912e 100644
--- a/dev-lang/rust/rust-1.23.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.26.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_5 )
 
 inherit multiprocessing python-any-r1 versionator toolchain-funcs
 
@@ -12,13 +12,13 @@ if [[ ${PV} = *beta* ]]; then
 	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.gz"
+	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.gz"
+	SRC="${MY_P}-src.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
@@ -36,15 +36,20 @@ CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
 
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
-	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
-	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
-	arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.gz )
+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"
+IUSE="debug doc extended +jemalloc ${ALL_LLVM_TARGETS[*]}"
 
 RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
 		jemalloc? ( dev-libs/jemalloc )"
@@ -58,7 +63,7 @@ DEPEND="${RDEPEND}
 "
 PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
 
-PATCHES=( "${FILESDIR}/1.23.0-separate-libdir.patch" )
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 
 S="${WORKDIR}/${MY_P}-src"
 
@@ -88,6 +93,7 @@ src_configure() {
 		optimize = $(toml_usex !debug)
 		release-debuginfo = $(toml_usex debug)
 		assertions = $(toml_usex debug)
+		targets = "${LLVM_TARGETS// /;}"
 		[build]
 		build = "${rust_target}"
 		host = ["${rust_target}"]
diff --git a/dev-lang/tcc/Manifest b/dev-lang/tcc/Manifest
index 67cb72d10be6..33aaad84a633 100644
--- a/dev-lang/tcc/Manifest
+++ b/dev-lang/tcc/Manifest
@@ -2,9 +2,9 @@ AUX clang.patch 441 BLAKE2B 6b60d1fd80301abdd707a8310e0c93d12e91bb9d680b72db13c4
 AUX linker.patch 667 BLAKE2B b84f58dd0c460e36c90c6ff3f6cc342034daede23bae157152c7c44ac845c0cd30c6773966227a0d0cb6b08bb70770323c04209c880b2150414687e973717207 SHA512 aadbd3676b5333ae3b8a04c75117633ca8b08c5fa0f695b9f7ff7d3019ff06211c986d0a0986c7dc329621cc1a57e23d50924fd49cf1367490d962fcef4b4efe
 DIST tcc-0.9.26.tar.bz2 525906 BLAKE2B 588e387d563ddede9842ac9012df36520fb1596bd3047fda2684ab44e49f8c1a35c1560c2fee724933cfcad5d618d84df853b72e1fee144b551cb67f7af1558a SHA512 abdbe208498cf4865a2036b5426616f5888b9b0e8d5d2fda6d1dd4afab3386167f12eca87d8a5c4c9b7dc88620d983ddce3e874b7dfa9c21eceea29ffa635d53
 DIST tcc-0.9.27.tar.bz2 634999 BLAKE2B 9a76dac9f54fa0b64a72e874cfec9a4bd9b938d244d064b2e76bd31acfb9e48fdbdb8895132634be1dee4302293405bf75606a6804c8178afa8fd30daa53b73a SHA512 835184292d97c07f0ff7b36ec550e855e649b04e23c7e2a1c706d223409eb60708dc1ae969f28eba45e56c8b96ae56936b93caf9d8a13ac5adf119014d5367a7
-EBUILD tcc-0.9.26-r1.ebuild 1566 BLAKE2B 61bcc852c44d4f1881fe6c51dd9e58908c0d0c9e9cdb52a1fd804b9f90f321d947227fb2389828bad474ce8c3fdc970fda6b610cf5165201e1246bb5c853b224 SHA512 40d4489879464f4d380eb9433212dda09faf1e4c297f99a204715993253387a0a8d6f5d11911ccbc47542c914b4a0a4d9c971568bed627a21fdff85580216bc0
-EBUILD tcc-0.9.26-r2.ebuild 1536 BLAKE2B c03d415d26ce6817e8903fb64a97b195c0901e0496a5edb57e6f7be70c6d6ca4e3ce9ba6cb63666801dcb38eea78c62004a206f148412503bb6b89f7af229480 SHA512 cdeffde7870d16177250e6f9901242e4242d037ec53e4a6a675f8e8bd68ea1af3989903b2daf793b58d024da407c5383b314ae0adba7a55387011767e0377f63
-EBUILD tcc-0.9.26-r3.ebuild 1700 BLAKE2B 4cd7ad6fd04f6cec1b8a55d939167e56414ef50537cf63c8b88855188528016bf4aa19053a3f9489998720aef920f128695edf7e921e82812fdba60223a752a4 SHA512 58215a00f35d25b98b456229b284e0f6e3e910c490da28b005ca715f5542d6f9f59da720333e86b52e0e611502bbe1c911c9b7ec737b1853e3ca34d29f11fd68
-EBUILD tcc-0.9.27.ebuild 1543 BLAKE2B 5c8320fb621188dbabc8e8d1fb11171e5a7333c963629066eb35ba5b9b3b56dff3ddea515cfa265244585ae982dd8679433a6f280a811afac46a5f0c3567a755 SHA512 94f24d5a9de41189366fcdd1323f7bb81df6cf81326f5cfe814c38a4b1e6c0bc519fc850afb7ecf9e5314d46e0b9a1bd1588cfbcd3c146c370038230743ff273
-EBUILD tcc-9999.ebuild 1689 BLAKE2B 414115e0eaa82a0cf6edde8d7d78dff29325737a0c0d992bfe538639c89173173bd114311301078d3fcab444812ff8cc60440515d578a7154e0fd8b3359b79f7 SHA512 0cff84ba9dd811953b62297df5b8c0767bcec678c211b21bc1a6d4c24d7ae595e759cc79fd7771fde1fd1a93a00ad7d6329aaad5c0287ab2d99f2cf8d8be3b6a
+EBUILD tcc-0.9.26-r1.ebuild 1568 BLAKE2B fab0abb6b2ec74a17ce36a28cbd42c61f5a70b293049fba563d4b753ec538936ef6d75b329a745cc27affaf177d6d825333f19949b0d71be327d6d7e2599344d SHA512 621f6d0dd29148f329245e8385d9d37fe742cc993f6d33ab1993cd4c8879c5d7b022210f8487051de4988e7a2dd4866e662dd572c6d5c8b4b67a4ad6bf2be740
+EBUILD tcc-0.9.26-r2.ebuild 1538 BLAKE2B e28c7c8b8e796d762f848676997bf10fbe11cc1fedb9a943bdb2f7a43d4a5a29d5dd617b3750dab56e3239653c42fb54f8937ea5257c0db30336f04dc49e67c0 SHA512 efc4358782dbfea9bddefe26328fd20e4d70ec2debb76bf9a7942d1d9eed3120749ff3cc1e6bde50dfa58d550b44efaa5a730082ba497f652304234a45500b31
+EBUILD tcc-0.9.26-r3.ebuild 1702 BLAKE2B 01eb3abfd82d3e76b799a14fe8593b64144975becb784182df81c0516f93fd8818fb0ea6f11bfb32e6c7fede220ad91d09d9f51d9702d0fb22e119fea18aaed4 SHA512 578de3aa7211dddfc4b5d08cf33d13d730140866a71b300e1753100cda606a9676efff847dea7f6420bad17e9e23844bd618557095aa33c6ee386583a136e569
+EBUILD tcc-0.9.27.ebuild 1545 BLAKE2B f162a055e57f04656b73ceb5edc43de3f69b893c7e3d94ce1749cf8604f1a366ec774769c0365b0160b1b7260ee245807e176481098998452216d72e226ad6ac SHA512 17da77bf834848d81396e715f23b81282f820a7fee07646b3a6b2c868a73a3852a3a53f521cd72d4f7ec5c930a1b9668bf16ae309f6fc10c96ba9ef9cf235bd3
+EBUILD tcc-9999.ebuild 1692 BLAKE2B fe9b98bb754a65cd7dabb4e5fbd528b1226df26c610b69ec3c84f1b3d14908af5eaf2fedff1c31cf08748778f9dd1b7edc3a4de2be1066aec192127f0b9d6f1e SHA512 90ba80835413a83a545d6545286626dd95f42f0ee3991609633f6ad1e29469a4a59edd0b23d57babed6a7ddc4f35781b9f324172a0d687fe26f5b7d155909b6c
 MISC metadata.xml 316 BLAKE2B b344343dfa24e8c1d5743fbb628c6abec535a89722195816d8b58d8c1291c320fa98fda44151736c8f362f0186608977321f914fc3f09f88eb9efa17ec064ce1 SHA512 87e93f1667a8b911d4f8e79d05ab06aca7933d347387157e9a1d5d79260f976e6e9df2c172656acf5e961afbbeae640868ba28ade4c6e73ed09e020f9bd14978
diff --git a/dev-lang/tcc/tcc-0.9.26-r1.ebuild b/dev-lang/tcc/tcc-0.9.26-r1.ebuild
index 4fbc6b2a7c0a..07171a4fca78 100644
--- a/dev-lang/tcc/tcc-0.9.26-r1.ebuild
+++ b/dev-lang/tcc/tcc-0.9.26-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A very small C compiler for ix86/amd64"
-HOMEPAGE="http://bellard.org/tcc/"
-SRC_URI="http://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
+HOMEPAGE="https://bellard.org/tcc/"
+SRC_URI="https://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-lang/tcc/tcc-0.9.26-r2.ebuild b/dev-lang/tcc/tcc-0.9.26-r2.ebuild
index 808555d46618..757cc7d58e06 100644
--- a/dev-lang/tcc/tcc-0.9.26-r2.ebuild
+++ b/dev-lang/tcc/tcc-0.9.26-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,8 +6,8 @@ EAPI="5"
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A very small C compiler for ix86/amd64"
-HOMEPAGE="http://bellard.org/tcc/"
-SRC_URI="http://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
+HOMEPAGE="https://bellard.org/tcc/"
+SRC_URI="https://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-lang/tcc/tcc-0.9.26-r3.ebuild b/dev-lang/tcc/tcc-0.9.26-r3.ebuild
index cd260028a260..edcf65c95fd7 100644
--- a/dev-lang/tcc/tcc-0.9.26-r3.ebuild
+++ b/dev-lang/tcc/tcc-0.9.26-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,8 +6,8 @@ EAPI="6"
 inherit toolchain-funcs
 
 DESCRIPTION="A very small C compiler for ix86/amd64"
-HOMEPAGE="http://bellard.org/tcc/"
-SRC_URI="http://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
+HOMEPAGE="https://bellard.org/tcc/"
+SRC_URI="https://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-lang/tcc/tcc-0.9.27.ebuild b/dev-lang/tcc/tcc-0.9.27.ebuild
index 9900cc9ea3a2..c9bb96edd47e 100644
--- a/dev-lang/tcc/tcc-0.9.27.ebuild
+++ b/dev-lang/tcc/tcc-0.9.27.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"
@@ -6,8 +6,8 @@ EAPI="6"
 inherit toolchain-funcs
 
 DESCRIPTION="A very small C compiler for ix86/amd64"
-HOMEPAGE="http://bellard.org/tcc/"
-SRC_URI="http://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
+HOMEPAGE="https://bellard.org/tcc/"
+SRC_URI="https://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-lang/tcc/tcc-9999.ebuild b/dev-lang/tcc/tcc-9999.ebuild
index d55542ed7b7e..dbc3af48d0a5 100644
--- a/dev-lang/tcc/tcc-9999.ebuild
+++ b/dev-lang/tcc/tcc-9999.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 DESCRIPTION="A very small C compiler for ix86/amd64"
-HOMEPAGE="http://bellard.org/tcc/"
+HOMEPAGE="https://bellard.org/tcc/"
 
 if [[ $PV == *9999* ]]; then
-	EGIT_REPO_URI="http://repo.or.cz/r/tinycc.git"
+	EGIT_REPO_URI="https://repo.or.cz/r/tinycc.git"
 	KEYWORDS=""
 	SRC_URI=""
 	scm_eclass=git-r3
 else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-	SRC_URI="http://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
+	SRC_URI="https://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
 fi
 
 inherit toolchain-funcs ${scm_eclass}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 8b21eb83c918..eba90388dc8f 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 794 BLAKE2B 2f716f12ed5d297d98ac9ade1bc407d071e6ca2b777cf13945c895dd8a597139f70a416642df1b537e4637a8f52b75c2bae3f9fb48ac146116628b482e56287e SHA512 5e87d9240ce51e905b94f99f380ce0164888b775ca6038e607891ab7f85b5cd7eb6c6649e066fc7f9584e0226e58fc9e7d28194f81df8b0be3590811177150ad
+EBUILD vala-0.34.16.ebuild 793 BLAKE2B eed81e3fa7bd6027218e07746f41d8235a6638fd3a064726f8ab754145b5dc796c05fb6d58957f43f879bb4b431931d7303c7f67057b67a11b272cb11ce6db7a SHA512 195158bb70547cc5e10642ceff9c14d8c25cfd40b06a4e47646171a0371b72f06c0bb3d50ea1ef5465595e8fcf632760bb34e1bdea92b6cc10ad7f1120291b32
 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 877 BLAKE2B d0472e98fce42ee402f4c9873e1788228c0713a4471f064b966256d02f645b0b9c64f1c7b16b7df2b69eda209df9807ae0fc1ff099b1b01e34359879cb146cd0 SHA512 b5e505386734ebda77ff7a530eac4518d95e433b3bd6f6652439433e5c5bc479bac9538ae7a44b6aa248085ca8634a232bf2164356391e0dc27f8a84b710a839
+EBUILD vala-0.36.13.ebuild 876 BLAKE2B 0920718027abfb148de8042bf2b8b352e7c0a76378d8bc1a66e188b81e9b87f032f17aafbd7e083a45e29372f38494c215d8b2abb912a71aaf5b8ac59143c213 SHA512 3610aad4b6685e096030200b87d93efc12970538dc8b373f6c1787d3cd5dd01c82ddd3b40216cf46b1ccbe5e42e5fc4d6577a411680babd9c6faa3434d6ed1e8
 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 e0fbc8927e0d..90d69ebfce64 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 f97c59f7460d..c0d657637f70 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-05-15 13:19:56 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-05-15 13:19:56 +0100
commit	d302a5d7fc9caafba5c8a404f2891bb6ccdec311 (patch)
tree	2a3ee43f080d1d0086964de8c29ccf1021fdfda7 /dev-lang
parent	ea31ad0ed5501d0bf92267c35beaf06ac016bad2 (diff)