diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3d5e5559d9e0..a06578573f3e 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7cc21a823f15..7cfdc5743af9 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index dac92b5672db..34c545c90fe8 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,6 +1,5 @@
-DIST puppet-3.8.7.tar.gz 2650247 BLAKE2B 20728a12c9c123f4a366ee89b25235fd73215a764ebe7fbd5f618d99f8db06935845778d3759722ccaf6f6a68536ea6de34a413824afba777d72e11d0543e864 SHA512 f86568d4f33c8c18da270e089e1274ce2e3c705c116b078531bb66656f0bbb9a2fc95effbb8bf5355a082d4f32ce5b44e7f6e316937164aa0d71dd47e654c618
 DIST puppet-4.10.1.tar.gz 2954351 BLAKE2B 6cf8ac28d8c09f4b82956b3fc8ebc17c0ec35c77818797e5101d03e099850b75fcfa35ec19bd351bcb51fb1d5071541f4f2b8b3be9eada3d21c00c8d8108aa95 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032
-DIST puppet-4.10.6.tar.gz 2977099 BLAKE2B fea4ece994c9ee639bdc4a079760b04286e8d9804dc502c7598add658cd7abc975d74fcce49dc63223a6696565e8be6f6a2c495bf4cf40aded314d36f1ce839e SHA512 f983005d161bbd5fb81dfd15a32cb0ae2417557bd4faa1a62d2fb10fffa55c91ea29c1577785af9642a2878c78405ab99c7e6ee4268fcedcc107c07a0a5bfdd1
 DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d
+DIST puppet-4.10.9.tar.gz 2981668 BLAKE2B 315c39953c2ba70b547fd7a393c7be0bd3c387bd52e3f383a932ebc03f9d96c17d988d53b15bcb8d08bc22ebcaf1c9c5cff00f9c34d730e231417565aad5311f SHA512 0ac70f716a602b15d28504cc594c5a0d4f8005083de6751c682dc9180feca68148d942353a63e16aaa2e783e6ebe90b8f77b0b033c671a5134bcbcdff36a3204
 DIST puppet-5.1.0.tar.gz 2734018 BLAKE2B d4169fee328710b7685de2606196de68e21ca31f9a9945bdd84255f5185fd2d95c6543a7b88b5130f1f01e60e04294664de71a8ccd1319c2e0bebf4d031e6225 SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15
 DIST puppet-5.3.3.tar.gz 2843386 SHA256 45360f64fe0375df617571d58e929515e2094daa1d0dc78e2b6718d7cbeaf18e SHA512 b5bb9ac4059855c7cac624ea0fdc2c3366cea82bf07bee195a179a0a709fa53e7fffe883e581c1e07a64705a638b156288301227f7334226ddc401a9bf770afe WHIRLPOOL 19c8511ba58186692ee0ace02158c16529715cc213f0eb7266bb078a10db6e698081edc4b3e0735f1e79fb568066cc6f1699d0b1a954a29d74d1a91f393130fa
diff --git a/app-admin/puppet/puppet-3.8.7-r1.ebuild b/app-admin/puppet/puppet-3.8.7-r1.ebuild
deleted file mode 100644
index f7e608e5bbfa..000000000000
--- a/app-admin/puppet/puppet-3.8.7-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=dev-ruby/rgen-0.7.0
-	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
-	dev-ruby/json
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-DEPEND="${DEPEND}
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )"
-RDEPEND="${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Fix compatibility with ruby22 and later. Psych has been the 
-	# default YAML engine since ruby 2.0 and ruby22 and later no longer 
-	# define YAML::ENGINE at all.
-	sed -i -e '/YAML_ENGINE =/ s/syck/psych/' lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
-
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# Avoid Rails specs to avoid this dependency and because they
-	# currently fail against Rails 4.1.
-	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
-	rm -r spec/unit/rails || die
-	rm spec/unit/parser/collector_spec.rb || die
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-all_ruby_compile() {
-	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el
-	fi
-
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs
-		cp ext/emacs/* ext/xemacs/
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	#${RUBY} install.rb --destdir="${D}" install || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	#systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	newinitd "${FILESDIR}"/puppet.init-r1 puppet
-
-	# Initial configuration files
-	insinto /etc/puppet
-
-	# Location of log and data files
-	keepdir /var/log/puppet
-	fowners -R puppet:puppet /var/log/puppet
-
-	if use minimal ; then
-		rm "${ED}/etc/puppet/auth.conf"
-	else
-		insinto /usr/lib/systemd/system
-		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
-		newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
-		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-		insinto /etc/puppet
-
-		keepdir /etc/puppet/manifests
-		keepdir /etc/puppet/modules
-
-		keepdir /var/lib/puppet/ssl
-		keepdir /var/lib/puppet/facts
-		keepdir /var/lib/puppet/files
-		fowners -R puppet:puppet /var/lib/puppet
-		fperms 0750 /var/lib/puppet
-	fi
-	fperms 0750 /etc/puppet
-	fowners :puppet /etc/puppet
-
-	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	if [ \
-		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
-	] ; then
-		elog
-		elog "Please remove deprecated config files."
-		elog "	/etc/puppet/puppetca.conf"
-		elog "	/etc/puppet/puppetd.conf"
-		elog "	/etc/puppet/puppetmasterd.conf"
-		elog
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "2" ]; then
-			elog
-			elog "If you're upgrading from 2.x then we strongly suggest you to read:"
-			elog "http://docs.puppetlabs.com/guides/upgrading.html"
-			elog
-		fi
-	done
-
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-4.10.6.ebuild b/app-admin/puppet/puppet-4.10.6.ebuild
deleted file mode 100644
index 90ba147596df..000000000000
--- a/app-admin/puppet/puppet-4.10.6.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
-IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl"
-
-# ruby_add_bdepend "
-# 	test? (
-# 		dev-ruby/mocha:0.14
-# 		=dev-ruby/rack-1*
-# 		dev-ruby/rspec-its
-# 		dev-ruby/rspec-collection_matchers
-# 		>=dev-ruby/vcr-2.9:2
-# 		>=dev-ruby/webmock-1.24:0
-# 	)"
-
-DEPEND+=" ${DEPEND}
-	xemacs? ( app-editors/xemacs )"
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	if use experimental; then
-		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
-	fi
-
-	# Use working version of mocha
-	sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing specs that need further investigation.
-	sed -i -e '/should resolve external facts/,/^    end/ s:^:#:' \
-		spec/integration/indirector/facts/facter_spec.rb || die
-	sed -i -e "/describe 'cfacter'/,/^  end/ s:^:#:" spec/unit/defaults_spec.rb || die
-	rm -f spec/unit/indirector/ldap_spec.rb \
-		spec/unit/parser/functions/create_resources_spec.rb || die
-
-	# Avoid specs that rely on tools from other OSs
-	rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
-	   spec/unit/provider/user/directoryservice_spec.rb || die
-
-	# Avoid specs that depend on hiera-eyaml to avoid circular
-	# dependencies
-	rm -f spec/unit/functions/lookup_spec.rb || die
-
-	# Avoid specs that fail due to an unpackaged file
-	sed -i -e '/when loading pp resource types using auto loading/,/^  end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
-}
-
-all_ruby_compile() {
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs
-		cp ext/emacs/* ext/xemacs/
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "3" ]; then
-			elog
-			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-			elog "/etc/puppetlabs/puppet"
-			elog "Also, puppet now uses config directories for modules and manifests."
-			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-			elog "for more information."
-			elog
-		fi
-	done
-
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use xemacs && xemacs-elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-4.10.6-r1.ebuild b/app-admin/puppet/puppet-4.10.9.ebuild
similarity index 97%
rename from app-admin/puppet/puppet-4.10.6-r1.ebuild
rename to app-admin/puppet/puppet-4.10.9.ebuild
index 62e5e757fb54..1c317f21c78d 100644
--- a/app-admin/puppet/puppet-4.10.6-r1.ebuild
+++ b/app-admin/puppet/puppet-4.10.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 #RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -17,12 +17,14 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64"
 IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
 RESTRICT="test"
 
 ruby_add_rdepend "
-	dev-ruby/hiera
+	>=dev-ruby/gettext-setup-0.10:0
+	>=dev-ruby/hiera-2.0
+	>=dev-ruby/locale-2.1
 	>=dev-ruby/rgen-0.6.5
 	dev-ruby/json:=
 	>=dev-ruby/facter-3.0.0
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index aebfff397683..52b45d0c42a4 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index eba9dc20362e..34d12fa9c6a5 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,2 +1,2 @@
-DIST ccid-1.4.26.tar.bz2 628038 SHA256 3267bf708ab780c02f01f6241b7c7277cb892d30fd1179a9926a8cc0ca40be2f SHA512 4a2e5e9412f2aa4870e14114e54da96fd8b3418ea6d3a236b83e19d6349adb20a94ef7f48628c108f8459f008c10b0606bbf4d797ae4be9183e1acde032c618c WHIRLPOOL 7118e57ca9a394de3b37166bb2c4f4d398fdf744caa0803ef9f1470db7020d999f795ca816a5a70db2b59b64db7225df2dd9366fd329ca34d52b5e4611fd5d21
-DIST ccid-1.4.27.tar.bz2 632817 SHA256 a660e269606986cb94840ad5ba802ffb0cd23dd12b98f69a35035e0deb9dd137 SHA512 14fb5d9878ed36de912d860d8537758170781f225957a99d5fed447dcfba0cba3133f78d2cc4bc7db60d3527399f70e4a7d1d1f8348fb50d1bcfc75820a23522 WHIRLPOOL 062ebe1be40ad09865db642c763cf32cc471b860df66072fe5e98c4b3b5a5efced7b2aeba1001a635231adaf9569e3e4fc2746ad9ebaa921b62302a0ebcf2273
+DIST ccid-1.4.26.tar.bz2 628038 BLAKE2B ba0cc8aa92a7b960d12e0ebfba79910c84eff11815495bda76287bacb7638093270eb2b5bc502c67b1a789a6bef19deac338312b044d74f6f7348adebd2a621e SHA512 4a2e5e9412f2aa4870e14114e54da96fd8b3418ea6d3a236b83e19d6349adb20a94ef7f48628c108f8459f008c10b0606bbf4d797ae4be9183e1acde032c618c
+DIST ccid-1.4.27.tar.bz2 632817 BLAKE2B a18de0594c9535c4564bc27886fc69a0edc54343941d77b9558f331a932d12d2b58303ae3994337e380f16648f7bb2a8aa90c00aae4c7cffe242e000003c5dcd SHA512 14fb5d9878ed36de912d860d8537758170781f225957a99d5fed447dcfba0cba3133f78d2cc4bc7db60d3527399f70e4a7d1d1f8348fb50d1bcfc75820a23522
diff --git a/app-crypt/ccid/ccid-1.4.27.ebuild b/app-crypt/ccid/ccid-1.4.27.ebuild
index 82c0a08d4cd1..974b4b431a25 100644
--- a/app-crypt/ccid/ccid-1.4.27.ebuild
+++ b/app-crypt/ccid/ccid-1.4.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.b
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d530c0b0a8c0..52a98dd36ba4 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/mc/files/mc-4.8.19-selected-size.patch b/app-misc/mc/files/mc-4.8.19-selected-size.patch
new file mode 100644
index 000000000000..06d6f46ff325
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.19-selected-size.patch
@@ -0,0 +1,30 @@
+From 069306eb2e7174f431bd3eecbc8f489f9652b782 Mon Sep 17 00:00:00 2001
+From: Andrew Borodin <aborodin@vmail.ru>
+Date: Sat, 2 Dec 2017 14:39:50 +0300
+Subject: [PATCH] Ticket #3883: size_trunc_sep() breaks on multibyte locales.
+
+The bug was introduced in b3867a6e154420833d6a1117f556b9ab2d64c6ab.
+
+Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+---
+ lib/util.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/util.c b/lib/util.c
+index 0326f65e8..c23d91fba 100644
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -383,7 +383,9 @@ size_trunc_sep (uintmax_t size, gboolean use_si)
+     p += strlen (p) - 1;
+     d = x + sizeof (x) - 1;
+     *d-- = '\0';
+-    while (p >= y && (isalpha ((unsigned char) *p) || (unsigned char) *p == ' '))
++    /* @size format is "size unit", i.e. "[digits][space][letters]".
++       Copy all charactes after digits. */
++    while (p >= y && !g_ascii_isdigit (*p))
+         *d-- = *p--;
+     for (count = 0; p >= y; count++)
+     {
+-- 
+2.15.1
+
diff --git a/app-misc/mc/mc-4.8.20.ebuild b/app-misc/mc/mc-4.8.20-r1.ebuild
similarity index 98%
rename from app-misc/mc/mc-4.8.20.ebuild
rename to app-misc/mc/mc-4.8.20-r1.ebuild
index cb720f326c5f..1a2e5e3918ae 100644
--- a/app-misc/mc/mc-4.8.20.ebuild
+++ b/app-misc/mc/mc-4.8.20-r1.ebuild
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.13-tinfo.patch
+	"${FILESDIR}"/${PN}-4.8.19-selected-size.patch
 )
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ed542d37717d..8a6161375d47 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 3c97af073682..bc12592bf012 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,4 +1,3 @@
-DIST cpuid2cpuflags-3.tar.bz2 70130 SHA256 779314786ceb347e69f150becd54b97b9f18a1d7e06ca88b7b112a44e00d116c SHA512 65fb0a845a480977a64566d5e3a3700af60f96252eef6d26273afc43484a2289cdb311fcfc1cee60e684be15e167c796e901b68a2a981f6b9c02c8055daddc71 WHIRLPOOL 9036563c9ce80896640f4fee6a35dfbc936521abbe2b9d79b951af5e9218f161d35b9ab3dc68e1f685f8d000c13c0c649c66c84c132d65c88127e701db084910
 DIST cpuid2cpuflags-4.tar.bz2 71216 SHA256 e8d911d06852ffa860ad175235f78aa8beb009ecb26d1809cd6c3fd253dbba4a SHA512 0f8a078a605687af9be0152d530dabfa7636827005747a5cce399103eec34f96216b4417e06472821aceecdca737a6ee106b63f056f221d6f2a3050bc3a03f6b WHIRLPOOL e887c998d0b5b4ffa9956c76f3853d4d695acc6eafaa4e94484ce3c895399a78e98eb91fb918a7df5e2cc07c6e28ea100725bf0b28af23cd082f6e719a62b74b
+DIST cpuid2cpuflags-5.tar.bz2 72050 BLAKE2B e9b7022ae5b7d51c88b5e41d9d7af1175498cb5a1f32876bfb766f785060f501d07ba3a5c346961e742bbf7022121faf3d0d068ec711ee9ed4e67cbdcd72a58a SHA512 41dcd2b974f6bd96867dea15a3839a8d63a3ff600189107ab16a67b5bc77ef421acbedb83f3e3b16ec90ac900d187aa8c44baae6fbdb4988f3bf7caa2d0d19a2
 DIST cpuinfo2cpuflags-1.tar.gz 1429 SHA256 aaa4b80568936acc4b2798f62254a5170328c862cadc70b22cd10e4e6716bbcc SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede WHIRLPOOL 57c66d7eddbf6245735f037980a3d7a685dbccc11bba7e7dd0e1290a77960f17cdb81f161c012abc0eec213b951709df8d7677f0034d5b083bc6f45be1386ad8
-DIST cpuinfo2cpuflags-2.tar.bz2 68939 SHA256 a8779df6fbd5f7d3b92580b0b73242a209bedd4e8204ea04d1d811e1ca6d5cba SHA512 672042112e6430edb0dbfd82d3de2088324544e7bcd81b1c3376d5a85b5f7da91b0e1c92d00d575adb861091b33de599a05edc9a75d0ef76a253ca077276127c WHIRLPOOL f64c040a4a6b8c193447d6c01aa2ba18af5c1232c6a7b0f9f794f5792c39d7c4288c190d135f2c80475dbf5fc3f187496edab4861209209311cdcd0e4218c7d8
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-2.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-2.ebuild
deleted file mode 100644
index e2535eee58b5..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=cpuinfo2cpuflags-${PV}
-DESCRIPTION="Tool to guess CPU_FLAGS_X86 flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-3.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
similarity index 88%
rename from app-portage/cpuid2cpuflags/cpuid2cpuflags-3.ebuild
rename to app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
index 7aec3c15788b..318806faa56c 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-3.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 pkg_postinst() {
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 54a5bd5f901b..d1820d4f2239 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 3367df31941f..d35aeda6752c 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1 +1,2 @@
-DIST ansifilter-2.8.1.tar.bz2 436461 SHA256 65556f76c234e709e9c3d326042e88a769ebf456c2fbbc5e32ffb247214fc6c6 SHA512 f736b1e9d975a17431a19c2a889ede1feab6b8967d6981fa08d4d1a541cdc1478258dbf6173b7d00f9aa476cf79cfd1c7321c9d017a8aa6ad7ac9133b33a0830 WHIRLPOOL 233edb50e9ed1e1116a1a5875bce4ddd197b9d0b5cadc490d07b3f0b62c9e0de28eba3ac8e06846f58d4cbb2359d621d268eeec19c2e0c894390ef7bd71ca1b8
+DIST ansifilter-2.8.1.tar.bz2 436461 BLAKE2B f4b059ed7c8cb2823c9793cffd49193160295b1be0a25981464979add2759116d62b7a938c599eb3a45ea7f647f2293f9bd67883e4b2010ff395d24d6bea9da5 SHA512 f736b1e9d975a17431a19c2a889ede1feab6b8967d6981fa08d4d1a541cdc1478258dbf6173b7d00f9aa476cf79cfd1c7321c9d017a8aa6ad7ac9133b33a0830
+DIST ansifilter-2.9.tar.bz2 455885 BLAKE2B 0865e17f45d16657e78444e65bcde07f74ee9d8605e100ef34354fc874210fa6cc4d01162e234bfca9c486fac3c41be0d1e0caa014d9702d4a90798b1fa85636 SHA512 9fd086d9b5fecb7c1d42f96baa728b2b6c155505bfb42f92c1a79ce59571abff541c7d55e14b159ad0e7890434fdbc1b383bc76ab4c22a16d835e270b6095005
diff --git a/app-text/ansifilter/ansifilter-2.9.ebuild b/app-text/ansifilter/ansifilter-2.9.ebuild
new file mode 100644
index 000000000000..a4c7a3b32c73
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs qmake-utils
+
+DESCRIPTION="Handles text files containing ANSI terminal escape codes"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt5"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# bug 431452
+	rm src/qt-gui/moc_mydialog.cpp || die
+}
+
+src_configure() {
+	if use qt5 ; then
+		pushd src/qt-gui > /dev/null || die
+		eqmake5
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
+
+	if use qt5 ; then
+		pushd src/qt-gui > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	dobin src/${PN}
+	use qt5 && dobin src/qt-gui/${PN}-gui
+
+	gunzip man/${PN}.1.gz
+	doman man/${PN}.1
+	einstalldocs
+}
diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
index 829479ad994d..354c82d0cc3f 100644
--- a/app-text/enchant/enchant-1.6.1.ebuild
+++ b/app-text/enchant/enchant-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test zemberek"
 REQUIRED_USE="|| ( hunspell aspell zemberek )"
diff --git a/app-text/iso-codes/iso-codes-3.75.ebuild b/app-text/iso-codes/iso-codes-3.75.ebuild
index a9f1403a6644..f8487e07c155 100644
--- a/app-text/iso-codes/iso-codes-3.75.ebuild
+++ b/app-text/iso-codes/iso-codes-3.75.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2ebfb38de6b9..74a3f8f57443 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch
deleted file mode 100644
index 7f6d82eb00db..000000000000
--- a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- CMakeLists.txt.old	2014-10-10 21:14:47.139654992 +0200
-+++ CMakeLists.txt	2014-10-10 21:16:17.114656451 +0200
-@@ -90,8 +90,12 @@
-     )
- 
- add_subdirectory(src)
-+
-+option(BUILD_TESTS "Build tests for qt4" ON)
- if (NOT USE_QT5) # TODO port tests to Qt5
--add_subdirectory(tests)
-+	if(BUILD_TESTS)
-+		add_subdirectory(tests)
-+	endif(BUILD_TESTS)
- endif()
- add_subdirectory(tools)
- 
diff --git a/dev-libs/libgee/libgee-0.20.0.ebuild b/dev-libs/libgee/libgee-0.20.0.ebuild
index 6b031fed14ca..d05495cbbdf5 100644
--- a/dev-libs/libgee/libgee-0.20.0.ebuild
+++ b/dev-libs/libgee/libgee-0.20.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sh sparc ~x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 0e92c74df13e..27d5f2cceb03 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,3 +1,4 @@
 DIST libgit2-glib-0.24.4.tar.xz 458360 SHA256 3a211f756f250042f352b3070e7314a048c88e785dba9d118b851253a7c60220 SHA512 55874f77ded1474eab6f84d3426c8cddd56a42b04b8b3e50e4294f396b8c10025a38bc925c0b74ba3e52022c696f07e7f69b75c443bbd0af0f9e0769b7c4555f WHIRLPOOL 22a17e940a670ccb31cf0fc229b8f042794e10e7c5996d4059779d3a7b2ab5865b9cf1bc1a32a9297e88e5b069b281e7f20b2db636f91d5f8af9df8f14d23346
 DIST libgit2-glib-0.25.0.tar.xz 420500 SHA256 4a256b9acfb93ea70d37213a4083e2310e59b05f2c7595242fe3c239327bc565 SHA512 f265d5da4bba28de2aa7254d36fa596b9e348c6543cd559cbb9c1f9610d4b63af00c82fb4138f345e15109503e0d61101d3344c68539348cb268403387a4418e WHIRLPOOL beb276d2637edca19a96f7eca94bc8b318b31e6c014044e7526c9c397ec376dea38891eb0985351899ad26de1436f4713e3ac0d708966e4e41d41d516208072f
 DIST libgit2-glib-0.26.0.tar.xz 420404 SHA256 06b16cfcc3a53d9804858618d690e5509e9af2e2245b75f0479cadbbe39745c3 SHA512 322f99b6273f0e56fcccdccd3b1193e1b62ca9dd495144e7c5fc59520dd693b1ceea4bab7335de1201ab09ecd7e146daa86afd9256d16649c144adb0b6de97c6 WHIRLPOOL 2bee4c44eae4ac01abd65d1b9a48069a60b749e86101d1df483a5b13a0aa3380756bb083b33801b4787ed384bc7fa7ed5de53271a7dcc95b09fa7f296b5060c1
+DIST libgit2-glib-0.26.2.tar.xz 421956 BLAKE2B d38698f00d85b484d17078e78ad051a4c068b87df73fcf4d7b852dc6966628580cc4e5b3899a6edd5dc29fb47ef97ebe2c458992701b7642549f3e411d917dc5 SHA512 35fb3ec7a3757212f53cc884760f69725beff8462018b8e716fad389ba57d1acba99ece0fcd148ff40dc63e1fc7e7d566fe84759bd88d3a0ff9fdf970b0a5563
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
new file mode 100644
index 000000000000..2a3ed8af6ae2
--- /dev/null
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 python-r1 vala
+
+DESCRIPTION="Git library for GLib"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="python +ssh +vala"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Specify libgit2 dependency with subslot because libgit2 upstream has a habit
+# of changing their API in each release in ways that break libgit2-glib
+RDEPEND="
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libgit2-0.26.0:0/26[ssh?]
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable python) \
+		$(use_enable ssh) \
+		$(use_enable vala)
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python ; then
+		install_gi_override() {
+			python_moduleinto "$(python_get_sitedir)/gi/overrides"
+			python_domodule "${S}"/${PN}/Ggit.py
+		}
+		python_foreach_impl install_gi_override
+	fi
+}
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index b0a26ad9875f..736b15a941b4 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,3 +1,3 @@
-DIST pcre2-10.22.tar.bz2 1470620 SHA256 b2b44619f4ac6c50ad74c2865fd56807571392496fae1c9ad7a70993d018f416 SHA512 dcf70b5e5b73f29188a56e4d9efb9afdf2b9ebe50e13a7640b80f543851235a289e476e1f517f49fac9628b456268bcdaf2b492237bc879ddff36f84ef4f32ea WHIRLPOOL 154ee1c4d2445878c2d2fd1eafa96584d8c943e9e545937b37d4c1fb12ba847938647184723d429244bf5aa989ba335cfbf74fadb5d38227862762bd34166232
+DIST pcre2-10.22.tar.bz2 1470620 BLAKE2B d968869db31cb9b0d93586227e6b44ecab57dea625108a386bf6bf8cb007c17f83e0b427744eaa6b4d6a1f6a7f344ee0aed29726bb51d077ff51889e68faf072 SHA512 dcf70b5e5b73f29188a56e4d9efb9afdf2b9ebe50e13a7640b80f543851235a289e476e1f517f49fac9628b456268bcdaf2b492237bc879ddff36f84ef4f32ea
 DIST pcre2-10.23.tar.bz2 1515314 SHA256 dfc79b918771f02d33968bd34a749ad7487fa1014aeb787fad29dd392b78c56e SHA512 3e5910bd2405cc35934d91e4be760abe4f2e900202a20b6ba74adb7a3acb2b74b3bf9b0e97e8de10f8e8534133e0722e0bf0f5fb40d6c2c4520d1ed61749d456 WHIRLPOOL 8db3deb22c26688607e1dc4b52229c64f8bcbb80908155ff9bd58b690a239984b6f5d1aff0cdc70efa3abf3ee899e22ea6e3a502437af424cb92d345133889a6
-DIST pcre2-10.30.tar.bz2 1583543 SHA256 90bd41c605d30e3745771eb81928d779f158081a51b2f314bbcc1f73de5773db SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e WHIRLPOOL 4491d5ea682ee90dad91f5b1a3dccf482c17768ea5de3c5cca2fa2b56ba97180b746242e552fbe240b154f98eac5b11da466b86d34e9bfe7c7a202d4c976172f
+DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
diff --git a/dev-libs/libpcre2/libpcre2-10.30.ebuild b/dev-libs/libpcre2/libpcre2-10.30.ebuild
index 5e9a3da42808..0cb030245022 100644
--- a/dev-libs/libpcre2/libpcre2-10.30.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.30.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
index ce70d3d242e7..7e165b94f439 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 0e6c13b0e29d..35dd1a5a42f4 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -5,3 +5,4 @@ DIST libuv-1.14.1.tar.gz 1157777 BLAKE2B 5abaaafe0568aadb7bc091970cb552c093fe4e6
 DIST libuv-1.15.0.tar.gz 1158746 BLAKE2B 7ae636fd04419a423ffc6cd1b5f888b136de71643c9b24bb11625678ebbfdf013b50a49da6675db455de59ffdc99f51d77cf62e8d970cecd833360bd67d72ac7 SHA512 46b9feb3959e73521f9e499881799c961db3ff1dcdd780537e774dfaf6145430cb98e9558cf3110624fa35a7117350868afdcccb30abf275f7648f11b3de4afa
 DIST libuv-1.16.1.tar.gz 1165502 BLAKE2B 07f77f0f9f53caf44962c7ca5e107e6c71c7f656ea22c423e2af1ca56b9b6de56f0afd597a490e22f78a2459f8f2eb0b3418411040ef2bbceae7e55cca4710c0 SHA512 e75c735467c5fc1681bee2b4f4ffae63116644309016d0f507b37643697ae8c85b3be7309288b1aca8fa11c6cb1dc1873962d1dc18fa3ed8cb66c8d2514c95e6
 DIST libuv-1.17.0.tar.gz 1167930 BLAKE2B 2e38e400d312005f94ad671203b82794f96e5802117fe6577d04951687310a95098ad8d352add67fd356479fa6c63b7b7027f109a77987e7626d3f77a34b19e7 SHA512 274615dd67808a7b7481184aa9c1650f7646ffe714c5304ea123e287eb09cad2a4c677ac06ae68b7d0e70071545954aa6a80414cd7e37c242a2533563094870c
+DIST libuv-1.18.0.tar.gz 1167950 BLAKE2B 2c40adbc2c98ffdd3a8a9c30f90eb90e6b0ad16b23935e43d1e19c53238f1a57e422f6f9a3e00374283c4187faa65e13c3e1546ead3ff1fd8e30d98340947078 SHA512 d1ef70b0f060f40cf57b282279d1d63d6dd019b4b811211b2252db32633a80af46290d201b4a4338f84b3efdfe9754a11b29bfa4a7636b06540b1a65e1fd4fbc
diff --git a/dev-libs/libuv/libuv-1.18.0.ebuild b/dev-libs/libuv/libuv-1.18.0.ebuild
new file mode 100644
index 000000000000..2db9dd2b54c8
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.18.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libxml2/libxml2-2.9.6.ebuild b/dev-libs/libxml2/libxml2-2.9.6.ebuild
index 779a5ef5f5fc..5fdd0fabd09c 100644
--- a/dev-libs/libxml2/libxml2-2.9.6.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 0d927d3ce6dc..7c4fd3bf5edc 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,2 +1,2 @@
 DIST libxslt-1.1.29.tar.gz 3428524 BLAKE2B e37cc4a79223c2c2b78dc2bbc0bdb502e7c9ac0e5e1f6dc1ad15a14fda3c26d5c92e7354141763eeb97f489b64af99a2c7da320405b6011195a95c11705e7f2a SHA512 a1ce555a74a9dabe65e8f64bb66e27e77760fd76940d88f2d59f58dd63ca73c8ae59f3fcbd8e76c8f92ff992fb0c09328528c20ea38ccac83e63252106bf5f31
-DIST libxslt-1.1.30.tar.gz 3444029 SHA256 ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986 WHIRLPOOL 7a346a1cdd340f6ee39b4d8d426dd894164ce4b8c55ee74b832cdcc9e7bb7bd2e13fdabb57a50a206c40be8bf238a57132bd1cf6fe48e77c710d8ec75f1aaffc
+DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986
diff --git a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
index 7e9ea36a3cd8..f520d1264f5e 100644
--- a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 4e3d253ab814..67c718d474d5 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,5 +1,3 @@
 DIST ntl-10.5.0.tar.gz 1278729 SHA256 b90b36c9dd8954c9bc54410b1d57c00be956ae1db5a062945822bbd7a86ab4d2 SHA512 b299dfc29005079470972c2a9ca02acd0ebdbc31ff8923df02f3627dbc66daa0f527226972cef032e1e488c4272554634a96456e94653fdf8b01356160319aa0 WHIRLPOOL 270f76a0088c79b506a1e0bfa12cbe06419bb5c0421e7cdb9fcc3ec2bd6b22b4f4c2468bbe73001090db623e8a662d185e181f4390475513b32a388ecca7c3cc
-DIST ntl-5.5.2.tar.gz 707247 SHA256 ef7fe7c8b60ec6e05b2a279caad0081263f7fb68b7360120846644cde726ff56 SHA512 44892e00051ca743b1184c9ae30e62c8e2605edaa394358979ff990a535993a6f282d882871ca9ebb3c632971f806c41d9b8024c8fb2cc6fa0d22bc26c66db06 WHIRLPOOL 4587463c4b52be721a7feb164fab73341af97c6f451c0bb2fbf675503c8a5262a5d7615d628e97f082dde23ce49db0f0b314c625dae0526bb1abdfc88732896f
-DIST ntl-6.1.0.tar.gz 715439 SHA256 e16c30ceef1d47e94b8a37a8c4a1fb58729b8f8449c648e2a96280a3eecf9b6f SHA512 8c013bd4a250c8e29d57864585492be1f392c84356959d8100d5c45b420e411e5cd677524e2d50bbe265dda4c364185395780ba5d8490f6ac46da73c6a9728de WHIRLPOOL cf2a48cfe33cb58d8bda35d4a18d57a20ae23f2ba53f0f757d1bacc58ffa0bfdfd38363db38996e2e4069f5e3f2ad6a3ae9a859437a93404308512652190c765
 DIST ntl-9.3.0.tar.gz 888710 SHA256 8f31508a9176b3fc843f08468b1632017f2450677bfd5147ead5136e0f24b68f SHA512 dfb4ac7a66aaddcf5d0d0c9fcaff253b0196a9d9f727788127dd18e131528fe60dedf8bfb864503225fc5796987aec9c7019b74e0fc12cd12c20aa33a9cf9d7d WHIRLPOOL a1f7cf573d49a277f0b2f1d50d18e66ef83a54430c517fd5d3c75e800216b706e8b5ff10e6ed2dc02b6eb4f9290671b249c67f1937cced96ac987055aaa3ab99
 DIST ntl-9.6.4.tar.gz 915256 SHA256 c4a1f015a879b4a20f6b76a98eb6033a7936b0ff3b3f3ca6159d7e7b2afd89eb SHA512 ec8a4deb6996b31140edff978e07844ea8e30327491a6777d3982bffec01599b0cb5cc5dca297c8610ecb7ac9a4eae3407a59736fed840a2415a52a159370868 WHIRLPOOL 31ab69dc19b206868d1a9ac4f3d1cb52180980e751fe1431b738921b3816998797cf33a0ea9db8e1017e4face98efa897a4e42aa5be58365d1bc12e320a34354
diff --git a/dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch b/dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch
deleted file mode 100644
index fafa97356cd8..000000000000
--- a/dev-libs/ntl/files/ntl-5.5.2-sage-tools.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- include/NTL/tools.h.orig	2008-05-06 22:14:06.000000000 +1200
-+++ include/NTL/tools.h	2008-05-06 22:14:23.000000000 +1200
-@@ -249,6 +249,12 @@
- char IntValToChar(long a);
- 
- 
-+/*
-+  This function is not present in vanilla NTL
-+  See tools.c for documentation.
-+ */
-+void SetErrorCallbackFunction(void (*func)(const char *s, void *context), void *context);
-+
- 
- void Error(const char *s);
- 
---- src/tools.c.orig	2008-05-06 22:15:32.000000000 +1200
-+++ src/tools.c	2008-05-06 22:15:45.000000000 +1200
-@@ -8,8 +8,35 @@
- NTL_START_IMPL
- 
- 
-+/*
-+   The following code differs from vanilla NTL
-+
-+   We add a SetErrorCallbackFunction(). This sets a global callback function _function_,
-+   which gets called with parameter _context_ and an error message string whenever Error()
-+   gets called.
-+
-+   Note that if the custom error handler *returns*, then NTL will dump the error message
-+   back to stderr and abort() as it habitually does.
-+
-+   -- David Harvey (2008-04-12)
-+*/
-+
-+void (*ErrorCallbackFunction)(const char*, void*) = NULL;
-+void *ErrorCallbackContext = NULL;
-+
-+
-+void SetErrorCallbackFunction(void (*function)(const char*, void*), void *context)
-+{
-+   ErrorCallbackFunction = function;
-+   ErrorCallbackContext = context;
-+}
-+
-+
- void Error(const char *s)
- {
-+   if (ErrorCallbackFunction != NULL)
-+      ErrorCallbackFunction(s, ErrorCallbackContext);
-+
-    cerr << s << "\n";
-    abort();
- }
diff --git a/dev-libs/ntl/files/ntl-5.5.2-shared-r1.patch b/dev-libs/ntl/files/ntl-5.5.2-shared-r1.patch
deleted file mode 100644
index 1420f55f3285..000000000000
--- a/dev-libs/ntl/files/ntl-5.5.2-shared-r1.patch
+++ /dev/null
@@ -1,151 +0,0 @@
---- src/DoConfig.orig	2009-05-05 07:46:39.000000000 +0100
-+++ src/DoConfig	2009-08-10 19:24:43.000000000 +0100
-@@ -25,14 +25,16 @@
- 'LDFLAGS_CXX' => '$(LDFLAGS)',
- 'LDLIBS'      => '-lm',
- 'LDLIBS_CXX'  => '$(LDLIBS)',
-+'PICFLAG'     => '-fPIC',
- 'CPPFLAGS'    => '',
- 
--'DEF_PREFIX'  => '/usr/local',
-+'DEF_PREFIX'  => '/usr',
- 
- 'PREFIX'      => '$(DEF_PREFIX)',
- 'LIBDIR'      => '$(PREFIX)/lib',
- 'INCLUDEDIR'  => '$(PREFIX)/include',
- 'DOCDIR'      => '$(PREFIX)/share/doc',
-+'SHMAKE'      => 'non-gld',
- 
- 'GMP_PREFIX'  => '$(DEF_PREFIX)',
- 'GMP_INCDIR'  => '$(GMP_PREFIX)/include',
---- src/mfile.orig	2009-05-05 07:46:39.000000000 +0100
-+++ src/mfile	2009-08-10 20:31:36.000000000 +0100
-@@ -141,6 +146,16 @@
- WIZARD=@{WIZARD}
- # Set to off if you want to bypass the wizard; otherwise, set to on.
- 
-+###############################################################
-+#
-+# New addition for shared library building. With gcc you need to
-+# choose the Position Indepent Code flag. You have a choice of 
-+# -fpic better code but in rare case not available (ppc)
-+# -fPIC slightly slower code but guaranted to work anywhere.
-+#
-+###############################################################
-+
-+PICFLAG=@{PICFLAG}
- 
- #################################################################
- #
-@@ -173,6 +188,8 @@
- 
- OBJ=$(O19)
- 
-+SHOBJ=$(subst .o,.lo,$(OBJ))
-+
- # library source files
- 
- 
-@@ -320,7 +356,7 @@
- LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
- LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
- 
--
-+.SUFFIXES: .lo
- 
- # 'make all' does a complete make, including all setup.
- # It also creates the file 'all', which means you should
-@@ -328,11 +364,11 @@
- # again.
- 
- all:
--	make setup1
--	make setup2
--	make setup3
--	make setup4
--	make ntl.a
-+	$(MAKE) setup1
-+	$(MAKE) setup2
-+	$(MAKE) setup3
-+	$(MAKE) setup4
-+	$(MAKE) ntl.a
- 	touch all
- 
- 
-@@ -378,18 +414,31 @@
- lip.o:	lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
- 	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
- 
-+lip.lo: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_INCDIR) lip.c -o lip.lo
-+
-+
-+
- ctools.o:	ctools.c
- 	$(LCOMP) $(COMPILE) ctools.c
- 
-+ctools.lo: 	 ctools.c
-+	$(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
-+
- 
- GetTime.o: GetTime.c 
- 	$(LCOMP) $(COMPILE) GetTime.c
- 
--
-+GetTime.lo: GetTime.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
- 
- .c.o: 
- 	$(LCOMP) $(COMPILE_CXX) $(GF2X_OPT_INCDIR) $<
- 
-+.c.lo: 
-+	$(LCOMP) $(COMPILE_CXX) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
-+
-+
- .c: 
- @{LSTAT}	$(LINK_CXX) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) #LSTAT
- @{LSHAR}	$(LIBTOOL) --mode=link $(LINK_CXX) -o $@ $< libntl.la #LSHAR
-@@ -403,7 +452,7 @@
- 
- check:
- 	sh RemoveProg $(PROGS)
--	make QuickTest
-+	$(MAKE) QuickTest
- 	./QuickTest
- 	sh RemoveProg QuickTest
- 	sh TestScript
-@@ -460,19 +509,18 @@
- #
- #################################################################
- 
--clobber:	
-+clobber:	clean
- 	rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h  GetTime.c 
- 	rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
--	sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
--	rm -f *.o
--	rm -rf small
-+	sh RemoveProg $(PROGS)
-+	rm -f libntl*.so*
- 	rm -f cfileout mfileout
- 	rm -rf .libs *.lo libntl.la
- 	rm -f all
- 
- clean:
- 	sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
--	rm -f *.o 
-+	rm -f *.o  *.lo
- 	rm -rf small
- @{LSHAR}	- $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
- 
-@@ -549,3 +597,10 @@
- 
- 
- 
-+sharedso: DIRNAME $(SHOBJ)
-+	 $(LINK_CXX) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	 ln -s lib`cat DIRNAME`.so libntl.so
-+
-+shareddylib: DIRNAME $(SHOBJ)
-+	 $(LINK_CXX) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	 ln -s lib`cat DIRNAME`.dylib libntl.dylib
diff --git a/dev-libs/ntl/files/ntl-5.5.2-shared.patch b/dev-libs/ntl/files/ntl-5.5.2-shared.patch
deleted file mode 100644
index 1ddd74507cf5..000000000000
--- a/dev-libs/ntl/files/ntl-5.5.2-shared.patch
+++ /dev/null
@@ -1,166 +0,0 @@
---- src/DoConfig.orig	2009-05-05 07:46:39.000000000 +0100
-+++ src/DoConfig	2009-08-10 19:24:43.000000000 +0100
-@@ -25,14 +25,16 @@
- 'LDFLAGS_CXX' => '$(LDFLAGS)',
- 'LDLIBS'      => '-lm',
- 'LDLIBS_CXX'  => '$(LDLIBS)',
-+'PICFLAG'     => '-fPIC',
- 'CPPFLAGS'    => '',
- 
--'DEF_PREFIX'  => '/usr/local',
-+'DEF_PREFIX'  => '/usr',
- 
- 'PREFIX'      => '$(DEF_PREFIX)',
- 'LIBDIR'      => '$(PREFIX)/lib',
- 'INCLUDEDIR'  => '$(PREFIX)/include',
- 'DOCDIR'      => '$(PREFIX)/share/doc',
-+'SHMAKE'      => 'non-gld',
- 
- 'GMP_PREFIX'  => '$(DEF_PREFIX)',
- 'GMP_INCDIR'  => '$(GMP_PREFIX)/include',
-@@ -87,11 +89,6 @@
- 
- foreach $arg (@ARGV) {
- 
--   if ($arg =~ '-h|help|-help|--help') {
--      system("more ../doc/config.txt");
--      exit;
--   }
--
-    if (($name, $val) = ($arg =~ /(.*?)=(.*)/)) {
-       
-       if (exists($MakeFlag{$name}) && ($val =~ 'on|off')) {
-
-
-
---- src/mfile.orig	2009-05-05 07:46:39.000000000 +0100
-+++ src/mfile	2009-08-10 20:31:36.000000000 +0100
-@@ -141,6 +146,16 @@
- WIZARD=@{WIZARD}
- # Set to off if you want to bypass the wizard; otherwise, set to on.
- 
-+###############################################################
-+#
-+# New addition for shared library building. With gcc you need to
-+# choose the Position Indepent Code flag. You have a choice of 
-+# -fpic better code but in rare case not available (ppc)
-+# -fPIC slightly slower code but guaranted to work anywhere.
-+#
-+###############################################################
-+
-+PICFLAG=@{PICFLAG}
- 
- #################################################################
- #
-@@ -173,6 +188,8 @@
- 
- OBJ=$(O19)
- 
-+SHOBJ=$(subst .o,.lo,$(OBJ))
-+
- # library source files
- 
- 
-@@ -320,7 +356,7 @@
- LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
- LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
- 
--
-+.SUFFIXES: .lo
- 
- # 'make all' does a complete make, including all setup.
- # It also creates the file 'all', which means you should
-@@ -328,11 +364,11 @@
- # again.
- 
- all:
--	make setup1
--	make setup2
--	make setup3
--	make setup4
--	make ntl.a
-+	$(MAKE) setup1
-+	$(MAKE) setup2
-+	$(MAKE) setup3
-+	$(MAKE) setup4
-+	$(MAKE) ntl.a
- 	touch all
- 
- 
-@@ -378,18 +414,31 @@
- lip.o:	lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
- 	$(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
- 
-+lip.lo: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
-+	$(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_INCDIR) lip.c -o lip.lo
-+
-+
-+
- ctools.o:	ctools.c
- 	$(LCOMP) $(COMPILE) ctools.c
- 
-+ctools.lo: 	 ctools.c
-+	$(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
-+
- 
- GetTime.o: GetTime.c 
- 	$(LCOMP) $(COMPILE) GetTime.c
- 
--
-+GetTime.lo: GetTime.c 
-+	$(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
- 
- .c.o: 
- 	$(LCOMP) $(COMPILE_CXX) $(GF2X_OPT_INCDIR) $<
- 
-+.c.lo: 
-+	$(LCOMP) $(COMPILE_CXX) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
-+
-+
- .c: 
- @{LSTAT}	$(LINK_CXX) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS_CXX) #LSTAT
- @{LSHAR}	$(LIBTOOL) --mode=link $(LINK_CXX) -o $@ $< libntl.la #LSHAR
-@@ -403,7 +452,7 @@
- 
- check:
- 	sh RemoveProg $(PROGS)
--	make QuickTest
-+	$(MAKE) QuickTest
- 	./QuickTest
- 	sh RemoveProg QuickTest
- 	sh TestScript
-@@ -460,19 +509,18 @@
- #
- #################################################################
- 
--clobber:	
-+clobber:	clean
- 	rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h  GetTime.c 
- 	rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
--	sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
--	rm -f *.o
--	rm -rf small
-+	sh RemoveProg $(PROGS)
-+	rm -f libntl*.so*
- 	rm -f cfileout mfileout
- 	rm -rf .libs *.lo libntl.la
- 	rm -f all
- 
- clean:
- 	sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
--	rm -f *.o 
-+	rm -f *.o  *.lo
- 	rm -rf small
- @{LSHAR}	- $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
- 
-@@ -549,3 +597,10 @@
- 
- 
- 
-+sharedso: DIRNAME $(SHOBJ)
-+	 $(LINK_CXX) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	 ln -s lib`cat DIRNAME`.so libntl.so
-+
-+shareddylib: DIRNAME $(SHOBJ)
-+	 $(LINK_CXX) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
-+	 ln -s lib`cat DIRNAME`.dylib libntl.dylib
diff --git a/dev-libs/ntl/files/ntl-5.5.2-singular.patch b/dev-libs/ntl/files/ntl-5.5.2-singular.patch
deleted file mode 100644
index 9f0d13140cee..000000000000
--- a/dev-libs/ntl/files/ntl-5.5.2-singular.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/NTL/new.h.orig	2008-05-06 21:56:16.000000000 +1200
-+++ include/NTL/new.h	2008-05-06 21:56:33.000000000 +1200
-@@ -12,7 +12,8 @@
- 
- #include <new>
- 
--#define NTL_NEW_OP new (std::nothrow)
-+// uncommenting std::nothrow makes this ntl work properly with Singular
-+#define NTL_NEW_OP new //(std::nothrow) 
- 
- 
- #else
diff --git a/dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch b/dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch
deleted file mode 100644
index e79731fc2fce..000000000000
--- a/dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- src.orig/src/tools.c	2012-08-06 11:54:53.652334400 +0200
-+++ src/src/tools.c	2012-08-06 11:59:18.183993600 +0200
-@@ -18,8 +18,35 @@
- void (*ErrorCallback)() = 0;
- 
- 
-+/*
-+   The following code differs from vanilla NTL.
-+
-+   We add a SetErrorCallbackFunction(). This sets a global callback function _function_,
-+   which gets called with parameter _context_ and an error message string whenever Error()
-+   gets called.
-+
-+   Note that if the custom error handler *returns*, then NTL will dump the error message
-+   back to stderr and abort() as it habitually does.
-+
-+   -- David Harvey (2008-04-12)
-+*/
-+
-+void (*ErrorCallbackFunction)(const char*, void*) = NULL;
-+void *ErrorCallbackContext = NULL;
-+
-+
-+void SetErrorCallbackFunction(void (*function)(const char*, void*), void *context)
-+{
-+   ErrorCallbackFunction = function;
-+   ErrorCallbackContext = context;
-+}
-+
-+
- void Error(const char *s)
- {
-+   if (ErrorCallbackFunction != NULL)
-+      ErrorCallbackFunction(s, ErrorCallbackContext);
-+
-    cerr << s << "\n";
-    _ntl_abort();
- }
---- src.orig/include/NTL/tools.h	2012-08-06 11:54:52.830333000 +0200
-+++ src/include/NTL/tools.h	2012-08-06 11:59:18.143993600 +0200
-@@ -10,6 +10,7 @@
- 
- #include <cstdlib>
- #include <cmath>
-+#include <cstdio>
- #include <iostream>
- 
- #else
-@@ -252,6 +253,12 @@
- char IntValToChar(long a);
- 
- 
-+/*
-+  This function is not present in vanilla NTL.
-+  See tools.c for documentation.
-+ */
-+void SetErrorCallbackFunction(void (*func)(const char *s, void *context), void *context);
-+
- 
- void Error(const char *s);
- 
diff --git a/dev-libs/ntl/files/ntl-6.0.0-singular.patch b/dev-libs/ntl/files/ntl-6.0.0-singular.patch
deleted file mode 100644
index c172386f3102..000000000000
--- a/dev-libs/ntl/files/ntl-6.0.0-singular.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src.orig/include/NTL/new.h	2012-08-06 17:12:25.658913083 +0200
-+++ src/include/NTL/new.h	2012-08-06 17:11:15.002915713 +0200
-@@ -12,7 +12,8 @@
- 
- #include <new>
- 
--#define NTL_NEW_OP new (std::nothrow)
-+// commenting std::nothrow makes this ntl work properly with Singular
-+#define NTL_NEW_OP new //(std::nothrow) 
- 
- 
- #else
diff --git a/dev-libs/ntl/ntl-5.5.2.ebuild b/dev-libs/ntl/ntl-5.5.2.ebuild
deleted file mode 100644
index c51e4b8d11db..000000000000
--- a/dev-libs/ntl/ntl-5.5.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/gmp-4.3
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# enable compatibility with singular
-	epatch "$FILESDIR/${P}-singular.patch"
-	# implement a call back framework (submitted upstream)
-	epatch "$FILESDIR/${P}-sage-tools.patch"
-	# sanitize the makefile and allow the building of shared library
-	epatch "$FILESDIR/${P}-shared.patch"
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-		NTL_STD_CXX=on NTL_GMP_LIP=on NTL_GF2X_LIB=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2 || die "emake setup failed"
-	emake setup3 || die "emake setup failed"
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs || use test; then
-		emake ntl.a  || die "emake static failed"
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg} || die "emake shared failed"
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a || die "installation of static library failed"
-	fi
-	dolib.so lib*$(get_libname) || die "installation of shared library failed"
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL || die "installation of the headers failed"
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt || die
-		dohtml doc/* || die
-	fi
-}
diff --git a/dev-libs/ntl/ntl-6.1.0.ebuild b/dev-libs/ntl/ntl-6.1.0.ebuild
deleted file mode 100644
index d09a697040fa..000000000000
--- a/dev-libs/ntl/ntl-6.1.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs eutils multilib flag-o-matic
-
-DESCRIPTION="High-performance and portable Number Theory C++ library"
-HOMEPAGE="http://shoup.net/ntl/"
-SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
-IUSE="doc static-libs test"
-
-RDEPEND=">=dev-libs/gmp-4.3
-	>=dev-libs/gf2x-0.9"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# fix parallel make
-	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
-	cd ..
-	# enable compatibility with singular
-	epatch "$FILESDIR/${PN}-6.0.0-singular.patch"
-	# implement a call back framework (submitted upstream)
-	epatch "$FILESDIR/${PN}-6.0.0-sage-tools.patch"
-	# sanitize the makefile and allow the building of shared library
-	epatch "$FILESDIR/${PN}-5.5.2-shared-r1.patch"
-	replace-flags -O[3-9] -O2
-}
-
-src_configure() {
-	perl DoConfig \
-		PREFIX="${EPREFIX}"/usr \
-		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-		NTL_STD_CXX=on NTL_GMP_LIP=on NTL_GF2X_LIB=on \
-		|| die "DoConfig failed"
-}
-
-src_compile() {
-	# split the targets to allow parallel make to run properly
-	emake setup1 setup2 || die "emake setup failed"
-	emake setup3 || die "emake setup failed"
-	sh Wizard on || die "Tuning wizard failed"
-	if use static-libs || use test; then
-		emake ntl.a  || die "emake static failed"
-	fi
-	local trg=so
-	[[ ${CHOST} == *-darwin* ]] && trg=dylib
-	emake shared${trg} || die "emake shared failed"
-}
-
-src_install() {
-	if use static-libs; then
-		newlib.a ntl.a libntl.a || die "installation of static library failed"
-	fi
-	dolib.so lib*$(get_libname) || die "installation of shared library failed"
-
-	cd ..
-	insinto /usr/include
-	doins -r include/NTL || die "installation of the headers failed"
-
-	dodoc README
-	if use doc ; then
-		dodoc doc/*.txt || die
-		dohtml doc/* || die
-	fi
-}
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index c5bffa1d1e04..336be24d378d 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -1,3 +1,2 @@
-DIST ppl-0.12.1.tar.bz2 14938132 SHA256 4022e54772f81c8ef66d3dd4c3d8dca48f72f9af614d8a36d05fbf5917f2b198 SHA512 e8a4c92271f608e79c5828c71ff2d36c681dd4bd48b5d31353b2a27bcf827a5cb8f0dcdfee3e13cf9f202f35a7693ddf9880dc4d5b8445ec558cef1319f43925 WHIRLPOOL 6616253d5c02c84294ec63e0601fa7bc65772fc72e6cea68f1300fa2b46f551311589813268d8e869cb59295d8fdc5be17a5b3d0cbb7b62fe0bc06a8bf9e1f39
 DIST ppl-1.1.tar.xz 14734820 SHA256 c48ccd74664ec2cd3cdb5e37f287974ccb062f0384dc658d4053c424b19ad178 SHA512 ae0503fb3eac494fa3edf5d5c9ec61e2419e6e2fa57d30323f7d0360ff080b033686410c7462f5b2ff5514803451cb91e9c0fc14cf953485c5f5fd664448cc27 WHIRLPOOL d1b85fe9b44195f7fdc0573b32291a70183ce9de5e29fbb502a5d181a6e0ae11998dd5cfb52ec7ce3e1aed36433a823484488bfaf93362ac3b45a7556a2e9b6a
 DIST ppl-1.2.tar.xz 14136236 SHA256 691f0d5a4fb0e206f4e132fc9132c71d6e33cdda168470d40ac3cf62340e9a60 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350 WHIRLPOOL cf2d5895d7d740c650707840caadd45d785411875b1c55db141928a288a1475f50d4f1e6ac829062ab021a920e9581be7822679e9cf2ea11dc64ac70cfa2e5dd
diff --git a/dev-libs/ppl/files/ppl-fix-gmp-5.1.0.patch b/dev-libs/ppl/files/ppl-fix-gmp-5.1.0.patch
deleted file mode 100644
index ff2423e93c79..000000000000
--- a/dev-libs/ppl/files/ppl-fix-gmp-5.1.0.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/p_std_bits.cc.org	2012-12-30 00:37:03.033948083 +0100
-+++ src/mp_std_bits.cc	2012-12-30 00:44:12.893019313 +0100
-@@ -25,6 +25,9 @@
- #include "ppl-config.h"
- #include "mp_std_bits.defs.hh"
- 
-+#if __GNU_MP_VERSION < 5 \
-+  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- const bool std::numeric_limits<mpz_class>::is_specialized;
- const int std::numeric_limits<mpz_class>::digits;
- const int std::numeric_limits<mpz_class>::digits10;
-@@ -70,3 +73,6 @@
- const bool std::numeric_limits<mpq_class>::traps;
- const bool std::numeric_limits<mpq_class>::tininess_before;
- const std::float_round_style std::numeric_limits<mpq_class>::round_style;
-+
-+#endif // __GNU_MP_VERSION < 5
-+       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
---- src/mp_std_bits.defs.hh.org	2012-12-30 00:37:03.037948187 +0100
-+++ src/mp_std_bits.defs.hh	2012-12-30 00:42:32.002424189 +0100
-@@ -38,6 +38,9 @@
- #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
- void swap(mpq_class& x, mpq_class& y);
- 
-+#if __GNU_MP_VERSION < 5 \
-+  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- namespace std {
- 
- #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
-@@ -164,6 +167,9 @@
- 
- } // namespace std
- 
-+#endif // __GNU_MP_VERSION < 5
-+       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- #include "mp_std_bits.inlines.hh"
- 
- #endif // !defined(PPL_mp_std_bits_defs_hh)
diff --git a/dev-libs/ppl/ppl-0.12.1-r1.ebuild b/dev-libs/ppl/ppl-0.12.1-r1.ebuild
deleted file mode 100644
index 630398ef0c22..000000000000
--- a/dev-libs/ppl/ppl-0.12.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="The Parma Polyhedra Library for numerical analysis of complex systems"
-HOMEPAGE="http://bugseng.com/products/ppl"
-SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
-IUSE="doc lpsol pch static-libs test"
-
-RDEPEND=">=dev-libs/gmp-4.1.3[cxx]
-	lpsol? ( <=sci-mathematics/glpk-4.48 )
-	!<dev-libs/cloog-ppl-0.15.10"
-DEPEND="${RDEPEND}
-	sys-devel/m4"
-
-pkg_setup() {
-	if use test; then
-		ewarn "The PPL testsuite will be run."
-		ewarn "Note that this can take several hours to complete on a fast machine."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/ppl-fix-gmp-5.1.0.patch" || die "Failed to patch"
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--disable-debugging \
-		--disable-optimization \
-		$(use_enable doc documentation) \
-		$(use_enable lpsol ppl_lpsol) \
-		$(use_enable pch) \
-		$(use_enable static-libs static) \
-		--enable-interfaces="c cxx" \
-		$(use test && echo --enable-check=quick)
-}
-
-src_test() {
-	# default src_test runs with -j1, overriding it here saves about
-	# 30 minutes and is recommended by upstream
-	if emake -j1 check -n &> /dev/null; then
-		emake check || die "tests failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	use static-libs || rm -f "${D}"/usr/lib*/libppl*.la
-
-	local docsdir="${ED}/usr/share/doc/${PF}"
-	rm "${docsdir}"/gpl* "${docsdir}"/fdl* || die
-
-	if ! use doc; then
-		rm -r "${docsdir}"/*-html/ || die
-	fi
-
-	dodoc NEWS README* STANDARDS TODO
-}
-
-pkg_postinst() {
-	echo
-	ewarn "After an upgrade of PPL it is important that you rebuild"
-	ewarn "dev-libs/cloog-ppl."
-	ewarn
-	ewarn "If you use gcc-config to switch to an older compiler version than"
-	ewarn "the one PPL was built with, PPL must be rebuilt with that version."
-	ewarn
-	ewarn "In both cases failure to do this will get you this error when"
-	ewarn "graphite flags are used:"
-	ewarn
-	ewarn "    sorry, unimplemented: Graphite loop optimizations cannot be used"
-	ewarn
-	echo
-}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index d8ae30f25851..85d8a9ad9152 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 69c3374ad8e4..f3885fe97a4b 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,2 +1,3 @@
-DIST llvm-4.0.1.src.tar.xz 21065652 SHA256 da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51 SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d WHIRLPOOL 1626ff270f7ce4801d02a0797b227fda9314ff5c0c01d653111599e9a4d2854c4d9edc3c698a7abee8d79d6bce8b18dc619fbced3c07ca610d44a248d65830cc
-DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d63b733852ccdb31e06f1373136da SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a WHIRLPOOL 6a99edbdc3e6726dc8ff9126b110fd7560faac46601407722e6dd80b5d894ff242521dc8fda7f4d879de83dac51c65645a37224f7e8def0d8d2f1e564b0531bb
+DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
+DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
+DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.1_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..8d1eba230aff
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.1_rc2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm python-any-r1
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+# Keep in sync with sys-devel/llvm
+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="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	!sys-devel/llvm[ocaml(-)]"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-ml/findlib
+	test? ( dev-ml/ounit )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Python is needed to run tests using lit
+	python_setup
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DWITH_POLLY=OFF
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg || die
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.48.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.48.0.ebuild
index bc072e185235..7d5874f42b14 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.48.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.48.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="idn"
 
 RDEPEND="
diff --git a/dev-perl/IO-Socket-SSL/Manifest b/dev-perl/IO-Socket-SSL/Manifest
index decfee01d74b..b731a65b4a4a 100644
--- a/dev-perl/IO-Socket-SSL/Manifest
+++ b/dev-perl/IO-Socket-SSL/Manifest
@@ -1,8 +1,8 @@
-DIST IO-Socket-SSL-2.024.tar.gz 209567 SHA256 dab3125b004b24ff8dfc003aa81c00c0f976a1bc34a75e1d8d9de9de837ce6c9 SHA512 b76c43efbffba031b72efebc9f5348eb24ea1d48704e61c2256c0a23a754fb786cad23d7a330884f526ed31fc2878e27f4114793afa8135cc0caf8f251c07c3c WHIRLPOOL 37ae14c700a21a89fad3ca653925e07272d51a2f4ecee2a5342909d49491f42b3d3ee6e318fbb5d6a02ead1479916a6775e48f61cb3722d9526795482ae5ee58
+DIST IO-Socket-SSL-2.024.tar.gz 209567 BLAKE2B b03bb1ea8de6bfb1aee642b9848aeb53e0548be9f0aa64a91f327c09245f206ce6bfc91bc6ef9b90dfb0744eaa5b169648f3b68f35d55d59d8435a3db580cf2c SHA512 b76c43efbffba031b72efebc9f5348eb24ea1d48704e61c2256c0a23a754fb786cad23d7a330884f526ed31fc2878e27f4114793afa8135cc0caf8f251c07c3c
 DIST IO-Socket-SSL-2.039.tar.gz 213906 SHA256 c6379a76860c724a22b79ebe9e91d26bd8a04e3ce035bacfd15de3d9beaf83ac SHA512 e107a5bdd1631d87e11fbb339e13b4c3272db3a7ca43488c221bbd17c7a93f2033e175c0ca8ee6e89f45550a68741c4762880845378dca7f0beaa45427399515 WHIRLPOOL e117469c5f0226d80ac3ac714cff72e0c3705a367c5008f57216c50af137928ff3ca99e0741a5e93f76236f60996af830bfbac269f1e045da53cfc685d7403b9
 DIST IO-Socket-SSL-2.040.tar.gz 214139 SHA256 7472bba199f9b3b88b9b1ece163bb7de4a5bab95bb8784b4f6d66ac030099645 SHA512 827db6a8b9f2ca51c4dd934ed5cd296d271dc30deafd5e9630bfcc8907d4ada0a7d6e71cf689df9013c6f7333c9b2f3d07643ec94a9b2675138cc669e8a68925 WHIRLPOOL 5adfb74daef5823d82908a6d66eb00996403aedaf836c9880df335b4474857c6e337482737bf8968148ac52539a9a157d7049016c46c9894b983efceea76de86
 DIST IO-Socket-SSL-2.043.tar.gz 214312 SHA256 cc08b1e40a336902a544825520e76a9c4cf8134649d48ae9140de662c35c5315 SHA512 91a49211c8aea107bdcfd886b276e3329f3e62fccce94c1700cd881d2282236b1f5714263dd4a9a3192c9f0bac0b73e11a0e19d18949855252994ed400462886 WHIRLPOOL b8651536c16f0afc9e7b455bc6a13c6c59555dc997a1966bc3dfc85fd42dcf9ca144c727b1032a230a18c8048fb7b28a80d5fa449c53d77c291c584a65544294
-DIST IO-Socket-SSL-2.045.tar.gz 214926 SHA256 ed3877815961e30f57be9975067e2bb67bfd61a11ed9add790f26d908d81ec11 SHA512 fa2d1c9ad690965069a2f05a0bcecfd6c03fe3c2d38e50195933a9301c5c2374871eed3da637eaf3556df0c8e60ef8be26491d2d3ca453062079d69d2ce0ffa0 WHIRLPOOL 0452996fde809ed2787cf5c1b1a66d126da25fd22a38d87adbc11d30537023d11ce0c8437332feb51caada639b06f62e416ed7bf9910ac0f400f5e3da45b07dc
-DIST IO-Socket-SSL-2.047.tar.gz 215199 SHA256 c5ad8e14174863194ad43c23a38c77e0b202a989cac9d3e13fb30efcf1d41158 SHA512 402d08d0c3fc9fb34ca83f371c1368cced68636198b0cb807562d480335784183850d1f1f9deb82b2ede312e86116624ed09439915c81cbbed3412e8e5697a72 WHIRLPOOL ec6ecaf01fa795c13d5341591451a21c91dbade95a02e6ad149e22954113e4c358547239b32528f209462104783f7015dfaa08555232408c09ade23ce6ddbf99
-DIST IO-Socket-SSL-2.048.tar.gz 214926 SHA256 b0f2199adf0f688a11357151fb47cd91b417a73d910539d4d48b5ac7e267ee07 SHA512 649aa7f4ed8c7c1f4725bd48e28c40d3929f0c7c7fc40093f6e4d373ea8e306451c2fc3f645a23a33d99cd3a5a378997f7affb2b165d883648c33fc801cfce67 WHIRLPOOL bee6702285d7ccabbf34c1923b63802360fbff397ad96c6614d1dac3f985e84342da56470747787866ec0059e40813c2bb6484874ca8a0bd11bc2d114cc2971f
-DIST IO-Socket-SSL-2.052.tar.gz 221703 SHA256 e4897a9b17cb18a3c44aa683980d52cef534cdfcb8063d6877c879bfa2f26673 SHA512 44a2ba94d1e9f911d6815a784263e2cddac0cea90e79cf8e267f73d8b2a3726ca9933d621bac8849a52db50bff0bd7a0d2cfd546a550f2963ea44346d3f8b600 WHIRLPOOL cef09d4ff2c9eee61ad4252d7cc7ed65d62315f5205d474e9c302a06649f5fad114225b544bec8250f033984c4852a70b57a908dc9bd52781cf7d255fd21ec96
+DIST IO-Socket-SSL-2.045.tar.gz 214926 BLAKE2B bfe3d46cf371cf4673b7036452704c7ddcdb9f7b0b23b2a448ca0263ccfaa935d32b1aa84f810a7697bcf65dbf8dd41c75f35c024c7d66af909ef86164be8335 SHA512 fa2d1c9ad690965069a2f05a0bcecfd6c03fe3c2d38e50195933a9301c5c2374871eed3da637eaf3556df0c8e60ef8be26491d2d3ca453062079d69d2ce0ffa0
+DIST IO-Socket-SSL-2.047.tar.gz 215199 BLAKE2B 4c302879b352b8c26f8f97003bbb863c06f71c787720f780c85c1d7ed3397b0390272d64f4f6871966ac3aea2cd37159dfabc5b19303ad440c6bdbd9269a280d SHA512 402d08d0c3fc9fb34ca83f371c1368cced68636198b0cb807562d480335784183850d1f1f9deb82b2ede312e86116624ed09439915c81cbbed3412e8e5697a72
+DIST IO-Socket-SSL-2.048.tar.gz 214926 BLAKE2B 1defa05aaa3f7b8e3fb078ca2d919400a92c33fd018c23ba81d3496e3d10c08981815c741b9a36bf449514576e8593a953ee0f61d9e82c13f664d19ba49f5e68 SHA512 649aa7f4ed8c7c1f4725bd48e28c40d3929f0c7c7fc40093f6e4d373ea8e306451c2fc3f645a23a33d99cd3a5a378997f7affb2b165d883648c33fc801cfce67
+DIST IO-Socket-SSL-2.052.tar.gz 221703 BLAKE2B 764dfa3b81e649bd67fec030f89c4e994372d7f18d126ce38653aa935011687f19ce6142bc7bb21f2d86613cdaa1cbd432568a3870f110427a639c81fb28a050 SHA512 44a2ba94d1e9f911d6815a784263e2cddac0cea90e79cf8e267f73d8b2a3726ca9933d621bac8849a52db50bff0bd7a0d2cfd546a550f2963ea44346d3f8b600
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index c16864cf59af..40fbab399c17 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c60b45e2f89a..b4a43bed4bf3 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/blessings/blessings-1.6-r1.ebuild b/dev-python/blessings/blessings-1.6-r1.ebuild
index 8878932d42f4..835c26c5e4ab 100644
--- a/dev-python/blessings/blessings-1.6-r1.ebuild
+++ b/dev-python/blessings/blessings-1.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/blessings/blessings-1.6.ebuild b/dev-python/blessings/blessings-1.6.ebuild
deleted file mode 100644
index ac8948b45395..000000000000
--- a/dev-python/blessings/blessings-1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A thin, practical wrapper around terminal coloring, styling, and positioning"
-HOMEPAGE="https://github.com/erikrose/blessings https://pypi.python.org/pypi/blessings/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	# The tests need an interactive terminal
-	# https://github.com/erikrose/blessings/issues/117
-	script -eqc "nosetests -w \"${BUILD_DIR}\"" /dev/null \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 4d92e834aa52..76edcde2e379 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,2 +1,3 @@
 DIST cfe-4.0.1.src.tar.xz 10933628 SHA256 61738a735852c23c3bdbe52d035488cdb2083013f384d67c1ba36fabebd8769b SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964 WHIRLPOOL 1cb56b36e21eab8004eec43d9c0f7377588cdbcd1d654cd0e6d836d43bc68dc0759993215439c1607e09ed3fa1f68b80504a222f73c1b76d3841cdf638dcbef2
 DIST cfe-5.0.0.src.tar.xz 11437024 SHA256 019f23c2192df793ac746595e94a403908749f8e0c484b403476d2611dd20970 SHA512 14acdd622310122b544c952ee5b932b7006d9d8424319f0e3974f2503d40a0cec4200fdd3d813a32ce0d877bcfbb9a5bd5c36f6142b4330e6c814f113ca2efe8 WHIRLPOOL 9d2fff35324621be191cc69b45db472681c9ebdf05aead09510f3178853ac8a179f2c454c2e6513e57f84a99980052671cd9a23d38d6d14b42dfda1853a7844a
+DIST cfe-5.0.1rc2.src.tar.xz 11512960 BLAKE2B f6f53a985abfc07869984a8b6461549df80d8511645ff0ba46c035b04f247d9f56a63a178da7496b60064aed059518175d2d34aa661b72877f3e62b27c9eed13 SHA512 069fa3dc549ed046a004ca31a1e571fe83fca986635b5515e9eab3f91e3a962af99022e927d15fa2482969c64fa9b33c9c7e79a8cd9dd8fa77b554ba3f08d1ea
diff --git a/dev-python/clang-python/clang-python-5.0.1_rc2.ebuild b/dev-python/clang-python/clang-python-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..97dd5ec33bf1
--- /dev/null
+++ b/dev-python/clang-python/clang-python-5.0.1_rc2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-r1
+
+MY_P=cfe-${PV/_/}.src
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}/bindings/python
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
+}
+
+src_test() {
+	python_foreach_impl nosetests -v || die
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/kitchen/Manifest b/dev-python/kitchen/Manifest
index f11e89dbb2b8..f5bdbda63d59 100644
--- a/dev-python/kitchen/Manifest
+++ b/dev-python/kitchen/Manifest
@@ -1 +1 @@
-DIST kitchen-1.2.4.tar.gz 187149 SHA256 38f73d844532dba7b8cce170e6eb032fc07d0d04a07670e1af754bd4c91dfb3d SHA512 790f7eaa16820d3b12f740d2ac7c9d849d40eea91527b7fc011270bd46af5038e987cc1b170c75c2175dc627f99a52bde52b9f276db8dac5d9d7df59ef9a505d WHIRLPOOL d9864ac07bb391df82049ffcd98f82a2013f6f28056ab19a7d17c59c8c345b64a0090eeac197313930391547f12412a68d1c794690798b4c434a840c5fb685a0
+DIST kitchen-1.2.4.tar.gz 187149 BLAKE2B 5ea3fa593ee22680998cf9ea08b66faacc2f7e20d70ec5823a6c29d8358991e98fe79cd4bd761b04b895dd1d87b1a21e2dc31ef33c0c47a05973ea4e9b884d7d SHA512 790f7eaa16820d3b12f740d2ac7c9d849d40eea91527b7fc011270bd46af5038e987cc1b170c75c2175dc627f99a52bde52b9f276db8dac5d9d7df59ef9a505d
diff --git a/dev-python/kitchen/kitchen-1.2.4.ebuild b/dev-python/kitchen/kitchen-1.2.4.ebuild
index 6d8e86f8775f..8420a55ca661 100644
--- a/dev-python/kitchen/kitchen-1.2.4.ebuild
+++ b/dev-python/kitchen/kitchen-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,3 +14,5 @@ LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index b78fecc7f8f4..7741026b2861 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,3 +1,4 @@
 DIST llvm-3.9.0.src.tar.xz 18235716 SHA256 66c73179da42cee1386371641241f79ded250e117a79f571bbd69e56daa48948 SHA512 f18ae32531218ab156c3e56c11826be0fd05f0799c82eaf2e6a043b38e1277560b4d921987513b88b11d97ea2619feaf277eec72181dd2ae4f4108c2836bf7b2 WHIRLPOOL a36c1bcee6e7995067a9a7a51e3fdb0f10d51d0239250eefab92ed2e46b024a203fa10a17a25a5aca69046bcb413628e288427f1a6690d0862e07cd95694c8a8
-DIST llvm-4.0.1.src.tar.xz 21065652 SHA256 da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51 SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d WHIRLPOOL 1626ff270f7ce4801d02a0797b227fda9314ff5c0c01d653111599e9a4d2854c4d9edc3c698a7abee8d79d6bce8b18dc619fbced3c07ca610d44a248d65830cc
-DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d63b733852ccdb31e06f1373136da SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a WHIRLPOOL 6a99edbdc3e6726dc8ff9126b110fd7560faac46601407722e6dd80b5d894ff242521dc8fda7f4d879de83dac51c65645a37224f7e8def0d8d2f1e564b0531bb
+DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
+DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
+DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
diff --git a/dev-python/lit/lit-5.0.1_rc2.ebuild b/dev-python/lit/lit-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..786386f1e7fd
--- /dev/null
+++ b/dev-python/lit/lit-5.0.1_rc2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}/utils/lit
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/lit" || die
+}
+
+python_test() {
+	./lit.py -sv tests || die
+}
diff --git a/dev-python/path-and-address/Manifest b/dev-python/path-and-address/Manifest
index bbc1f49cd7dc..63a46df4a44b 100644
--- a/dev-python/path-and-address/Manifest
+++ b/dev-python/path-and-address/Manifest
@@ -1 +1 @@
-DIST path-and-address-1.1.0.zip 7652 SHA256 c9cbea6919464ff2bbe441b996341e97d112ef876d8eeaa7ab127fe9fb811471 SHA512 eb60fabce6a71401b4681bcc1db5253c2043c33bd25f9bc8bf678d45aa459e2398ed482166fa0f85a0365ba8762a46e75c6c497ea25b6c1ba5c91d6a37618062 WHIRLPOOL adc380044564ae44390e9a9c882cbb0a0afb1f8d111480eef57a65c3cde611f415f2220d36d8dbfe0d76871e50643dd99fca87e88266864388c5eeb3a3f8c1ec
+DIST path-and-address-1.1.0.zip 7652 BLAKE2B fcf80494a2969d4b59a96ca6cd6f9dbc03a56b11e4374e64ea59fba18859b50eb8621d506b28472713bce8aaec6e8d9f26ba763b82b726df439967aa3c8a75be SHA512 eb60fabce6a71401b4681bcc1db5253c2043c33bd25f9bc8bf678d45aa459e2398ed482166fa0f85a0365ba8762a46e75c6c497ea25b6c1ba5c91d6a37618062
diff --git a/dev-python/path-and-address/path-and-address-1.1.0.ebuild b/dev-python/path-and-address/path-and-address-1.1.0.ebuild
index 174f3ca7f76c..e752aa3869f5 100644
--- a/dev-python/path-and-address/path-and-address-1.1.0.ebuild
+++ b/dev-python/path-and-address/path-and-address-1.1.0.ebuild
@@ -15,3 +15,5 @@ SLOT="0"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 KEYWORDS="~amd64"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
new file mode 100644
index 000000000000..632a9e12b309
--- /dev/null
+++ b/dev-python/pipenv/Manifest
@@ -0,0 +1 @@
+DIST pipenv-8.3.2.tar.gz 3843733 BLAKE2B 81e154b65a0024eb2587c70adc37e5419c112f737c58f4ae53fa1249092a52a6ee762784e4691a3a847026a955a9bbd2df4ccf949694da74db18915609c667c9 SHA512 bd2d1cf4a7a171fe94147064baf5dc73b7a7cce81d13078f214d4cc586541f241a8d174b99ed2009fca5607c46c42dd9839aa172848af63f708d922ca88c3138
diff --git a/dev-python/pipenv/metadata.xml b/dev-python/pipenv/metadata.xml
new file mode 100644
index 000000000000..b87f6d34740c
--- /dev/null
+++ b/dev-python/pipenv/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pipenv</remote-id>
+    <maintainer status="unknown">
+      <email>me@kennethreitz.org</email>
+      <name>Kenneth Reitz</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pipenv/pipenv-8.3.2.ebuild b/dev-python/pipenv/pipenv-8.3.2.ebuild
new file mode 100644
index 000000000000..dd7ad3f7639f
--- /dev/null
+++ b/dev-python/pipenv/pipenv-8.3.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Development Workflow for Humans."
+HOMEPAGE="https://github.com/kennethreitz/pipenv https://pypi.python.org/pypi/pipenv"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+# not completely packed
+# requires networking
+RESTRICT="test"
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index 0d83944fa760..4af938515571 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1 +1 @@
-DIST priority-1.3.0.tar.gz 13827 SHA256 6bc1961a6d7fcacbfc337769f1a382c8e746566aaa365e78047abe9f66b2ffbe SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a WHIRLPOOL 45fe643b70a4c3cb9e3600e73475384a5b339acbb0a801be8c0e6c190bc2e3894443b28c3b691b3c555250175d6d313808c6bf7a0fed3b586c9fe7beb3b4a843
+DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index ed2cf6f6c385..09f46e5a9e33 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -18,6 +18,7 @@ IUSE="test"
 RDEPEND=""
 
 DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
 		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pycollada/Manifest b/dev-python/pycollada/Manifest
index f0de7041cf89..8b9b16a339e9 100644
--- a/dev-python/pycollada/Manifest
+++ b/dev-python/pycollada/Manifest
@@ -1 +1 @@
-DIST pycollada-0.4.tar.gz 519732 SHA256 62a69cce29759900cce0400dac8796d7210de1910dad4c60d4094248c7738121 SHA512 6e9569b858f2014aa08764d0bf328c8317b94edc91e99c2a7c97bf2355983555ea103012d6e6f197862cb3df113ca9263de18fc47edb3c60e74fa8e58b5ca8b0 WHIRLPOOL ce54dcb29cab7e1d97ac8c2eaa3718182373dfa79c7647c7c46f5a2afde88bf7832f98db4a89bdfb58964ccbab041787ac17a25dabc148e963e0739bac27780e
+DIST pycollada-0.4.tar.gz 519732 BLAKE2B 9fd9b7ca369943cb6b2d9960b343ed39a9e578bb2e94c06d5e7c027a814220b13ff66d6137371edab150befd4b4301e9cf5420385f7dd3ad72dc11a38c38afa9 SHA512 6e9569b858f2014aa08764d0bf328c8317b94edc91e99c2a7c97bf2355983555ea103012d6e6f197862cb3df113ca9263de18fc47edb3c60e74fa8e58b5ca8b0
diff --git a/dev-python/pycollada/pycollada-0.4.ebuild b/dev-python/pycollada/pycollada-0.4.ebuild
index 2f8bf9700865..91e85d338acd 100644
--- a/dev-python/pycollada/pycollada-0.4.ebuild
+++ b/dev-python/pycollada/pycollada-0.4.ebuild
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
 
-DEPEND="doc? ( dev-python/sphinx )
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
 	test? ( dev-python/python-dateutil )"
 RDEPEND="dev-python/numpy
 	dev-python/lxml
diff --git a/dev-python/pycollada/pycollada-9999.ebuild b/dev-python/pycollada/pycollada-9999.ebuild
deleted file mode 100644
index f0b16d863454..000000000000
--- a/dev-python/pycollada/pycollada-9999.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_MULTIPLE_ABI=1
-
-inherit distutils-r1 git-2
-
-DESCRIPTION="python library for reading and writing collada documents"
-HOMEPAGE="https://pycollada.github.com/"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc examples test"
-
-DEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-python/python-dateutil )"
-RDEPEND="dev-python/numpy
-	dev-python/lxml
-	>=dev-python/python-dateutil-2.0"
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc ; then
-		pushd docs
-		emake html
-		popd
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	if use doc ; then
-		pushd docs/_build/html
-		dohtml -r *
-		popd
-	fi
-
-	if use examples ; then
-		insinto /usr/share/${P}/
-		doins -r examples
-	fi
-
-	install_test_data() {
-		insinto $(python_get_sitedir)/collada/tests/
-		doins -r collada/tests/data
-	}
-	python_foreach_impl install_test_data
-}
-
-src_test() {
-	test_collada() {
-		for script in "${S}"/collada/tests/*.py ; do
-			PYTHONPATH="${S}" $EPYTHON "${script}"
-		done
-	}
-	python_foreach_impl test_collada
-}
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index de66e5345902..846962830984 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -1 +1 @@
-DIST pydecomp-0.1.tar.gz 8793 SHA256 4abff74b3d8814bb48be523d3d3ae91eb28e9d8e7fc887d909dcab09f857d6d6 SHA512 027925589da745bc34f87bf7845dd34f1feb61221bc48b3490e56145f3aef5856dbbce16ea36cc0a65e913b7fa8c042a914fbf9e1e3d82e26f98f8a6fbc6da5c WHIRLPOOL 7f5469291f9c19557adafe14d1dac894d5066391d759c2053f0c600b1bf2fae7543575586fda197af77be2c282a370814331ca07d376ca6d6b7495fdec234321
+DIST pydecomp-0.2.tar.gz 9819 BLAKE2B fc2078b00f152e598599b1fc4b1239035d1d21789689fb49605a4c3afb6d9201a1b1635d6f1971edf98fef8de02caeb6ea5e6bae1fe2b21f546e8a712ca94949 SHA512 1cec8ba501cf6223740c50751508a83f474a9acbce811c82f6d8beb5536ea8ce9c1d04a218503acd13b6eec8d9a68ef4b712049a7e0ae94ff34ba05c6f50ebc9
diff --git a/dev-python/pydecomp/pydecomp-0.1.ebuild b/dev-python/pydecomp/pydecomp-0.2.ebuild
similarity index 76%
rename from dev-python/pydecomp/pydecomp-0.1.ebuild
rename to dev-python/pydecomp/pydecomp-0.2.ebuild
index c53046276087..2a4799a2e0f3 100644
--- a/dev-python/pydecomp/pydecomp-0.1.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 python-r1
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	EGIT_REPO_URI="https://github.com/dol-sen/pyDeComp.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
@@ -29,15 +29,8 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	einfo
-	einfo "This is new software."
-	einfo "The API's it installs should be considered unstable"
-	einfo "and are subject to change."
 	einfo
 	einfo "Please file any enhancement requests, or bugs"
 	einfo "at https://github.com/dol-sen/pyDeComp/issues"
 	einfo "I am also on IRC @ #gentoo-releng of the freenode network"
-	einfo
-	ewarn "There may be some python 3 compatibility issues still."
-	ewarn "Please help debug/fix/report them in github or bugzilla."
 }
diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index 0f094d46e1c6..c25e7e24119c 100644
--- a/dev-python/pydecomp/pydecomp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 python-r1
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	EGIT_REPO_URI="https://github.com/dol-sen/pyDeComp.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 0cf610b57ab4..6b230bd77aca 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,2 +1,2 @@
-DIST pyglet-1.1.4.tar.gz 2946835 SHA256 63a7936dffe4fc0475617a4d804a4b63ab13949cb30afd3c62ab98d8384f7ff3 SHA512 e1acd2e145bddbed2da1e8d66222b7057ecfcc97f93f4972741e87ec8584a944e2cc0c972aa985cb1f51e0dd2e4bbf1332201e8eb66f29945cfdac1b9ac63b64 WHIRLPOOL f31dc562b940454766a188d0ce9ac8a462a9c24e995d28cacafe1437c1f1dc609410b748d9a31f2fe8c85aac7fbfa4bc54ec2c5470560f31251af64dda258c6c
-DIST pyglet-1.2.4.tar.gz 2122017 SHA256 9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445 SHA512 70cd781936db8c8c156499e524ee73520bc90c19461074264abd62a4854307ef090af5faba521686f247fb4cbee552a428892f59a5b382429acfc000f4c2e22d WHIRLPOOL 24aa15be5819d659274a65eb39a3dcc44c74ddab3d48f8755d1a927427ce4bf05e07b6ebc3a92e1b06e8a1de97f599cb52c506732d3ec6a8a76346c9efd241c9
+DIST pyglet-1.1.4.tar.gz 2946835 BLAKE2B e6dacb162b0fc16440edaec8340ea2d99f59db85e3cacb9fc52aa406eafa595a78c91ec0c1d30091928d9a6090163d799dc75aa5d570017aa010b8a48f2e1d91 SHA512 e1acd2e145bddbed2da1e8d66222b7057ecfcc97f93f4972741e87ec8584a944e2cc0c972aa985cb1f51e0dd2e4bbf1332201e8eb66f29945cfdac1b9ac63b64
+DIST pyglet-1.2.4.tar.gz 2122017 BLAKE2B 6e5e24ec78e24b9a9c8e9627791ede93d740c1af7af0176c6f75409c76981fa16752bbe14c9b5ec871438f5468b3587e7ce12194241d94ab3731d46cbbe395f1 SHA512 70cd781936db8c8c156499e524ee73520bc90c19461074264abd62a4854307ef090af5faba521686f247fb4cbee552a428892f59a5b382429acfc000f4c2e22d
diff --git a/dev-python/pyglet/pyglet-1.2.4.ebuild b/dev-python/pyglet/pyglet-1.2.4.ebuild
index bfe61697a4ae..28a91921aa95 100644
--- a/dev-python/pyglet/pyglet-1.2.4.ebuild
+++ b/dev-python/pyglet/pyglet-1.2.4.ebuild
@@ -21,7 +21,8 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib[alisp] )
 	gtk? ( x11-libs/gtk+:2 )
 	openal? ( media-libs/openal )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 #	ffmpeg? ( media-libs/avbin-bin )
 
 # pyglet.gl.glx_info.GLXInfoException: pyglet requires an X server with GLX
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 4389890304a9..5550c766ed61 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1 @@
-DIST pylast-1.6.0.tar.gz 41307 SHA256 6bf325ee0fdeb35780554843cf64df99304abb98c5ce2e451c0df7e95e08b42e SHA512 2e47eca2282da8637d5fc79b8fc6784f6f7e9c88975f10e5f162be1445f81dbce0a01c6d7e8ff14162bc3b48a8a4171bf4c81239b17fb08ea5c6b1eaf432f18f WHIRLPOOL f76dbae7326c2b973c8ac1e68e4f31145e449a37d5a342f7ab551cdc737fe529bf9839b05f74d67805bd97aa66f7808a56abea6f57bf0e74390a33d59aa07179
-DIST pylast-1.7.0.tar.gz 42433 SHA256 a482a769b6a037e2e9b78433de91a287eaf6aacff60bbb2f4562c3c7ece10430 SHA512 c5f983f651b4d76a004d5521ae3a76d05dc3b424523be365679b7a35f11a5a83894e2bc18365b058b254935fa804575631eacbde4b37d1e2f3d7eb325eeabab4 WHIRLPOOL 04caefd6a7aa11dda40f270587c0a9cfe393c9262411f802a429e5ba893e7320200ba2e8942047f7d583b0e76e4f7edfc2b5671b223c98084287c7a2b255a4b9
 DIST pylast-1.9.0.tar.gz 42584 SHA256 ae1c4105cbe704d9ac10ba57ac4c26bc576cc33978f1b578101b20c6a2360ca4 SHA512 ff3929583d88466738c9a1e964676652717c9f5bd4631f1a0a7855903e77cd394a612b0e2e8fc2f698ac84a34a135f4e940ff7760c2c88bf388ae56fc9c3da65 WHIRLPOOL 701e11a314c60eec50196103c916c107729f5f233d9a00173813f7f33393818a7a4a7b860bdeaec8c680072ca25604acc13d30ace0575623ffa5159da32b14d7
diff --git a/dev-python/pylast/pylast-1.6.0.ebuild b/dev-python/pylast/pylast-1.6.0.ebuild
deleted file mode 100644
index 65641f2e94df..000000000000
--- a/dev-python/pylast/pylast-1.6.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="https://github.com/pylast/pylast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# As the testing requires a last.fm account and online access it is restricted
-RESTRICT="test"
diff --git a/dev-python/pylast/pylast-1.7.0.ebuild b/dev-python/pylast/pylast-1.7.0.ebuild
deleted file mode 100644
index 4a99492062fb..000000000000
--- a/dev-python/pylast/pylast-1.7.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="https://github.com/pylast/pylast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# As the testing requires a last.fm account and online access it is restricted
-RESTRICT="test"
diff --git a/dev-python/pylast/pylast-1.9.0.ebuild b/dev-python/pylast/pylast-1.9.0.ebuild
index dce10b85fb36..27338bb36722 100644
--- a/dev-python/pylast/pylast-1.9.0.ebuild
+++ b/dev-python/pylast/pylast-1.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 25c5dbbf19af..a47eba325f7a 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1 +1 @@
-DIST pyproj-1.9.5.1.tar.gz 4424543 SHA256 53fa54c8fa8a1dfcd6af4bf09ce1aae5d4d949da63b90570ac5ec849efaf3ea8 SHA512 b0e0f85be01a3399cb41c4bf29d1a63ecb519fd45d6092a3558060d93c715afafd12f7532c8665839225ad7243e739a117677f6747bf34a0ccbde5e75c85f324 WHIRLPOOL 5ddb28a2ee6bbc3e50a0d76355f51b93c50c078459a6bc582f6a1538abbe349b45b0fe3bbc195e751b575ef5096a47ee6e88cf8e5dd4c69b9e917589da29ac05
+DIST pyproj-1.9.5.1.tar.gz 4424543 BLAKE2B cdf954ec0fe794f354b246fcd5afeac01b796f84cc2456efce3e289fcfb12074d7352c9fa7e9d74356199135dfa9814c07da9379f85771dbb7130b8b9b7ecc34 SHA512 b0e0f85be01a3399cb41c4bf29d1a63ecb519fd45d6092a3558060d93c715afafd12f7532c8665839225ad7243e739a117677f6747bf34a0ccbde5e75c85f324
diff --git a/dev-python/pyproj/pyproj-1.9.5.1.ebuild b/dev-python/pyproj/pyproj-1.9.5.1.ebuild
index 1f67541befb1..a39b855d09fa 100644
--- a/dev-python/pyproj/pyproj-1.9.5.1.ebuild
+++ b/dev-python/pyproj/pyproj-1.9.5.1.ebuild
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="doc"
 
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 	append-cflags -fno-strict-aliasing
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
index 30b7649caf6c..eb514be58a00 100644
--- a/dev-python/pytest-salt/Manifest
+++ b/dev-python/pytest-salt/Manifest
@@ -1 +1 @@
-DIST pytest-salt-0.1_pre20170731.tar.xz 30084 SHA256 9c3a0b2a82e5ff22301ba5e6321319345b37de88c32d91d51c559e68b86fee11 SHA512 700072c9afef3c78ea4fc5cdbc54e28fb9d0635744cea07fa187cf21665f211eda05318d6a945c1dd6cc7a944bdf608ae2d8f78448d0667cba4984fc2fa2c75e WHIRLPOOL f8dd3a2033eac5c2f74638e76bae1869fd1e5b0969a0a98c100908ee78ff6f26d53955b589819215c731a4161c0ce0fa83dcbcbaa5d535bb4f5813ef10ebbb10
+DIST pytest-salt-0.1_pre20170731.tar.xz 30084 BLAKE2B a86159900aa4710d261e117aa745010ac2d977d852cd97ee366e2871d4c6a3e12c9769481d1de697d8df10f4c8b1f3366b93807de05257ffec590b5028ab2dcb SHA512 700072c9afef3c78ea4fc5cdbc54e28fb9d0635744cea07fa187cf21665f211eda05318d6a945c1dd6cc7a944bdf608ae2d8f78448d0667cba4984fc2fa2c75e
diff --git a/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild b/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild
index ad6ebfdf36dd..6e5e664f9a1b 100644
--- a/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild
+++ b/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild
@@ -13,3 +13,6 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 8ca9c3eef508..1c9f8bc1e9d2 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,8 +1,8 @@
-DIST setuptools-30.4.0.tar.gz 655934 SHA256 2bea341aa5b48ae05521374d9c473713e42dde7f8712a731904a6f8257e896ed SHA512 8239262e11c7702165d7539d57982dadd16e61a992529cb4d5f42141d57ffbab46fd928c765d0439ec4f07db1bc252b9a4604901d8f9951e55076438bdd6f515 WHIRLPOOL 4866efbe00d23291ad07b401d7924f2f150a38664ab0a3d9afe9e00aa4e887de6c9e82f81e7d2ec157b1bf05406b2616a08772fa9f3a45e1e20fddbe27c11fd2
-DIST setuptools-34.0.2.zip 617839 SHA256 a5bdc45a3c123a88c84e089a789ba70bbc61ee888c1306fd9dac04e037e81c37 SHA512 8ff6475620fc18e5992900dffd50158bfea980d3e7f2c7c98e8c99180b2f11b3f81c13a60f93516da580def2543a786940cc164dcdc36802d9657c48e45d9266 WHIRLPOOL c9350f96628957c0bab680a2cd018d27d93f04afded737b317b9ea527e0bad3ea9c4f4af2a31843a3010573cdb0ec1c7fbdeef371cfc8cb5c8de93b6d762bf1d
-DIST setuptools-35.0.1.zip 624263 SHA256 eea7f2ff55d4a810b6bc39be1ad1c60c2702341b78b2365c71306eaa7316beac SHA512 a3f5362ad64dead468172f9989bc62043ce736180d22e50d9815af25aecbceb58e701bb87a643b9fbbf0beedb37a45268b23b1b5e7e6e397aa124f43b1d4bb0d WHIRLPOOL e33041a6f03dc4ceb4a34db4c18a4d76a908b4e5a726ad18598cc202aca24df0a81241aa72812b7a31b1e452dd265e813c58ea23255e37a75c2c2ec2f73d8787
-DIST setuptools-35.0.2.zip 624829 SHA256 1e55496ca8058db68ae12ac29a985d1ee2c2483a5901f7692fb68fa2f9a250fd SHA512 f80789cef8fe86ff1989e7f769637d1f6cb2008c6190609b8f8c5b4fdb63fac83267709895c7f502a09a693779b41e6ee0551e94f3348b64b6108dbc9629a116 WHIRLPOOL 23b22065ced0a7df25ff35b79675b94e6146ec9ca7eff7c27a94d5aea64e4e9356e136fb537f642810a824eb3e0921d817b5739fe9cd3daf083cad99475354e9
-DIST setuptools-36.0.1.zip 711296 SHA256 e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a SHA512 cbcd2591d0d8a7591c5d9a1d4173814afa0b984af29f2e34d26a37c357474b043f371978ac224cea12f50834d91babd9f14b137488c4edcd62594e91aff903d8 WHIRLPOOL 9818d419a11ab6493027fcf27a48b087c80a10fe2bf3b0539893bd57b33be23ed5b90572682f0a27850044482f03d299905e04cc890f724d3cf719d34bf36464
-DIST setuptools-36.5.0.zip 721505 SHA256 ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64 SHA512 e61c2f9ee640bf5dd8ab7c7a7c29667d91aa2498a7b027e387493ad7bcc9b56927e6fa63cdb4e083333c57eb355a670ba3df861ed5f8447b216fef0bc77c8b43 WHIRLPOOL a18b45eb750bc92579d0179d0d5797d4cf949c20ab4e6cbf0b4ae154d351285983505829a1f0f0ee71b5b4aa3793bd3306ab3a9c44ea42b8306cb80cf3d273ec
-DIST setuptools-36.6.0.zip 725173 SHA256 62074589522a798da243f47348f38020d55b6c945652e2f2c09d3a96299812b7 SHA512 b1b7fbff45db72e24ffb0aef41509a8f49c3911f20e6dfa7335aace22d0b2c533615edd1626c6b58602960644d1a3ad7b2e6899efeec4138aa58a187d063c319 WHIRLPOOL 62e0e32eddd56b758dcd4da415a422e78f51acc58f83dc887d6ca67d7836cfe28dc1bdf4acb423b5e1f694c79ab4a392dbdc5f8ccb669e641f70f8c6f37f62b7
-DIST setuptools-36.7.2.zip 726758 SHA256 ad86fd8dd09c285c33b4c5b82bbc21d21883637faef78b0ab58fa9984847220d SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9 WHIRLPOOL 4000d4657f39ccc63dbaa98a3ee695d63dabfca361b574bf552393e633be4ce31b67489a3eea5b780b55e7385da220d2b3339fbacacc776eba379a13732724aa
+DIST setuptools-30.4.0.tar.gz 655934 BLAKE2B 312a70dac5a75fd9f4f9720d20a3b224b6d817986779d3c250d208038619ac53d7f6139d2bfd21ce66b1374e746115e2933a1a2832cc6fec5b9c69f1ad26b45d SHA512 8239262e11c7702165d7539d57982dadd16e61a992529cb4d5f42141d57ffbab46fd928c765d0439ec4f07db1bc252b9a4604901d8f9951e55076438bdd6f515
+DIST setuptools-34.0.2.zip 617839 BLAKE2B c06ef384a42430ec8f4d956723d21f70fdcf993e41fb6d6e8b4fd18a7f12eeb957f9aef3e8b81e59f006452bd7dc8f59d6c5dec07ca099156f93fa74b5f4d152 SHA512 8ff6475620fc18e5992900dffd50158bfea980d3e7f2c7c98e8c99180b2f11b3f81c13a60f93516da580def2543a786940cc164dcdc36802d9657c48e45d9266
+DIST setuptools-35.0.1.zip 624263 BLAKE2B 83821fa85b19eb7f84eea1226d3fb750c5199a08aee84fe27dae3df8ea2afa5aeacfa7191ed51e10e216d49bf3bb90251b92ad3e8eb69c98bb4b05fd5eeb4d30 SHA512 a3f5362ad64dead468172f9989bc62043ce736180d22e50d9815af25aecbceb58e701bb87a643b9fbbf0beedb37a45268b23b1b5e7e6e397aa124f43b1d4bb0d
+DIST setuptools-35.0.2.zip 624829 BLAKE2B 3c4cb71ae07bc1a2ce63a9fd562a3c2270ffccab60c79ec88ee6e3f2d80249f2efaf0a65cd1842bce8c694cab77a39ed6a00a56df7bedd907a9d477d7eb6d10c SHA512 f80789cef8fe86ff1989e7f769637d1f6cb2008c6190609b8f8c5b4fdb63fac83267709895c7f502a09a693779b41e6ee0551e94f3348b64b6108dbc9629a116
+DIST setuptools-36.0.1.zip 711296 BLAKE2B c58a4efd8d3a2d574ff6ba5cd01a196fc7ad61a238119ac95714239965875d91e4613d08439c63ab3b9a0794b04ead5c6e8de09839e0306e4d29f47c2c7a7c58 SHA512 cbcd2591d0d8a7591c5d9a1d4173814afa0b984af29f2e34d26a37c357474b043f371978ac224cea12f50834d91babd9f14b137488c4edcd62594e91aff903d8
+DIST setuptools-36.5.0.zip 721505 BLAKE2B 4b5ca4359d1576952e68589c39b4fb0365d710df799a44869eb91da6037a2fc0b38afff7313e97c249adadc397f9fdae2f7ea208e06f53e352f32f8eed779a64 SHA512 e61c2f9ee640bf5dd8ab7c7a7c29667d91aa2498a7b027e387493ad7bcc9b56927e6fa63cdb4e083333c57eb355a670ba3df861ed5f8447b216fef0bc77c8b43
+DIST setuptools-36.6.0.zip 725173 BLAKE2B 1be948d561025b1ae1e9442fe2dc55b48e0ee3670ad47efb9296a25878df69ccbfc99d75dd6c906e5c94fc5f262bb19d01849b1fbf7f436f95830416470681a5 SHA512 b1b7fbff45db72e24ffb0aef41509a8f49c3911f20e6dfa7335aace22d0b2c533615edd1626c6b58602960644d1a3ad7b2e6899efeec4138aa58a187d063c319
+DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14c57c421309683c6a65102ce4911850acd5d492087aa0f14a0026da732e47eb9bf971030443fc1b57f9f909aaaa SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9
diff --git a/dev-python/setuptools/setuptools-36.7.2.ebuild b/dev-python/setuptools/setuptools-36.7.2.ebuild
index b9335a39d953..4665a12e802c 100644
--- a/dev-python/setuptools/setuptools-36.7.2.ebuild
+++ b/dev-python/setuptools/setuptools-36.7.2.ebuild
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	app-arch/unzip
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
 		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/shutilwhich/Manifest b/dev-python/shutilwhich/Manifest
index 55338c155496..9e83f97654f0 100644
--- a/dev-python/shutilwhich/Manifest
+++ b/dev-python/shutilwhich/Manifest
@@ -1 +1 @@
-DIST shutilwhich-1.1.0.tar.gz 2300 SHA256 db1f39c6461e42f630fa617bb8c79090f7711c9ca493e615e43d0610ecb64dc6 SHA512 94001875c428ce1ad1c92e5f5be1ed497630ac0e2221dbb93fde8438f128f4f2663a0a13e17b94852e4813aadec694fa21c24f647500e8053c89ec610eb7fe21 WHIRLPOOL 31fbd1cfaacd52d271fbd7751ee2ba9ac41a310d410975fa425a1763ffcdc50be0ebec89aa9a817bf06a93152a6cae48cc343946eda118400dc865e98c217cd1
+DIST shutilwhich-1.1.0.tar.gz 2300 BLAKE2B 0b510fe364991bcb1b2a627368e0aba23550a60dd0c8f892dbf25b5f23696f49ceedec487d91cc6a5acaffe28c29f635bacc633cc3c3377799fa8c75bd8bcd4d SHA512 94001875c428ce1ad1c92e5f5be1ed497630ac0e2221dbb93fde8438f128f4f2663a0a13e17b94852e4813aadec694fa21c24f647500e8053c89ec610eb7fe21
diff --git a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
index a831a85242ba..714baa4474e6 100644
--- a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
+++ b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
@@ -16,5 +16,5 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
diff --git a/dev-python/simplebayes/Manifest b/dev-python/simplebayes/Manifest
index aef312711c29..17d1ed2b6eb0 100644
--- a/dev-python/simplebayes/Manifest
+++ b/dev-python/simplebayes/Manifest
@@ -1 +1 @@
-DIST simplebayes-1.5.7.tar.gz 19260 SHA256 71cb029768bd25c172bdb3bd37174d42f872da92c33329ec736c3748ffa3b4a7 SHA512 417af72db13418e5a9df2fdb642fc63ed3eb4fbbf88cc7252a9e3603d31e35ccb68ae5838d8bb7d77554c1820a9db8aa944c639af4eb6418babb9d360ef3ddbc WHIRLPOOL 826617d920c45411a138bc405f760229e79959b25f4cd7e3d6b4525cdd2e9fec43b88f0df011dd820a72484df5bf988e3a18b357fe2966e15a8349c686eba308
+DIST simplebayes-1.5.7.tar.gz 19260 BLAKE2B 373820a19c1a3188f0dfb57cbe6ac8e27fc6a96e9d1686d698a1f109122afd5240715678d965d843482de3c12b8b806157acef17008d4c6fac0103b343dd44d7 SHA512 417af72db13418e5a9df2fdb642fc63ed3eb4fbbf88cc7252a9e3603d31e35ccb68ae5838d8bb7d77554c1820a9db8aa944c639af4eb6418babb9d360ef3ddbc
diff --git a/dev-python/simplebayes/simplebayes-1.5.7.ebuild b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
index b7c3fc7c6d22..803dcc401434 100644
--- a/dev-python/simplebayes/simplebayes-1.5.7.ebuild
+++ b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
@@ -17,6 +17,7 @@ IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
index 42d302a16328..6656408e855f 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE=""
 
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
 python_test() {
 	python -m unittest discover
 }
diff --git a/dev-python/utidylib/utidylib-0.2-r2.ebuild b/dev-python/utidylib/utidylib-0.2-r2.ebuild
index 76d37d0e30b8..e71c0277816b 100644
--- a/dev-python/utidylib/utidylib-0.2-r2.ebuild
+++ b/dev-python/utidylib/utidylib-0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,6 +22,7 @@ IUSE="doc test"
 RDEPEND="app-text/htmltidy"
 DEPEND="${RDEPEND}
 	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
 	test? ( dev-python/twisted-core[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/utidylib/utidylib-0.3.ebuild b/dev-python/utidylib/utidylib-0.3.ebuild
index 3551da313538..177e0d3644c2 100644
--- a/dev-python/utidylib/utidylib-0.3.ebuild
+++ b/dev-python/utidylib/utidylib-0.3.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
index debed9d5c526..efd9e98135da 100644
--- a/dev-python/virtualenv-clone/Manifest
+++ b/dev-python/virtualenv-clone/Manifest
@@ -1 +1 @@
-DIST virtualenv-clone-0.2.6.tar.gz 5691 SHA256 6b3be5cab59e455f08c9eda573d23006b7d6fb41fae974ddaa2b275c93cc4405 SHA512 e4963532a8f954ab9840f9f950ccb9c5a8c2bb863c6b0bc72576e5f464b321ef098f199192dbdbb342a232223be9d47b170ea6222d3ecb5848f965cb5ddf8256 WHIRLPOOL 317737e6c38bf0a55280371b9001e55409990814161b7433df78d1017b50264927946d51eb26dea5e1ae8d2aab7ec5325ef9e04d29a64acba7d91060ebeebea8
+DIST virtualenv-clone-0.2.6.tar.gz 5691 BLAKE2B e049f7661939d0cc9b5b85d4bb49c34d62c1f7dc388b974b55e0ef5899c4f44006ad1d2b0df2c50aee3047b54d8645666684df8ddac4f1f006c7e7fdc98e6f40 SHA512 e4963532a8f954ab9840f9f950ccb9c5a8c2bb863c6b0bc72576e5f464b321ef098f199192dbdbb342a232223be9d47b170ea6222d3ecb5848f965cb5ddf8256
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
index c86ecc743a56..21e8667c3e40 100644
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
@@ -16,5 +16,5 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 29fc57a47c26..f0a742e02ca6 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
index f5fbbe0bce72..37ed1d3134aa 100644
--- a/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
@@ -16,7 +16,7 @@ DEPEND="
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
 	iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
-	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	icu? ( <dev-libs/icu-59:=[${MULTILIB_USEDEP}] )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
 		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
index 8d72af313bd0..d3f864080535 100644
--- a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
@@ -16,7 +16,7 @@ DEPEND="
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
 	iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
-	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	icu? ( <dev-libs/icu-59:=[${MULTILIB_USEDEP}] )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
 		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild
index 9af397014440..b3d1ba495de7 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild
@@ -20,7 +20,7 @@ DEPEND="
 	~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
 	>=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
 	>=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}]
-	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	icu? ( <dev-libs/icu-59:=[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index ee29f983282d..665c8028831b 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 490822aad7e6..3e9a8f6e1aa5 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,3 +1,3 @@
-DIST fast_gettext-1.4.1.tar.gz 88329 SHA256 19ea679c60c9289741ac1352d1ff920d888129330ed867a0cab381ce97996e9d SHA512 43edce74ab294c92dc63baa855ec0a408ad3fa2092f920d71265516b64bbf2a10863b43aade55b583e792b6ef4901641f24cdce12477b595ffa86f47642dc522 WHIRLPOOL 2e04842ee70cb61490b01731f6b285330b8f6d6fda243ddc5f2c3935430db73fd6cf397c209912a622f01775bc7140e93955daa18230b007fe877c5645c1b6d0
-DIST fast_gettext-1.5.0.tar.gz 88258 SHA256 c88c017b3f40f98d9e680008ea2c0ee55a90d9dbf016462d3a4309a51bb3da25 SHA512 dabb6933337715b967ebebff5efc40b05cc5b59a254edc7399c905be30d378e25ac0e930d5a6317269e12f6b55db180b8e4580c679382d8f3cec2ee782d45563 WHIRLPOOL 4492a53574d18136b59690bcb031698a9b59979781c0d01fa61511164f640d299bb95501031a851881685cdb4b36d6da11e571f8179764a5ea8fee5f6fa08778
-DIST fast_gettext-1.5.1.tar.gz 88259 SHA256 c3859267f3d57d850757ce7878a871380084e5d2599fabf1dced330f82c5e723 SHA512 44b6531d3a50982f2eee5f6154fd716411d85fcc19750781596253af1e841852f0178f2a735ba3d3d45a037c8204de18c6b1390d1e9e2bdd7b3f895eb740ccff WHIRLPOOL b3e0b88cf7b11ce339c3ff93e5eb27088d7b0a0f0d6b5905075b1c45dcf15ae354c6fe7c11510a2dab3009c2544d7a1244fe87e89bfc68d247b7631438e20c4f
+DIST fast_gettext-1.4.1.tar.gz 88329 BLAKE2B 2e8e75de28bd0e53a394367344544f3524213a0d0bce8d450e37f639f34499c2a80f400ea10c05b930ed9eec1c8d970a28e0c03780bc1076471d20909bb216e0 SHA512 43edce74ab294c92dc63baa855ec0a408ad3fa2092f920d71265516b64bbf2a10863b43aade55b583e792b6ef4901641f24cdce12477b595ffa86f47642dc522
+DIST fast_gettext-1.5.0.tar.gz 88258 BLAKE2B 710e013b7a1295b44f95827fc0e2dfdc805a4c0dfa98750b84a82440519292231ab7399d8af5b2c5408dab1fa7b1c54a524287d1805d2379c44f015094411002 SHA512 dabb6933337715b967ebebff5efc40b05cc5b59a254edc7399c905be30d378e25ac0e930d5a6317269e12f6b55db180b8e4580c679382d8f3cec2ee782d45563
+DIST fast_gettext-1.5.1.tar.gz 88259 BLAKE2B 75f9875e7a51d28a16d2acb690dfebe97bb0ac64a715b91348537b15c52643c2f08e5597cc135a95e66a0d4d87445ba40ba98b7c08f70a33cdae873c1e4d1e7f SHA512 44b6531d3a50982f2eee5f6154fd716411d85fcc19750781596253af1e841852f0178f2a735ba3d3d45a037c8204de18c6b1390d1e9e2bdd7b3f895eb740ccff
diff --git a/dev-ruby/fast_gettext/fast_gettext-1.5.1.ebuild b/dev-ruby/fast_gettext/fast_gettext-1.5.1.ebuild
index 3f27a46c65c6..391aeb7cecfa 100644
--- a/dev-ruby/fast_gettext/fast_gettext-1.5.1.ebuild
+++ b/dev-ruby/fast_gettext/fast_gettext-1.5.1.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/activerecord[sqlite] dev-ruby/bundler )"
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
 
 all_ruby_prepare() {
 	rm Gemfile.lock || die
@@ -34,6 +34,14 @@ all_ruby_prepare() {
 		-e '/\(wwtd\|bump\)/ s:^:#:' \
 		-i fast_gettext.gemspec || die
 
+	# Avoid a test dependency on activerecord since this is now in the
+	# dependency tree for app-admin/puppet and many arches don't have
+	# rails keyworded.
+	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
+	sed -i -e '/works with DB repository/,/^    end/ s:^:#:' spec/fast_gettext/storage_spec.rb || die
+	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
+
 	# Don't run a test that requires safe mode which we can't provide
 	# due to insecure directory settings for the portage dir. This spec
 	# also calls out to ruby which won't work with different ruby
diff --git a/dev-ruby/libxml/Manifest b/dev-ruby/libxml/Manifest
index fc2c25843521..61b5f39e00bb 100644
--- a/dev-ruby/libxml/Manifest
+++ b/dev-ruby/libxml/Manifest
@@ -1,2 +1 @@
-DIST libxml-ruby-2.8.0.gem 261120 SHA256 0bd2780afaaf944d38786999d929a4fd37eb30922c404301b86dee94c9c512b6 SHA512 085670e0d343d47085d03d7d95a94498e7be049fbab5e60f1c5f43f9fc41222fe96315de7d5b12b221a3c866d0c178dbfbe2e717a206cce8c4471a2b3ddb9c42 WHIRLPOOL bae7fe3e885b35c58e314cf84ecf0f09abb754e4d41e047b101f20fc2d62f7695e328f8cc07f91d473de87ceb82c2a54d37ea4cb03c421897a5d539605883400
-DIST libxml-ruby-2.9.0.gem 262144 SHA256 e25a6278aaca2376ec0cc9e93a034a25d95af1102590abdbfce786d5c6612ddf SHA512 06ad42ce68c16715fc92a41439c3c27b49fc25b4f8829fac0a27f860d6c3df9a4cb964f1b4677d7587d31c0e5542c4d1c1c25ae3bcfcec889015618d22f6ff3c WHIRLPOOL e656ac449cd893325378b5af1d1108c8b2fa53e79b9000891785ffe5800a067f961c162699d1c6fab585dd8ba475b4b97898ee1ff2d2cf254c10a965504122c8
+DIST libxml-ruby-2.9.0.gem 262144 BLAKE2B fb601a0be0aab7fdfd00ac7ef245e52413dbc6e4de71eecb4f0618843ee0621f96ef438df5ec20483a56686ec0ba7ed13fce29b13b779a04313337caa385ae8c SHA512 06ad42ce68c16715fc92a41439c3c27b49fc25b4f8829fac0a27f860d6c3df9a4cb964f1b4677d7587d31c0e5542c4d1c1c25ae3bcfcec889015618d22f6ff3c
diff --git a/dev-ruby/libxml/libxml-2.8.0-r1.ebuild b/dev-ruby/libxml/libxml-2.8.0-r1.ebuild
deleted file mode 100644
index cace17bd2a36..000000000000
--- a/dev-ruby/libxml/libxml-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ruby22 → test suite hangs
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_NAME="libxml-ruby"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc HISTORY"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby libxml with a user friendly API, akin to REXML"
-HOMEPAGE="https://github.com/xml4r/libxml-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND} dev-libs/libxml2"
-DEPEND="${DEPEND} dev-libs/libxml2"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	# Remove grancher tasks only needed for publishing the website
-	sed -i -e '/grancher/d' -e '/Grancher/,$d' Rakefile || die
-
-	# We don't have the hanna template available.
-	sed -i -e 's/hanna/rake/' Rakefile || die
-
-	# Remove rake-compiler bits since we don't use it
-	sed -i -e '/extensiontask/d' -e '/ExtensionTask/,/end/d' -e '/GemPackageTask/,/end/d' Rakefile || die
-
-	# replace ulimit -n output as it does not work with Ruby 1.9
-	sed -i -e 's:`ulimit -n`:"'`ulimit -n`'":' test/tc_parser.rb || die
-
-	# Avoid test failures with libxml2-2.9.2 since that is the oldest
-	# secure version available: https://github.com/xml4r/libxml-ruby/issues/103
-	sed -i -e '/tc_html_parser_context/d' test/test_suite.rb || die
-	sed -i -e '/test_bad_xml/,/^  end/ s:^:#:' test/tc_parser.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/libxml extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/libxml V=1
-	cp ext/libxml/libxml_ruby.so lib/ || die
-}
-
-each_ruby_test() {
-	# The test suite needs to load its files in alphabetical order but
-	# this is not guaranteed. See bug 370501.
-	${RUBY} -Ilib -r ./test/test_helper.rb test/test_suite.rb || die
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild b/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
index 8f77904809f4..0c937d52f425 100644
--- a/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild
index e1ad1a97f5c5..8d7056ae2520 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild
index 3758bb78ed2c..a97a1bd3cac8 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 49dd6877ef88..038bc8d54c5b 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,4 +1,4 @@
 DIST rspec-support-3.3.0-git.tgz 45380 SHA256 cea58331f616e407c4ee25bb0b74bad26dbdc793fd341010d37749dea15e30a2 SHA512 88f0fdbc7609093c8f14bff220a03d0788847315e5ac73c025cd181d84a3ac120c294aca8ffff9a0c11c9f11e35019dc337f9e43fc2c33cabe4856d87e36fa1e WHIRLPOOL 6f355bb1dc71bbb7804fd3d4a4227042bbe0d166ef336e4121730abce52e1596b25b94ae38e72a6284ca2eac6d0eb6146a02f54d08792b1ff5a6320d40524a2a
-DIST rspec-support-3.5.0-git.tgz 59824 SHA256 856a052e7fd6d3a368c543580528495e660bb1ce403333001ba4be48e39a518f SHA512 246d86c131dae12d6ca9040dba800ea5e378cfce083b1840492cc2c968e4d17fe67617332aa77d46817356113f81d8d9584698e4fe9e4873291d18ebe04eacbc WHIRLPOOL ed288c0681b14670e6bbb43c5672d7240c408e98be2927b32d38eb330b5b941d2169c4d3c30b1a0c7f715554f4f67d5399451da466a4a15f4c90c9ce208313b1
-DIST rspec-support-3.6.0-git.tgz 64987 SHA256 cd02fc3b5fc5cf668ead3192a7bd8301b197c9344433b819c5e1c5fc6ffcd0fd SHA512 550e23ad2da53b445fa5e496eab243ad8c00db69949e50fe9e6c391b77166bbdc94261aae3a2b49c7f2f598abefe40ea4e93940cb493017fcdcc501675c8476e WHIRLPOOL 08ee95290280af2ac1bf811e8016888e9e8157210b7e330cece5e6f543200d14215925701e480684a0f2277687dfe8ceb6b5a4b432fe9f5051aa6272913a2001
+DIST rspec-support-3.5.0-git.tgz 59824 BLAKE2B 8e970af2f060344f842664e3afad7ba18d6884ef4a0e5b47ca3f2544f27a80df7227b98e853fea5a1091a6727d075d6a033e23dae930bbad854a181f8aa1662a SHA512 246d86c131dae12d6ca9040dba800ea5e378cfce083b1840492cc2c968e4d17fe67617332aa77d46817356113f81d8d9584698e4fe9e4873291d18ebe04eacbc
+DIST rspec-support-3.6.0-git.tgz 64987 BLAKE2B 9337da63047a1b33e8534a74a6dd4004287f0f057278b78160465ad66d43d5b543b9039d68e3488752e963308764b74a1343868f692b0ff26559b0c90cd3b674 SHA512 550e23ad2da53b445fa5e496eab243ad8c00db69949e50fe9e6c391b77166bbdc94261aae3a2b49c7f2f598abefe40ea4e93940cb493017fcdcc501675c8476e
 DIST rspec-support-3.7.0-git.tgz 65675 SHA256 2098352c9cead0534de5878580194cf42721e77aab632015804fcea0161d4da7 SHA512 a4a3fc705d4c31d760777513f86d8b0ca4c9e540b0a6f4b6d1152676f252e1276fedebe7cd259f0dbbb60b447cc179eea194f3a3e5bb023907923cbf16fc8033 WHIRLPOOL 7e1950cdf58ff07a98ae5280b953c77150d2580368a3fae9f128f78494d3f287017ded13799ed64bbf540c0cc6d1a108508029bf88bf351f22e12e08bcb95429
diff --git a/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
index 464b99983983..708708ce5dd8 100644
--- a/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.5.0:3 dev-ruby/thread_order )"
diff --git a/dev-ruby/ruby-ldap/Manifest b/dev-ruby/ruby-ldap/Manifest
index aa213c087d92..3b0465a223c1 100644
--- a/dev-ruby/ruby-ldap/Manifest
+++ b/dev-ruby/ruby-ldap/Manifest
@@ -1,2 +1 @@
-DIST ruby-ldap-0.9.17.gem 66560 SHA256 951ab18e8dbc2b9791555c38833df07e322992d3eb53aefca88a085fc55686c6 SHA512 b6400faa4ae19f3d783810a6b2f7af36e89cbf001aa48a343e1ff6e5f9e74639bb84db2dc58a1465f91130248eaf17767a6c125e1d416aaf7d45ff8c14c3b68e WHIRLPOOL 00b9f4508a94b0c4ecb61e3f3749142b2daa4645d80feccd86d7ed1ff9163a2cc5dcec9d516ebd4b8587573e49abdeadc31427b09e057494f8389b35009ced49
-DIST ruby-ldap-0.9.19.gem 91648 SHA256 8729230019eddd6f5a13baf5116e95e2800478636f66027e76011db274213981 SHA512 0ed931552df00c11855297ab44fd1c9a79e751937758d38189147f1d37cbce9b1da6fa42e64a9fd44610e948b1c13031013b7931ed473cd55b8425e64a50584a WHIRLPOOL f82e718f03feabb028f7490f8c87a3da159b6d2cf26c7ed9c7872183f5a029978dc56b26976223d61fd6afc576c489997e9340d064341221c8ea1dd262face0d
+DIST ruby-ldap-0.9.19.gem 91648 BLAKE2B 0ea6fe17ac2e4cd34a0834c6b95b1db4905e709010962959735cc3cedf9d50695d642b6042711b4f5154198fbe0bb5312903169ba8f1a7868b6f18d681a81682 SHA512 0ed931552df00c11855297ab44fd1c9a79e751937758d38189147f1d37cbce9b1da6fa42e64a9fd44610e948b1c13031013b7931ed473cd55b8425e64a50584a
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.17.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.17.ebuild
deleted file mode 100644
index 55450913c9ca..000000000000
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.17.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-inherit multilib ruby-fakegem
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="ChangeLog FAQ NOTES README TODO"
-
-DESCRIPTION="A Ruby interface to some LDAP libraries"
-HOMEPAGE="http://ruby-ldap.sourceforge.net/"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-macos"
-IUSE="ssl"
-DEPEND=">=net-nds/openldap-2
-	dev-libs/cyrus-sasl
-	ssl? ( dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}"
-
-# Current test set is interactive due to certificate generation and requires
-# running LDAP daemon
-RESTRICT="test"
-
-each_ruby_configure() {
-	local myconf="--with-openldap2"
-	if ! use ssl ; then
-		myconf="${myconf} --without-libcrypto --without-libssl"
-	fi
-	${RUBY} extconf.rb ${myconf} || die "extconf.rb failed"
-	sed -i -e 's:-Wl,--no-undefined::' \
-		-e "s/^ldflags  = /ldflags = $\(LDFLAGS\) /" Makefile || die
-}
-
-each_ruby_compile() {
-	emake V=1
-	cp ldap$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/ruby-opengl/Manifest b/dev-ruby/ruby-opengl/Manifest
index e8c0e7e82549..98ec49dcf54d 100644
--- a/dev-ruby/ruby-opengl/Manifest
+++ b/dev-ruby/ruby-opengl/Manifest
@@ -1,2 +1 @@
-DIST opengl-0.10.0.gem 565248 SHA256 e3bc0fa92dafe5ece8858259ccc47f156edab3b6671786a75873ae1d05355a89 SHA512 8d85d7f8a25e429b18245a10c186d07a85fdc8dc4e158b0001cde2b6e4bacfe4b09552a3b3fba5e14439d2fdbe000ad23bba89563f58f612f79958283b588dde WHIRLPOOL 53c3ed2ca848e7a10a2089e40a2875aa800cad69143a3a5356805d08a1787b4f8fa8b1a6fb765c71fe1f4bb236531286aecd22b8545abab1cf4981676941bad5
-DIST opengl-0.9.2.gem 444416 SHA256 cf421841af7c8beb9768aaf755124e17a09f726ea7c91af0f8cd92941036f2cb SHA512 0a7fe8d064e90df5b0507d667d30c3158671861c944086660470f23950606bb821e431735067dfbb2f9b97ebf68041b4937d4330907c4aa3daeb21d5b7e61c37 WHIRLPOOL 7d014cbfa7c0b3eaa206ad9a3c29e78f1cb03f170a10aa5a537fc8504176e794144591131b2ff0db029907b2ba9204b6a47c59ce733d6f2a4c7c8667a08743f4
+DIST opengl-0.10.0.gem 565248 BLAKE2B e427590865e7ff13110d22a21d04a936cbdc7e559e80b37be94938a4b15c71ca6341d72bc093a45ca10e7cf419fe720e7c68866724a3c99ddc44314a4b054414 SHA512 8d85d7f8a25e429b18245a10c186d07a85fdc8dc4e158b0001cde2b6e4bacfe4b09552a3b3fba5e14439d2fdbe000ad23bba89563f58f612f79958283b588dde
diff --git a/dev-ruby/ruby-opengl/ruby-opengl-0.9.2.ebuild b/dev-ruby/ruby-opengl/ruby-opengl-0.9.2.ebuild
deleted file mode 100644
index 0416b28c3f46..000000000000
--- a/dev-ruby/ruby-opengl/ruby-opengl-0.9.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# Two tests fails but the README already indicates that this may not
-# work. Additionally these tests require access to video devices such as
-# /dev/nvidiactl.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_NAME="opengl"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="OpenGL / GLUT bindings for ruby"
-HOMEPAGE="https://github.com/larskanis/opengl"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-
-IUSE=""
-
-DEPEND+=" virtual/opengl
-	media-libs/freeglut"
-RDEPEND+=" virtual/opengl
-	media-libs/freeglut"
-
-each_ruby_configure() {
-	${RUBY} -Cext/opengl extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/opengl V=1
-
-	cp ext/*/*$(get_modname) lib/ || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/*
-}
diff --git a/dev-ruby/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index afebdd06719f..03e7e2473133 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -1,4 +1,4 @@
-DIST ruby-progressbar-1.4.2.gem 24064 SHA256 1285524b097446471bc60c4b756f9f8c4b527dd870eaf318e7d83380cde99fa7 SHA512 443fc015b2dcabc76c685f1529a39ffba289cb00c3cee3992ef240fb9822729f9049db4d85c58ee1ab6cc17927cb325044ea45a968c755a9b5ad93f7b9999fbd WHIRLPOOL 50bcbefce6fe3e1b05ad20476f67f9e610e5e91e5d9bc92a8ecc0ef5ab79233c16237c04f3782878855fae8115e556d53a0c6624d151fcd49bd58792aeb370f7
-DIST ruby-progressbar-1.7.5.gem 21504 SHA256 71c754e2e3f26b87f307e360dee8f2267800b88327a7def0098d7e6cb752d643 SHA512 1a5cb4b8ca9a9669bdaa60fcf3f01bec347b4ac1aefe737a7c6014bf40166c72d74ab0f489638c12ffd5245cc2b0a19186f7ab440bd7629579bf00d5155a8741 WHIRLPOOL 13e05a761c10c6fbb87cfb11f83f18acae93daeec1e11306b432ee751427e0d95a56d63cd7528590242b3e5241d4de6eaef2ea1b9190a1c1196430f4828f5580
-DIST ruby-progressbar-1.8.1.gem 26112 SHA256 95ded755295440de814704970d7ccaf3cb259854534f03a03a6d05918f3eece3 SHA512 bded41f29ed3386b83b0c4fe208813de330cb6be527c4b91cbf436f44d0efe58cb717a783d104f32b697fe1d9b71eeec500c8a72a9a5b34fc416c86e7565bc01 WHIRLPOOL 3e2c00c55734819fab7eaf9e0b1666cc1ff7a733edf2d14260f4f5baf77d2d608db1473c76c45759a5d055ee5c59ef7fdbd7869964e00b4ef6ea23882bce2150
-DIST ruby-progressbar-1.8.3.tar.gz 44706 SHA256 b3ac685d7b1dcf21cb41ec381faadd74d854eeac1dc0256772d5cdad6e0c8b54 SHA512 c8394c9be76e00692e3e51b27be92b0aac9baede288ae514a2656a7880df61fde44f07cf16395c69a5215c3cdeb6474cce106af054be9c6ecdfd5887150c111b WHIRLPOOL 9b1e7155ce44cceb3727378b7e32244f1c5010c102fa2a49c0da2fa21991f7a37eb4e46cc2515545d71291bed38e76dc8bfea603c73af64f9c714c244302a7b6
+DIST ruby-progressbar-1.4.2.gem 24064 BLAKE2B 4c26f5c281129a7333c8a7a1f7738a094ec02d769293252c8fbc6df0bea99971cd0d235b6bbeba7e2e4fac10409028f7cdb15870484878c26d9ea9f709f0135b SHA512 443fc015b2dcabc76c685f1529a39ffba289cb00c3cee3992ef240fb9822729f9049db4d85c58ee1ab6cc17927cb325044ea45a968c755a9b5ad93f7b9999fbd
+DIST ruby-progressbar-1.7.5.gem 21504 BLAKE2B abb50406df3b952327bbacdb4600a66751772ab3c22053a172150618cfb36e9aa567461ea31772ae74372d9b3df4d13419994fd8597c9f0f10ea090251493e6d SHA512 1a5cb4b8ca9a9669bdaa60fcf3f01bec347b4ac1aefe737a7c6014bf40166c72d74ab0f489638c12ffd5245cc2b0a19186f7ab440bd7629579bf00d5155a8741
+DIST ruby-progressbar-1.8.1.gem 26112 BLAKE2B 2e4a8406328f07b2be0b59b5d08e8f56e17d4e5ae43325b4fadd563427aabde1e354fb05e6e67403c9f00c17e0f8e3239cdc3d0cb40d4c8cc6520306214289b3 SHA512 bded41f29ed3386b83b0c4fe208813de330cb6be527c4b91cbf436f44d0efe58cb717a783d104f32b697fe1d9b71eeec500c8a72a9a5b34fc416c86e7565bc01
+DIST ruby-progressbar-1.8.3.tar.gz 44706 BLAKE2B ef0b7bc2647da5af777e4ee88b85632ad47d7bee3a1b5f3ade57108362b663a66a78b023080039a94bb452694b41be3e6d52da1e322d1e6d86a2f28ff8aa7fc3 SHA512 c8394c9be76e00692e3e51b27be92b0aac9baede288ae514a2656a7880df61fde44f07cf16395c69a5215c3cdeb6474cce106af054be9c6ecdfd5887150c111b
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild
index a7c6276c65dc..cf0379c1e7c2 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-fbsd"
 
 IUSE="test"
 
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 5ee9048a8e47..8bc7ee217fdf 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,7 +1,6 @@
-DIST selenium-webdriver-2.53.4.gem 897536 SHA256 44b38d9b6a97b39c7d2aa5185ff9585320295d5aa194cb21ec562897d6711e97 SHA512 ad7934a67c4415a81c2d0efae5f510d41784411076ea903724e1fa2be1b209382131aa1b05f3636deb1deca38db6e76805262f5037ab2e621e785e4eb3c2b90e WHIRLPOOL c75f4b89fbfc31987ff92c013c1274a07d73f4d7fcbcdbade267180849e45279ebd5099fa63f7a5138ca75100fc1d39e15e0df4f15f35552cd2e679ea5c2bff0
-DIST selenium-webdriver-3.4.3.gem 837632 SHA256 61b29ae4970250f811f559bdf67dc704a9fccb49eb0a53052b6b56c98d552aa0 SHA512 29df75d4a89a710fbd48e67b6c6c72e85a2a266e678de7ce45965da9d108ea01f997cf881996930e41804c1d793e6f4b93e5bef18ecccf19be16ca2538d90c5f WHIRLPOOL edb2ba1dd3abebec61b4ab9282054a2887742cfcfded9e7e9f0b41b696ca0a4be8198128ee84fe84b07f565bda555e083918f381a3cf0e5b3a9f8bad892bbd5a
-DIST selenium-webdriver-3.4.4.gem 838144 SHA256 4188bcf6db106b97e5961295a736492e72d02fae16942c6d70015410f1df0a57 SHA512 57382abfb5e01781c38688c2d70bfbddd31708b84851b099ce06959f33c12aa3e93ec6455c8c310484ab556fff0fe1d27c02990a9cf0a563cf1259abad38d57d WHIRLPOOL 11fe418dc5dbc73a0c2c9c327f80e7b19042000dcfd5a20108859a738445d6bcbcc0a439505c2962bb39a4a65a0b9bb31f7c1b95cda6c7fd9d1702853f41b203
-DIST selenium-webdriver-3.5.1.gem 830464 SHA256 7fb36c73618ddcd1553313de9e2e3100d4e767ec752f2e2cdb17b553e6d9ee28 SHA512 5a3c0776d4ab6816b107e8e8bca62afd7df9f90b3f757563b2180de4764a4b4499b9afd88668913cbcec9b10df04a94be27a91ad96181f4a4d7e9008e7062fa8 WHIRLPOOL db091e5eb671bf98096bb8c3d41b2814a96bab11f8c6dbce87ae0aa04c98b6c072ac6efe96c5e58617167e46ff818ea10c726887fa430ef3e9c8e460b4a611bc
-DIST selenium-webdriver-3.5.2.gem 830976 SHA256 fe42fdc7dfb654488715b79b970f59937a19acbbd1ad52e30206bfb3a8815d82 SHA512 c0a8c0e23e4323762d5cad329774337688cc831658de4bb4712f69c2b4c3f0e189fcd0e3576d8132ec9a3fd5c0365ad128bf65061045514b2871a43b30eaeb3a WHIRLPOOL 1c45abe6a2354b5f780e0c5ccf0d40304d27eac6b89af1ad2418d9f1a9cb945057fcff02f973877c52a0ced39c58d1c8541ef74123bb4e202e8b4035a8180664
-DIST selenium-webdriver-3.6.0.gem 841216 SHA256 1276317792e13f24a556f4bec954bbd5213ac22018fa4ecb194904a450499626 SHA512 c0cea582314167de0390007fe26d94e7470020bbb999787fa0883eb65a491a6ecfcbfad9938a50cbc415023edf2ee7ee44ba88ea35d22cbe87d0ed435f38fc99 WHIRLPOOL 54d67d1272c9e47c95d1257646b466276b63e268f34e969d9e5f8d1c82bc6a81038afa4658a5753f0ebe1db0aeafcb36f43951bf709456f4a0046962afd65a25
-DIST selenium-webdriver-3.7.0.gem 839168 SHA256 f5702ce0dfed6a5fb3c456aeb99072757666d68b7f53d417a462e20aa8ed0e1f SHA512 f15819d7e3a683d101073710876792ec0cca7c28d387bb9d1b19964083a99e276340fbcfedd9b0ca2234c54f7db56d12dc3af2e4eadf8995e1e05f7282169726 WHIRLPOOL 7742d5db0965afb4f23581b08583840aea509ec1100cccb44873a86270cc7d93d0e9e4dc5bf0bdea47b9ebbeced1ad987be3cba01a397435113e8dad588afcd4
+DIST selenium-webdriver-2.53.4.gem 897536 BLAKE2B 630b5e8cd5ce53de7a689135ce80e364e33b783bd8493f79af01d79717d3d65541fe04c6c0e5016a85af8a559864ddcb641d06c99430599b21095b54ff40845a SHA512 ad7934a67c4415a81c2d0efae5f510d41784411076ea903724e1fa2be1b209382131aa1b05f3636deb1deca38db6e76805262f5037ab2e621e785e4eb3c2b90e
+DIST selenium-webdriver-3.5.1.gem 830464 BLAKE2B 3f84f324e204beef201656e18b34db65d8eb599d82dda99c1aa0df6659e5b92cf28f936b976bf95574b0d2800dd891ad5c00a2950ee6cfd6e2cf07901db5f247 SHA512 5a3c0776d4ab6816b107e8e8bca62afd7df9f90b3f757563b2180de4764a4b4499b9afd88668913cbcec9b10df04a94be27a91ad96181f4a4d7e9008e7062fa8
+DIST selenium-webdriver-3.5.2.gem 830976 BLAKE2B 04474aaa7a17c40208d4d5c411cb1c94b31a1f12a1ad9dbaee4dcd40944a2a94340641c2a6a12b605ff3a8979ed0e1336a05284d11dc8ce8125831857edeca5d SHA512 c0a8c0e23e4323762d5cad329774337688cc831658de4bb4712f69c2b4c3f0e189fcd0e3576d8132ec9a3fd5c0365ad128bf65061045514b2871a43b30eaeb3a
+DIST selenium-webdriver-3.6.0.gem 841216 BLAKE2B 8cfe144b0f3e827c9344977ea44aeb4638cd4a197c0d06bf11aef92545b66af5504ac58e353841bcce3855870b6b042b09c4793d33b9a1d372ccd0a382d30ae3 SHA512 c0cea582314167de0390007fe26d94e7470020bbb999787fa0883eb65a491a6ecfcbfad9938a50cbc415023edf2ee7ee44ba88ea35d22cbe87d0ed435f38fc99
+DIST selenium-webdriver-3.7.0.gem 839168 BLAKE2B 0c6940ff2a8197a3166e8f3f7e7b43bc4551b5bb1f8a40a5887ddcfa7efab93faefa9ead632d3973cbd57a65553a9027f83145bbac753b4ef122f792bae569fd SHA512 f15819d7e3a683d101073710876792ec0cca7c28d387bb9d1b19964083a99e276340fbcfedd9b0ca2234c54f7db56d12dc3af2e4eadf8995e1e05f7282169726
+DIST selenium-webdriver-3.8.0.gem 840192 BLAKE2B 3f3871afed9734627757e58a211ad894fd45a49b73208b533fd39e0d99172536e7f2abdfbed1e0589c45aac6a26dd0c1ae0cf8f25053d44082957f7d07591d37 SHA512 c00c44786ecee4c02723b88c9ae5921d6a3f2d4c6c3bd043da1f524692c75a69357b752fc183c7881de0d0a6e6d6ddb03ca31e6a983afacdd06978bdd0797957
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.4.4.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.4.4.ebuild
deleted file mode 100644
index 9c991789564e..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.4.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at https://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="https://github.com/seleniumhq/selenium"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
-	dev-ruby/rubyzip:1"
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.4.3.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.8.0.ebuild
similarity index 92%
rename from dev-ruby/selenium-webdriver/selenium-webdriver-3.4.3.ebuild
rename to dev-ruby/selenium-webdriver/selenium-webdriver-3.8.0.ebuild
index a199ade47e97..c4c4d1b87cc2 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.4.3.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 # NOTE: this package contains precompiled code. It appears that all
 # source code can be found at https://code.google.com/p/selenium/ but the
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/seleniumhq/selenium"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index 3c0a0c69e990..e521c3f61c7b 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -1,4 +1,3 @@
-DIST timecop-0.7.1.gem 15360 SHA256 22e529f06739b1361b4e3b40adc667dfa8f50e66b13b778448cf51fb62bc8f2a SHA512 cbc1e1d6575473ed4200e71a8bbc91f4dd78a0e612e08ca236f485a92e71f02621bd199dc32a983dd7eea9a143b8fbf4b833f73016b5a7ea6a7459730efc1d83 WHIRLPOOL f54018f65fdd55c8d7399083a7c9d1f6f1405a6cea5941b8e20ef143d3c4a57350cc2714a2626f918ff753a11dafb506539d41ef4c43464258a2832590215a2a
-DIST timecop-0.8.1.gem 16384 SHA256 bdce943521113e0b9ed2a6136e1c7396fa413ec7100814f2fe5bc1ee319f8b6f SHA512 c4d281aa04fe94636dc23dc0fa6ea4a1dc27fc1debe550b06a208ceaab1d9d8b160f792bd5f14a7c004cecf489d4427df39873a68fe6ab27fe9c0e94770cc764 WHIRLPOOL 794420343bb9112f36d69b7aa161b865d1a79da3069200c2befbf693c4916f8a4021e9bbac28751beeefa8a77f21db82ff2caeddab39d5c310c8ce12147dafb1
-DIST timecop-0.9.0.gem 16896 SHA256 adced6244cf4f853f8028b240be5f78f0c44be2021949c7c7db075a2963810ed SHA512 820a953ed70588bd377d1b15188937429f0b8d7902e3c6696cbd0c878dfbe95269985654adae6598482384ccbf79b4cd9edf025ec61baf0982eaf340ce19c314 WHIRLPOOL ca756a190d8489b33b5e60c02c68b8a9f330ab6765fb54e8a5bab14c38afac9bf61ceaf777d5cdcfba00512850ae8fd66a4bebeedccf8aaeb98d5c7a1c416403
-DIST timecop-0.9.1.gem 16896 SHA256 374b543f0961dbd487e96d09ac812d4fdfeb603ec705bbff241ba060d0a9f534 SHA512 2c8429ad4d9c706865810caa80dfb12c16acaaa97ea289fc300e172a359817fea7d31789f4bea75cfae8ce1f84e7d8effd32b39a0482f3d68fb4e225b487e13e WHIRLPOOL 895b9625601f1b4f0d76499d6cc313072abcd48f75ca9fa38109a4437238d7c5614161784d06ea748d99747b99981d89e00646e7719bab3584625c273df8a6f5
+DIST timecop-0.8.1.gem 16384 BLAKE2B ca3aa8422841b83f4631afa102c4475f4df73c3968eb9ec17d2159a41ed976330ac9c078970f3ed2a504146ae0f4d88650892c314c92da6dab0f8a0ff0a24a35 SHA512 c4d281aa04fe94636dc23dc0fa6ea4a1dc27fc1debe550b06a208ceaab1d9d8b160f792bd5f14a7c004cecf489d4427df39873a68fe6ab27fe9c0e94770cc764
+DIST timecop-0.9.0.gem 16896 BLAKE2B 3341889394559c01c3353c3c22a2cc42b4bde268bd6c211af6f88b87996d551e7e9f4a2d8099b1a4d75b850dfa854ad1c1eb264140bc11afb86a9ef9c8663727 SHA512 820a953ed70588bd377d1b15188937429f0b8d7902e3c6696cbd0c878dfbe95269985654adae6598482384ccbf79b4cd9edf025ec61baf0982eaf340ce19c314
+DIST timecop-0.9.1.gem 16896 BLAKE2B f4dd9293743f0be4dc5616aae077965a32e348faa7019867d694689b0376c6be06817870842bdcbf5f398ec4814ae1e4f6546c75c95639bbd2cb8021a1dee3f7 SHA512 2c8429ad4d9c706865810caa80dfb12c16acaaa97ea289fc300e172a359817fea7d31789f4bea75cfae8ce1f84e7d8effd32b39a0482f3d68fb4e225b487e13e
diff --git a/dev-ruby/timecop/timecop-0.7.1.ebuild b/dev-ruby/timecop/timecop-0.7.1.ebuild
deleted file mode 100644
index b23435dc1954..000000000000
--- a/dev-ruby/timecop/timecop-0.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A gem providing 'time travel' and 'time freezing' capabilities"
-HOMEPAGE="https://github.com/travisjeffery/timecop"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' -e '/History.rdoc/d' Rakefile test/test_helper.rb || die
-	sed -i -e '/rubygems/ a\gem "test-unit"' test/test_helper.rb || die
-}
-each_ruby_prepare() {
-	sed -i -e "/bin\/sh/ a\RUBY='${RUBY}'" test/run_tests.sh || die
-}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 659c9c126410..0ea1cd3f8e56 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/jscheme/jscheme-7.2.ebuild b/dev-scheme/jscheme/jscheme-7.2.ebuild
index e92523300a5d..d78b804ae606 100644
--- a/dev-scheme/jscheme/jscheme-7.2.ebuild
+++ b/dev-scheme/jscheme/jscheme-7.2.ebuild
@@ -5,7 +5,7 @@ EAPI="3"
 
 inherit java-utils-2 java-pkg-2
 
-DESCRIPTION="JScheme is a dialect of Scheme with a very simple interface to Java, called the Javadot notation"
+DESCRIPTION="JScheme is a Scheme dialect with a simple Java interface called Javadot notation"
 HOMEPAGE="http://jscheme.sourceforge.net/jscheme/main.html"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index 34f11bd199f2..30befbadd4d3 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -1,4 +1,2 @@
-DIST XQTS_1_0_2.zip 19879467 SHA256 923361362d70a20818c6442eb52a6401fe9d2e53e4f52ee8b4d7fb1c841b4443 SHA512 a9c35ee02871b2b9629ce87125886347ef407133871c63e7628bfc8b99a60045c0187a2fbfa1a6f02dc572d7ac1b27cac24e467dd07f95acdedc6b4c7ffd969a WHIRLPOOL 43628d3650e0996c97f7bc05da2255661d8dcedfa45ddbb325311a3aec0d9e7e6f6383f73ed2f65a77bd5a26158c069dcfe1eac04b418da21c14bfcdf2a55a0f
 DIST XQTS_1_0_3.zip 30956043 SHA256 1a6c9dd8761f021e78105efd4f46d5d35bb8b73b18e14bfde0512661e6be78ec SHA512 e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd WHIRLPOOL 57ac5b2d5a38446d89df7bd7d06dbe09a592b6243ceb415fac4d2d0bf154a8cf51307194feab7eef14643bdd8f24e87f307b2cb521f5f81ef412814bf9fddc8b
-DIST kawa-1.10.tar.gz 2238130 SHA256 f697f5784b55b1945f0644954459f88a0eb9511bb60d695b1a9767b58eb7492e SHA512 4ab27331f7be6d6107272e75508179ed7d14c475e1fffaceeb7a16600e3ba4e54fc63506788ed89fca1f2d390477d2e3e685f29b015a28214fcb4f62016c943d WHIRLPOOL 2dc4c85ae4d8496b0425d6faf9c6077fe66906a107d0780b60d19fc91992b0a06f066857c4aa45fb81e29495ec4f9c7d9bac9d6f9a210874d2ffaf79dbf851eb
 DIST kawa-1.14.tar.gz 2691484 SHA256 2201cf3f4c57f49f15cf929d8634855cb8ef4ffe79158cecd66ebd5bd9b4b909 SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e WHIRLPOOL 6f7e32e38ecea68e4d7faffc2cb1df16d33b384010391d23507397714891ad1588a35aa7d0b4c1079322acc3250f25459c94ddb68f90a14f04a552f847542d6a
diff --git a/dev-scheme/kawa/files/kawa-1.10.patch b/dev-scheme/kawa/files/kawa-1.10.patch
deleted file mode 100644
index 8acc5e442f69..000000000000
--- a/dev-scheme/kawa/files/kawa-1.10.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur kawa-1.10.orig/Makefile.in kawa-1.10/Makefile.in
---- kawa-1.10.orig/Makefile.in		2010-09-19 01:38:24.000000000 +0200
-+++ kawa-1.10/Makefile.in	2010-09-19 01:38:59.000000000 +0200
-@@ -908,7 +908,7 @@
-     | sed -e 's|./||' | sort > $@
- 
- gnu/kawa/util/PreProcess.class: $(srcdir)/gnu/kawa/util/PreProcess.java
--	$(JAVAC) -d . $(srcdir)/gnu/kawa/util/PreProcess.java
-+	$(JAVAC) $(JAVACFLAGS) -d . $(srcdir)/gnu/kawa/util/PreProcess.java
- 
- # JDK 1.1
- select-java1: $(srcdir)/patch-source-list gnu/kawa/util/PreProcess.class
-diff -Naur kawa-1.9.90.orig/bin/Makefile.in kawa-1.9.90/bin/Makefile.in
---- kawa-1.9.90.orig/bin/Makefile.in	2009-08-08 12:20:49.000000000 -0300
-+++ kawa-1.9.90/bin/Makefile.in	2009-09-21 20:15:06.000000000 -0300
-@@ -686,7 +686,7 @@
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
--@ENABLE_KAWA_FRONTEND_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
-+@ENABLE_KAWA_FRONTEND_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) ./kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
- @WITH_GCJ_DBTOOL_FALSE@@WITH_GCJ_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) kawa-bin$(EXEEXT) $(DESTDIR)$(bindir)/kawa-bin$(EXEEXT)
- @ENABLE_SERVLET_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) cgi-servlet$(EXEEXT) $(DESTDIR)$(bindir)/cgi-servlet$(EXEEXT)
- 
diff --git a/dev-scheme/kawa/kawa-1.10.ebuild b/dev-scheme/kawa/kawa-1.10.ebuild
deleted file mode 100644
index 74950542bece..000000000000
--- a/dev-scheme/kawa/kawa-1.10.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Kawa, the Java-based Scheme system & Language Framework"
-HOMEPAGE="https://www.gnu.org/software/kawa/"
-XQTS_Ver="1_0_2"
-SRC_URI="mirror://gnu/kawa/${P}.tar.gz
-		 xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_${XQTS_Ver}.zip )"
-
-LICENSE="MIT public-domain
-		 jemacs? ( GPL-2 )
-		 krl? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="+awt echo2 +frontend jemacs krl +sax servlets +swing swt +xml xqtests"
-
-COMMON_DEPEND="( >=virtual/jdk-1.5 )
-			   frontend? ( sys-libs/readline:0 )
-			   sax? ( dev-java/sax:0 )
-			   echo2? ( dev-java/echo2 )
-			   swt? ( dev-java/swt:3.5 )
-			   servlets? ( dev-java/servletapi:2.4 )"
-DEPEND="${COMMON_DEPEND}
-		xqtests? ( app-arch/unzip:0 )"
-RDEPEND="${COMMON_DEPEND}"
-
-xtestsuite="XQTS_${XQTS_Ver}"
-
-src_unpack () {
-	unpack kawa-${PV}.tar.gz || die
-	if use xqtests; then
-		mkdir "${WORKDIR}/${xtestsuite}" || die
-		cd "${WORKDIR}/${xtestsuite}" || die
-		unpack ${xtestsuite}.zip || die
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-}
-
-src_configure() {
-	# speeds up one-shot ebuilds.
-	myconf="--disable-dependency-tracking"
-	if use jemacs && ! use swing; then
-		echo
-		einfo "Although the swing USE flag is disabled you chose to enable jemacs,"
-		einfo "so swing is enabled anyway."
-		echo
-		myconf="${myconf} --with-swing"
-	else
-		myconf="${myconf} $(use_with swing)"
-	fi
-	if use xqtests; then
-		myconf="${myconf} $(use_with xqtests XQTS=${WORKDIR}/${xtestsuite})"
-	fi
-	if use servlets; then
-		myconf="${myconf} --with-servlet=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
-	fi
-	if use swt; then
-		myconf="${myconf} --with-swt=$(java-pkg_getjar swt-3.5 swt.jar)"
-	fi
-
-	econf ${myconf} $(use_enable frontend kawa-frontend) \
-		  $(use_enable xml) \
-		  $(use_enable krl brl) \
-		  $(use_enable echo2) \
-		  $(use_enable jemacs) \
-		  $(use_with awt) \
-		  $(use_with sax sax2) \
-		  --with-java-source=$(java-pkg_get-source) || die "econf failed."
-}
-
-src_compile() {
-	emake -j1 || die "emake failed."
-}
-
-src_install () {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	rm -rv "${D}"/usr/share/java/ || die "rm -rv failed"
-
-	java-pkg_newjar kawa-${PV}.jar || die
-
-	java-pkg_dolauncher "kawa" --main kawa.repl || die "dolauncher failed"
-	java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \
-		"--xquery" || die "dolauncher qexo failed"
-	if use servlets; then
-		java-pkg_dolauncher "kawa-cgi-servlet" --main \
-			gnu.kawa.servlet.CGIServletWrapper || die
-	fi
-	if use jemacs; then
-		java-pkg_dolauncher "jemacs" --main \
-			gnu.jemacs.lang.ELisp || die
-	fi
-
-	use source && java-pkg_dosrc kawa/* gnu/*
-
-	dodoc ChangeLog TODO README NEWS || die
-	doinfo doc/kawa.info* || die
-	cp doc/kawa.man doc/kawa.2 || die
-	cp doc/qexo.man doc/qexo.2 || die
-	doman doc/*.2 || die
-}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index c69908bc7012..21b8da5ab060 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/slatex/slatex-20090928.ebuild b/dev-tex/slatex/slatex-20090928.ebuild
index b6ffd8b818d2..476a4ab04f53 100644
--- a/dev-tex/slatex/slatex-20090928.ebuild
+++ b/dev-tex/slatex/slatex-20090928.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
 # for updating the texmf database, id est latex-package_rehash
 inherit latex-package
 
-DESCRIPTION="SLaTeX is a Scheme program that allows you to write Scheme code in your (La)TeX source"
+DESCRIPTION="SLaTeX is a Scheme program allowing you to write Scheme in your (La)TeX source"
 HOMEPAGE="http://www.ccs.neu.edu/home/dorai/slatex/slatxdoc.html"
 SRC_URI="http://evalwhen.com/slatex/slatex.tar.bz2 -> ${P}.tar.bz2"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d164298eaed7..e2fad43d04e1 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
index c05659eb0025..cdb3f6c3c48f 100644
--- a/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
+++ b/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
@@ -7,7 +7,7 @@ inherit autotools
 
 MY_P="${PN/-/_}_${PV//./_}"
 
-DESCRIPTION="CLI designed to validate AppData descriptions for standards compliance and to the style guide"
+DESCRIPTION="CLI designed to validate AppData descriptions for standards and style compliance"
 HOMEPAGE="https://github.com/hughsie/appdata-tools/"
 SRC_URI="https://github.com/hughsie/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
index 9cfc41218f87..308d6bfef72c 100644
--- a/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
+++ b/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-DESCRIPTION="CLI designed to validate AppData descriptions for standards compliance and to the style guide"
+DESCRIPTION="CLI designed to validate AppData descriptions for standards and style compliance"
 HOMEPAGE="https://github.com/hughsie/appdata-tools/"
 SRC_URI=""
 
diff --git a/dev-util/autoproject/autoproject-0.20.ebuild b/dev-util/autoproject/autoproject-0.20.ebuild
index 05e5e1d55816..5343efa1d037 100644
--- a/dev-util/autoproject/autoproject-0.20.ebuild
+++ b/dev-util/autoproject/autoproject-0.20.ebuild
@@ -4,7 +4,7 @@
 inherit eutils
 
 DEB_VER=3
-DESCRIPTION="Used to start a programming project using autotools and a command line parser generator"
+DESCRIPTION="Start a programming project using autotools and a command line parser generator"
 HOMEPAGE="http://packages.debian.org/unstable/devel/autoproject"
 SRC_URI="mirror://debian/pool/main/a/autoproject/${PN}_${PV}.orig.tar.gz
 	mirror://debian/pool/main/a/autoproject/${PN}_${PV}-${DEB_VER}.diff.gz"
diff --git a/dev-util/autoproject/autoproject-0.20_p5.ebuild b/dev-util/autoproject/autoproject-0.20_p5.ebuild
index f76f1b6b6548..d37a9867e8e3 100644
--- a/dev-util/autoproject/autoproject-0.20_p5.ebuild
+++ b/dev-util/autoproject/autoproject-0.20_p5.ebuild
@@ -5,7 +5,7 @@ inherit eutils
 
 MY_PV=${PV%_p*}
 DEB_VER=${PV#*_p}
-DESCRIPTION="Used to start a programming project using autotools and a command line parser generator"
+DESCRIPTION="Start a programming project using autotools and a command line parser generator"
 HOMEPAGE="http://packages.debian.org/unstable/devel/autoproject"
 SRC_URI="mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}.orig.tar.gz
 	mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}-${DEB_VER}.diff.gz"
diff --git a/dev-util/catalyst/catalyst-3.0.0.ebuild b/dev-util/catalyst/catalyst-3.0.0.ebuild
index 25437e6d4b09..d92c866043e2 100644
--- a/dev-util/catalyst/catalyst-3.0.0.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.0.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	>=dev-python/pydecomp-0.1[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-crypt/shash
 	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
index cb4ad6f52b66..ca8da0a70b91 100644
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ b/dev-util/cucumber-tag_expressions/Manifest
@@ -1,2 +1,3 @@
 DIST cucumber-tag_expressions-1.0.1.gem 8192 BLAKE2B a47f6d1c049e16df641deedd58ef5c7bb12fa1fb3d0a7e894cc04ac5fde05b1de71663af763ea5199b3d53a44f942abb650fb054a0baf3763f7e2f6dd59a76cb SHA512 be19d91c4b267d0f4c5f483e61a13d63cc023719874358bb63ac72fa3104e6068b8edc6231e70c4ee24c4f33e0b4f2254148edb666bec1f617c0d322275582b6
 DIST cucumber-tag_expressions-1.1.0.gem 7680 BLAKE2B c8aa789750c0e33acc0864d85bb7f90c87d9b0872cf027e84eda4be8ea73187e0171abbbc430d7f2fad4cffda3e218bff35c9016800f0eb80877c6acb84fe75f SHA512 471dd0e8cc63cc67e9cd99a446859047683b5e4f4b55461c986b25999240d4b466bf1d3eef4bf7debf56b7ea3ed10e6dac7f19b67496f81bbbe6d2d4c7168aeb
+DIST cucumber-tag_expressions-1.1.1.gem 7680 BLAKE2B 31e1f23c5fc008390c9221307473022107b109d409d8385a111f4fed1911fad15660faa824bee71cd87a2e183ec41a6ac9b5f7ecf5f1c417ed51d649c76712e8 SHA512 9b46d681be78b428c7cd29ca1cae21dbd410f7ca9844ec6f94368170c133f8de662a55e4f4440045704107e5428306ab81d2a90020c64102ef42f647cd8a66a6
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
new file mode 100644
index 000000000000..37e6c5e8fac9
--- /dev/null
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber tag expressions for ruby"
+HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~ia64 ~ppc"
+SLOT="1"
diff --git a/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild b/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
index cd45b24397af..51b8e6bcee90 100644
--- a/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="diff-like program that operates at the word level instead of the line level"
+DESCRIPTION="diff-like program operating at word level instead of line level"
 HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
 SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
 
diff --git a/dev-util/dwdiff/dwdiff-2.1.0.ebuild b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
index bc7474f29dea..5fd42d0959e4 100644
--- a/dev-util/dwdiff/dwdiff-2.1.0.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils toolchain-funcs
 
-DESCRIPTION="A front-end for the diff program that operates at the word level instead of the line level"
+DESCRIPTION="diff-like program operating at word level instead of line level"
 HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
 SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
 
diff --git a/dev-util/dwdiff/dwdiff-2.1.1.ebuild b/dev-util/dwdiff/dwdiff-2.1.1.ebuild
index 252cdd66239f..c8e8a440ba08 100644
--- a/dev-util/dwdiff/dwdiff-2.1.1.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="diff-like program that operates at the word level instead of the line level"
+DESCRIPTION="diff-like program operating at word level instead of line level"
 HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
 SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
 
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
index a8cf96c8ab2d..9321798e4897 100644
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
@@ -5,7 +5,7 @@ inherit eutils toolchain-funcs versionator
 
 MY_PV=$(delete_version_separator _)
 
-DESCRIPTION="Jam is a powerful alternative to make.  FTJam is a 100% compatible enhanced Jam implementation"
+DESCRIPTION="FTJam is a 100% compatible, enhanced implementation of the make alternative Jam"
 HOMEPAGE="http://freetype.sourceforge.net/jam/index.html"
 SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
 
diff --git a/dev-util/global/global-6.3.1.ebuild b/dev-util/global/global-6.3.1.ebuild
index dcefb9fac0a0..eb062c9e9b89 100644
--- a/dev-util/global/global-6.3.1.ebuild
+++ b/dev-util/global/global-6.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 inherit autotools elisp-common eutils
 
-DESCRIPTION="GNU Global is a tag system to find the locations of a specified object in various sources"
+DESCRIPTION="tag system to find an object location in various sources"
 HOMEPAGE="https://www.gnu.org/software/global/global.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
index a943b7004385..ee483f416c9b 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/igprof/igprof-5.9.11.ebuild b/dev-util/igprof/igprof-5.9.11.ebuild
index 5199159f060d..14f8ced68fcd 100644
--- a/dev-util/igprof/igprof-5.9.11.ebuild
+++ b/dev-util/igprof/igprof-5.9.11.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit cmake-utils
 
-DESCRIPTION="Ignominous Profiler for analysing application memory and performance characteristics"
+DESCRIPTION="Ignominous Profiler for analysing application memory and performance"
 HOMEPAGE="http://igprof.org"
 SRC_URI="https://github.com/ktf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-util/jconfig/jconfig-2.8-r3.ebuild b/dev-util/jconfig/jconfig-2.8-r3.ebuild
index a39ec9d566c0..b8bbced5a266 100644
--- a/dev-util/jconfig/jconfig-2.8-r3.ebuild
+++ b/dev-util/jconfig/jconfig-2.8-r3.ebuild
@@ -5,7 +5,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="jConfig is an extremely helpful utility, providing a simple API for the management of properties"
+DESCRIPTION="Utility that provides a simple API for the management of properties"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
 HOMEPAGE="http://www.jconfig.org/"
 LICENSE="BSD"
diff --git a/dev-util/jconfig/jconfig-2.8.5.ebuild b/dev-util/jconfig/jconfig-2.8.5.ebuild
index a39ec9d566c0..b8bbced5a266 100644
--- a/dev-util/jconfig/jconfig-2.8.5.ebuild
+++ b/dev-util/jconfig/jconfig-2.8.5.ebuild
@@ -5,7 +5,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="jConfig is an extremely helpful utility, providing a simple API for the management of properties"
+DESCRIPTION="Utility that provides a simple API for the management of properties"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
 HOMEPAGE="http://www.jconfig.org/"
 LICENSE="BSD"
diff --git a/dev-util/jconfig/jconfig-2.9.ebuild b/dev-util/jconfig/jconfig-2.9.ebuild
index 22792d15895d..ba1c8d27d47a 100644
--- a/dev-util/jconfig/jconfig-2.9.ebuild
+++ b/dev-util/jconfig/jconfig-2.9.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="jConfig is an extremely helpful utility, providing a simple API for the management of properties"
+DESCRIPTION="Utility that provides a simple API for the management of properties"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
 HOMEPAGE="http://www.jconfig.org/"
 LICENSE="BSD"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 814b759317bf..32e8b6e6807a 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,4 +1,6 @@
 DIST lldb-4.0.1.src.tar.xz 19088212 SHA256 8432d2dfd86044a0fc21713e0b5c1d98e1d8aad863cf67562879f47f841ac47b SHA512 1d94d7dfcc0614b16d0ef83436bbe814b39e34ba18394361bb9f13ad408ae9b29affa9a5d58c50c8dcd83765a39ae4d59ffabb7d8cd1358fd2fbd198b2de2ab6 WHIRLPOOL d7897416b89c683702bec9bd244caa911e24e5801270b64b119caf0e617f4bdc714d10bcea3963f229273d040ffdebcb8c5737a71ca17fc92e2bbbf93af002bb
 DIST lldb-5.0.0.src.tar.xz 19203772 SHA256 c0a0ca32105e9881d86b7ca886220147e686edc97fdb9f3657c6659dc6568b7d SHA512 bc70953c7f6b3f0bc797461fb53d9c60c5ab36c0b9aae815a3c37fc597a61c7220695ee3b60a9682486d2e4713c5f78ea85e853e13c587e356510a1c99a62ba9 WHIRLPOOL 25b88b8b0678afe5aaf9e108dd154b874defc63ff41c48a495c91b98a22844e614142e2240515d9996d794ed5322aec26c977ed156cc2d5081ffe5a0c0999cd3
-DIST llvm-4.0.1.src.tar.xz 21065652 SHA256 da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51 SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d WHIRLPOOL 1626ff270f7ce4801d02a0797b227fda9314ff5c0c01d653111599e9a4d2854c4d9edc3c698a7abee8d79d6bce8b18dc619fbced3c07ca610d44a248d65830cc
-DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d63b733852ccdb31e06f1373136da SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a WHIRLPOOL 6a99edbdc3e6726dc8ff9126b110fd7560faac46601407722e6dd80b5d894ff242521dc8fda7f4d879de83dac51c65645a37224f7e8def0d8d2f1e564b0531bb
+DIST lldb-5.0.1rc2.src.tar.xz 19182108 BLAKE2B 711b2eed319f8f9b170317c1d6b9f755e8ed8019bb14b551e20dd50f3a09d8cba7c9aca155ed173e9720e42d8058efa725f216eb037ca0a6754f4453a645f87e SHA512 428edfb0e882f41410fa789a3a96a10ae28e614e486e43160872adb92e61a0950d97e6347f9e78d931b74e7fadc826608a27edbd773dc0bfae338e0e07ebce85
+DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
+DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
+DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
diff --git a/dev-util/lldb/lldb-5.0.1_rc2.ebuild b/dev-util/lldb/lldb-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..5ddf9b76049c
--- /dev/null
+++ b/dev-util/lldb/lldb-5.0.1_rc2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm python-single-r1 toolchain-funcs
+
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( http://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit ncurses python test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_USEDEP}]
+		${PYTHON_DEPS} )
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+# swig-3.0.9+ generates invalid wrappers, #598708
+# upstream: https://github.com/swig/swig/issues/769
+DEPEND="${RDEPEND}
+	python? ( <dev-lang/swig-3.0.9 )
+	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+		# compiler for ole' python tests
+		-DLLDB_TEST_COMPILER="$(type -P clang)"
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# oh my...
+	if use python; then
+		# remove bundled six module
+		rm "${D}$(python_get_sitedir)/six.py" || die
+
+		# remove custom readline.so for now
+		# TODO: figure out how to deal with it
+		# upstream is basically building a custom readline.so with -ledit
+		# to avoid symbol collisions between readline and libedit...
+		rm "${D}$(python_get_sitedir)/readline.so" || die
+
+		# byte-compile the modules
+		python_optimize
+	fi
+}
diff --git a/dev-util/makepp/Manifest b/dev-util/makepp/Manifest
index 7a44931ea8b6..fb713c8bca6e 100644
--- a/dev-util/makepp/Manifest
+++ b/dev-util/makepp/Manifest
@@ -1,6 +1,5 @@
 DIST makepp-1.18.tar.gz 236990 SHA256 0a1ee878452d44ecdf52dae928418ed2c426b5bbb95bc223b787329f9f5cc2be SHA512 e6d4fe2d8136bbbbec00401761bf5a4bf5ff15357e75080b942188a613b8156c67eac63f46ce89f1e521997ca620f22924dd0b9055dcb66e30801142dab4e0a9 WHIRLPOOL 278fd69d575e7c9fcbed168d43da031740b5c9fc8c1bf5f97b16e4ab8b3d0b5d65d0a8a3764a72b212137b1958a9fe69a67c7ef649a713aff669cc50597e7ac1
 DIST makepp-1.40.1a.tar.gz 278170 SHA256 eb9991e9c726836e9b214377976dc15f66f4f6045f9713cd36c8c6b73c1f8e83 SHA512 554987f1ff51fd4d984d54a8bf1c36182418f57820899567aba8d961753ab4daa4f4fee9591557dac199c0a2e4ba33f5b2a789e237ae9684e5168201d0a152ef WHIRLPOOL 1ac773abd2f384c020c54264e700c32c84021b07f43e13c7e7474579bb99aee018321f5476441942ef891a8b1840e6195cb89260e837fbb49d0d5e651eddb0b0
-DIST makepp-1.50-110621.txz 496296 SHA256 70d6af24020bcdc1ad4607817163e18c952792a39f67674ee60562545c940330 SHA512 fca88aa5abad01f02edd59060cafd0f0e1ecd4335c2af556e04890d07f48bc07027e9fe533ad2c0d125b35b2da90a775d09b6401fce22e539df4843fc7704966 WHIRLPOOL b55572e05b3152552fb9fbd2b5c80cde82d3006024e8763d1b7eba3873f5108a606bfa3dc420b36bafe8b1bd72f7424e226130fd6df9019637738c6a0a625fd9
 DIST makepp-2.0.98.4.txz 528092 SHA256 e37f6d4374c64f0ebe2146af044514ab531ad0dea5701b31ca059a337e935f68 SHA512 c04e67f62155ce398c1fccba350354b163367ef5a6db961277433a7c733a71512a48cf3427d02a7b6874ab33047f6b7082105ed78b8397dc430c9d6a34ad9d38 WHIRLPOOL f75be059e04aa139f2ebe47acb8f64815b6f0e95c3ade0a24d00bfb437962292eb2e264f774a4f4d3eee65aa836f7a129d97eeaf99a4439b0d1ddde42cb2171e
 DIST makepp-2.0.98.5.txz 529556 SHA256 ae62717cf37da1788b46fa7c90511e399a6e545798d8c12531d33b2be0ac62bb SHA512 f4ad5ab3800148fc4527558374be765e0b7ac731220192c1105e9c688c5961b8d5dd42ed2177db2aadc879b2c66e4bde14428eaf3055a6ba52163d908c576b5a WHIRLPOOL debdd1d25d1ab4822b38cda3a72bad1975fb759c6526332cea65b6dedc4644554662667562024949bc3ed725f03990cb647aa487a1c083e98d9411e0e4aff719
 DIST makepp-2.0.99.1.txz 532784 SHA256 6217553ebbe208b6e450affd77e6c82c0c928ab30f617d489ebbfa9cfd3b6d86 SHA512 457d64a2e9d2860dc2f7ad1bd4ef7df9fcd1563878dcd7b63e6f1d3fd6c03cdb89aab68faa018b3ef6b3009733a365fadbb49ad6c8a03ffe6eafcf867b765213 WHIRLPOOL 71b2e1037e5ca05976c766669b221234b4d21b3e8b8e43de311d56cb1a908ceeed5c7a5d4d31ed59638c5973d446e8d19506eb3d2fb9ca4db16a745c4f61692c
diff --git a/dev-util/makepp/makepp-1.50_pre110621.ebuild b/dev-util/makepp/makepp-1.50_pre110621.ebuild
deleted file mode 100644
index d19d34f743bb..000000000000
--- a/dev-util/makepp/makepp-1.50_pre110621.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils
-
-MY_PV=${PV/_pre/-}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV%_pre*}/${MY_P}.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
-	unpack ./${P}.tar.xz
-}
-
-src_prepare() {
-#	epatch "${FILESDIR}"/${P}-install.patch
-	# remove ones which cause sandbox violations
-#	rm makepp_tests/wildcard_repositories.test
-	# default "all" rule is to run tests :x
-	sed -i '/^all:/s:test::' config.pl || die
-}
-
-src_configure() {
-	# not an autoconf configure script
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--mandir=/usr/share/man \
-		--datadir=/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog README
-}
diff --git a/dev-util/mpatch/mpatch-0.8-r1.ebuild b/dev-util/mpatch/mpatch-0.8-r1.ebuild
index 5b31fd4fba7d..6bc96da215b0 100644
--- a/dev-util/mpatch/mpatch-0.8-r1.ebuild
+++ b/dev-util/mpatch/mpatch-0.8-r1.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
 
-DESCRIPTION="Patch-like tool for applying diffs which can resolve common causes of patch rejects"
+DESCRIPTION="Patch-like tool which can resolve common causes of patch rejects when applying"
 HOMEPAGE="http://oss.oracle.com/~mason/mpatch/"
 SRC_URI="http://oss.oracle.com/~mason/mpatch/${P}.tar.bz2"
 
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild
index 36abfaddc7f9..3a7f46fa7048 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild
@@ -12,7 +12,7 @@ fi
 
 inherit ${SCM} distutils-r1
 
-DESCRIPTION="Generates rosinstall files containing information about repositories with ROS packages/stacks"
+DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
 HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild
index d0f79b54db5c..37c80b8e751a 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild
@@ -12,7 +12,7 @@ fi
 
 inherit ${SCM} distutils-r1
 
-DESCRIPTION="Generates rosinstall files containing information about repositories with ROS packages/stacks"
+DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
 HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
index a793d67d94a8..484e133e8ea0 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
@@ -12,7 +12,7 @@ fi
 
 inherit ${SCM} distutils-r1
 
-DESCRIPTION="Generates rosinstall files containing information about repositories with ROS packages/stacks"
+DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
 HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index a793d67d94a8..484e133e8ea0 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -12,7 +12,7 @@ fi
 
 inherit ${SCM} distutils-r1
 
-DESCRIPTION="Generates rosinstall files containing information about repositories with ROS packages/stacks"
+DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
 HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index 65b4804e13c1..27cef589a4d0 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils fixheadtails flag-o-matic toolchain-funcs
 
-DESCRIPTION="program for applying patches that patch cannot apply because of conflicting changes"
+DESCRIPTION="tool for applying patches that patch cannot apply because of conflicting changes"
 HOMEPAGE="http://neil.brown.name/wiggle http://neil.brown.name/git?p=wiggle"
 SRC_URI="http://neil.brown.name/${PN}/${P}.tar.gz"
 
diff --git a/dev-util/xdelta/xdelta-3.0.11.ebuild b/dev-util/xdelta/xdelta-3.0.11.ebuild
index 9aec8203f46c..2f2e7eb8bc51 100644
--- a/dev-util/xdelta/xdelta-3.0.11.ebuild
+++ b/dev-util/xdelta/xdelta-3.0.11.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 MY_P=xdelta3-${PV}
 
-DESCRIPTION="a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression"
+DESCRIPTION="Computes changes between binary or text files and creates deltas"
 HOMEPAGE="http://xdelta.org/"
 SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.tar.gz"
 
diff --git a/dev-util/xdelta/xdelta-3.1.0.ebuild b/dev-util/xdelta/xdelta-3.1.0.ebuild
index b9ae9918aa94..a3f444acd4c2 100644
--- a/dev-util/xdelta/xdelta-3.1.0.ebuild
+++ b/dev-util/xdelta/xdelta-3.1.0.ebuild
@@ -9,7 +9,7 @@ inherit autotools python-any-r1
 
 MY_P=xdelta3-${PV}
 
-DESCRIPTION="a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression"
+DESCRIPTION="Computes changes between binary or text files and creates deltas"
 HOMEPAGE="http://xdelta.org/"
 SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.tar.gz"
 
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 4bbae381d0e8..d2b6a1a8f5bc 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild b/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild
index 5265e66774c8..d90a497685ee 100644
--- a/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild
+++ b/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.3.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
-DESCRIPTION="Bazaar plugin that adds support for rebasing, similar to the functionality in git"
+DESCRIPTION="Bazaar plugin that adds support for rebasing, similar to git rebase"
 HOMEPAGE="https://launchpad.net/bzr-rewrite"
 SRC_URI="https://launchpad.net/bzr-rewrite/trunk/${PV}/+download/${P}.tar.gz"
 
diff --git a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild
index a724c30907c0..6006269067ab 100644
--- a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild
+++ b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
 
-DESCRIPTION="A Bazaar plugin that provides a option to generate XML output forbuiltin commands."
+DESCRIPTION="Bazaar plugin providing an option to generate XML output for builtin commands"
 HOMEPAGE="http://bazaar-vcs.org/XMLOutput"
 SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 980652faf315..e050d50e66e0 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,6 +1,6 @@
 DIST mercurial-3.8.4.tar.gz 4775341 SHA256 4b2e3ef19d34fa1d781cb7425506a05d4b6b1172bab69d6ea78874175fdf3da6 SHA512 2ee785f631f9ae346e10ca77251a9ce6d3dacd598588c39f1a69ce1f4b668866f6109d682428512c37c300b26741b74672195538d66845e85cfff5ead886cf4c WHIRLPOOL 1f0a12cc6d00f3544ab00e011a9ff9308fe1652c0598045ddba2a41ba17b55c291da200bce85d4c600d673b8746e936c441ffa7398ad810d1069bd97fb32f2db
 DIST mercurial-4.1.3.tar.gz 5134965 SHA256 103d2ae187d5c94110c0e86ccc3b46f55fcd8e21c78d1c209bac7b59a73e86d8 SHA512 794c513b7e061bc56d270ef57adc0fadeffd5bcc988da0934b24db686b76bf573aef2bbaa3baa9220f31463795bc6e6a99fc1284ebcf8d7e49f42b8129347811 WHIRLPOOL a2f5d5e3e89f794415521bf0bc93ff0e8a67aec6c39951437b6b585f9f6d604bd556af10cce50951128c746719db54ea48f86fb7c262a36a29576ba539be1e79
-DIST mercurial-4.3.2.tar.gz 5491214 SHA256 0f5bf688ba2add6f5db98a633edef43411ecf2c7ada5f2e14b9265820a96cd48 SHA512 e69b7cff941d83531d59d91c30e336807f868302dfda565e1421b7d34c2769221220686774af236d86ac0f67dba6e8a0947ed1185b30d89463a8d211e20d1cbc WHIRLPOOL 079d05e75cde63ff907b485a45a6a9cf8b42001525a799939647d05dd60d85c1faa0cbf14b9da95488103ec9f0b177f59ad7d8bde93dca3ffe428d697669bd4e
 DIST mercurial-4.3.3.tar.gz 5491634 SHA256 47a63c78698bc735667984bbc5b76619ff29a38d742f20cdf9f44cce59752374 SHA512 2d5249b6b2ec6b21c548702af2cf6b8e0858197a370514465aa7a880391f2e9efd6aecefb67fc547dfb8759c1c678009dc5a33fc48743bee30fcbdd853ee1cc6 WHIRLPOOL ef42493fdb4547a4e37d5f311cf5ac6fed90eb991d48ece6b2cbb3efe6722dec1513f044800cc58708c7a680eb1828c7888873b1849772e82901ad5d6d8a757d
 DIST mercurial-4.3.tar.gz 5469979 SHA256 ebf11176e9b5354ec7a1bde6c5382c914d10c397410531faf89f8b5124a7cb65 SHA512 d74ae5f35d8c415c07737b59e6c5455963dfbf5d038c43d683fd34dd84423b9ccf9cd670667f458db20d8580fc7c7d9e5609d29d990e1e94683734694211c417 WHIRLPOOL 54583dbc826fdec3e737dc49d1a8ce180d29579d091c86e48a3b7c68bb4a2d399c5aff3b2ff0e30cd911e8955537a621c73c330d70a55f7efcdeafd21257178f
-DIST mercurial-4.4.1.tar.gz 5636532 SHA256 8f2a5512d6cc2ffb08988aef639330a2f0378e4ac3ee0e1fbbdb64d9fff56246 SHA512 4c87adb6d3d30f7f9211eee64df727aefdac246be3ca9e3af412b76c32b76d701b19e00ca339168446ee5e20fad2ffc24f0c87438b6bda954560108235ab14a8 WHIRLPOOL f4fdfe28c4c5e6ac146429cc85d14fcd327fd22f8aed8383979bc16ea4a4fd64826d0ec7f78961f849a449e2cf611f6bf1672206f6c60264ab29c524eb07bb85
+DIST mercurial-4.4.1.tar.gz 5636532 BLAKE2B 07b91da192db30a925bd9798c5d6ab02336501c04f9d65bb9042786c2f5e6f8c16f6ebe6817f68ac746c21f79e39dbb8284b7590063d7a6ef615a8e2b6dbe821 SHA512 4c87adb6d3d30f7f9211eee64df727aefdac246be3ca9e3af412b76c32b76d701b19e00ca339168446ee5e20fad2ffc24f0c87438b6bda954560108235ab14a8
+DIST mercurial-4.4.2.tar.gz 5647013 BLAKE2B 3663517e5e53525e50852fd4941f7c71cc446fcc1255ed09d3e8375fcc14aea01f00e4c05a1cda2876d96b4f935b0d5e3d887567bc62c9c4629954b2cef8617f SHA512 3d1d103689eac4f50cc1005be44144b37d75ebfac3ff3b4fc90d6f41fbee46e107a168d04f2c366ce7cca2733ea4e5b5127df462af8e253f61a72f8938833993
diff --git a/dev-vcs/mercurial/mercurial-4.3.2.ebuild b/dev-vcs/mercurial/mercurial-4.4.2.ebuild
similarity index 100%
rename from dev-vcs/mercurial/mercurial-4.3.2.ebuild
rename to dev-vcs/mercurial/mercurial-4.4.2.ebuild
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index de5c6c4fcd40..d268a5e2d97b 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/metadata.xml b/games-emulation/metadata.xml
index 5f57686a0828..1d99058d9f44 100644
--- a/games-emulation/metadata.xml
+++ b/games-emulation/metadata.xml
@@ -5,15 +5,13 @@
 		The games-emulation category contains game platform emulators.
 	</longdescription>
 	<longdescription lang="de">
-	    Die Kategorie games-emulation enthält Emulatoren für verschiedene
-	    Spieleplattformen.
+		Die Kategorie games-emulation enthält Emulatoren für verschiedene Spieleplattformen.
 	</longdescription>
 	<longdescription lang="es">
 		La categoría games-emulation contiene emuladores de juegos de plataforma.
 	</longdescription>
 	<longdescription lang="ja">
-		games-emulationカテゴリーにはプラットフォームをエミュレートしたゲームが
-		含まれています。
+		games-emulationカテゴリーにはプラットフォームをエミュレートしたゲームが含まれています。
 	</longdescription>
 	<longdescription lang="nl">
 		De games-emulation categorie bevat emulators voor verschillende spelcomputers.
@@ -25,11 +23,9 @@
 		La categoria games-emulation contiene emulatori di piattaforme di gioco.
 	</longdescription>
 	<longdescription lang="pt">
-		A categoria games-emulation contém emuladores de plataformas de
-		jogos.
+		A categoria games-emulation contém emuladores de plataformas de jogos.
 	</longdescription>
 	<longdescription lang="pl">
 		Kategoria games-emulation zawiera emulatory rozmaitych platform dla gier.
 	</longdescription>
 </catmetadata>
-
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 9692215c45f7..31ac4832d129 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/metadata.xml b/games-misc/metadata.xml
index ebeb7bde2ed2..df9216675ec7 100644
--- a/games-misc/metadata.xml
+++ b/games-misc/metadata.xml
@@ -2,24 +2,19 @@
 <!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <catmetadata>
 	<longdescription lang="en">
-		The games-misc category contains miscellaneous games which do not fit
-		into other games- categories.
+		The games-misc category contains miscellaneous games which do not fit into other games- categories.
 	</longdescription>
 	<longdescription lang="de">
-	    Die Kategorie games-misc enthält verschiedenste Spiele die sich nicht
-	    in andere Kategorien einordnen lassen.
+		Die Kategorie games-misc enthält verschiedenste Spiele die sich nicht in andere Kategorien einordnen lassen.
 	</longdescription>
 	<longdescription lang="es">
-		La categoría games-misc contiene juegos que no encajan en ninguna de las
-		otras categorías games-.
+		La categoría games-misc contiene juegos que no encajan en ninguna de las otras categorías games-.
 	</longdescription>
 	<longdescription lang="ja">
-		games-miscカテゴリーには他のgame-カテゴリーに分類されない多種多様な
-		ゲームが含まれています。
+		games-miscカテゴリーには他のgame-カテゴリーに分類されない多種多様なゲームが含まれています。
 	</longdescription>
 	<longdescription lang="nl">
-		De games-misc categorie bevat spellen die niet in een van de andere
-		categorieen ingedeeld konden worden.
+		De games-misc categorie bevat spellen die niet in een van de andere categorieen ingedeeld konden worden.
 	</longdescription>
 	<longdescription lang="vi">
 		Nhóm games-misc chứa các trò chơi linh tinh không thích hợp với các nhóm games- khác.
@@ -28,12 +23,9 @@
 		La categoria games-misc contiene giochi che non ricadono in altre categorie games-.
 	</longdescription>
 	<longdescription lang="pt">
-		A categoria games-misc contém jogos que não se encaixam em
-		nenhuma das outras categorias games-.
+		A categoria games-misc contém jogos que não se encaixam em nenhuma das outras categorias games-.
 	</longdescription>
 	<longdescription lang="pl">
-		Kategoria games-misc zawiera gry, które nie pasowały do pozostałych
-		kategorii.
+		Kategoria games-misc zawiera gry, które nie pasowały do pozostałych kategorii.
 	</longdescription>
 </catmetadata>
-
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 26502f0d5107..db3e5bf0a2e9 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/dconf/dconf-0.26.1.ebuild b/gnome-base/dconf/dconf-0.26.1.ebuild
index 40c302764a6e..37761f010878 100644
--- a/gnome-base/dconf/dconf-0.26.1.ebuild
+++ b/gnome-base/dconf/dconf-0.26.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Projects/dconf"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/gnustep-base/Manifest.gz b/gnustep-base/Manifest.gz
index 72dcc1f85efa..fdeedf49faad 100644
Binary files a/gnustep-base/Manifest.gz and b/gnustep-base/Manifest.gz differ
diff --git a/gnustep-base/libobjc2/metadata.xml b/gnustep-base/libobjc2/metadata.xml
index fdf8cfb7ce10..b347a3b63481 100644
--- a/gnustep-base/libobjc2/metadata.xml
+++ b/gnustep-base/libobjc2/metadata.xml
@@ -6,27 +6,23 @@
 		<name>Gentoo GNUstep Project</name>
 	</maintainer>
 	<longdescription>
-The GNUstep Objective-C runtime is designed as a drop-in replacement for the
-GCC runtime.  It supports both a legacy and a modern ABI, allowing code
-compiled with old versions of GCC to be supported without requiring
-recompilation.  The modern ABI adds the following features:
+		The GNUstep Objective-C runtime is designed as a drop-in replacement for the
+		GCC runtime.  It supports both a legacy and a modern ABI, allowing code
+		compiled with old versions of GCC to be supported without requiring
+		recompilation.  The modern ABI adds the following features:
+		- Non-fragile instance variables.
+		- Protocol uniquing.
+		- Object planes support.
+		- Declared property introspection.
 
-- Non-fragile instance variables.
-- Protocol uniquing.
-- Object planes support.
-- Declared property introspection.
-
-Both ABIs support the following feature above and beyond the GCC runtime:
-
-- The modern Objective-C runtime APIs, introduced with OS X 10.5.
-- Blocks (closures).
-- Low memory profile for platforms where memory usage is more important than
-  speed.
-- Synthesised property accessors.
-- Efficient support for @synchronized()
-- Type-dependent dispatch, eliminating stack corruption from mismatched
-  selectors.
-</longdescription>
+		Both ABIs support the following feature above and beyond the GCC runtime:
+		- The modern Objective-C runtime APIs, introduced with OS X 10.5.
+		- Blocks (closures).
+		- Low memory profile for platforms where memory usage is more important than speed.
+		- Synthesised property accessors.
+		- Efficient support for @synchronized()
+		- Type-dependent dispatch, eliminating stack corruption from mismatched selectors.
+	</longdescription>
 	<use>
 		<flag name="boehm-gc">Enable Hans Boehm's garbage collector
 		(<pkg>dev-libs/boehm-gc</pkg>). Not recommended by upstream</flag>
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 356d60606c89..ba01ec37a266 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/kalzium/files/kalzium-17.04.3-ocaml404.patch b/kde-apps/kalzium/files/kalzium-17.04.3-ocaml404.patch
deleted file mode 100644
index b2c315702a70..000000000000
--- a/kde-apps/kalzium/files/kalzium-17.04.3-ocaml404.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 447d0ca4cc757f79ad02ca52ab5e086b78dfdfb1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa=20Lema?=
- <panfaust@gmail.com>
-Date: Thu, 3 Aug 2017 18:10:53 +0200
-Subject: Fix build with ocaml 4.04
-
-BUG: 372671
-FIXED-IN: 17.08
-
-Differential Revision: https://phabricator.kde.org/D6752
----
- src/CMakeOCamlInstructions.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeOCamlInstructions.cmake b/src/CMakeOCamlInstructions.cmake
-index 483d003..da703b1 100644
---- a/src/CMakeOCamlInstructions.cmake
-+++ b/src/CMakeOCamlInstructions.cmake
-@@ -58,7 +58,7 @@ ocaml_ml_to_cmx(${CMAKE_CURRENT_BINARY_DIR}/lexer.cmx ${CMAKE_CURRENT_SOURCE_DIR
- # object files
- 
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
--                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -o ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
-+                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c
-                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c ${CMAKE_CURRENT_BINARY_DIR}/solver.o
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o)
--- 
-cgit v0.11.2
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 8e5b1efe1233..8643279bbc6b 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch b/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
deleted file mode 100644
index aca4fe412462..000000000000
--- a/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -purN kdeui/util/kkeyserver_mac.cpp kdeui/util/kkeyserver_mac.cpp
---- a/kdeui/util/kkeyserver_mac.cpp	2009-12-14 17:05:26.284881642 -0500
-+++ b/kdeui/util/kkeyserver_mac.cpp	2009-12-14 17:11:23.393094384 -0500
-@@ -68,7 +68,7 @@ namespace KKeyServer {
- #ifdef QT_MAC_USE_COCOA
-     static TISInputSourceRef lastLayout = 0;
- #else
--    static KeyboardLayoutRef lastLayout = NULL;
-+    static TISInputSourceRef lastLayout = NULL;
- #endif
-     
-     void updateScancodes() {
-@@ -125,16 +125,27 @@ namespace KKeyServer {
- #endif
-             lastLayout = layout;
-             scancodes.clear();
--            void *kchr;
--            if (KLGetKeyboardLayoutProperty(layout, kKLKCHRData, const_cast<const void**>(&kchr)) != noErr) {
-+            UCKeyboardLayout *uchr = (UCKeyboardLayout *)TISGetInputSourceProperty(layout, kTISPropertyUnicodeKeyLayoutData);
-+            if (uchr == NULL) {
-                 kWarning() << "Couldn't load active keyboard layout";
-             } else {
-                 for (int i = 0; i < 128; i++) {
-                     UInt32 tmpState = 0;
--                    UInt32 chr = KeyTranslate(kchr, i, &tmpState);
--                    if (chr && chr != kFunctionKeyCharCode) {
--                        scancodes.insert(chr, i);
--                    }
-+                    UInt32 deadKeyState = 0;
-+                    UInt32 flags = 0;
-+                    UniCharCount maxStringLength = 255;
-+                    UniCharCount actualStringLength = 0;
-+                    UniChar unicodeString[maxStringLength];
-+                    
-+                    UCKeyTranslate(uchr, i, kUCKeyActionDown,
-+                            flags, LMGetKbdType(),
-+                            1, &deadKeyState, maxStringLength, &actualStringLength, unicodeString);
-+                    fprintf(stderr, "Got key: %s\n", unicodeString);
-+                    fflush(stderr);
-+                    //UInt32 chr = KeyTranslate(kchr, i, &tmpState);
-+                    //if (chr && chr != kFunctionKeyCharCode) {
-+                    //    scancodes.insert(chr, i);
-+                    //}
-                 }
-             }
-         }
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index 4ff5a867102b..65f11e1c0394 100644
Binary files a/lxde-base/Manifest.gz and b/lxde-base/Manifest.gz differ
diff --git a/lxde-base/menu-cache/menu-cache-0.3.3.ebuild b/lxde-base/menu-cache/menu-cache-0.3.3.ebuild
index 299d84be8aaf..d1b3e425efe2 100644
--- a/lxde-base/menu-cache/menu-cache-0.3.3.ebuild
+++ b/lxde-base/menu-cache/menu-cache-0.3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="4"
 
-DESCRIPTION="A library creating and utilizing caches to speed up freedesktop.org application menus"
+DESCRIPTION="Library to create and utilize caches to speed up freedesktop application menus"
 HOMEPAGE="http://lxde.sourceforge.net/"
 SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
 
diff --git a/lxde-base/menu-cache/menu-cache-0.5.1.ebuild b/lxde-base/menu-cache/menu-cache-0.5.1.ebuild
index aa09b413f73a..86dc26199396 100644
--- a/lxde-base/menu-cache/menu-cache-0.5.1.ebuild
+++ b/lxde-base/menu-cache/menu-cache-0.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-DESCRIPTION="A library creating and utilizing caches to speed up freedesktop.org application menus"
+DESCRIPTION="Library to create and utilize caches to speed up freedesktop application menus"
 HOMEPAGE="http://lxde.sourceforge.net/"
 SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
 
diff --git a/lxde-base/menu-cache/menu-cache-1.0.0-r1.ebuild b/lxde-base/menu-cache/menu-cache-1.0.0-r1.ebuild
index 7ff279c05bb1..1de7fb22bea3 100644
--- a/lxde-base/menu-cache/menu-cache-1.0.0-r1.ebuild
+++ b/lxde-base/menu-cache/menu-cache-1.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-DESCRIPTION="A library creating and utilizing caches to speed up freedesktop.org application menus"
+DESCRIPTION="Library to create and utilize caches to speed up freedesktop application menus"
 HOMEPAGE="http://lxde.sourceforge.net/"
 SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index a94281aa15fb..b4aee5475a5e 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index a1017b3f41df..876fb0a91821 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
-DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
-DIST mutt-1.9.0.tar.gz 4191932 SHA256 ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03 WHIRLPOOL d38647d3c7afb4cf1f5e1aab2a03fd6ec6812da9580932301e12e68d71fed9b4de1ba60b15ba5dbeddd1306584615d8aeaae859fb6a34dc34c1d335c616ef1b6
-DIST mutt-1.9.1.tar.gz 4193868 SHA256 749b83a96373c6e2101ebe8c4b9a651735e02c478edb750750a5146a15d91bb1 SHA512 1a6871eb8499c60ae18b03d56b81e64de1643c68f8fbe05bbe114085b20098be58175e5bd6d2515e8332a824cbed75640744a261d4f10654c56625f903224095 WHIRLPOOL 8333c27b4271c9536329cef56c4a3e7af039c099f12dae06b269c7c0a99714fe70a33c9868150a7fcdb55bd22d029d434d225fe07a748011fce2a0ef56e81bd8
-DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
-DIST mutt-gentoo-1.9.0-patches-r3.tar.xz 114568 SHA256 ed0cad43735ea0e952b207806204c4c517fc62974f418ef479fd37203bf4e79d SHA512 9ea5979e54237a9e11cfc8b62119329fdff217f54ec0b75b9ee84d6db891638219855c2408a8a65fae2f8b6c6d19333d009364ced22d2a6de6e93df09bd2ef69 WHIRLPOOL 4b91d264d89501ee271988b91157e10313985d697807af0a8cff442280ef1e52cce3de869f5bd4c724371f322be20c2807b4ea802ffe2d3e4d3e05577977b467
-DIST mutt-gentoo-1.9.1-patches-r1.tar.xz 112940 SHA256 47a5a9db7065ecda36ea65a603f6a1752e7ca73f157363c832e91a289909efa4 SHA512 ad658140a39e59c84b3c5dcee0585ec6f462ce60093dac2c77e2a77ef792a4214c4f966fe4e9c29a84d333b4249a5336d1d8a3fdaeef5368ebbc7edfb4c2ebf5 WHIRLPOOL 8b4da87c174112c2518ed1429ed17a73eda7134b58ee7ae8053051cc017f652f17b4465346348022b7867542ceb8f35044c48deb42b7ed99a358f86980d9d2ce
+DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
+DIST mutt-1.9.0.tar.gz 4191932 BLAKE2B 8ec3bf68f6ae4e12875d396fcd097070110f349cf0ff84ed3897e597d98cf658ef11c2a6323ee8fae8e3b242442f206fdcef5de16576a060db19a5ee7edc0697 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03
+DIST mutt-1.9.1.tar.gz 4193868 BLAKE2B 44623e3fd75e9f599daf044be54913944f894a5e05a8cb4e669c5d44e6bfab9caecbf0e0eb0fd6ebe0c0d177a141c78f1e837ad3059260e29326867c9db201b0 SHA512 1a6871eb8499c60ae18b03d56b81e64de1643c68f8fbe05bbe114085b20098be58175e5bd6d2515e8332a824cbed75640744a261d4f10654c56625f903224095
+DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
+DIST mutt-gentoo-1.9.0-patches-r3.tar.xz 114568 BLAKE2B 157060a7f0d2833c311fdc68ee02e1b52cd9feeb18236e6e3f7d8a3ad75acd6d2fdbc7c11dbf29a298d9d88056b1d0eee3abd9fd508d04aca6e47877ce78ee1c SHA512 9ea5979e54237a9e11cfc8b62119329fdff217f54ec0b75b9ee84d6db891638219855c2408a8a65fae2f8b6c6d19333d009364ced22d2a6de6e93df09bd2ef69
+DIST mutt-gentoo-1.9.1-patches-r1.tar.xz 112940 BLAKE2B 9992f7977a6a2a39f1bc6d3da092477c2da065342ec1aacd2315fd204732aca5fe4a9a33cf5233660de213c87e53f94b87d65cce7084954391c9b8c95b650ae7 SHA512 ad658140a39e59c84b3c5dcee0585ec6f462ce60093dac2c77e2a77ef792a4214c4f966fe4e9c29a84d333b4249a5336d1d8a3fdaeef5368ebbc7edfb4c2ebf5
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index 0e7f081573f6..75c5b94f6148 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -9,15 +9,21 @@
     <name>Net-Mail</name>
   </maintainer>
   <use>
-    <flag name="hcache">Enable header cache</flag>
-    <flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
-    <flag name="pop">Enable support for POP3</flag>
+    <flag name="berkdb">Enable <pkg>sys-libs/db</pkg> database backend
+      for header caching</flag>
+    <flag name="gdbm">Enable <pkg>sys-libs/gdbm</pkg> database backend
+      for header caching</flag>
+    <flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg> to
+      sign/verify and encrypt/decrypt OpenPGP messages</flag>
+    <flag name="hcache">Enable header cache, one database backend needs
+      to be enabled</flag>
     <flag name="lmdb">Enable <pkg>dev-db/lmdb</pkg> database backend for
       header caching</flag>
     <flag name="notmuch">Enable support for <pkg>net-mail/notmuch</pkg></flag>
+    <flag name="pop">Enable support for POP3 mailboxes</flag>
     <flag name="sidebar">Enable the sidebar feature</flag>
-    <flag name="smime">Enable support for S/MIME</flag>
-    <flag name="smtp">Enable support for smtp</flag>
+    <flag name="smime">Enable support for S/MIME mailparts</flag>
+    <flag name="smtp">Enable support for direct SMTP delivery</flag>
     <flag name="tokyocabinet">Enable <pkg>dev-db/tokyocabinet</pkg>
       database backend for header caching</flag>
   </use>
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index c48e9eef74ea..9cc35ec6feaf 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,5 +1,5 @@
-DIST neomutt-20170714.tar.gz 2509160 SHA256 40d48920f95ca49ab96eb109b658f5cf6e1c222320c58bdd03769c1355d7a383 SHA512 eb31d2f23b7211904cd66ba293c008f953778b37f13fd09d4db571d013f1c8e6449fccd827872f3ad0a2c8e62555f92b3f9591a1f0f4ac37ab362a4681abaaa0 WHIRLPOOL 455495501a2ab1989d5f3bfa75aa2370896956cdfd7d2e852e225c96aa23a1abdaf2dbb9d886d1d96486d19b2b38c225e8263f268ebafcef8cbd0024885189f3
-DIST neomutt-20170912.tar.gz 2533245 SHA256 9f0d128fe8dbbbddb67e2b629f8b5e52a9d892f82c735845c1708c14e3046657 SHA512 7551da47029667443257d9d370af7217846abf988d1469c4e08f367ef0bce2dfb658321df27176622bbd07e6d46c320380749d4ce05ee39cb1e8d9b6c3e1d7e6 WHIRLPOOL 0dad6380acf5b6f891bcb77388023de27d23e4ea8ad0eb3563c1704de555a2fc54604d47b9b67557c6ab0310e1c365c786a1952f6794b2012594f1c19033ad3c
-DIST neomutt-20171006.tar.gz 2706019 SHA256 86e9d945919438a377828b15f03c8690f639062e44151e219e2f8443ae27147c SHA512 adfa702ee642ce58b11dab1d2b805626d8f90e8cc88731cb7e051df5b785010ac43d90eb14d2a5ace02d3abaf921c9f36f86f627063036bcb7f5724912ca134d WHIRLPOOL 75f2a0c8881b769f1a7acd8c0e7724baf0a2943a68a4029d74d32a5a5ed3203c32ce3704b3271a8e05f02c233273319437a593ffad9df5e1b988f8725f0f2433
-DIST neomutt-20171013.tar.gz 2706753 SHA256 5a7c6302d623b620db03d923a7cd7cf967123a67fc42c117a0dd4b45612e9a55 SHA512 9e4499b165f25091d73868c62b14f950bdfc032444c0cb3619e99a8299d29c3d1f24078e15537e693a3af69ae0681d59e25a73b857882cce2653be593231ffac WHIRLPOOL fde9e7833bc6a469882716d7c9deb4d5146d0a6ffd5769e7d76d952096165b05d29584e057503a1ba3a4887c8afd0efe26401fc9d533250c597527bce8500634
-DIST neomutt-20171027.tar.gz 2682699 SHA256 2d00de2a1cdef4cd59fcf6f894a6fe7e677e1065565f5e01f4dae8e1d910e583 SHA512 e2df0d20c0729abb32d1614c94c08cca0cecad1cb36a380f8210e2df3e353ffc08f66abf1e5e3a1cf4a746437d59c15262ce05ab1a820561466bf7e3a5d6b894 WHIRLPOOL b79f58d4b59c0a4d0bbac46993a4743e659d7b29471ffbef7f291e83b63835629735139b07f911181fed2f8c403c70e7530870330eef6de5733eae9b0dcc6e6e
+DIST neomutt-20170714.tar.gz 2509160 BLAKE2B 33170f85be17d9999414a4034b740e375a71bd7092c5134342aa2b23b35afd83ddf5de95c06fb221c63aac36fbf247204508cc3e6d6259ab8c7606de5b444344 SHA512 eb31d2f23b7211904cd66ba293c008f953778b37f13fd09d4db571d013f1c8e6449fccd827872f3ad0a2c8e62555f92b3f9591a1f0f4ac37ab362a4681abaaa0
+DIST neomutt-20170912.tar.gz 2533245 BLAKE2B fde5690d2f80b0ef55ddc753487905130b1db027da2ba712d9629d59f79d2c2fcd6025e96dd031045c2c162020991141375c607ae10e9be9cf1f81fe64166c05 SHA512 7551da47029667443257d9d370af7217846abf988d1469c4e08f367ef0bce2dfb658321df27176622bbd07e6d46c320380749d4ce05ee39cb1e8d9b6c3e1d7e6
+DIST neomutt-20171006.tar.gz 2706019 BLAKE2B b16f065fd1c5b829c6b73614c42e5353b968fe9111d445319927a48ec2612e59ac23dd3e06948c7c5b6f34bdd1646773cf91ae21737adf67ff4019c9850895e2 SHA512 adfa702ee642ce58b11dab1d2b805626d8f90e8cc88731cb7e051df5b785010ac43d90eb14d2a5ace02d3abaf921c9f36f86f627063036bcb7f5724912ca134d
+DIST neomutt-20171013.tar.gz 2706753 BLAKE2B d8801f4168ce978b8b2578a1fa28b8f29e98700c2b3c11dcce7b9cdf132a755403ed1b54216426736c1dde78c580320ebac4fbb6e3ca6f92abc1c1e6d1e4fd1b SHA512 9e4499b165f25091d73868c62b14f950bdfc032444c0cb3619e99a8299d29c3d1f24078e15537e693a3af69ae0681d59e25a73b857882cce2653be593231ffac
+DIST neomutt-20171027.tar.gz 2682699 BLAKE2B 4e3eda453a8c19d2ec1460c0813e030ef8209e8761d1ef768698cf624c11a2d3b22b941da78fb2d39ef44d6f39c7b30786248448910e59170f50b6d6e010a331 SHA512 e2df0d20c0729abb32d1614c94c08cca0cecad1cb36a380f8210e2df3e353ffc08f66abf1e5e3a1cf4a746437d59c15262ce05ab1a820561466bf7e3a5d6b894
diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 2cce62e661b3..9810e2b83198 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -22,5 +22,11 @@
 		<flag name="smime">Enable support for smime</flag>
 		<flag name="tokyocabinet">Enable Tokyo Cabinet database backend for
 			header caching</flag>
+		<flag name="gpgme">Build gpgme backend to support S/MIME, PGP/MIME and
+			traditional/inline PGP</flag>
+		<flag name="pgp_classic">Build classic_pgp backend to support PGP/MIME
+			and traditional/inline PGP</flag>
+		<flag name="smime_classic">Build classic_smime backend to support
+			S/MIME</flag>
 	</use>
 </pkgmetadata>
diff --git a/mail-client/neomutt/neomutt-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
index 5dc34a207c8a..6832f903c178 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -14,8 +14,9 @@ HOMEPAGE="https://www.neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet
-	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl tokyocabinet"
+IUSE="berkdb debug doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+	lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic ssl
+	tokyocabinet"
 
 CDEPEND="
 	app-misc/mime-types
@@ -27,7 +28,7 @@ CDEPEND="
 	qdbm? ( dev-db/qdbm )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpg? ( >=app-crypt/gpgme-0.9.0 )
+	gpgme? ( >=app-crypt/gpgme-0.9.0 )
 	idn? ( net-dns/libidn )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch )
@@ -60,22 +61,22 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		"$(use_enable crypt pgp)"
 		"$(use_enable debug)"
 		"$(use_enable doc)"
-		"$(use_enable gpg gpgme)"
+		"$(use_enable gpgme)"
 		"$(use_enable nls)"
-		"$(use_enable smime)"
 		"$(use_enable notmuch)"
+		"$(use_enable pgp_classic pgp)"
+		"$(use_enable smime_classic smime)"
+		"$(use_with berkdb bdb)"
+		"$(use_with gdbm)"
 		"$(use_with idn)"
 		"$(use_with kerberos gss)"
-		"$(use_with sasl)"
-		"$(use_with tokyocabinet)"
 		"$(use_with kyotocabinet)"
-		"$(use_with qdbm)"
-		"$(use_with gdbm)"
-		"$(use_with berkdb bdb)"
 		"$(use_with lmdb)"
+		"$(use_with qdbm)"
+		"$(use_with sasl)"
+		"$(use_with tokyocabinet)"
 		"--with-$(usex slang slang curses)"
 		"--sysconfdir=${EPREFIX}/etc/${PN}"
 		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index a6bf6a7e03b9..cedc30ae9fb2 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/clamassassin/clamassassin-1.2.4.ebuild b/mail-filter/clamassassin/clamassassin-1.2.4.ebuild
index ca9ab9a78ee8..b3e4d97bc08a 100644
--- a/mail-filter/clamassassin/clamassassin-1.2.4.ebuild
+++ b/mail-filter/clamassassin/clamassassin-1.2.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-DESCRIPTION="A simple spamassassin-like script for virus scanning (through clamav) and filtering e-mail messages"
+DESCRIPTION="Simple spamassassin-like script for virus scanning and filtering e-mail messages"
 HOMEPAGE="http://jameslick.com/clamassassin/"
 SRC_URI="http://jameslick.com/clamassassin/${P}.tar.gz"
 LICENSE="BSD"
@@ -34,5 +34,5 @@ src_compile() {
 
 src_install() {
 	dobin clamassassin
-	dodoc CHANGELOG LICENSE README
+	dodoc CHANGELOG README
 }
diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild
index b5eb7acc548b..eb327d19061d 100644
--- a/mail-filter/libspf2/libspf2-1.2.10.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.10.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit autotools eutils
 
-DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair"
+DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols"
 HOMEPAGE="http://www.libspf2.org"
 SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
 
diff --git a/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild b/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild
index 4de36d3af89b..6e99cae55055 100644
--- a/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=4
 inherit eutils autotools
 
-DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair"
+DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols"
 HOMEPAGE="http://www.libspf2.org"
 SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
 
diff --git a/mail-filter/mimedefang/mimedefang-2.73.ebuild b/mail-filter/mimedefang/mimedefang-2.73.ebuild
index d77e08301069..c87ab3177048 100644
--- a/mail-filter/mimedefang/mimedefang-2.73.ebuild
+++ b/mail-filter/mimedefang/mimedefang-2.73.ebuild
@@ -5,7 +5,7 @@ EAPI=4
 
 inherit eutils user
 
-DESCRIPTION="Antispam, antivirus and other customizable filtering for MTAs with Milter support"
+DESCRIPTION="Antispam, antivirus and other customizable filters for MTAs with Milter support"
 HOMEPAGE="http://www.mimedefang.org/"
 SRC_URI="http://www.mimedefang.org/static/${P}.tar.gz"
 LICENSE="GPL-2"
diff --git a/mail-filter/mimedefang/mimedefang-2.74.ebuild b/mail-filter/mimedefang/mimedefang-2.74.ebuild
index f5a99090ef38..24f01e24f08f 100644
--- a/mail-filter/mimedefang/mimedefang-2.74.ebuild
+++ b/mail-filter/mimedefang/mimedefang-2.74.ebuild
@@ -5,7 +5,7 @@ EAPI=4
 
 inherit eutils user
 
-DESCRIPTION="Antispam, antivirus and other customizable filtering for MTAs with Milter support"
+DESCRIPTION="Antispam, antivirus and other customizable filters for MTAs with Milter support"
 HOMEPAGE="http://www.mimedefang.org/"
 SRC_URI="http://www.mimedefang.org/static/${P}.tar.gz"
 LICENSE="GPL-2"
diff --git a/mail-filter/mimedefang/mimedefang-2.75.ebuild b/mail-filter/mimedefang/mimedefang-2.75.ebuild
index e33080eee390..fe9400a104bc 100644
--- a/mail-filter/mimedefang/mimedefang-2.75.ebuild
+++ b/mail-filter/mimedefang/mimedefang-2.75.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils user
 
-DESCRIPTION="Antispam, antivirus and other customizable filtering for MTAs with Milter support"
+DESCRIPTION="Antispam, antivirus and other customizable filters for MTAs with Milter support"
 HOMEPAGE="http://www.mimedefang.org/"
 SRC_URI="http://www.mimedefang.org/static/${P}.tar.gz"
 LICENSE="GPL-2"
diff --git a/mail-filter/spampd/spampd-2.30.ebuild b/mail-filter/spampd/spampd-2.30.ebuild
index 63b30d6a9061..f1c37bc2bc1e 100644
--- a/mail-filter/spampd/spampd-2.30.ebuild
+++ b/mail-filter/spampd/spampd-2.30.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-DESCRIPTION="spampd is a program to scan messages for possible Unsolicited Commercial E-mail content"
+DESCRIPTION="spampd is a program to scan messages for Unsolicited Commercial E-mail content"
 HOMEPAGE="http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm"
 SRC_URI="http://www.worlddesign.com/Content/rd/mta/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
diff --git a/mail-filter/spampd/spampd-2.42.ebuild b/mail-filter/spampd/spampd-2.42.ebuild
index cc46ce177c5e..d45e51557bf9 100644
--- a/mail-filter/spampd/spampd-2.42.ebuild
+++ b/mail-filter/spampd/spampd-2.42.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-DESCRIPTION="spampd is a program to scan messages for possible Unsolicited Commercial E-mail content"
+DESCRIPTION="spampd is a program to scan messages for Unsolicited Commercial E-mail content"
 HOMEPAGE="http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm"
 SRC_URI="https://github.com/mpaperno/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index d6ec5651ce4d..b6b2661ec7b9 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/esmtp/esmtp-1.2-r1.ebuild b/mail-mta/esmtp/esmtp-1.2-r1.ebuild
index 320421752547..ac16a7833d1b 100644
--- a/mail-mta/esmtp/esmtp-1.2-r1.ebuild
+++ b/mail-mta/esmtp/esmtp-1.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-DESCRIPTION="esmtp is a user configurable relay-only Mail Transfer Agent (MTA) with a sendmail compatible syntax"
+DESCRIPTION="User configurable relay-only Mail Transfer Agent with a sendmail-like syntax"
 HOMEPAGE="http://esmtp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
diff --git a/mail-mta/esmtp/esmtp-1.2.ebuild b/mail-mta/esmtp/esmtp-1.2.ebuild
index e512a546b22b..6bc78f3bb12c 100644
--- a/mail-mta/esmtp/esmtp-1.2.ebuild
+++ b/mail-mta/esmtp/esmtp-1.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-DESCRIPTION="esmtp is a user configurable relay-only Mail Transfer Agent (MTA) with a sendmail compatible syntax"
+DESCRIPTION="User configurable relay-only Mail Transfer Agent with a sendmail-like syntax"
 HOMEPAGE="http://esmtp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
diff --git a/mail-mta/metadata.xml b/mail-mta/metadata.xml
index 832ee68326ff..85fb13a2c47f 100644
--- a/mail-mta/metadata.xml
+++ b/mail-mta/metadata.xml
@@ -8,12 +8,10 @@
 		Die Kategorie mail-mta enthält Mail Transport Agents wie z.B. Sendmail und Postfix.
 	</longdescription>
 	<longdescription lang="es">
-		La categoría mail-mta contiene los paquetes de los agentes de transporte
-		de correo electrónico.
+		La categoría mail-mta contiene los paquetes de los agentes de transporte de correo electrónico.
 	</longdescription>
 	<longdescription lang="ja">
-		 mail-mtaカテゴリーにはメール・トランスポート・エージェントのパッケージが
-		 含まれています。
+		mail-mtaカテゴリーにはメール・トランスポート・エージェントのパッケージが含まれています。
 	</longdescription>
 	<longdescription lang="nl">
 		De mail-mta categorie bevat Mail Transport Agents, zoals sendmail &amp; postfix.
@@ -25,12 +23,10 @@
 		Nhóm mail-mta chứa các mail server (Mail Transport Agent).
 	</longdescription>
 	<longdescription lang="it">
-		La categoria mail-mta contiene pacchetti di server per la posta elettronica
-		(Mail Transport Agent).
+		La categoria mail-mta contiene pacchetti di server per la posta elettronica (Mail Transport Agent).
 	</longdescription>
 	<longdescription lang="pt">
-		A categoria mail-mta contém pacotes de servidor dos agentes de
-		transporte de correio eletrônico (Mail Transport Agent).
+		A categoria mail-mta contém pacotes de servidor dos agentes de transporte de correio eletrônico (Mail Transport Agent).
 	</longdescription>
 	<longdescription lang="pl">
 		Kategoria mail-mta zawiera serwery przekazywania poczty.
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index c66aa5affe02..5e1af318e03b 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/metadata.xml b/media-fonts/metadata.xml
index 01248fc1c85b..76d28ef6523a 100644
--- a/media-fonts/metadata.xml
+++ b/media-fonts/metadata.xml
@@ -5,7 +5,7 @@
 		The media-fonts category contains fonts.
 	</longdescription>
 	<longdescription lang="de">
-	        Die Kategorie media-fonts enthält verschiedene Font-Pakete.
+		Die Kategorie media-fonts enthält verschiedene Font-Pakete.
 	</longdescription>
 	<longdescription lang="es">
 		La categoría media-fonts contiene fuentes.
@@ -29,4 +29,3 @@
 		Kategoria media-fonts zawiera czcionki.
 	</longdescription>
 </catmetadata>
-
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 582eccd23496..1d9ad3afbd05 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libkate/libkate-0.4.1-r2.ebuild b/media-libs/libkate/libkate-0.4.1-r2.ebuild
index 035f70aa8eab..279c56974bdc 100644
--- a/media-libs/libkate/libkate-0.4.1-r2.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug doc wxwidgets"
 REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index bd816043b0cf..6afca3e88be7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,6 @@
 DIST mesa-13.0.5.tar.xz 9171480 SHA256 bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87 SHA512 db5f6a97b40ee6e45ba81280ab4543354e9f274c7112c5a43b8970244f329902a22f68d5eeddad5b64502507f462ffbcc028efc5dff93822adf95d30ba5903c1 WHIRLPOOL 164116608908331d4e8d69c4d2b92dc22e8e6d98725a20e8c2da5cc24b4e9ae9e05ee9c7209d55371b419e0f4e6c1d4752a46d149a968a6b83612aa77f7e480e
 DIST mesa-13.0.6.tar.xz 9179236 SHA256 29ef104a7fc082d352b1599bd6cb1d040be424ccd22f5e0eb7ee9b0e9acd3597 SHA512 2455e044647f674c2f1dd524143b61b8630713fa929bbf6fe1c981436a9c08dc933553d638a22b32d2799afb77be746355b48b1b20af172141c5b63891e94441 WHIRLPOOL 1fdaaf29de96225cf41a3bdeb559a35cf20fda524f80985b2bfdc52095dcb7f6b320704b7ccf754a6f80555925a6a80dfa2b1115a4bdd9bdc1ebb672f115208a
-DIST mesa-17.0.6.tar.xz 9494872 SHA256 89ecf3bcd0f18dcca5aaa42bf36bb52a2df33be89889f94aaaad91f7a504a69d SHA512 537d28aa694c2d48811d2467e33b3adc841067d5f1cdb7e0809ba100f71869090285bbb246e57e5f0177401a539b44cc32b1ccfcb32a1855c14b011b92d32eaf WHIRLPOOL f3ee87377e87cbd23bd9009d840e6c0ae50ccbbb30cfa7be61f3023cbe9519f5b50f22c59dbcc207a106a6e357d77074fcaee63916ee091b920cbc3d511ec2ab
+DIST mesa-17.0.6.tar.xz 9494872 BLAKE2B 1e83b0d40bb911c26880f25b281ba6e065dbf47555812c53e7d6fbccbc36a11a80531b8887eef6fbcb58e91d1eb5425151fdc03588d4ea36c2f268e5a6fcb604 SHA512 537d28aa694c2d48811d2467e33b3adc841067d5f1cdb7e0809ba100f71869090285bbb246e57e5f0177401a539b44cc32b1ccfcb32a1855c14b011b92d32eaf
 DIST mesa-17.1.10.tar.xz 9872168 SHA256 cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb SHA512 728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b WHIRLPOOL d33cc0b7620e01822ce6ca2708f01eccc6c7796c1ed19f3642dab733521d17d794658dbc47bcca7d71f94f99c81637a28738dc6c45c4d1ccc7e2855f07a5f961
 DIST mesa-17.1.8.tar.xz 9902800 SHA256 75ed2eaeae26ddd536150f294386468ae2e1a7717948c41cd14b7875be5269db SHA512 d29fd999d75967683f5aa836cf0b701705f54de428ebbbac059c3e335e94552c0b455aa67fa2870464a086dc58994f2f320710a1abc265dea363241aede71c5b WHIRLPOOL 8faad2f3da8546d48ee9b5470d147de7507a0dc39787a876f6513933e958baa94571d285095fced7c34c674364ab897a896acc39374849fb22026dd05a9bd27f
 DIST mesa-17.2.6.tar.xz 10387604 BLAKE2B 43bd60f9e61bb04e3a2afe4bc6e18099a524cdec3c7948d9ccfffa5bfe50eb3e0625ba6da7bb3b32959ef4a5e3db982daf2f90d3ee555cf65084d70849b3ca12 SHA512 739645d963da2ff79fa0f2bfcc4948516c4f0a768f9d21f98eff049edc88218847afd3786003ccf7b10deec585f4f1d7f70fcc5e5f6e33186ebbb86cd8cb0202
diff --git a/media-libs/mesa/mesa-17.1.8.ebuild b/media-libs/mesa/mesa-17.1.8.ebuild
index f0443941a305..0366bb61c356 100644
--- a/media-libs/mesa/mesa-17.1.8.ebuild
+++ b/media-libs/mesa/mesa-17.1.8.ebuild
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-17.2.6.ebuild b/media-libs/mesa/mesa-17.2.6.ebuild
index 12be4d77969f..c73b6d0c97be 100644
--- a/media-libs/mesa/mesa-17.2.6.ebuild
+++ b/media-libs/mesa/mesa-17.2.6.ebuild
@@ -153,7 +153,7 @@ LLVM_DEPSTR="
 		sys-devel/llvm:4[${MULTILIB_USEDEP}]
 		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
 	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	<sys-devel/llvm-6:=[${MULTILIB_USEDEP}]
 "
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
diff --git a/media-libs/mesa/mesa-17.3.0_rc5.ebuild b/media-libs/mesa/mesa-17.3.0_rc5.ebuild
index 34d01959bac4..14e934a13216 100644
--- a/media-libs/mesa/mesa-17.3.0_rc5.ebuild
+++ b/media-libs/mesa/mesa-17.3.0_rc5.ebuild
@@ -153,7 +153,7 @@ LLVM_DEPSTR="
 		sys-devel/llvm:4[${MULTILIB_USEDEP}]
 		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
 	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	<sys-devel/llvm-6:=[${MULTILIB_USEDEP}]
 "
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
diff --git a/media-libs/taglib/files/taglib-1.6.1-install-examples.patch b/media-libs/taglib/files/taglib-1.6.1-install-examples.patch
deleted file mode 100644
index f53768175a32..000000000000
--- a/media-libs/taglib/files/taglib-1.6.1-install-examples.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -purN taglib-1.6.1.orig/examples/CMakeLists.txt taglib-1.6.1/examples/CMakeLists.txt
---- taglib-1.6.1.orig/examples/CMakeLists.txt	2009-09-09 14:16:38.000000000 -0400
-+++ taglib-1.6.1/examples/CMakeLists.txt	2009-12-14 18:47:33.405385063 -0500
-@@ -45,6 +45,12 @@ ADD_EXECUTABLE(strip-id3v1 strip-id3v1.c
- 
- TARGET_LINK_LIBRARIES(strip-id3v1  tag )
- 
-+INSTALL(TARGETS
-+	tagreader tagreader_c tagwriter framelist strip-id3v1
-+	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-+)
- 
- endif(BUILD_EXAMPLES)
- 
diff --git a/media-libs/taglib/files/taglib-1.9.1-abi-breakage.patch b/media-libs/taglib/files/taglib-1.9.1-abi-breakage.patch
deleted file mode 100644
index 930439fc8349..000000000000
--- a/media-libs/taglib/files/taglib-1.9.1-abi-breakage.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 3bf30af66c8fd77a88d9379a0956ddb2fc70dc20 Mon Sep 17 00:00:00 2001
-From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
-Date: Wed, 6 Nov 2013 17:01:21 +0900
-Subject: [PATCH 2/6] Fixed ABI breakage in TagLib::String
-
----
- taglib/toolkit/tstring.cpp | 20 ++++++++++++++++++--
- taglib/toolkit/tstring.h   | 12 ++++++++++--
- tests/test_string.cpp      | 14 ++++++++++++++
- 3 files changed, 42 insertions(+), 4 deletions(-)
-
-diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
-index 75a9833..fb6e947 100644
---- a/taglib/toolkit/tstring.cpp
-+++ b/taglib/toolkit/tstring.cpp
-@@ -209,8 +209,16 @@ String::String(const std::string &s, Type t)
- String::String(const wstring &s, Type t)
-   : d(new StringPrivate())
- {
--  if(t == UTF16 || t == UTF16BE || t == UTF16LE)
-+  if(t == UTF16 || t == UTF16BE || t == UTF16LE) {
-+    // This looks ugly but needed for the compatibility with TagLib1.8. 
-+    // Should be removed in TabLib2.0.
-+    if (t == UTF16BE)
-+      t = WCharByteOrder;
-+    else if (t == UTF16LE)
-+      t = (WCharByteOrder == UTF16LE ? UTF16BE : UTF16LE);
-+
-     copyFromUTF16(s.c_str(), s.length(), t);
-+  }
-   else {
-     debug("String::String() -- A TagLib::wstring should not contain Latin1 or UTF-8.");
-   }
-@@ -219,8 +227,16 @@ String::String(const wstring &s, Type t)
- String::String(const wchar_t *s, Type t)
-   : d(new StringPrivate())
- {
--  if(t == UTF16 || t == UTF16BE || t == UTF16LE)
-+  if(t == UTF16 || t == UTF16BE || t == UTF16LE) {
-+    // This looks ugly but needed for the compatibility with TagLib1.8. 
-+    // Should be removed in TabLib2.0.
-+    if (t == UTF16BE)
-+      t = WCharByteOrder;
-+    else if (t == UTF16LE)
-+      t = (WCharByteOrder == UTF16LE ? UTF16BE : UTF16LE);
-+
-     copyFromUTF16(s, ::wcslen(s), t);
-+  }
-   else {
-     debug("String::String() -- A const wchar_t * should not contain Latin1 or UTF-8.");
-   }
-diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h
-index 57945be..605b9c2 100644
---- a/taglib/toolkit/tstring.h
-+++ b/taglib/toolkit/tstring.h
-@@ -134,13 +134,21 @@ namespace TagLib {
- 
-     /*!
-      * Makes a deep copy of the data in \a s.
-+     *
-+     * /note If \a t is UTF16LE, the byte order of \a s will be swapped regardless 
-+     * of the CPU byte order.  If UTF16BE, it will not be swapped.  This behavior
-+     * will be changed in TagLib2.0.
-      */
--    String(const wstring &s, Type t = WCharByteOrder);
-+    String(const wstring &s, Type t = UTF16BE);
- 
-     /*!
-      * Makes a deep copy of the data in \a s.
-+     *
-+     * /note If \a t is UTF16LE, the byte order of \a s will be swapped regardless 
-+     * of the CPU byte order.  If UTF16BE, it will not be swapped.  This behavior
-+     * will be changed in TagLib2.0.
-      */
--    String(const wchar_t *s, Type t = WCharByteOrder);
-+    String(const wchar_t *s, Type t = UTF16BE);
- 
-     /*!
-      * Makes a deep copy of the data in \a c.
-diff --git a/tests/test_string.cpp b/tests/test_string.cpp
-index a815a0b..9a574b3 100644
---- a/tests/test_string.cpp
-+++ b/tests/test_string.cpp
-@@ -75,6 +75,20 @@ public:
- 	String unicode3(L"\u65E5\u672C\u8A9E");
- 	CPPUNIT_ASSERT(*(unicode3.toCWString() + 1) == L'\u672C');
- 
-+    String unicode4(L"\u65e5\u672c\u8a9e", String::UTF16BE);
-+    CPPUNIT_ASSERT(unicode4[1] == L'\u672c');
-+
-+    String unicode5(L"\u65e5\u672c\u8a9e", String::UTF16LE);
-+    CPPUNIT_ASSERT(unicode5[1] == L'\u2c67');
-+
-+    wstring stduni = L"\u65e5\u672c\u8a9e";
-+
-+    String unicode6(stduni, String::UTF16BE);
-+    CPPUNIT_ASSERT(unicode6[1] == L'\u672c');
-+
-+    String unicode7(stduni, String::UTF16LE);
-+    CPPUNIT_ASSERT(unicode7[1] == L'\u2c67');
-+
-     CPPUNIT_ASSERT(strcmp(String::number(0).toCString(), "0") == 0);
-     CPPUNIT_ASSERT(strcmp(String::number(12345678).toCString(), "12345678") == 0);
-     CPPUNIT_ASSERT(strcmp(String::number(-12345678).toCString(), "-12345678") == 0);
--- 
-1.8.4.2
-
diff --git a/media-libs/taglib/files/taglib-1.9.1-bytevector-simpler.patch b/media-libs/taglib/files/taglib-1.9.1-bytevector-simpler.patch
deleted file mode 100644
index 0b134ec82215..000000000000
--- a/media-libs/taglib/files/taglib-1.9.1-bytevector-simpler.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 4a7d31c87bf41c1de21cb725176d5b34c2a95720 Mon Sep 17 00:00:00 2001
-From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
-Date: Thu, 14 Nov 2013 14:05:32 +0900
-Subject: [PATCH 3/6] Rewrote ByteVector::replace() simpler
-
----
- taglib/toolkit/tbytevector.cpp | 77 +++++++++++++++---------------------------
- tests/test_bytevector.cpp      |  5 +++
- 2 files changed, 33 insertions(+), 49 deletions(-)
-
-diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
-index b658246..566a20f 100644
---- a/taglib/toolkit/tbytevector.cpp
-+++ b/taglib/toolkit/tbytevector.cpp
-@@ -31,6 +31,7 @@
- #include <iostream>
- #include <cstdio>
- #include <cstring>
-+#include <cstddef>
- 
- #include <tstring.h>
- #include <tdebug.h>
-@@ -508,62 +509,40 @@ ByteVector &ByteVector::replace(const ByteVector &pattern, const ByteVector &wit
-   if(pattern.size() == 0 || pattern.size() > size())
-     return *this;
- 
--  const uint withSize = with.size();
--  const uint patternSize = pattern.size();
--  int offset = 0;
-+  const size_t withSize    = with.size();
-+  const size_t patternSize = pattern.size();
-+  const ptrdiff_t diff = withSize - patternSize;
-+  
-+  size_t offset = 0;
-+  while (true)
-+  {
-+    offset = find(pattern, offset);
-+    if(offset == static_cast<size_t>(-1)) // Use npos in taglib2.
-+      break;
- 
--  if(withSize == patternSize) {
--    // I think this case might be common enough to optimize it
-     detach();
--    offset = find(pattern);
--    while(offset >= 0) {
--      ::memcpy(data() + offset, with.data(), withSize);
--      offset = find(pattern, offset + withSize);
--    }
--    return *this;
--  }
- 
--  // calculate new size:
--  uint newSize = 0;
--  for(;;) {
--    int next = find(pattern, offset);
--    if(next < 0) {
--      if(offset == 0)
--        // pattern not found, do nothing:
--        return *this;
--      newSize += size() - offset;
--      break;
-+    if(diff < 0) {
-+      ::memmove(
-+        data() + offset + withSize, 
-+        data() + offset + patternSize, 
-+        size() - offset - patternSize);
-+      resize(size() + diff);
-     }
--    newSize += (next - offset) + withSize;
--    offset = next + patternSize;
--  }
--
--  // new private data of appropriate size:
--  ByteVectorPrivate *newData = new ByteVectorPrivate(newSize, 0);
--  char *target = DATA(newData);
--  const char *source = data();
--
--  // copy modified data into new private data:
--  offset = 0;
--  for(;;) {
--    int next = find(pattern, offset);
--    if(next < 0) {
--      ::memcpy(target, source + offset, size() - offset);
--      break;
-+    else if(diff > 0) {
-+      resize(size() + diff);
-+      ::memmove(
-+        data() + offset + withSize, 
-+        data() + offset + patternSize, 
-+        size() - diff - offset - patternSize);
-     }
--    int chunkSize = next - offset;
--    ::memcpy(target, source + offset, chunkSize);
--    target += chunkSize;
--    ::memcpy(target, with.data(), withSize);
--    target += withSize;
--    offset += chunkSize + patternSize;
--  }
- 
--  // replace private data:
--  if(d->deref())
--    delete d;
-+    ::memcpy(data() + offset, with.data(), with.size());
- 
--  d = newData;
-+    offset += withSize;
-+    if(offset > size() - patternSize)
-+      break;
-+  }
- 
-   return *this;
- }
-diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp
-index 9efd23a..eca74f8 100644
---- a/tests/test_bytevector.cpp
-+++ b/tests/test_bytevector.cpp
-@@ -239,6 +239,11 @@ public:
-       a.replace(ByteVector("ab"), ByteVector());
-       CPPUNIT_ASSERT_EQUAL(ByteVector("cdf"), a);
-     }
-+    {
-+      ByteVector a("abcdabf");
-+      a.replace(ByteVector("bf"), ByteVector("x"));
-+      CPPUNIT_ASSERT_EQUAL(ByteVector("abcdax"), a);
-+    }
-   }
- 
- };
--- 
-1.8.4.2
-
diff --git a/media-libs/taglib/files/taglib-1.9.1-missing-deletes.patch b/media-libs/taglib/files/taglib-1.9.1-missing-deletes.patch
deleted file mode 100644
index 9cdbdcf00fbd..000000000000
--- a/media-libs/taglib/files/taglib-1.9.1-missing-deletes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c14a3b5c3d0831f7c113d0cf95840c4671d9ebd4 Mon Sep 17 00:00:00 2001
-From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
-Date: Tue, 13 May 2014 20:07:02 +0900
-Subject: [PATCH] Added some missing deletes to test_flac.cpp.
-
----
- tests/test_flac.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/test_flac.cpp b/tests/test_flac.cpp
-index caec715..364fb11 100644
---- a/tests/test_flac.cpp
-+++ b/tests/test_flac.cpp
-@@ -91,6 +91,7 @@ public:
-     newpic->setData("JPEG data");
-     f->addPicture(newpic);
-     f->save();
-+    delete f;
- 
-     f = new FLAC::File(newname.c_str());
-     lst = f->pictureList();
-@@ -138,6 +139,7 @@ public:
-     f->removePictures();
-     f->addPicture(newpic);
-     f->save();
-+    delete f;
- 
-     f = new FLAC::File(newname.c_str());
-     lst = f->pictureList();
-@@ -165,6 +167,7 @@ public:
- 
-     f->removePictures();
-     f->save();
-+    delete f;
- 
-     f = new FLAC::File(newname.c_str());
-     lst = f->pictureList();
-@@ -185,6 +188,7 @@ public:
-     tag->setTitle("NEW TITLE 2");
-     f->save();
-     CPPUNIT_ASSERT_EQUAL(String("NEW TITLE 2"), tag->title());
-+    delete f;
- 
-     f = new FLAC::File(newname.c_str());
-     tag = f->tag();
--- 
-1.9.0
-
diff --git a/media-libs/taglib/files/taglib-1.9.1-order-big-endian.patch b/media-libs/taglib/files/taglib-1.9.1-order-big-endian.patch
deleted file mode 100644
index 86d5201e54d4..000000000000
--- a/media-libs/taglib/files/taglib-1.9.1-order-big-endian.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From db3e961d1098d5efe57364f540f68a5996dc83c2 Mon Sep 17 00:00:00 2001
-From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
-Date: Tue, 13 May 2014 18:22:16 +0900
-Subject: [PATCH] Fixed a wrong byte order handling on big-endian machines.
-
----
- taglib/toolkit/tstring.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
-index 603455a..1ec083b 100644
---- a/taglib/toolkit/tstring.cpp
-+++ b/taglib/toolkit/tstring.cpp
-@@ -47,10 +47,14 @@
- 
- namespace 
- {
--
-   inline unsigned short combine(unsigned char c1, unsigned char c2)
-   {
--    return (c1 << 8) | c2;
-+    using namespace TagLib::Utils;
-+
-+    if(SystemByteOrder == LittleEndian)
-+      return (c1 << 8) | c2;
-+    else
-+      return (c2 << 8) | c1;
-   }
- 
-   void UTF16toUTF8(const wchar_t *src, size_t srcLength, char *dst, size_t dstLength)
--- 
-1.9.0
-
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bdf4a85c4c8e..1115782c090e 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index 75f411728345..b57e60ab662e 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1 +1 @@
-DIST alsaplayer-0.99.81.tar.bz2 806906 SHA256 187897e5ad5a94ea819e42092cc35d53463e5fa43a3a5a78cb76ffd0d5ddee11 SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650 WHIRLPOOL 2f4849f5643768db14a7542c65504e937023585aaa7025a1d66e7f87568dfb25a981b304684a0fa242c0a4d9200c4111368669b8c6cd897cfdcfd1a43cee66f5
+DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
index e5ada6c7bf4f..bc24c59aa7a3 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils
+EAPI=6
+
+inherit autotools desktop
 
 DESCRIPTION="A heavily multi-threaded pluggable audio player"
 HOMEPAGE="http://www.alsaplayer.org/"
@@ -13,8 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 ~mips ~ppc ~sparc x86"
 IUSE="+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd"
 
-RDEPEND="media-libs/libsndfile
-	sys-libs/zlib
+RDEPEND="
+	media-libs/libsndfile:=
+	sys-libs/zlib:=
 	alsa? ( media-libs/alsa-lib )
 	audiofile? ( media-libs/audiofile )
 	flac? ( media-libs/flac )
@@ -36,6 +38,8 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="|| ( alsa jack nas oss )"
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e 's:AM_CFLAGS = $(AM_CXXFLAGS)::' \
 		output/jack/Makefile.am || die
@@ -48,11 +52,11 @@ src_prepare() {
 }
 
 src_configure() {
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-	use xosd || export ac_cv_lib_xosd_xosd_create=no
+	export ac_cv_prog_HAVE_DOXYGEN=$(usex doc true false)
+	export ac_cv_lib_xosd_xosd_create=$(usex xosd)
 
 	econf \
-		--docdir=/usr/share/doc/${PF} \
+		--disable-esd \
 		$(use_enable nls) \
 		$(use_enable opengl) \
 		$(use_enable mikmod) \
@@ -64,16 +68,16 @@ src_configure() {
 		$(use_enable gtk systray) \
 		$(use_enable jack) \
 		$(use_enable alsa) \
-		--disable-esd \
 		$(use_enable oss) \
 		$(use_enable gtk gtk2) \
 		$(use_enable nas)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README TODO docs/*.txt
+	default
+	dodoc docs/*.txt
+
 	newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-sound/cmix/Manifest b/media-sound/cmix/Manifest
index 670057d26288..50811eadb5a2 100644
--- a/media-sound/cmix/Manifest
+++ b/media-sound/cmix/Manifest
@@ -1 +1 @@
-DIST cmix-1.6.tbz2 12880 SHA256 3c63e687c0afac50f5218f2ee0f594132f1656073d5a9cf3f7f0da525b4e8afe SHA512 5d8409872bbea0575a1cb7d15d1f1469571860d06f4f71bf78b685077d0ff394323ef12498d3f8424e00b31a7c7430115ee7a810b7bbf291bb586a3d95f19a38 WHIRLPOOL 08d496d71d2d016679df5c99056d625f097aef7c334a38bbff448145a11cec931c0bb5557a33872459781202c12a46e3cd97b98a32db0f6dc39458eaa8303612
+DIST cmix-1.6.tbz2 12880 BLAKE2B 1d024279a30439099dbc1f7a4c7a98f96143b716f032f57bb662d901e3fb92977333cc6ca1743727128c08ec92f3ef01c57b37e7bf803f8525c05910eed9da0c SHA512 5d8409872bbea0575a1cb7d15d1f1469571860d06f4f71bf78b685077d0ff394323ef12498d3f8424e00b31a7c7430115ee7a810b7bbf291bb586a3d95f19a38
diff --git a/media-sound/cmix/cmix-1.6.ebuild b/media-sound/cmix/cmix-1.6.ebuild
index 933e6189f5a0..1dc7e4ab02a2 100644
--- a/media-sound/cmix/cmix-1.6.ebuild
+++ b/media-sound/cmix/cmix-1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+EAPI=6
 
-IUSE=""
+inherit toolchain-funcs
 
 DESCRIPTION="command line audio mixer"
 HOMEPAGE="http://cmix.sourceforge.net/"
@@ -14,18 +14,13 @@ SLOT="0"
 #-amd64: 1.6: 'cmix list' gives: MIXER_READ(SOUND_MIXER_OUTSRC): Input/output error
 KEYWORDS="-amd64 ~ppc sparc x86"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-}
+PATCHES=( "${FILESDIR}/${P}-ldflags.patch" )
 
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	einstall || die
 	dobin cmix
-	dodoc README || die
+	einstalldocs
 }
diff --git a/media-sound/cmix/files/cmix-1.6-ldflags.patch b/media-sound/cmix/files/cmix-1.6-ldflags.patch
index ba8dacb2567b..0ddf7e085844 100644
--- a/media-sound/cmix/files/cmix-1.6-ldflags.patch
+++ b/media-sound/cmix/files/cmix-1.6-ldflags.patch
@@ -1,14 +1,14 @@
-Index: cmix-1.6/Makefile
-===================================================================
---- cmix-1.6.orig/Makefile
-+++ cmix-1.6/Makefile
-@@ -3,8 +3,7 @@ CC=gcc
- #CFLAGS=-Wall -O2
- 
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,5 @@
+-CC=gcc
+-#CFLAGS=-Wall -g
+-#CFLAGS=-Wall -O2
+-
  cmix: mix.c
 -	$(CC) $(CFLAGS) mix.c -o $@
 -	strip $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) mix.c -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) mix.c -o $@ $(LIBS)
  
  install: 
  
diff --git a/media-sound/pulseaudio/pulseaudio-11.1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1.ebuild
index 6891133b530e..cb559d066005 100644
--- a/media-sound/pulseaudio/pulseaudio-11.1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-11.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
 
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4368c85adbb6..45f9181342b9 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/bdsup2sub/bdsup2sub-4.0.0-r1.ebuild b/media-video/bdsup2sub/bdsup2sub-4.0.0-r1.ebuild
deleted file mode 100644
index 7818e675d5d2..000000000000
--- a/media-video/bdsup2sub/bdsup2sub-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-XDG_P="xdg-20100731"
-
-DESCRIPTION="A tool to convert and tweak bitmap based subtitle streams"
-HOMEPAGE="http://bdsup2sub.javaforge.com/help.htm"
-SRC_URI="http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
-	http://sbriesen.de/gentoo/distfiles/${XDG_P}.java.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/xz-utils"
-
-S="${WORKDIR}/${PN}/${PV}"
-
-java_prepare() {
-	# apply XDG patch
-	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java"
-	epatch "${FILESDIR}/${P}-xdg.patch"
-
-	# copy build.xml
-	cp -f "${FILESDIR}/build-${PV}.xml" build.xml || die
-}
-
-src_compile() {
-	eant build $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar dist/BDSup2Sub.jar
-	java-pkg_dolauncher BDSup2Sub --main BDSup2Sub --java_args -Xmx256m
-	newicon bin_copy/icon_32.png BDSup2Sub.png
-	make_desktop_entry BDSup2Sub BDSup2Sub BDSup2Sub
-	use doc && java-pkg_dojavadoc apidocs
-	use source && java-pkg_dosrc src
-}
diff --git a/media-video/sonic-snap/sonic-snap-1.7.ebuild b/media-video/sonic-snap/sonic-snap-1.7.ebuild
deleted file mode 100644
index 48a5f4180085..000000000000
--- a/media-video/sonic-snap/sonic-snap-1.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-inherit eutils linux-info multilib toolchain-funcs
-
-DESCRIPTION="Webcam app for sn9c10x based camera controllers (with optional MPEG4 support)"
-HOMEPAGE="http://www.stolk.org/sonic-snap/"
-SRC_URI="http://www.stolk.org/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mpeg"
-
-DEPEND="x11-libs/fltk:1
-	mpeg? ( >=media-libs/libfame-0.9.1 )
-	sys-libs/zlib
-	x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft"
-
-CONFIG_CHECK="~USB_SN9C102"
-ERROR_USB_SN9C102="Please make sure the SN9C1xx PC Camera Controller driver is \
-enabled, under V4L USB devices, as a module in your kernel."
-
-src_prepare() {
-	# fix bad assumptions
-	sed -i \
-		-e "s|\$(HOME)/include|/usr/include|" \
-		-e "s|\$(HOME)/lib|/usr/$(get_libdir)|" \
-		-e "s|CFLAGS=|CFLAGS= ${CXXFLAGS} |" \
-		-e "s|LFLAGS=|LFLAGS= ${LDFLAGS} |" \
-		-e "s/g++-4.0 -O3/$(tc-getCXX)/" \
-		Makefile
-
-	use mpeg || sed -i -e "s?USE_FAME=1?USE_FAME=0?g" Makefile
-}
-
-src_compile() {
-	make || die '"make" failed.'
-}
-
-src_install() {
-	dodir /usr/bin
-	make DESTDIR="${D}" install || die '"make install" failed.'
-
-	dodoc ChangeLog README
-	doman debian/sonic-snap.1
-}
-
-pkg_postinst() {
-
-	elog
-	elog "This driver is V4L v2 only, so V4L v1 apps will not work."
-	elog "Finally, only a few image sensors are supported, eg, PAS106B"
-	elog "so (check dmesg or /var/log/messages for USB device info when"
-	elog "you plug the cam in)."
-	elog
-	elog "Now try sonic-snap-gui /dev/videoX (where X is 0, 1 , etc)."
-	elog
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 5af75b96c5de..f007d119cfdb 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 545ebe78bf7f..aff0ab3e8d78 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Dec 2017 22:38:34 +0000
+Sat, 02 Dec 2017 17:38:36 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b8411eb0f8ac..3e16c26a90de 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Dec 2017 22:38:35 +0000
+Sat, 02 Dec 2017 17:38:37 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index f56580ead821..47ff3a282d56 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 972364127f02..343d20ca95c5 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/puppet-3.8.7-r1 b/metadata/md5-cache/app-admin/puppet-3.8.7-r1
deleted file mode 100644
index 922ce7361288..000000000000
--- a/metadata/md5-cache/app-admin/puppet-3.8.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby22] >=dev-ruby/facter-1.6.2[ruby_targets_ruby22] <dev-ruby/facter-3[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby23] >=dev-ruby/facter-1.6.2[ruby_targets_ruby23] <dev-ruby/facter-3[ruby_targets_ruby23] dev-ruby/json[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A system automation and configuration management software
-EAPI=5
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby22] >=dev-ruby/facter-1.6.2[ruby_targets_ruby22] <dev-ruby/facter-3[ruby_targets_ruby22] dev-ruby/json[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.7.0[ruby_targets_ruby23] >=dev-ruby/facter-1.6.2[ruby_targets_ruby23] <dev-ruby/facter-3[ruby_targets_ruby23] dev-ruby/json[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.8.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=19edff0f20544c22b84eac8906a195ad
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.6 b/metadata/md5-cache/app-admin/puppet-4.10.6
deleted file mode 100644
index ea2099150557..000000000000
--- a/metadata/md5-cache/app-admin/puppet-4.10.6
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=658069dffecb95566856846c8436dc94
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.6-r1 b/metadata/md5-cache/app-admin/puppet-4.10.6-r1
deleted file mode 100644
index f91b36a5a553..000000000000
--- a/metadata/md5-cache/app-admin/puppet-4.10.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=be288adbc7390dcadd5f35390116bbde
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.9 b/metadata/md5-cache/app-admin/puppet-4.10.9
new file mode 100644
index 000000000000..4a2a0edb0256
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-4.10.9
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A system automation and configuration management software.
+EAPI=6
+HOMEPAGE=http://puppetlabs.com/
+IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~ppc64
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.9.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
+_md5_=1f3aab687aa5b78ea5edf249dc9d797d
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index fbde0da7673c..e383b123ff30 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.27 b/metadata/md5-cache/app-crypt/ccid-1.4.27
index 0fc974cef32b..d2b0d3ac7097 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.4.27
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.27
@@ -4,10 +4,10 @@ DESCRIPTION=CCID free software driver
 EAPI=6
 HOMEPAGE=http://pcsclite.alioth.debian.org/ccid.html
 IUSE=twinserial kobil-midentity +usb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
 SLOT=0
 SRC_URI=http://alioth.debian.org/frs/download.php/file/4218/ccid-1.4.27.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=39e6ca0c5c2ebde192da9360fab1374d
+_md5_=4bf6d0c8d41e8cad54af9d98172df222
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 9ce1f48156a6..6a6270608e14 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/mc-4.8.20 b/metadata/md5-cache/app-misc/mc-4.8.20-r1
similarity index 97%
rename from metadata/md5-cache/app-misc/mc-4.8.20
rename to metadata/md5-cache/app-misc/mc-4.8.20-r1
index 1155238f1717..187bdbc7e119 100644
--- a/metadata/md5-cache/app-misc/mc-4.8.20
+++ b/metadata/md5-cache/app-misc/mc-4.8.20-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=spell? ( edit )
 SLOT=0
 SRC_URI=http://ftp.midnight-commander.org/mc-4.8.20.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9dbfdbe6ffadae27aab09c008cdc4bbc
+_md5_=ed10cfbfbc1acad3c4640c735369ddd6
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 9aa34540eadd..c5630fb4b007 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/cpuid2cpuflags-2 b/metadata/md5-cache/app-portage/cpuid2cpuflags-2
deleted file mode 100644
index 2578f848680c..000000000000
--- a/metadata/md5-cache/app-portage/cpuid2cpuflags-2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Tool to guess CPU_FLAGS_X86 flags for the host
-EAPI=5
-HOMEPAGE=https://github.com/mgorny/cpuid2cpuflags
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/mgorny/cpuid2cpuflags/releases/download/v2/cpuinfo2cpuflags-2.tar.bz2
-_md5_=bf7a954856da6ff368e330096a5c1346
diff --git a/metadata/md5-cache/app-portage/cpuid2cpuflags-3 b/metadata/md5-cache/app-portage/cpuid2cpuflags-5
similarity index 56%
rename from metadata/md5-cache/app-portage/cpuid2cpuflags-3
rename to metadata/md5-cache/app-portage/cpuid2cpuflags-5
index cc8ef9349f62..7142996dc86c 100644
--- a/metadata/md5-cache/app-portage/cpuid2cpuflags-3
+++ b/metadata/md5-cache/app-portage/cpuid2cpuflags-5
@@ -2,8 +2,8 @@ DEFINED_PHASES=postinst
 DESCRIPTION=Tool to guess CPU_FLAGS_X86 flags for the host
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/cpuid2cpuflags
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 SLOT=0
-SRC_URI=https://github.com/mgorny/cpuid2cpuflags/releases/download/v3/cpuid2cpuflags-3.tar.bz2
-_md5_=15d61cbe3bf5f3dcd001daf9ce9f92f0
+SRC_URI=https://github.com/mgorny/cpuid2cpuflags/releases/download/v5/cpuid2cpuflags-5.tar.bz2
+_md5_=75c54698f9f416ccfcd5c9ca62ed35da
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 0d626e575a2a..e3aa6aed4959 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/ansifilter-2.9 b/metadata/md5-cache/app-text/ansifilter-2.9
new file mode 100644
index 000000000000..43579cfed664
--- /dev/null
+++ b/metadata/md5-cache/app-text/ansifilter-2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Handles text files containing ANSI terminal escape codes
+EAPI=6
+HOMEPAGE=http://www.andre-simon.de/
+IUSE=qt5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+SLOT=0
+SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.9.tar.bz2
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=194fa3c2d60d907a7ce00f4e2a29c1c4
diff --git a/metadata/md5-cache/app-text/enchant-1.6.1 b/metadata/md5-cache/app-text/enchant-1.6.1
index cd8fab796b17..09062c77d4ca 100644
--- a/metadata/md5-cache/app-text/enchant-1.6.1
+++ b/metadata/md5-cache/app-text/enchant-1.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=Spellchecker wrapping library
 EAPI=6
 HOMEPAGE=https://abiword.github.io/enchant/
 IUSE=aspell +hunspell static-libs test zemberek
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) zemberek? ( dev-libs/dbus-glib ) zemberek? ( app-text/zemberek-server )
 REQUIRED_USE=|| ( hunspell aspell zemberek )
 SLOT=0
 SRC_URI=https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/enchant-1.6.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9b7bcf2fb9e88db2edb05d6c7b02ee7f
+_md5_=006bd83c7ca1e89f9b50ee4ad5182191
diff --git a/metadata/md5-cache/app-text/iso-codes-3.75 b/metadata/md5-cache/app-text/iso-codes-3.75
index 2168afa14638..3bf0103ee5cf 100644
--- a/metadata/md5-cache/app-text/iso-codes-3.75
+++ b/metadata/md5-cache/app-text/iso-codes-3.75
@@ -4,10 +4,10 @@ DESCRIPTION=ISO language, territory, currency, script codes and their translatio
 EAPI=6
 HOMEPAGE=http://pkg-isocodes.alioth.debian.org/
 IUSE=linguas_af linguas_am linguas_ar linguas_as linguas_ast linguas_az linguas_be linguas_bg linguas_bn linguas_bn_IN linguas_br linguas_bs linguas_byn linguas_ca linguas_crh linguas_cs linguas_cy linguas_da linguas_de linguas_dz linguas_el linguas_en linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_ga linguas_gez linguas_gl linguas_gu linguas_haw linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_kok linguas_ku linguas_lt linguas_lv linguas_mi linguas_mk linguas_ml linguas_mn linguas_mr linguas_ms linguas_mt linguas_nb linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_or linguas_pa linguas_pl linguas_ps linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_so linguas_sq linguas_sr linguas_sr@latin linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_ti linguas_tig linguas_tk linguas_tl linguas_tr linguas_tt linguas_tt@iqtelif linguas_ug linguas_uk linguas_ve linguas_vi linguas_wa linguas_wal linguas_wo linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.75.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	l10n	2c2e15383ba891d642f51896a7f0ecfe	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d5c5752269ae50738f179082248b239f
+_md5_=6266f956fd88be21801f13faea9070dc
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 6e596677fd91..880a7272318a 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/libgee-0.20.0 b/metadata/md5-cache/dev-libs/libgee-0.20.0
index b731370a6c0f..fa89754a8579 100644
--- a/metadata/md5-cache/dev-libs/libgee-0.20.0
+++ b/metadata/md5-cache/dev-libs/libgee-0.20.0
@@ -4,10 +4,10 @@ DESCRIPTION=GObject-based interfaces and classes for commonly used data structur
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgee
 IUSE=+introspection
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sh ~sparc ~x86 ~x86-linux
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sh sparc ~x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 SLOT=0.8/2
 SRC_URI=mirror://gnome/sources/libgee/0.20/libgee-0.20.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d374cff76e90ce55ff8bc1f702e7748f
+_md5_=d755fe9379690bca8a591f84bd5eee11
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.26.2 b/metadata/md5-cache/dev-libs/libgit2-glib-0.26.2
new file mode 100644
index 000000000000..27a5a58e152c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.26.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0/26[ssh?] python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Git library for GLib
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
+IUSE=python +ssh +vala python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0/26[ssh?] python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vala	103e6885c83965507391cdc5b6fa0e67	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c8442e918bcce4a837430f5a1d048af1
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.30 b/metadata/md5-cache/dev-libs/libpcre2-10.30
index d14a16c3bff7..db675d201eb5 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.30
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.30
@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=6
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/pcre/pcre2-10.30.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.30.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1fb667984cabbae3a08cfb32b558a749
+_md5_=a10b5e01a247d18173442db6bfb3dd6d
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.0 b/metadata/md5-cache/dev-libs/libpwquality-1.4.0
index 728312d86935..b9c8fb79d607 100644
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.0
+++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Library for password quality checking and generating random password
 EAPI=6
 HOMEPAGE=https://github.com/libpwquality/libpwquality
 IUSE=pam python static-libs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=>=sys-libs/cracklib-2.8:= pam? ( virtual/pam ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.0/libpwquality-1.4.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f0ff49eed1df51af6bf8af4d1a0d1797
+_md5_=b9db95c56d56df3f2ffa94bdfeafa2e9
diff --git a/metadata/md5-cache/dev-libs/libuv-1.18.0 b/metadata/md5-cache/dev-libs/libuv-1.18.0
new file mode 100644
index 000000000000..54a26c0accb1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libuv-1.18.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/libtool virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Cross-platform asychronous I/O
+EAPI=6
+HOMEPAGE=https://github.com/libuv/libuv
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD BSD-2 ISC MIT
+RESTRICT=test
+SLOT=0/1
+SRC_URI=https://github.com/libuv/libuv/archive/v1.18.0.tar.gz -> libuv-1.18.0.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=df7871991f5913db6cc77b4d9233941e
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.6 b/metadata/md5-cache/dev-libs/libxml2-2.9.6
index 4f3b7e77d765..fd20bfdeefa1 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.6
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.6
@@ -4,11 +4,11 @@ DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.6.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	7b6fb2fc216b101b5d97d171925a847c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=91c4046816ffcb63e58dc15ddb766cbd
+_md5_=d88e380ed06c249689abd628d5ee28ee
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2 b/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2
index dd272e422d04..f204ab5229d6 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.30-r2
@@ -4,11 +4,11 @@ DESCRIPTION=XSLT libraries and tools
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=crypt debug examples python static-libs python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.1-r5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.30.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=eb3789b42d3df79d9bddfcc42660996d
+_md5_=229f3609ea013f0f0b3d8b5a532ba4e2
diff --git a/metadata/md5-cache/dev-libs/ntl-5.5.2 b/metadata/md5-cache/dev-libs/ntl-5.5.2
deleted file mode 100644
index 145f96fa4776..000000000000
--- a/metadata/md5-cache/dev-libs/ntl-5.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/gmp-4.3 >=dev-libs/gf2x-0.9 dev-lang/perl
-DESCRIPTION=High-performance and portable Number Theory C++ library
-EAPI=3
-HOMEPAGE=http://shoup.net/ntl/
-IUSE=doc static-libs test
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/gmp-4.3 >=dev-libs/gf2x-0.9
-SLOT=0
-SRC_URI=http://www.shoup.net/ntl/ntl-5.5.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=31ec45a48d4d5cf381561f2ecb7f56b7
diff --git a/metadata/md5-cache/dev-libs/ntl-6.1.0 b/metadata/md5-cache/dev-libs/ntl-6.1.0
deleted file mode 100644
index 3df0cb43d205..000000000000
--- a/metadata/md5-cache/dev-libs/ntl-6.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/gmp-4.3 >=dev-libs/gf2x-0.9 dev-lang/perl
-DESCRIPTION=High-performance and portable Number Theory C++ library
-EAPI=5
-HOMEPAGE=http://shoup.net/ntl/
-IUSE=doc static-libs test
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/gmp-4.3 >=dev-libs/gf2x-0.9
-SLOT=0
-SRC_URI=http://www.shoup.net/ntl/ntl-6.1.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2696d779579b5de431fc5f8d4989e429
diff --git a/metadata/md5-cache/dev-libs/ppl-0.12.1-r1 b/metadata/md5-cache/dev-libs/ppl-0.12.1-r1
deleted file mode 100644
index 8d659714a16d..000000000000
--- a/metadata/md5-cache/dev-libs/ppl-0.12.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=>=dev-libs/gmp-4.1.3[cxx] lpsol? ( <=sci-mathematics/glpk-4.48 ) !<dev-libs/cloog-ppl-0.15.10 sys-devel/m4
-DESCRIPTION=The Parma Polyhedra Library for numerical analysis of complex systems
-EAPI=3
-HOMEPAGE=http://bugseng.com/products/ppl
-IUSE=doc lpsol pch static-libs test
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/gmp-4.1.3[cxx] lpsol? ( <=sci-mathematics/glpk-4.48 ) !<dev-libs/cloog-ppl-0.15.10
-SLOT=0
-SRC_URI=http://bugseng.com/products/ppl/download/ftp/releases/0.12.1/ppl-0.12.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=037140633653c6503bfb7560b05c1d98
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index efd069db5f43..17ea91708bb0 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.1_rc2 b/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.1_rc2
new file mode 100644
index 000000000000..f36093503316
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.1_rc2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-5.0.1_rc2:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore
+LICENSE=UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-5.0.1_rc2:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)]
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
+SLOT=0/5.0.1_rc2
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/llvm-5.0.1rc2.src.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d2f82199a96d4f6d22c70e1c544768a2
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.48.0 b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.48.0
index 22c057899ae8..c9a0aecf849b 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.48.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-SSL-2.48.0
@@ -4,10 +4,10 @@ DESCRIPTION=Nearly transparent SSL encapsulation for IO::Socket::INET
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/IO-Socket-SSL/
 IUSE=idn examples
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-SSLeay-1.460.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN dev-perl/Net-IDN-Encode ) ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.048.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=522c64452e45fb761e6e9dc7c663e1ca
+_md5_=dd9574cf239b2d0baddd38cb4a76534b
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 6a5203537ea3..9c4fb08e3a92 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 94ced0d87b68..a06892269a09 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/blessings-1.6 b/metadata/md5-cache/dev-python/blessings-1.6
deleted file mode 100644
index d41ef2e8b9c9..000000000000
--- a/metadata/md5-cache/dev-python/blessings-1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A thin, practical wrapper around terminal coloring, styling, and positioning
-EAPI=5
-HOMEPAGE=https://github.com/erikrose/blessings https://pypi.python.org/pypi/blessings/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/b/blessings/blessings-1.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0be20975fcff421ba855e9632d18846c
diff --git a/metadata/md5-cache/dev-python/blessings-1.6-r1 b/metadata/md5-cache/dev-python/blessings-1.6-r1
index 31bed8693574..a47968fec510 100644
--- a/metadata/md5-cache/dev-python/blessings-1.6-r1
+++ b/metadata/md5-cache/dev-python/blessings-1.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A thin, practical wrapper around terminal coloring, styling, and pos
 EAPI=6
 HOMEPAGE=https://github.com/erikrose/blessings https://pypi.python.org/pypi/blessings/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/blessings/blessings-1.6.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2925d83e61af484d43be0cc64fc2fee9
+_md5_=fbb534c59f8b09f242564397d156ffc0
diff --git a/metadata/md5-cache/dev-python/clang-python-5.0.1_rc2 b/metadata/md5-cache/dev-python/clang-python-5.0.1_rc2
new file mode 100644
index 000000000000..53870940e062
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-5.0.1_rc2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install test unpack
+DEPEND=>=sys-devel/clang-5.0.1_rc2:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python2_7
+LICENSE=UoI-NCSA
+RDEPEND=>=sys-devel/clang-5.0.1_rc2:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/cfe-5.0.1rc2.src.tar.xz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=d0c106e81236b2d9f5ebba6551c1c5d5
diff --git a/metadata/md5-cache/dev-python/kitchen-1.2.4 b/metadata/md5-cache/dev-python/kitchen-1.2.4
index 7e0acad1e94a..4f062e9e3155 100644
--- a/metadata/md5-cache/dev-python/kitchen-1.2.4
+++ b/metadata/md5-cache/dev-python/kitchen-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=A cornucopia of useful code
 EAPI=6
 HOMEPAGE=https://fedorahosted.org/kitchen/ https://pypi.python.org/pypi/kitchen
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/k/kitchen/kitchen-1.2.4.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1938d499bfcb60835808158e5ba3593f
+_md5_=a87c98672642d6a0aa9779ae6f069dd9
diff --git a/metadata/md5-cache/dev-python/lit-5.0.1_rc2 b/metadata/md5-cache/dev-python/lit-5.0.1_rc2
new file mode 100644
index 000000000000..e439a7e352d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-5.0.1_rc2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/llvm ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A stand-alone install of the LLVM suite testing tool
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=UoI-NCSA
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/llvm-5.0.1rc2.src.tar.xz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4513ab6bd8e9bb45da832874d125ac63
diff --git a/metadata/md5-cache/dev-python/path-and-address-1.1.0 b/metadata/md5-cache/dev-python/path-and-address-1.1.0
index 27cc95a6f965..507dd53936ee 100644
--- a/metadata/md5-cache/dev-python/path-and-address-1.1.0
+++ b/metadata/md5-cache/dev-python/path-and-address-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Functions for server CLI applications used by humans
 EAPI=6
 HOMEPAGE=https://github.com/joeyespo/path-and-address
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/p/path-and-address/path-and-address-1.1.0.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e2af8f077cda2671aeb711ec417937a7
+_md5_=c1f063ba2cfa5a8e0bcac7a0b44c705a
diff --git a/metadata/md5-cache/dev-python/pipenv-8.3.2 b/metadata/md5-cache/dev-python/pipenv-8.3.2
new file mode 100644
index 000000000000..4102dd8be09a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pipenv-8.3.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python Development Workflow for Humans.
+EAPI=6
+HOMEPAGE=https://github.com/kennethreitz/pipenv https://pypi.python.org/pypi/pipenv
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pipenv/pipenv-8.3.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9efd5aaaa08903cf29b55b38fc685a92
diff --git a/metadata/md5-cache/dev-python/priority-1.3.0 b/metadata/md5-cache/dev-python/priority-1.3.0
index 32a148621ec4..a2615b870f92 100644
--- a/metadata/md5-cache/dev-python/priority-1.3.0
+++ b/metadata/md5-cache/dev-python/priority-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/pytest-2.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-cov-2.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-xdist-1.14.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hypothesis-3.4.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-2.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-cov-2.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-xdist-1.14.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hypothesis-3.4.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A pure-Python implementation of the HTTP/2 priority tree
 EAPI=6
 HOMEPAGE=http://python-hyper.org/priority https://github.com/python-hyper/priority https://pypi.python.org/pypi/priority
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/p/priority/priority-1.3.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e6c8924691f5b728ce9f7f7afa1a1c2
+_md5_=781bcdafc3596254ff7d8942c85bdd79
diff --git a/metadata/md5-cache/dev-python/pycollada-0.4 b/metadata/md5-cache/dev-python/pycollada-0.4
index f1f5ae75d3a5..e2c04b85a864 100644
--- a/metadata/md5-cache/dev-python/pycollada-0.4
+++ b/metadata/md5-cache/dev-python/pycollada-0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx ) test? ( dev-python/python-dateutil ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx ) test? ( dev-python/python-dateutil ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=python library for reading and writing collada documents
 EAPI=5
 HOMEPAGE=https://pycollada.github.com/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://github.com/pycollada/pycollada/archive/v0.4.tar.gz -> pycollada-0.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7674728d19e2e0dad971a52a02976ce4
+_md5_=ee637228b2b570ab928447d1bb0ca10b
diff --git a/metadata/md5-cache/dev-python/pycollada-9999 b/metadata/md5-cache/dev-python/pycollada-9999
deleted file mode 100644
index 2d25c6745c08..000000000000
--- a/metadata/md5-cache/dev-python/pycollada-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=doc? ( dev-python/sphinx ) test? ( dev-python/python-dateutil ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git
-DESCRIPTION=python library for reading and writing collada documents
-EAPI=5
-HOMEPAGE=https://pycollada.github.com/
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=BSD
-RDEPEND=dev-python/numpy dev-python/lxml >=dev-python/python-dateutil-2.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71b1ac25ff687cdf8e055a656c0cdb5d
diff --git a/metadata/md5-cache/dev-python/pydecomp-0.1 b/metadata/md5-cache/dev-python/pydecomp-0.2
similarity index 96%
rename from metadata/md5-cache/dev-python/pydecomp-0.1
rename to metadata/md5-cache/dev-python/pydecomp-0.2
index 03f944c83cc5..8017f2903428 100644
--- a/metadata/md5-cache/dev-python/pydecomp-0.1
+++ b/metadata/md5-cache/dev-python/pydecomp-0.2
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~dolsen/releases/pydecomp/pyDeComp-0.1.tar.gz -> pydecomp-0.1.tar.gz
+SRC_URI=https://dev.gentoo.org/~dolsen/releases/pydecomp/pyDeComp-0.2.tar.gz -> pydecomp-0.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca938d2d257b89f84e826dc7a78f6ab8
+_md5_=1af13e7a9d444fff75b1e2c4a5446083
diff --git a/metadata/md5-cache/dev-python/pydecomp-9999 b/metadata/md5-cache/dev-python/pydecomp-9999
index 7ac5d272b0cd..8094a606da93 100644
--- a/metadata/md5-cache/dev-python/pydecomp-9999
+++ b/metadata/md5-cache/dev-python/pydecomp-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A python library of common (de)compression and contents handling
 EAPI=5
 HOMEPAGE=https://github.com/dol-sen/pyDeComp
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f6fbe068339863c08909a4906e0b05fd
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=34d91f15980fc4e18b585ad9bf36b979
diff --git a/metadata/md5-cache/dev-python/pyglet-1.2.4 b/metadata/md5-cache/dev-python/pyglet-1.2.4
index 8d0a846e9e03..8715c075e52b 100644
--- a/metadata/md5-cache/dev-python/pyglet-1.2.4
+++ b/metadata/md5-cache/dev-python/pyglet-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/opengl alsa? ( media-libs/alsa-lib[alisp] ) gtk? ( x11-libs/gtk+:2 ) openal? ( media-libs/openal ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=virtual/opengl alsa? ( media-libs/alsa-lib[alisp] ) gtk? ( x11-libs/gtk+:2 ) openal? ( media-libs/openal ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Cross-platform windowing and multimedia library for Python
 EAPI=5
 HOMEPAGE=http://www.pyglet.org/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyglet/pyglet-1.2.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5edc1904f129c09b070c92e3e190dcc3
+_md5_=11717d3d7c2217b60f2624997ce42120
diff --git a/metadata/md5-cache/dev-python/pylast-1.6.0 b/metadata/md5-cache/dev-python/pylast-1.6.0
deleted file mode 100644
index 81d62d0bcb56..000000000000
--- a/metadata/md5-cache/dev-python/pylast-1.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python interface to last.fm and other api-compatible websites
-EAPI=6
-HOMEPAGE=https://github.com/pylast/pylast
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pylast/pylast-1.6.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f0c2e524ab8f10ecdfc13a726bdd1f8
diff --git a/metadata/md5-cache/dev-python/pylast-1.7.0 b/metadata/md5-cache/dev-python/pylast-1.7.0
deleted file mode 100644
index 0ba1c8aa9c19..000000000000
--- a/metadata/md5-cache/dev-python/pylast-1.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python interface to last.fm and other api-compatible websites
-EAPI=6
-HOMEPAGE=https://github.com/pylast/pylast
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pylast/pylast-1.7.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d0d3f739fe6f4606adeadb0fa6d3797d
diff --git a/metadata/md5-cache/dev-python/pylast-1.9.0 b/metadata/md5-cache/dev-python/pylast-1.9.0
index 5e567db3ed4c..abc21ebe74a9 100644
--- a/metadata/md5-cache/dev-python/pylast-1.9.0
+++ b/metadata/md5-cache/dev-python/pylast-1.9.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python interface to last.fm and other api-compatible websites
 EAPI=6
 HOMEPAGE=https://github.com/pylast/pylast
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pylast/pylast-1.9.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aee5dc297c1d3893fc6f348844438333
+_md5_=6dac180428e6bf1bcfc350a94d32221f
diff --git a/metadata/md5-cache/dev-python/pyproj-1.9.5.1 b/metadata/md5-cache/dev-python/pyproj-1.9.5.1
index 5425595e5655..769c556c0c6d 100644
--- a/metadata/md5-cache/dev-python/pyproj-1.9.5.1
+++ b/metadata/md5-cache/dev-python/pyproj-1.9.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Python interface to PROJ.4 library
 EAPI=6
 HOMEPAGE=https://github.com/jswhit/pyproj
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pyproj/pyproj-1.9.5.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fcb87c7f7c178b6fdbfc78052eed56e8
+_md5_=029dd696287ae8655d0e9864615556ba
diff --git a/metadata/md5-cache/dev-python/pytest-salt-0.1_pre20170731 b/metadata/md5-cache/dev-python/pytest-salt-0.1_pre20170731
index 3616ac444a15..2c4ccee61c13 100644
--- a/metadata/md5-cache/dev-python/pytest-salt-0.1_pre20170731
+++ b/metadata/md5-cache/dev-python/pytest-salt-0.1_pre20170731
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=PyTest Salt Plugin
 EAPI=6
 HOMEPAGE=https://github.com/saltstack/pytest-salt
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gentoo/pytest-salt-0.1_pre20170731.tar.xz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=222a57553a641ab29ceeca02965a3ba5
+_md5_=eb671e101ff7417f738b37438e948180
diff --git a/metadata/md5-cache/dev-python/setuptools-36.7.2 b/metadata/md5-cache/dev-python/setuptools-36.7.2
index c9e88856837c..ad7f7254e62b 100644
--- a/metadata/md5-cache/dev-python/setuptools-36.7.2
+++ b/metadata/md5-cache/dev-python/setuptools-36.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip test? ( dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-fixture-config[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/backports-unittest-mock-1.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=app-arch/unzip test? ( dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-3.1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-fixture-config[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/backports-unittest-mock-1.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Collection of extensions to Distutils
 EAPI=6
 HOMEPAGE=https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-36.7.2.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f3e6ebb8c42d4642beb6dfd07527028d
+_md5_=79ddcb2a3275256526bb75add0427aef
diff --git a/metadata/md5-cache/dev-python/shutilwhich-1.1.0 b/metadata/md5-cache/dev-python/shutilwhich-1.1.0
index f4197333a5db..55eee9591e39 100644
--- a/metadata/md5-cache/dev-python/shutilwhich-1.1.0
+++ b/metadata/md5-cache/dev-python/shutilwhich-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A copy & paste backport of Python 3.3's shutil.which function
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/shutilwhich https://github.com/mbr/shutilwhich
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/shutilwhich/shutilwhich-1.1.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7ebf89cd060be3627872036e090d52ce
+_md5_=d03ff8f86eda77944c9ecca33bb56011
diff --git a/metadata/md5-cache/dev-python/simplebayes-1.5.7 b/metadata/md5-cache/dev-python/simplebayes-1.5.7
index 15f13096b2c4..4971bbcf10a4 100644
--- a/metadata/md5-cache/dev-python/simplebayes-1.5.7
+++ b/metadata/md5-cache/dev-python/simplebayes-1.5.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=memory-based, optional-persistence naive bayesian text classifier
 EAPI=6
 HOMEPAGE=https://github.com/hickeroar/simplebayes
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://github.com/hickeroar/simplebayes/archive/1.5.7.tar.gz -> simplebayes-1.5.7.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f90a882687992a46269eb5d67645bb1
+_md5_=5ac34bf5a379e810649be9dd5b1205c6
diff --git a/metadata/md5-cache/dev-python/unicodecsv-0.14.1 b/metadata/md5-cache/dev-python/unicodecsv-0.14.1
index ed789e7f1272..47840ad10a2f 100644
--- a/metadata/md5-cache/dev-python/unicodecsv-0.14.1
+++ b/metadata/md5-cache/dev-python/unicodecsv-0.14.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Drop-in replacement for python stdlib csv module supporting unicode
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/unicodecsv https://github.com/jdunck/python-unicodecsv
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/u/unicodecsv/unicodecsv-0.14.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8208d36d429bca88f2846a9bc2f5fa60
+_md5_=4775897ab91b923b30db5f2ee11d4eb1
diff --git a/metadata/md5-cache/dev-python/utidylib-0.2-r2 b/metadata/md5-cache/dev-python/utidylib-0.2-r2
index 0cc7b11ac73a..ea4fd3141c90 100644
--- a/metadata/md5-cache/dev-python/utidylib-0.2-r2
+++ b/metadata/md5-cache/dev-python/utidylib-0.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/htmltidy app-arch/unzip doc? ( dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=app-text/htmltidy app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=TidyLib Python wrapper
 EAPI=5
 HOMEPAGE=https://cihar.com/software/utidylib/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/uTidylib-0.2.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fe74314f4ea8c4aaea684dba117e7650
+_md5_=706561ba605ca7b1ba2f862c28c174b2
diff --git a/metadata/md5-cache/dev-python/utidylib-0.3 b/metadata/md5-cache/dev-python/utidylib-0.3
index 2156935d24ba..4cf724f08adf 100644
--- a/metadata/md5-cache/dev-python/utidylib-0.3
+++ b/metadata/md5-cache/dev-python/utidylib-0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/htmltidy dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=app-text/htmltidy dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=TidyLib Python wrapper
 EAPI=6
 HOMEPAGE=https://cihar.com/software/utidylib/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://dl.cihar.com/utidylib/uTidylib-0.3.tar.bz2
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=77daa48db86cc195798163e37a4bda93
+_md5_=97cb3213a33c86250fd1177d0b8832b0
diff --git a/metadata/md5-cache/dev-python/virtualenv-clone-0.2.6 b/metadata/md5-cache/dev-python/virtualenv-clone-0.2.6
index b8cad5128c8b..b6c156f7c671 100644
--- a/metadata/md5-cache/dev-python/virtualenv-clone-0.2.6
+++ b/metadata/md5-cache/dev-python/virtualenv-clone-0.2.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A script for cloning a non-relocatable virtualenv
 EAPI=6
 HOMEPAGE=https://github.com/edwardgeorge/virtualenv-clone
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv-clone/virtualenv-clone-0.2.6.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e674324b690e119991a4f75b92447d1
+_md5_=99d5f59032038d4c23ecd02bab2b963c
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index deb1c2caf702..129e9cfec0b5 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtcore-4.8.7-r2 b/metadata/md5-cache/dev-qt/qtcore-4.8.7-r2
index 00a37bf88325..3b16c951639f 100644
--- a/metadata/md5-cache/dev-qt/qtcore-4.8.7-r2
+++ b/metadata/md5-cache/dev-qt/qtcore-4.8.7-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( <dev-libs/icu-59:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Cross-platform application development framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
@@ -7,8 +7,8 @@ IUSE=+glib iconv icu libressl qt3support ssl abi_x86_32 abi_x86_64 abi_x86_x32 a
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 PDEPEND=~dev-qt/qttranslations-4.8.7 qt3support? ( ~dev-qt/qtgui-4.8.7[aqua=,debug=,glib=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( <dev-libs/icu-59:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	qt4-build-multilib	277a1997239523435425a3e17d116e23	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0eeb70f98e8a5afd499fc1b539d0a88f
+_md5_=dea24fc6c57c75e84f5675e7d50e5c42
diff --git a/metadata/md5-cache/dev-qt/qtcore-4.8.7-r3 b/metadata/md5-cache/dev-qt/qtcore-4.8.7-r3
index 91cd4a4980a3..b72d43623b5f 100644
--- a/metadata/md5-cache/dev-qt/qtcore-4.8.7-r3
+++ b/metadata/md5-cache/dev-qt/qtcore-4.8.7-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( <dev-libs/icu-59:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Cross-platform application development framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
@@ -7,8 +7,8 @@ IUSE=+glib iconv icu libressl qt3support ssl abi_x86_32 abi_x86_64 abi_x86_x32 a
 KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 PDEPEND=~dev-qt/qttranslations-4.8.7 qt3support? ( ~dev-qt/qtgui-4.8.7[aqua=,debug=,glib=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( <dev-libs/icu-59:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	qt4-build-multilib	277a1997239523435425a3e17d116e23	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=32d48f92e7370e1cbe5c0376cf7c3437
+_md5_=02e154810fdcc40b95309793830b784a
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-4.8.7 b/metadata/md5-cache/dev-qt/qtwebkit-4.8.7
index db85068262bd..1c49c07fe86f 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtwebkit-4.8.7
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtcore-4.8.7[aqua=,debug=,ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtxmlpatterns-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtcore-4.8.7[aqua=,debug=,ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtxmlpatterns-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( <dev-libs/icu-59:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=The WebKit module for the Qt toolkit
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=icu +jit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
 KEYWORDS=amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
-RDEPEND=>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtcore-4.8.7[aqua=,debug=,ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtxmlpatterns-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
+RDEPEND=>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtcore-4.8.7[aqua=,debug=,ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-qt/qtxmlpatterns-4.8.7[aqua=,debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.5.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( <dev-libs/icu-59:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	qt4-build-multilib	277a1997239523435425a3e17d116e23	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=300ceefc0796b0eba8c72fb8e0602f87
+_md5_=c3b4da91e8bbbc3d93010a4d82b2e7f8
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index def23348a4fb..4265768801da 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.5.1 b/metadata/md5-cache/dev-ruby/fast_gettext-1.5.1
index b114b3a48bc2..c2aed636f9f3 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.5.1
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/activerecord[ruby_targets_ruby22,sqlite] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/activerecord[ruby_targets_ruby23,sqlite] dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/activerecord[ruby_targets_ruby24,sqlite] dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!
 EAPI=6
 HOMEPAGE=https://github.com/grosser/fast_gettext
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.5.1.tar.gz -> fast_gettext-1.5.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6ad7e47b50f83d96c81f7d5b3b9c8e7f
+_md5_=fd2c88158f56837014509d26e45afc04
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1 b/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
deleted file mode 100644
index 24f7240a08cf..000000000000
--- a/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libxml2 ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Ruby libxml with a user friendly API, akin to REXML
-EAPI=5
-HOMEPAGE=https://github.com/xml4r/libxml-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-libs/libxml2 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/libxml-ruby-2.8.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=35f1006752468db466e7cdcadfb481b0
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.5.4 b/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
index e373c9750c42..67f23ed8616a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
 IUSE=highlight test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.5.4.tar.gz -> rspec-core-3.5.4-git.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ec463002a229a5601585c8a7faae0cdf
+_md5_=b79f76e5e456b41c40c98369d22537e7
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
index 9e595a2e649f..c36c2ce51870 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-expectations
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.5.0.tar.gz -> rspec-expectations-3.5.0-git.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7defe0e8ef6cb65daa3964d693bc74e9
+_md5_=b6eb1d5e375d49f7e7588d447d04b1a0
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
index 8caba63e2926..62dbd68a64fb 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-mocks
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] =dev-ruby/diff-lcs-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.5.0.tar.gz -> rspec-mocks-3.5.0-git.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=be4755d0a40dbdfc5b1df6b434a08dc9
+_md5_=0f464c69c13a4e773c8c8269108be84b
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
index f99979a87b4b..d5caa579086a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-support
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.5.0.tar.gz -> rspec-support-3.5.0-git.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4640c2f48d820b20da1c036e4a5b37b0
+_md5_=3608a3269f4f41662e37bee2cd937e1d
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
deleted file mode 100644
index 235ae77eb5a7..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Ruby interface to some LDAP libraries
-EAPI=5
-HOMEPAGE=http://ruby-ldap.sourceforge.net/
-IUSE=ssl elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=alpha amd64 hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-macos
-LICENSE=BSD
-RDEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://rubygems/ruby-ldap-0.9.17.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5a581e82d887869ca2a082374eff5ee4
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
deleted file mode 100644
index 484407807ea3..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=OpenGL / GLUT bindings for ruby
-EAPI=5
-HOMEPAGE=https://github.com/larskanis/opengl
-IUSE=elibc_FreeBSD ruby_targets_ruby22 test
-KEYWORDS=amd64 hppa ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/opengl-0.9.2.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2efd5321f8df6a3003ee523e4a3be250
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
index 34acd2accca8..f8e243a01727 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Text Progress Bar Library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=amd64 hppa ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~hppa ppc ppc64 x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-1.4.2.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7792a6370aea90c926ed8de57e8fafc7
+_md5_=924dab204a0f93b3b052c4a5d03d30d3
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.4 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.4
deleted file mode 100644
index 07ab7dbdf89e..000000000000
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=This gem provides Ruby bindings for WebDriver
-EAPI=6
-HOMEPAGE=https://github.com/seleniumhq/selenium
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=mirror://rubygems/selenium-webdriver-3.4.4.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2acc02fc3b988258314b038148daf08f
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.3 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.8.0
similarity index 95%
rename from metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.3
rename to metadata/md5-cache/dev-ruby/selenium-webdriver-3.8.0
index 36512ea3bbde..fb193085487a 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.4.3
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=This gem provides Ruby bindings for WebDriver
 EAPI=6
 HOMEPAGE=https://github.com/seleniumhq/selenium
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] dev-ruby/rubyzip:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
-SRC_URI=mirror://rubygems/selenium-webdriver-3.4.3.gem
+SRC_URI=mirror://rubygems/selenium-webdriver-3.8.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f35f8f9252624d162e5188f02989dd1f
+_md5_=cf60b112cd1c1bb7220eb70ac1d9d278
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.7.1 b/metadata/md5-cache/dev-ruby/timecop-0.7.1
deleted file mode 100644
index a4dcc976372c..000000000000
--- a/metadata/md5-cache/dev-ruby/timecop-0.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
-EAPI=5
-HOMEPAGE=https://github.com/travisjeffery/timecop
-IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/timecop-0.7.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=32f235d280cfd5ae216b3a097720c316
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 634f3f222d9f..3bbc69e3983e 100644
Binary files a/metadata/md5-cache/dev-scheme/Manifest.gz and b/metadata/md5-cache/dev-scheme/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-scheme/jscheme-7.2 b/metadata/md5-cache/dev-scheme/jscheme-7.2
index bbe95ca026ac..ad74530f80a7 100644
--- a/metadata/md5-cache/dev-scheme/jscheme-7.2
+++ b/metadata/md5-cache/dev-scheme/jscheme-7.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst prepare setup
 DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=JScheme is a dialect of Scheme with a very simple interface to Java, called the Javadot notation
+DESCRIPTION=JScheme is a Scheme dialect with a simple Java interface called Javadot notation
 EAPI=3
 HOMEPAGE=http://jscheme.sourceforge.net/jscheme/main.html
 IUSE=doc elibc_FreeBSD elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://sourceforge/jscheme/jscheme-7.2.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=02860b3206eb468cedb3a18492211c9f
+_md5_=5ac33dd22a0784ce11c803d74a86f9b6
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.10 b/metadata/md5-cache/dev-scheme/kawa-1.10
deleted file mode 100644
index 459f648a1dfa..000000000000
--- a/metadata/md5-cache/dev-scheme/kawa-1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=( >=virtual/jdk-1.5 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) swt? ( dev-java/swt:3.5 ) servlets? ( dev-java/servletapi:2.4 ) xqtests? ( app-arch/unzip:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Kawa, the Java-based Scheme system & Language Framework
-EAPI=3
-HOMEPAGE=https://www.gnu.org/software/kawa/
-IUSE=+awt echo2 +frontend jemacs krl +sax servlets +swing swt +xml xqtests elibc_FreeBSD source
-KEYWORDS=x86
-LICENSE=MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )
-RDEPEND=( >=virtual/jdk-1.5 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) swt? ( dev-java/swt:3.5 ) servlets? ( dev-java/servletapi:2.4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gnu/kawa/kawa-1.10.tar.gz xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_1_0_2.zip )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=004e36314d896391e5e8822b41fc1955
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 0012a3cecf21..60bf8f6903a8 100644
Binary files a/metadata/md5-cache/dev-tex/Manifest.gz and b/metadata/md5-cache/dev-tex/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tex/slatex-20090928 b/metadata/md5-cache/dev-tex/slatex-20090928
index f152bf2fb45c..ba159e87255e 100644
--- a/metadata/md5-cache/dev-tex/slatex-20090928
+++ b/metadata/md5-cache/dev-tex/slatex-20090928
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare unpack
 DEPEND=dev-scheme/guile dev-scheme/scmxlate !dev-scheme/plt-scheme virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=SLaTeX is a Scheme program that allows you to write Scheme code in your (La)TeX source
+DESCRIPTION=SLaTeX is a Scheme program allowing you to write Scheme in your (La)TeX source
 EAPI=3
 HOMEPAGE=http://www.ccs.neu.edu/home/dorai/slatex/slatxdoc.html
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=dev-scheme/guile virtual/latex-base
 SLOT=0
 SRC_URI=http://evalwhen.com/slatex/slatex.tar.bz2 -> slatex-20090928.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	latex-package	79acad19b9efeec616d0ad70cd117b03	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=09d496f9d0fe9d732ba41aa96e69620f
+_md5_=ad4106ea2e8d6768145215f3801eb8a8
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 318248ad6414..b4098d7ec6b7 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/appdata-tools-0.1.7 b/metadata/md5-cache/dev-util/appdata-tools-0.1.7
index f06c2377a4d6..9bb106101059 100644
--- a/metadata/md5-cache/dev-util/appdata-tools-0.1.7
+++ b/metadata/md5-cache/dev-util/appdata-tools-0.1.7
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure prepare
 DEPEND=>=dev-libs/glib-2.14 >=net-libs/libsoup-2.4 >=x11-libs/gdk-pixbuf-2.0 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt nls? ( >=dev-util/intltool-0.35.0 sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=CLI designed to validate AppData descriptions for standards compliance and to the style guide
+DESCRIPTION=CLI designed to validate AppData descriptions for standards and style compliance
 EAPI=5
 HOMEPAGE=https://github.com/hughsie/appdata-tools/
 IUSE=nls
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.14 >=net-libs/libsoup-2.4 >=x11-libs/gdk-pixbuf-2.0
 SLOT=0
 SRC_URI=https://github.com/hughsie/appdata-tools/archive/appdata_tools_0_1_7.tar.gz -> appdata-tools-0.1.7.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4c8dbf122bd8e2e10c81bf25cda2c205
+_md5_=61dfaf0963b9006b1116c2dcbb0b0cc4
diff --git a/metadata/md5-cache/dev-util/appdata-tools-0.1.8-r1 b/metadata/md5-cache/dev-util/appdata-tools-0.1.8-r1
index a2a7ac035a05..b58142247d26 100644
--- a/metadata/md5-cache/dev-util/appdata-tools-0.1.8-r1
+++ b/metadata/md5-cache/dev-util/appdata-tools-0.1.8-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
-DESCRIPTION=CLI designed to validate AppData descriptions for standards compliance and to the style guide
+DESCRIPTION=CLI designed to validate AppData descriptions for standards and style compliance
 EAPI=5
 HOMEPAGE=https://github.com/hughsie/appdata-tools/
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=metapackage
 RDEPEND=>=dev-libs/appstream-glib-0.3.2
 SLOT=0
-_md5_=3a158d1ca606b577cc894ae2c026f1e4
+_md5_=1f3bc8ab7a1f4d2bd7f6d0e3100b0c2f
diff --git a/metadata/md5-cache/dev-util/autoproject-0.20 b/metadata/md5-cache/dev-util/autoproject-0.20
index 13b6e9f3a5d5..61c2e4f9682a 100644
--- a/metadata/md5-cache/dev-util/autoproject-0.20
+++ b/metadata/md5-cache/dev-util/autoproject-0.20
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install unpack
 DEPEND=sys-devel/automake sys-devel/autoconf test? ( sys-apps/texinfo )
-DESCRIPTION=Used to start a programming project using autotools and a command line parser generator
+DESCRIPTION=Start a programming project using autotools and a command line parser generator
 EAPI=0
 HOMEPAGE=http://packages.debian.org/unstable/devel/autoproject
 IUSE=test
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/automake sys-devel/autoconf
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/autoproject/autoproject_0.20.orig.tar.gz mirror://debian/pool/main/a/autoproject/autoproject_0.20-3.diff.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0904e12c694c720891aefe873cddd502
+_md5_=57478c52aeeebe6c2d51df552d7c0f49
diff --git a/metadata/md5-cache/dev-util/autoproject-0.20_p5 b/metadata/md5-cache/dev-util/autoproject-0.20_p5
index 8b2d1f22cf58..562b2847935a 100644
--- a/metadata/md5-cache/dev-util/autoproject-0.20_p5
+++ b/metadata/md5-cache/dev-util/autoproject-0.20_p5
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install unpack
 DEPEND=sys-devel/automake sys-devel/autoconf test? ( sys-apps/texinfo )
-DESCRIPTION=Used to start a programming project using autotools and a command line parser generator
+DESCRIPTION=Start a programming project using autotools and a command line parser generator
 EAPI=0
 HOMEPAGE=http://packages.debian.org/unstable/devel/autoproject
 IUSE=test
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/automake sys-devel/autoconf
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/autoproject/autoproject_0.20.orig.tar.gz mirror://debian/pool/main/a/autoproject/autoproject_0.20-5.diff.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ca86bc35d4c3a2d8fc644b1c27e7f575
+_md5_=329e4e369d680b3849cbb93209a16d38
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.0 b/metadata/md5-cache/dev-util/catalyst-3.0.0
index fc84e65e4581..e7268e13bdc8 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.0
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
 IUSE=ccache doc kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-python/pydecomp-0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/lbzip2 app-crypt/shash !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) x86-fbsd? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) ia64? ( sys-fs/dosfstools ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=dev-python/pydecomp-0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/lbzip2 app-crypt/shash !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) x86-fbsd? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) ia64? ( sys-fs/dosfstools ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gentoo/catalyst-3.0.0.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-3.0.0.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-3.0.0.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-3.0.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c5297a687ccb86a7ed2baa7a155f3936
+_md5_=b205ca7ea2aff4683524530feab0ba4c
diff --git a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1 b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
new file mode 100644
index 000000000000..1f754c0ebb00
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Cucumber tag expressions for ruby
+EAPI=6
+HOMEPAGE=https://docs.cucumber.io/tag-expressions/
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~ia64 ~ppc
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=1
+SRC_URI=mirror://rubygems/cucumber-tag_expressions-1.1.1.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e0dd5f39a3a5a732da18a0cd1479eaa9
diff --git a/metadata/md5-cache/dev-util/dwdiff-2.1.0 b/metadata/md5-cache/dev-util/dwdiff-2.1.0
index 8c284bca2323..71b848cffd9d 100644
--- a/metadata/md5-cache/dev-util/dwdiff-2.1.0
+++ b/metadata/md5-cache/dev-util/dwdiff-2.1.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-libs/icu:= nls? ( sys-devel/gettext )
-DESCRIPTION=A front-end for the diff program that operates at the word level instead of the line level
+DESCRIPTION=diff-like program operating at word level instead of line level
 EAPI=5
 HOMEPAGE=http://os.ghalkes.nl/dwdiff.html
 IUSE=nls
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/icu:= sys-apps/diffutils
 SLOT=0
 SRC_URI=http://os.ghalkes.nl/dist/dwdiff-2.1.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=57dcf2ceeeaf890340f144049f2270a8
+_md5_=c30e4956aa3d069731b510e6a0bb31df
diff --git a/metadata/md5-cache/dev-util/dwdiff-2.1.0-r1 b/metadata/md5-cache/dev-util/dwdiff-2.1.0-r1
index de34d010f023..05fedf1a64a6 100644
--- a/metadata/md5-cache/dev-util/dwdiff-2.1.0-r1
+++ b/metadata/md5-cache/dev-util/dwdiff-2.1.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-libs/icu:= nls? ( sys-devel/gettext )
-DESCRIPTION=diff-like program that operates at the word level instead of the line level
+DESCRIPTION=diff-like program operating at word level instead of line level
 EAPI=6
 HOMEPAGE=http://os.ghalkes.nl/dwdiff.html
 IUSE=nls
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/icu:= sys-apps/diffutils
 SLOT=0
 SRC_URI=http://os.ghalkes.nl/dist/dwdiff-2.1.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6fc4da61c21e6794a063356a6353c0fc
+_md5_=62b95246646dbbb04d5f414835cfe6a0
diff --git a/metadata/md5-cache/dev-util/dwdiff-2.1.1 b/metadata/md5-cache/dev-util/dwdiff-2.1.1
index ad514da4082f..87ca1c1fc0e2 100644
--- a/metadata/md5-cache/dev-util/dwdiff-2.1.1
+++ b/metadata/md5-cache/dev-util/dwdiff-2.1.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-libs/icu:= nls? ( sys-devel/gettext )
-DESCRIPTION=diff-like program that operates at the word level instead of the line level
+DESCRIPTION=diff-like program operating at word level instead of line level
 EAPI=6
 HOMEPAGE=http://os.ghalkes.nl/dwdiff.html
 IUSE=nls
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/icu:= sys-apps/diffutils
 SLOT=0
 SRC_URI=http://os.ghalkes.nl/dist/dwdiff-2.1.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=22689c5d68dfe55b9f0aaa4c651b6a87
+_md5_=afec74d0430bf6bb59a64155cb58d4a5
diff --git a/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r1 b/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r1
index e287c084ec36..03bb9e0d2b29 100644
--- a/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r1
+++ b/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install unpack
 DEPEND=!dev-util/jam sys-devel/bison
-DESCRIPTION=Jam is a powerful alternative to make. FTJam is a 100% compatible enhanced Jam implementation
+DESCRIPTION=FTJam is a 100% compatible, enhanced implementation of the make alternative Jam
 EAPI=0
 HOMEPAGE=http://freetype.sourceforge.net/jam/index.html
 KEYWORDS=amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
@@ -9,4 +9,4 @@ RDEPEND=!dev-util/jam
 SLOT=0
 SRC_URI=http://david.freetype.org/jam/ftjam-2.5.3rc2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a2b3dbab4589b5fab7a36f2bda2cb708
+_md5_=ad4f21538d3e13384b705f1757d8d8b3
diff --git a/metadata/md5-cache/dev-util/global-6.3.1 b/metadata/md5-cache/dev-util/global-6.3.1
index 9025015d99ee..669098125fd0 100644
--- a/metadata/md5-cache/dev-util/global-6.3.1
+++ b/metadata/md5-cache/dev-util/global-6.3.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=doc? ( app-text/texi2html sys-apps/texinfo ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GNU Global is a tag system to find the locations of a specified object in various sources
+DESCRIPTION=tag system to find an object location in various sources
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/global/global.html
 IUSE=doc emacs vim
@@ -10,4 +10,4 @@ RDEPEND=|| ( dev-libs/libltdl:0 sys-devel/libtool:2 ) sys-libs/ncurses emacs? (
 SLOT=0
 SRC_URI=mirror://gnu/global/global-6.3.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=50547b0bf0e708b7785918f5c1871a7b
+_md5_=94659b1c6d40b00d6d908728d8f3a80e
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.19 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.19
index c3816dfe55f1..0876b3c3466a 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.19
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.22.19
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.49.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.2
 DESCRIPTION=GTK update icon cache
 EAPI=6
 HOMEPAGE=https://www.gtk.org/ https://github.com/EvaSDK/gtk-update-icon-cache
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.49.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~eva/distfiles/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad2b7eb2af6ee5af14a573bbd716bd4a
+_md5_=939125d1ec2af22f15b2cfa62a8dd082
diff --git a/metadata/md5-cache/dev-util/igprof-5.9.11 b/metadata/md5-cache/dev-util/igprof-5.9.11
index 9a7e1bed3492..37bf12d0c597 100644
--- a/metadata/md5-cache/dev-util/igprof-5.9.11
+++ b/metadata/md5-cache/dev-util/igprof-5.9.11
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/libpcre sys-libs/libunwind sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Ignominous Profiler for analysing application memory and performance characteristics
+DESCRIPTION=Ignominous Profiler for analysing application memory and performance
 EAPI=5
 HOMEPAGE=http://igprof.org
 IUSE=debug
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libpcre sys-libs/libunwind
 SLOT=0
 SRC_URI=https://github.com/ktf/igprof/archive/v5.9.11.tar.gz -> igprof-5.9.11.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a875630d16ca918ab1c909a50ff4f47b
+_md5_=a7ba20399daffa91067452579381dba6
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8-r3 b/metadata/md5-cache/dev-util/jconfig-2.8-r3
index 7e486305ef28..c420144865e6 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.8-r3
+++ b/metadata/md5-cache/dev-util/jconfig-2.8-r3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup unpack
 DEPEND=>=virtual/jdk-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=jConfig is an extremely helpful utility, providing a simple API for the management of properties
+DESCRIPTION=Utility that provides a simple API for the management of properties
 EAPI=0
 HOMEPAGE=http://www.jconfig.org/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 sour
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=efbd37613ad4a4ccc269698107721646
+_md5_=57c63a68bc36a58609302dcdb1f90a5c
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8.5 b/metadata/md5-cache/dev-util/jconfig-2.8.5
index d3b11cb76b32..497f8d989cb6 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.8.5
+++ b/metadata/md5-cache/dev-util/jconfig-2.8.5
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup unpack
 DEPEND=>=virtual/jdk-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=jConfig is an extremely helpful utility, providing a simple API for the management of properties
+DESCRIPTION=Utility that provides a simple API for the management of properties
 EAPI=0
 HOMEPAGE=http://www.jconfig.org/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 sour
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.8.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=efbd37613ad4a4ccc269698107721646
+_md5_=57c63a68bc36a58609302dcdb1f90a5c
diff --git a/metadata/md5-cache/dev-util/jconfig-2.9 b/metadata/md5-cache/dev-util/jconfig-2.9
index 2020075364bc..b4eeb257ae86 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.9
+++ b/metadata/md5-cache/dev-util/jconfig-2.9
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=virtual/jdk-1.6 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=jConfig is an extremely helpful utility, providing a simple API for the management of properties
+DESCRIPTION=Utility that provides a simple API for the management of properties
 EAPI=5
 HOMEPAGE=http://www.jconfig.org/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 java-virtuals/jmx >=dev-java/java-config-2.2.0-r3 sour
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=47f350221ea9b5ed0b7876cc2be5022f
+_md5_=45bf6322487ba3dfa28e4500ecbaa393
diff --git a/metadata/md5-cache/dev-util/lldb-5.0.1_rc2 b/metadata/md5-cache/dev-util/lldb-5.0.1_rc2
new file mode 100644
index 000000000000..75993508f492
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-5.0.1_rc2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-5.0.1_rc2[xml] ~sys-devel/llvm-5.0.1_rc2 !<sys-devel/llvm-4.0 python? ( <dev-lang/swig-3.0.9 ) test? ( ~dev-python/lit-5.0.1_rc2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=The LLVM debugger
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=libedit ncurses python test python_targets_python2_7
+LICENSE=UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-5.0.1_rc2[xml] ~sys-devel/llvm-5.0.1_rc2 !<sys-devel/llvm-4.0
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/lldb-5.0.1rc2.src.tar.xz test? ( http://prereleases.llvm.org/5.0.1/rc2/llvm-5.0.1rc2.src.tar.xz )
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=471eead6f176a56744c6654d651cf613
diff --git a/metadata/md5-cache/dev-util/makepp-1.50_pre110621 b/metadata/md5-cache/dev-util/makepp-1.50_pre110621
deleted file mode 100644
index 3ccb03eea354..000000000000
--- a/metadata/md5-cache/dev-util/makepp-1.50_pre110621
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-lang/perl-5.6.0
-DESCRIPTION=GNU make replacement
-EAPI=3
-HOMEPAGE=http://makepp.sourceforge.net/
-KEYWORDS=~alpha ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6.0
-SLOT=0
-SRC_URI=mirror://sourceforge/makepp/1.50/makepp-1.50-110621.txz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6f8fe161aca7ad23e1478fc63f625653
diff --git a/metadata/md5-cache/dev-util/mpatch-0.8-r1 b/metadata/md5-cache/dev-util/mpatch-0.8-r1
index 94a9d6c4e112..d34d82315628 100644
--- a/metadata/md5-cache/dev-util/mpatch-0.8-r1
+++ b/metadata/md5-cache/dev-util/mpatch-0.8-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-DESCRIPTION=Patch-like tool for applying diffs which can resolve common causes of patch rejects
+DESCRIPTION=Patch-like tool which can resolve common causes of patch rejects when applying
 EAPI=5
 HOMEPAGE=http://oss.oracle.com/~mason/mpatch/
 IUSE=python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://oss.oracle.com/~mason/mpatch/mpatch-0.8.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=649cfc0c893d59b8cd216a0b13d334e6
+_md5_=519506b095888ca07b794196065fcd3e
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.11 b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.11
index e144e3abd883..cff2c03e5a7a 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.11
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.11
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rosdistro[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Generates rosinstall files containing information about repositories with ROS packages/stacks
+DESCRIPTION=Generates rosinstall metadata about repositories with ROS packages/stacks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosinstall_generator
 IUSE=python_targets_python2_7 python_targets_python3_4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosinstall_generator/archive/0.1.11.tar.gz -> rosinstall_generator-0.1.11.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b377d7406d919b9792b09cb96cacc843
+_md5_=97ecd3316df4d073ad006130b041b6dc
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.12 b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.12
index da54657ffdce..aba9e447fb6a 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.12
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.12
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rosdistro[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Generates rosinstall files containing information about repositories with ROS packages/stacks
+DESCRIPTION=Generates rosinstall metadata about repositories with ROS packages/stacks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosinstall_generator
 IUSE=python_targets_python2_7 python_targets_python3_4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosinstall_generator/archive/0.1.12.tar.gz -> rosinstall_generator-0.1.12.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ba38416c0f0c51b9e6bac0778d6a4f5e
+_md5_=a180c17da28d34a3e862e8fbfe45c089
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.13 b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.13
index b50cb9b13927..6891900994c3 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.13
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.13
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Generates rosinstall files containing information about repositories with ROS packages/stacks
+DESCRIPTION=Generates rosinstall metadata about repositories with ROS packages/stacks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosinstall_generator
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosinstall_generator/archive/0.1.13.tar.gz -> rosinstall_generator-0.1.13.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc8b9aeb9c10807e4cf39c2a7e9f7e41
+_md5_=b136b143ecbd67ee929b5ba3e24a92a9
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-9999 b/metadata/md5-cache/dev-util/rosinstall_generator-9999
index 73f7b449f10c..be48c10cd60f 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-9999
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-9999
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Generates rosinstall files containing information about repositories with ROS packages/stacks
+DESCRIPTION=Generates rosinstall metadata about repositories with ROS packages/stacks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosinstall_generator
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
@@ -9,4 +9,4 @@ RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python2_7(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc8b9aeb9c10807e4cf39c2a7e9f7e41
+_md5_=b136b143ecbd67ee929b5ba3e24a92a9
diff --git a/metadata/md5-cache/dev-util/wiggle-0.9-r1 b/metadata/md5-cache/dev-util/wiggle-0.9-r1
index e7aa73a97364..0634c225f360 100644
--- a/metadata/md5-cache/dev-util/wiggle-0.9-r1
+++ b/metadata/md5-cache/dev-util/wiggle-0.9-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0= sys-apps/groff test? ( sys-process/time ) >=sys-apps/sed-4
-DESCRIPTION=program for applying patches that patch cannot apply because of conflicting changes
+DESCRIPTION=tool for applying patches that patch cannot apply because of conflicting changes
 EAPI=5
 HOMEPAGE=http://neil.brown.name/wiggle http://neil.brown.name/git?p=wiggle
 IUSE=test
@@ -10,4 +10,4 @@ RDEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findut
 SLOT=0
 SRC_URI=http://neil.brown.name/wiggle/wiggle-0.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e2288ea14ae195163d15de65171e02df
+_md5_=da0665ca85d00252ebb3707270722e73
diff --git a/metadata/md5-cache/dev-util/xdelta-3.0.11 b/metadata/md5-cache/dev-util/xdelta-3.0.11
index aef8e8073262..69d4d16d55d0 100644
--- a/metadata/md5-cache/dev-util/xdelta-3.0.11
+++ b/metadata/md5-cache/dev-util/xdelta-3.0.11
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install test
 DEPEND=lzma? ( app-arch/xz-utils:= )
-DESCRIPTION=a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression
+DESCRIPTION=Computes changes between binary or text files and creates deltas
 EAPI=6
 HOMEPAGE=http://xdelta.org/
 IUSE=examples lzma
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils:= )
 SLOT=3
 SRC_URI=https://github.com/jmacd/xdelta-gpl/releases/download/v3.0.11/xdelta3-3.0.11.tar.gz
-_md5_=efe50106ac6d2addd81b53b7cac142be
+_md5_=62c0a7dcd3d85916f7cce39848a668da
diff --git a/metadata/md5-cache/dev-util/xdelta-3.1.0 b/metadata/md5-cache/dev-util/xdelta-3.1.0
index b62e723dc78e..aa93351f3974 100644
--- a/metadata/md5-cache/dev-util/xdelta-3.1.0
+++ b/metadata/md5-cache/dev-util/xdelta-3.1.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare setup test
 DEPEND=app-arch/xz-utils test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.14* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression
+DESCRIPTION=Computes changes between binary or text files and creates deltas
 EAPI=6
 HOMEPAGE=http://xdelta.org/
 IUSE=examples test
@@ -10,4 +10,4 @@ RDEPEND=app-arch/xz-utils
 SLOT=3
 SRC_URI=https://github.com/jmacd/xdelta-gpl/releases/download/v3.1.0/xdelta3-3.1.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a4f995ddc52f069e55f0f574f83f281b
+_md5_=14a01e537d2aa95b5479d2dc7de8a661
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 9e93cab0d7a1..08f88fb83205 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/bzr-rewrite-0.6.3 b/metadata/md5-cache/dev-vcs/bzr-rewrite-0.6.3
index 67afec1c8ba1..1ad59fe0e939 100644
--- a/metadata/md5-cache/dev-vcs/bzr-rewrite-0.6.3
+++ b/metadata/md5-cache/dev-vcs/bzr-rewrite-0.6.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-vcs/bzr-2.5.0 !dev-vcs/bzr-rebase python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Bazaar plugin that adds support for rebasing, similar to the functionality in git
+DESCRIPTION=Bazaar plugin that adds support for rebasing, similar to git rebase
 EAPI=5
 HOMEPAGE=https://launchpad.net/bzr-rewrite
 IUSE=python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/bzr-rewrite/trunk/0.6.3/+download/bzr-rewrite-0.6.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2a4fe8e439579e73053d954255c79dfd
+_md5_=ce412c995291e2c637c0f91ea9ba486b
diff --git a/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r2 b/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r2
index cbb6c215a614..516515661f5d 100644
--- a/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r2
+++ b/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-DESCRIPTION=A Bazaar plugin that provides a option to generate XML output forbuiltin commands.
+DESCRIPTION=Bazaar plugin providing an option to generate XML output for builtin commands
 EAPI=5
 HOMEPAGE=http://bazaar-vcs.org/XMLOutput
 IUSE=python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://launchpad.net/bzr-xmloutput/trunk/0.8.8/+download/bzr-xmloutput-0.8.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a116bc31178aff7d88930ec58d00a451
+_md5_=ca1bc678baf7e7a6dc959f3703778c85
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.3.2 b/metadata/md5-cache/dev-vcs/mercurial-4.4.2
similarity index 96%
rename from metadata/md5-cache/dev-vcs/mercurial-4.3.2
rename to metadata/md5-cache/dev-vcs/mercurial-4.4.2
index 029eaee9c1d2..367d01640925 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-4.3.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.4.2
@@ -9,6 +9,6 @@ LICENSE=GPL-2+
 RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.3.2.tar.gz
+SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.4.2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4c49dd45247fe7985eb1c2b72f848c28
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index f8232a5089cb..30c1b5de29de 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/dconf-0.26.1 b/metadata/md5-cache/gnome-base/dconf-0.26.1
index 396093d801cd..c783a2e05d5b 100644
--- a/metadata/md5-cache/gnome-base/dconf-0.26.1
+++ b/metadata/md5-cache/gnome-base/dconf-0.26.1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple low-level configuration system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/action/show/Projects/dconf
 IUSE=test
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf/0.26/dconf-0.26.1.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1caa0010d862ecd50d9df429ec8b97d7
+_md5_=f264d79d767961d7ade75c38f6497d5a
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index dce8e7ea93ff..8f3afbbb8262 100644
Binary files a/metadata/md5-cache/lxde-base/Manifest.gz and b/metadata/md5-cache/lxde-base/Manifest.gz differ
diff --git a/metadata/md5-cache/lxde-base/menu-cache-0.3.3 b/metadata/md5-cache/lxde-base/menu-cache-0.3.3
index 3a86cbe46f77..469fc9f7a981 100644
--- a/metadata/md5-cache/lxde-base/menu-cache-0.3.3
+++ b/metadata/md5-cache/lxde-base/menu-cache-0.3.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DEPEND=dev-libs/glib:2 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A library creating and utilizing caches to speed up freedesktop.org application menus
+DESCRIPTION=Library to create and utilize caches to speed up freedesktop application menus
 EAPI=4
 HOMEPAGE=http://lxde.sourceforge.net/
 KEYWORDS=~alpha amd64 arm ppc x86 ~amd64-linux ~x86-linux
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/menu-cache-0.3.3.tar.gz
-_md5_=9e787bcf9856b41fe15179091f210172
+_md5_=bd391de7d3d2cb982869176fdf2ab672
diff --git a/metadata/md5-cache/lxde-base/menu-cache-0.5.1 b/metadata/md5-cache/lxde-base/menu-cache-0.5.1
index fd6903b9c43f..b3ba6843babf 100644
--- a/metadata/md5-cache/lxde-base/menu-cache-0.5.1
+++ b/metadata/md5-cache/lxde-base/menu-cache-0.5.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DEPEND=dev-libs/glib:2 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A library creating and utilizing caches to speed up freedesktop.org application menus
+DESCRIPTION=Library to create and utilize caches to speed up freedesktop application menus
 EAPI=5
 HOMEPAGE=http://lxde.sourceforge.net/
 KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2
 SLOT=0/2
 SRC_URI=mirror://sourceforge/lxde/menu-cache-0.5.1.tar.gz
-_md5_=3a7353a659f05616e658c3e9b44f9fa9
+_md5_=b7eb371a712d731b4ae67b20e17e9215
diff --git a/metadata/md5-cache/lxde-base/menu-cache-1.0.0-r1 b/metadata/md5-cache/lxde-base/menu-cache-1.0.0-r1
index b4500f3d6492..a84c87b262c0 100644
--- a/metadata/md5-cache/lxde-base/menu-cache-1.0.0-r1
+++ b/metadata/md5-cache/lxde-base/menu-cache-1.0.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DEPEND=dev-libs/glib:2 x11-libs/libfm-extra sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A library creating and utilizing caches to speed up freedesktop.org application menus
+DESCRIPTION=Library to create and utilize caches to speed up freedesktop application menus
 EAPI=5
 HOMEPAGE=http://lxde.sourceforge.net/
 KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/libfm-extra
 SLOT=0/2
 SRC_URI=mirror://sourceforge/lxde/menu-cache-1.0.0.tar.xz
-_md5_=f9e48efee5ec7de8c314a9ab2ab955df
+_md5_=f95ca22d03d458ac8170ad1ed34e216e
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index d6d0a849fa11..5a2f3b1b09b3 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/neomutt-9999 b/metadata/md5-cache/mail-client/neomutt-9999
index da95f0529cf7..9aeb762632f4 100644
--- a/metadata/md5-cache/mail-client/neomutt-9999
+++ b/metadata/md5-cache/mail-client/neomutt-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=6
 HOMEPAGE=https://www.neomutt.org/
-IUSE=berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl tokyocabinet
+IUSE=berkdb debug doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic ssl tokyocabinet
 LICENSE=GPL-2
-RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
+RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5d06b17a60d6bc9b0fc879825b874ca9
+_md5_=d3c6d7b5c58bfd298d343fde1281bdd9
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 9eac7a42369a..9e649cf9c0b6 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/clamassassin-1.2.4 b/metadata/md5-cache/mail-filter/clamassassin-1.2.4
index 6d5b6293aaa9..dac81094f292 100644
--- a/metadata/md5-cache/mail-filter/clamassassin-1.2.4
+++ b/metadata/md5-cache/mail-filter/clamassassin-1.2.4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install
 DEPEND=>=app-antivirus/clamav-0.90 sys-apps/debianutils sys-apps/which mail-filter/procmail
-DESCRIPTION=A simple spamassassin-like script for virus scanning (through clamav) and filtering e-mail messages
+DESCRIPTION=Simple spamassassin-like script for virus scanning and filtering e-mail messages
 EAPI=0
 HOMEPAGE=http://jameslick.com/clamassassin/
 IUSE=subject-rewrite clamd
@@ -9,4 +9,4 @@ LICENSE=BSD
 RDEPEND=>=app-antivirus/clamav-0.90 sys-apps/debianutils sys-apps/which mail-filter/procmail
 SLOT=0
 SRC_URI=http://jameslick.com/clamassassin/clamassassin-1.2.4.tar.gz
-_md5_=9680ed65e1bbdc7f80ad7b7286015711
+_md5_=cd6b30af576430bca9a4bc586be67c71
diff --git a/metadata/md5-cache/mail-filter/libspf2-1.2.10 b/metadata/md5-cache/mail-filter/libspf2-1.2.10
index 60ef50f75367..08270b4dc88a 100644
--- a/metadata/md5-cache/mail-filter/libspf2-1.2.10
+++ b/metadata/md5-cache/mail-filter/libspf2-1.2.10
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair
+DESCRIPTION=libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols
 EAPI=5
 HOMEPAGE=http://www.libspf2.org
 IUSE=static static-libs
@@ -11,4 +11,4 @@ REQUIRED_USE=static? ( static-libs )
 SLOT=0
 SRC_URI=http://www.libspf2.org/spf/libspf2-1.2.10.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0e2088c036aec40f85725c52ef1008c7
+_md5_=c40786c6b9f84a971933ec3dc0288aab
diff --git a/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3 b/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3
index bac9093ba40e..ffb2cc758835 100644
--- a/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3
+++ b/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair
+DESCRIPTION=libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols
 EAPI=4
 HOMEPAGE=http://www.libspf2.org
 IUSE=static static-libs
@@ -11,4 +11,4 @@ REQUIRED_USE=static? ( static-libs )
 SLOT=0
 SRC_URI=http://www.libspf2.org/spf/libspf2-1.2.9.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2df6940a36c2e245de25d5b725551686
+_md5_=66bcedfbf9f78d7e928929be1ee1c28a
diff --git a/metadata/md5-cache/mail-filter/mimedefang-2.73 b/metadata/md5-cache/mail-filter/mimedefang-2.73
index ec874143f057..8a246ceb03cb 100644
--- a/metadata/md5-cache/mail-filter/mimedefang-2.73
+++ b/metadata/md5-cache/mail-filter/mimedefang-2.73
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install prepare setup
 DEPEND=>=dev-perl/MIME-tools-5.412 dev-perl/IO-stringy virtual/perl-MIME-Base64 dev-perl/Digest-SHA1 clamav? ( app-antivirus/clamav ) || ( mail-filter/libmilter mail-mta/sendmail )
-DESCRIPTION=Antispam, antivirus and other customizable filtering for MTAs with Milter support
+DESCRIPTION=Antispam, antivirus and other customizable filters for MTAs with Milter support
 EAPI=4
 HOMEPAGE=http://www.mimedefang.org/
 IUSE=clamav +poll
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mimedefang.org/static/mimedefang-2.73.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=0e778454e6d7dffef5568088294e1334
+_md5_=42e1cd852244797a081efe17bcc49196
diff --git a/metadata/md5-cache/mail-filter/mimedefang-2.74 b/metadata/md5-cache/mail-filter/mimedefang-2.74
index da86895c9ee5..5983bb719157 100644
--- a/metadata/md5-cache/mail-filter/mimedefang-2.74
+++ b/metadata/md5-cache/mail-filter/mimedefang-2.74
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install prepare setup
 DEPEND=>=dev-perl/MIME-tools-5.412 dev-perl/IO-stringy virtual/perl-MIME-Base64 dev-perl/Digest-SHA1 clamav? ( app-antivirus/clamav ) || ( mail-filter/libmilter mail-mta/sendmail )
-DESCRIPTION=Antispam, antivirus and other customizable filtering for MTAs with Milter support
+DESCRIPTION=Antispam, antivirus and other customizable filters for MTAs with Milter support
 EAPI=4
 HOMEPAGE=http://www.mimedefang.org/
 IUSE=clamav +poll
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mimedefang.org/static/mimedefang-2.74.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=79f8a4e4b71529201fb66e9c0fa43e9a
+_md5_=4d7ab844fe30b9fc1bb5607d1f68a263
diff --git a/metadata/md5-cache/mail-filter/mimedefang-2.75 b/metadata/md5-cache/mail-filter/mimedefang-2.75
index 01cbf4b683e8..47ca68b71a30 100644
--- a/metadata/md5-cache/mail-filter/mimedefang-2.75
+++ b/metadata/md5-cache/mail-filter/mimedefang-2.75
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install prepare setup
 DEPEND=>=dev-perl/MIME-tools-5.412 dev-perl/IO-stringy virtual/perl-MIME-Base64 dev-perl/Digest-SHA1 clamav? ( app-antivirus/clamav ) || ( mail-filter/libmilter mail-mta/sendmail )
-DESCRIPTION=Antispam, antivirus and other customizable filtering for MTAs with Milter support
+DESCRIPTION=Antispam, antivirus and other customizable filters for MTAs with Milter support
 EAPI=5
 HOMEPAGE=http://www.mimedefang.org/
 IUSE=clamav +poll
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mimedefang.org/static/mimedefang-2.75.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f1e321633e818706f97f8371394ff522
+_md5_=5b99051da8e25a890e1593be5d9fa09f
diff --git a/metadata/md5-cache/mail-filter/spampd-2.30 b/metadata/md5-cache/mail-filter/spampd-2.30
index 6f896e80011c..0eb5cd8065e3 100644
--- a/metadata/md5-cache/mail-filter/spampd-2.30
+++ b/metadata/md5-cache/mail-filter/spampd-2.30
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DEPEND=dev-lang/perl dev-perl/Net-Server mail-filter/spamassassin
-DESCRIPTION=spampd is a program to scan messages for possible Unsolicited Commercial E-mail content
+DESCRIPTION=spampd is a program to scan messages for Unsolicited Commercial E-mail content
 EAPI=0
 HOMEPAGE=http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm
 KEYWORDS=~amd64 ~ppc x86
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Net-Server mail-filter/spamassassin
 SLOT=0
 SRC_URI=http://www.worlddesign.com/Content/rd/mta/spampd/spampd-2.30.tar.gz
-_md5_=e59eb5650b713a8a7f5ce78f4c7c4be7
+_md5_=649adf39bd1cf36ac3e4cf54c4bbe1fc
diff --git a/metadata/md5-cache/mail-filter/spampd-2.42 b/metadata/md5-cache/mail-filter/spampd-2.42
index 88ae91657183..9bfb57d18c2e 100644
--- a/metadata/md5-cache/mail-filter/spampd-2.42
+++ b/metadata/md5-cache/mail-filter/spampd-2.42
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DEPEND=dev-lang/perl dev-perl/Net-Server mail-filter/spamassassin
-DESCRIPTION=spampd is a program to scan messages for possible Unsolicited Commercial E-mail content
+DESCRIPTION=spampd is a program to scan messages for Unsolicited Commercial E-mail content
 EAPI=5
 HOMEPAGE=http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm
 KEYWORDS=~amd64 ~ppc ~x86
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Net-Server mail-filter/spamassassin
 SLOT=0
 SRC_URI=https://github.com/mpaperno/spampd/archive/2.42.tar.gz -> spampd-2.42.tar.gz
-_md5_=cd7b302448b8f50dcdb0b5f93bc8fef3
+_md5_=5e29351f8a8a3dfdec7307f32ae53d2d
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 1b06dace4378..030eaf886ae3 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/esmtp-1.2 b/metadata/md5-cache/mail-mta/esmtp-1.2
index 9cda5640f658..9972ec62e741 100644
--- a/metadata/md5-cache/mail-mta/esmtp-1.2
+++ b/metadata/md5-cache/mail-mta/esmtp-1.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst
 DEPEND=net-libs/libesmtp dev-libs/openssl sys-devel/flex
-DESCRIPTION=esmtp is a user configurable relay-only Mail Transfer Agent (MTA) with a sendmail compatible syntax
+DESCRIPTION=User configurable relay-only Mail Transfer Agent with a sendmail-like syntax
 EAPI=0
 HOMEPAGE=http://esmtp.sourceforge.net/
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libesmtp dev-libs/openssl !mail-mta/courier !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd
 SLOT=0
 SRC_URI=mirror://sourceforge/esmtp/esmtp-1.2.tar.bz2
-_md5_=404d086c486a67233406315039196f9c
+_md5_=845ea836f5badf321782dd53f3726e45
diff --git a/metadata/md5-cache/mail-mta/esmtp-1.2-r1 b/metadata/md5-cache/mail-mta/esmtp-1.2-r1
index 4c04adbf26a3..c99abf3fb872 100644
--- a/metadata/md5-cache/mail-mta/esmtp-1.2-r1
+++ b/metadata/md5-cache/mail-mta/esmtp-1.2-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst
 DEPEND=net-libs/libesmtp !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-devel/flex
-DESCRIPTION=esmtp is a user configurable relay-only Mail Transfer Agent (MTA) with a sendmail compatible syntax
+DESCRIPTION=User configurable relay-only Mail Transfer Agent with a sendmail-like syntax
 EAPI=5
 HOMEPAGE=http://esmtp.sourceforge.net/
 IUSE=libressl
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libesmtp !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) !mail-mta/courier !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd
 SLOT=0
 SRC_URI=mirror://sourceforge/esmtp/esmtp-1.2.tar.bz2
-_md5_=4390fd2e6483055370420ed352d3fe50
+_md5_=dba273a6fe152f828e3c3ea1af108972
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 36ab38441f16..08be321bf2a7 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/libkate-0.4.1-r2 b/metadata/md5-cache/media-libs/libkate-0.4.1-r2
index 7aad917b8ceb..8f5cfffb0c53 100644
--- a/metadata/md5-cache/media-libs/libkate-0.4.1-r2
+++ b/metadata/md5-cache/media-libs/libkate-0.4.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Codec for karaoke and text encapsulation for Ogg
 EAPI=6
 HOMEPAGE=https://code.google.com/p/libkate/
 IUSE=debug doc wxwidgets python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=media-libs/libogg:= media-libs/libpng:0= wxwidgets? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-libs/liboggz )
 REQUIRED_USE=wxwidgets? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://libkate.googlecode.com/files/libkate-0.4.1.tar.gz
 _eclasses_=ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=247f10a3788df3fa223d3f2b92edf7ea
+_md5_=82f7f1d81da32ca59d3c660be6d6b9bc
diff --git a/metadata/md5-cache/media-libs/mesa-17.1.8 b/metadata/md5-cache/media-libs/mesa-17.1.8
index 996843df2e3c..43bc674b97f8 100644
--- a/metadata/md5-cache/media-libs/mesa-17.1.8
+++ b/metadata/md5-cache/media-libs/mesa-17.1.8
@@ -4,7 +4,7 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=6
 HOMEPAGE=https://www.mesa3d.org/
 IUSE=video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_imx video_cards_nouveau video_cards_vc4 video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan? ( >=sys-devel/llvm-3.9.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/llvm-3.6.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.77[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.77[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.77[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.77[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.77[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.77[video_cards_amdgpu] )
 REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.1.8.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	llvm	fe231a791db197943447fdeadafa7e08	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=07d2a168ddae846e484fae5638c65c6c
+_md5_=d8120e3830913356247ffed9ddfe0452
diff --git a/metadata/md5-cache/media-libs/mesa-17.2.6 b/metadata/md5-cache/media-libs/mesa-17.2.6
index fd700f1ec5a1..a403f4ff8620 100644
--- a/metadata/md5-cache/media-libs/mesa-17.2.6
+++ b/metadata/md5-cache/media-libs/mesa-17.2.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.82[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.82[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.82[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.82[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) >=x11-proto/dri2proto-2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri3? ( >=x11-proto/dri3proto-1.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/presentproto-1.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-proto/glproto-1.4.17-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xextproto-7.2.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xf86driproto-2.1.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.82[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.82[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.82[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.82[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) >=x11-proto/dri2proto-2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri3? ( >=x11-proto/dri3proto-1.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/presentproto-1.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-proto/glproto-1.4.17-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xextproto-7.2.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xf86driproto-2.1.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=6
 HOMEPAGE=https://www.mesa3d.org/
 IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.82[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.82[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.82[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.82[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.82[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.82[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.82[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.82[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.82[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
 REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.2.6.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	llvm	fe231a791db197943447fdeadafa7e08	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=00f0da00215cf51eec468eb8d51e55b6
+_md5_=d4b4ba95ad15f1ff7483d46f20a17bb3
diff --git a/metadata/md5-cache/media-libs/mesa-17.3.0_rc5 b/metadata/md5-cache/media-libs/mesa-17.3.0_rc5
index ea03c00bb38b..fe9c933b77fe 100644
--- a/metadata/md5-cache/media-libs/mesa-17.3.0_rc5
+++ b/metadata/md5-cache/media-libs/mesa-17.3.0_rc5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.85[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.85[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.85[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.85[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) >=x11-proto/dri2proto-2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri3? ( >=x11-proto/dri3proto-1.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/presentproto-1.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-proto/glproto-1.4.17-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xextproto-7.2.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xf86driproto-2.1.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/mako-0.7.3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.85[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.85[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.85[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.85[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) >=x11-proto/dri2proto-2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri3? ( >=x11-proto/dri3proto-1.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/presentproto-1.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-proto/glproto-1.4.17-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xextproto-7.2.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xf86driproto-2.1.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/mako-0.7.3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=6
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.85[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.85[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.85[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.85[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.85[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.85[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.85[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.85[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.85[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
 REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.3.0-rc5.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	llvm	fe231a791db197943447fdeadafa7e08	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=396a48e6408b568009b605a111b150e1
+_md5_=ebfaa8ccffe61121f4f645a3b2a56719
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index b454b2411024..cee615362b06 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/alsaplayer-0.99.81 b/metadata/md5-cache/media-sound/alsaplayer-0.99.81
index 43a6ce1ffb88..3c1800f785f2 100644
--- a/metadata/md5-cache/media-sound/alsaplayer-0.99.81
+++ b/metadata/md5-cache/media-sound/alsaplayer-0.99.81
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsndfile sys-libs/zlib alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag ) jack? ( >=media-sound/jack-audio-connection-kit-0.80 ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd ) virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) oss? ( virtual/os-headers ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/libsndfile:= sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag ) jack? ( >=media-sound/jack-audio-connection-kit-0.80 ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd ) virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) oss? ( virtual/os-headers ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A heavily multi-threaded pluggable audio player
-EAPI=4
+EAPI=6
 HOMEPAGE=http://www.alsaplayer.org/
 IUSE=+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd
 KEYWORDS=amd64 ~mips ~ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=media-libs/libsndfile sys-libs/zlib alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag ) jack? ( >=media-sound/jack-audio-connection-kit-0.80 ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd )
+RDEPEND=media-libs/libsndfile:= sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag ) jack? ( >=media-sound/jack-audio-connection-kit-0.80 ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd )
 REQUIRED_USE=|| ( alsa jack nas oss )
 SLOT=0
 SRC_URI=http://www.alsaplayer.org/alsaplayer-0.99.81.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=81cfb6549045ee6f2595d0697856d2b5
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=88aa06dc4ee042fd84c1296e3c5c06f3
diff --git a/metadata/md5-cache/media-sound/cmix-1.6 b/metadata/md5-cache/media-sound/cmix-1.6
index 53cc154d6ca6..8c5e83a1399d 100644
--- a/metadata/md5-cache/media-sound/cmix-1.6
+++ b/metadata/md5-cache/media-sound/cmix-1.6
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=configure install
 DESCRIPTION=command line audio mixer
-EAPI=0
+EAPI=6
 HOMEPAGE=http://cmix.sourceforge.net/
 KEYWORDS=-amd64 ~ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://antipoder.dyndns.org/downloads/cmix-1.6.tbz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=700cd645abf63ab8f5e695a5a4de598b
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=0fada6a717c79b14b383b1cbdb66cc4d
diff --git a/metadata/md5-cache/media-sound/pulseaudio-11.1 b/metadata/md5-cache/media-sound/pulseaudio-11.1
index c05167b2c265..215b50b2bd21 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-11.1
+++ b/metadata/md5-cache/media-sound/pulseaudio-11.1
@@ -4,7 +4,7 @@ DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 IUSE=+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset +orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libICE[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( >=sys-libs/libcap-2.22-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) || ( ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) ( <media-libs/speex-1.2.0 >=media-libs/speex-1.2_rc1 ) ) gdbm? ( sys-libs/gdbm ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) systemd? ( sys-apps/systemd:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) system-wide? ( alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-5 ) )
@@ -12,4 +12,4 @@ REQUIRED_USE=bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-11.1.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=beb2be0571bf41e26f553bdcf98b8c1d
+_md5_=6bf1efdb5964b383a04f39702f8559c9
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 69b415da67ff..52d5abeb5426 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r1 b/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r1
deleted file mode 100644
index 25d4c555680e..000000000000
--- a/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/xz-utils >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A tool to convert and tweak bitmap based subtitle streams
-EAPI=3
-HOMEPAGE=http://bdsup2sub.javaforge.com/help.htm
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://sbriesen.de/gentoo/distfiles/bdsup2sub-4.0.0.tar.xz http://sbriesen.de/gentoo/distfiles/xdg-20100731.java.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2785d7f3856e0e97669347c6cc869817
diff --git a/metadata/md5-cache/media-video/sonic-snap-1.7 b/metadata/md5-cache/media-video/sonic-snap-1.7
deleted file mode 100644
index d02197bde856..000000000000
--- a/metadata/md5-cache/media-video/sonic-snap-1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=x11-libs/fltk:1 mpeg? ( >=media-libs/libfame-0.9.1 ) sys-libs/zlib x11-libs/libXdmcp x11-libs/libXau x11-libs/libXrender x11-libs/libX11 x11-libs/libXext x11-libs/libXft
-DESCRIPTION=Webcam app for sn9c10x based camera controllers (with optional MPEG4 support)
-EAPI=3
-HOMEPAGE=http://www.stolk.org/sonic-snap/
-IUSE=mpeg
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-1
-RDEPEND=x11-libs/fltk:1 mpeg? ( >=media-libs/libfame-0.9.1 ) sys-libs/zlib x11-libs/libXdmcp x11-libs/libXau x11-libs/libXrender x11-libs/libX11 x11-libs/libXext x11-libs/libXft
-SLOT=0
-SRC_URI=http://www.stolk.org/sonic-snap/downloads/sonic-snap-1.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2ac2aa179aef293485913297e445e867
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index c6c1dbe1b6a0..ce068e742acb 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r4 b/metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r4
new file mode 100644
index 000000000000..acfb985300b0
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=net-libs/libpcap >=net-libs/libnet-1.1.2.1-r2
+DESCRIPTION=discover DHCP and BootP servers on a directly-attached Ethernet network
+EAPI=6
+HOMEPAGE=http://www.net.princeton.edu/software/dhcp_probe/
+KEYWORDS=~x86 ~amd64
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap >=net-libs/libnet-1.1.2.1-r2
+SLOT=0
+SRC_URI=http://www.net.princeton.edu/software/dhcp_probe/dhcp_probe-1.3.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=99490cf075f3b149339d00e54a086586
diff --git a/metadata/md5-cache/net-analyzer/tsung-1.6.0 b/metadata/md5-cache/net-analyzer/tsung-1.6.0
deleted file mode 100644
index 302dff4a28ba..000000000000
--- a/metadata/md5-cache/net-analyzer/tsung-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=dev-lang/erlang
-DESCRIPTION=Erlang's multi-protocol distributed load testing tool
-EAPI=3
-HOMEPAGE=http://tsung.erlang-projects.org/
-IUSE=gnuplot
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=gnuplot? ( sci-visualization/gnuplot dev-perl/Template-Toolkit ) dev-lang/erlang
-RESTRICT=test
-SLOT=0
-SRC_URI=http://tsung.erlang-projects.org/dist/tsung-1.6.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1b0a498eb338c4c620d84b6122c52c39
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 3edc234a9d82..08761828bcfa 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libflowmanager-3.0.0-r1 b/metadata/md5-cache/net-libs/libflowmanager-3.0.0-r1
index 89e07e1ef11d..4327723ffdc9 100644
--- a/metadata/md5-cache/net-libs/libflowmanager-3.0.0-r1
+++ b/metadata/md5-cache/net-libs/libflowmanager-3.0.0-r1
@@ -10,4 +10,4 @@ RDEPEND=>=net-libs/libtrace-3.0.6
 SLOT=0/3
 SRC_URI=http://research.wand.net.nz/software/libflowmanager/libflowmanager-3.0.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7b9f9ad308f6735ff51f0e1bf1f17ec4
+_md5_=f6658e72feda3c1cf727c797de307cb4
diff --git a/metadata/md5-cache/net-libs/libnet-1.0.2a-r5 b/metadata/md5-cache/net-libs/libnet-1.0.2a-r5
index ea52de7a112d..bc4cbc44560d 100644
--- a/metadata/md5-cache/net-libs/libnet-1.0.2a-r5
+++ b/metadata/md5-cache/net-libs/libnet-1.0.2a-r5
@@ -8,4 +8,4 @@ LICENSE=BSD BSD-2 HPND
 SLOT=1.0
 SRC_URI=http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.0.2a.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6ff08505d4ae25ace2bdcf50e9f5f3da
+_md5_=88bd6b1b6cc1fbedf2b3bee414e0ebb1
diff --git a/metadata/md5-cache/net-libs/libnet-1.0.2a-r6 b/metadata/md5-cache/net-libs/libnet-1.0.2a-r6
new file mode 100644
index 000000000000..711a9bf1a8a1
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnet-1.0.2a-r6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=library providing an API for commonly used low-level network functions
+EAPI=6
+HOMEPAGE=http://www.packetfactory.net/libnet/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD BSD-2 HPND
+SLOT=1.0
+SRC_URI=http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.0.2a.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=b7d44975beed8763bdea07a6062feaa3
diff --git a/metadata/md5-cache/net-libs/libnet-1.1.6 b/metadata/md5-cache/net-libs/libnet-1.1.6
deleted file mode 100644
index 576244901675..000000000000
--- a/metadata/md5-cache/net-libs/libnet-1.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-devel/autoconf
-DESCRIPTION=library to provide an API for commonly used low-level network functions (mainly packet injection)
-EAPI=4
-HOMEPAGE=http://libnet-dev.sourceforge.net/
-IUSE=doc static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD BSD-2 HPND
-SLOT=1.1
-SRC_URI=mirror://sourceforge/project/libnet-dev/libnet-1.1.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d04f32e7ffbe87581222d2864a801ac8
diff --git a/metadata/md5-cache/net-libs/libnet-1.1.6-r1 b/metadata/md5-cache/net-libs/libnet-1.1.6-r1
deleted file mode 100644
index 2c7f3b324daf..000000000000
--- a/metadata/md5-cache/net-libs/libnet-1.1.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/autoconf >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=library providing an API for commonly used low-level network functions
-EAPI=6
-HOMEPAGE=http://libnet-dev.sourceforge.net/
-IUSE=doc static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD BSD-2 HPND
-SLOT=1.1
-SRC_URI=mirror://sourceforge/project/libnet-dev/libnet-1.1.6.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8a70ddae3d979e94dd12d82694ba093a
diff --git a/metadata/md5-cache/net-libs/libnet-1.2_rc3 b/metadata/md5-cache/net-libs/libnet-1.2_rc3
deleted file mode 100644
index 042722f7a519..000000000000
--- a/metadata/md5-cache/net-libs/libnet-1.2_rc3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/autoconf >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=library to provide an API for commonly used low-level network functions (mainly packet injection)
-EAPI=5
-HOMEPAGE=http://libnet-dev.sourceforge.net/
-IUSE=doc static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD BSD-2 HPND
-SLOT=1.1
-SRC_URI=mirror://sourceforge/project/libnet-dev/libnet-1.2-rc3.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1c0d0d1dbb6b532c3c22fa12679d4c03
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 12f6ea78247b..abb67204e150 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/chrony-3.1 b/metadata/md5-cache/net-misc/chrony-3.1
index c3c3388090b6..f483075e7a9e 100644
--- a/metadata/md5-cache/net-misc/chrony-3.1
+++ b/metadata/md5-cache/net-misc/chrony-3.1
@@ -4,7 +4,7 @@ DESCRIPTION=NTP client and server programs
 EAPI=6
 HOMEPAGE=http://chrony.tuxfamily.org/
 IUSE=caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns
-KEYWORDS=~alpha ~amd64 arm hppa ppc ppc64 ~sparc x86
+KEYWORDS=~alpha ~amd64 arm hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) selinux? ( sec-policy/selinux-chronyd )
 REQUIRED_USE=?? ( libedit readline )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/chrony/chrony-3.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2ff541603d29ceac5357a8c06c2e96c6
+_md5_=9217cedbeae3b9c240cbf98d79fabad2
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index f4a649accb78..3660746d40d2 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/gsim-21.3 b/metadata/md5-cache/sci-chemistry/gsim-21.3
index 759dcff29207..19d93d69e844 100644
--- a/metadata/md5-cache/sci-chemistry/gsim-21.3
+++ b/metadata/md5-cache/sci-chemistry/gsim-21.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=dev-cpp/muParser media-libs/freetype sci-libs/libcmatrix sci-libs/minuit virtual/blas dev-qt/qtsvg:4 emf? ( media-libs/libemf ) opengl? ( dev-qt/qtopengl:4 ) virtual/pkgconfig
-DESCRIPTION=Programm for visualisation and processing of experimental and simulated NMR spectra
+DESCRIPTION=Visualisation and processing of experimental and simulated NMR spectra
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/gsim/
 IUSE=emf opengl
@@ -10,4 +10,4 @@ RDEPEND=dev-cpp/muParser media-libs/freetype sci-libs/libcmatrix sci-libs/minuit
 SLOT=0
 SRC_URI=mirror://sourceforge/gsim/gsim-21.3.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=952b237476b1e3b1d25e73077cf5ea4f
+_md5_=8b4d9903ad01081c70ba10643f5542c2
diff --git a/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2 b/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
index ed9a6fa4be02..a8df443ea8d9 100644
--- a/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
+++ b/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install nofetch prepare
 DEPEND=media-libs/freeglut media-libs/gd:2= media-libs/libpng:0= virtual/jpeg:0= || ( x11-libs/libXmu x11-libs/libXext x11-libs/libX11 )
-DESCRIPTION=Display molecular 3D structures, such as proteins, in both schematic and detailed representations
+DESCRIPTION=Display 3D molecules (e.g., proteins) in schematic and detailed representations
 EAPI=5
 HOMEPAGE=http://www.avatar.se/molscript/
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
@@ -10,4 +10,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=molscript-2.1.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=eb0013ea21e1b6460673297657b6c433
+_md5_=c1991e872be752de44194c5a181e2c17
diff --git a/metadata/md5-cache/sci-chemistry/msms-bin-2.6.1-r1 b/metadata/md5-cache/sci-chemistry/msms-bin-2.6.1-r1
index 88440e2ee383..a1445c85c406 100644
--- a/metadata/md5-cache/sci-chemistry/msms-bin-2.6.1-r1
+++ b/metadata/md5-cache/sci-chemistry/msms-bin-2.6.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install nofetch
-DESCRIPTION=MSMS allows to compute very efficiently triangulations of Solvent Excluded Surfaces
+DESCRIPTION=MSMS very efficiently computes triangulations of Solvent Excluded Surfaces
 EAPI=4
 HOMEPAGE=http://mgl.scripps.edu/people/sanner/html/msms_home.html
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
@@ -7,4 +7,4 @@ LICENSE=MSMS
 RESTRICT=fetch
 SLOT=0
 SRC_URI=amd64? ( msms_i86_64Linux2_2.6.1.tar.gz ) x86? ( msms_i86Linux2_2.6.1.tar.gz )
-_md5_=3bed25085e21d3be0ead51b25101c70b
+_md5_=c43ab98fd504ae15a5c6f4c778ac6daf
diff --git a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1 b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1
index bac05d02bb1e..a95afee35b8a 100644
--- a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1
+++ b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare setup
 DEPEND=python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] virtual/fortran
-DESCRIPTION=Tools for manipulating and doing calculations on wwPDB macromolecule structure files
+DESCRIPTION=Tools for manipulating and calculations on wwPDB macromolecule structure files
 EAPI=5
 HOMEPAGE=https://github.com/harmslab/pdbtools
 IUSE=python_targets_pypy python_targets_python2_7 python_single_target_pypy python_single_target_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) pyt
 SLOT=0
 SRC_URI=https://pdb-tools.googlecode.com/files/pdbTools_0.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1351edf19d2820e89574c5ff43489439
+_md5_=65e79ac4a3cfe79480b4076c8296ae6d
diff --git a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2 b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2
index 1c0ee81b63b4..8fcc574fa7e1 100644
--- a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2
+++ b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare setup
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] virtual/fortran
-DESCRIPTION=Tools for manipulating and doing calculations on wwPDB macromolecule structure files
+DESCRIPTION=Tools for manipulating and calculations on wwPDB macromolecule structure files
 EAPI=5
 HOMEPAGE=https://github.com/harmslab/pdbtools
 IUSE=python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://pdb-tools.googlecode.com/files/pdbTools_0.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f9f71182abfaac381b3fc033e7a068f5
+_md5_=6829f5fae8d0bf0ffdef84abe46217bb
diff --git a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1 b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1
index 9322149a9eeb..2559d31ca2e3 100644
--- a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1
+++ b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-chemistry/openbabel-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] opal? ( dev-python/zsi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pdb2pka? ( sci-chemistry/apbs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),-mpi] ) dev-lang/swig:0 dev-util/scons virtual/fortran
-DESCRIPTION=An automated pipeline for performing Poisson-Boltzmann electrostatics calculations
+DESCRIPTION=Automated pipeline for performing Poisson-Boltzmann electrostatics calculations
 EAPI=5
 HOMEPAGE=http://www.poissonboltzmann.org/
 IUSE=doc examples opal +pdb2pka python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/Electrostatics/apbs-pdb2pqr/releases/download/pdb2pqr-1.9.0/pdb2pqr-src-1.9.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=277a039f856ae0c68d6abceb12d4badc
+_md5_=787e26e15fbbe6ccc3debd3915e303dc
diff --git a/metadata/md5-cache/sci-chemistry/pdbcns-2.0.010504 b/metadata/md5-cache/sci-chemistry/pdbcns-2.0.010504
index 9c683bfa0359..c86bbcb16707 100644
--- a/metadata/md5-cache/sci-chemistry/pdbcns-2.0.010504
+++ b/metadata/md5-cache/sci-chemistry/pdbcns-2.0.010504
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DESCRIPTION=Convert atom names for common amino acids and nucleic acid bases from PDB format to CNS or back
+DESCRIPTION=Convert atom names for amino acids/nucleic acid bases between PDB and CNS format
 EAPI=4
 HOMEPAGE=http://www.mybiosoftware.com/3d-molecular-model/314/
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
@@ -7,4 +7,4 @@ LICENSE=BSD
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pdbcns.2.0.010504.perl.tgz
-_md5_=f167b7636f3008d03c5b5a4fa27d414e
+_md5_=89c30d46542bd1560e7c844043f6096c
diff --git a/metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r1 b/metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r1
index 4effb4f82fc0..49816abdda1b 100644
--- a/metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r1
+++ b/metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=x11-libs/libXext x11-libs/libXmu x11-libs/libX11 x11-libs/libXt X? ( >=x11-libs/motif-2.3:0 )
-DESCRIPTION=Prepares molecular kinemages (input files for Mage & KiNG) from PDB-format coordinate files
+DESCRIPTION=Prepares molecular kinemages from PDB-format coordinate files
 EAPI=2
 HOMEPAGE=http://kinemage.biochem.duke.edu/software/prekin.php
 IUSE=X
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libXext x11-libs/libXmu x11-libs/libX11 x11-libs/libXt X? ( >=x
 SLOT=0
 SRC_URI=http://kinemage.biochem.duke.edu/downloads/software/prekin/prekin.6.51.081122.src.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=74da56bfd665dc0e2e02f09683a31550
+_md5_=b00f4c87d6c7171e4ba9e2ca6780b506
diff --git a/metadata/md5-cache/sci-chemistry/propka-3.1_p140511 b/metadata/md5-cache/sci-chemistry/propka-3.1_p140511
index 702a6576a73b..0ce95470c991 100644
--- a/metadata/md5-cache/sci-chemistry/propka-3.1_p140511
+++ b/metadata/md5-cache/sci-chemistry/propka-3.1_p140511
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Prediction of the pKa values of ionizable groups in proteins and protein-ligand complexes
+DESCRIPTION=pKa-value prediction of ionizable groups in protein and protein-ligand complexes
 EAPI=5
 HOMEPAGE=http://propka.ki.ku.dk/
 IUSE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/propka-3.1_p140511.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ebb8e38b8268a314f0aedc878dc74b59
+_md5_=77a50416f48bdac3be53689262fbd770
diff --git a/metadata/md5-cache/sci-chemistry/shelx-20141228 b/metadata/md5-cache/sci-chemistry/shelx-20141228
index 5d7b51cf6f2c..b71ccc3b10ab 100644
--- a/metadata/md5-cache/sci-chemistry/shelx-20141228
+++ b/metadata/md5-cache/sci-chemistry/shelx-20141228
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install nofetch
-DESCRIPTION=Programs for crystal structure determination from single-crystal diffraction data
+DESCRIPTION=Crystal structure determination from single-crystal diffraction data
 EAPI=5
 HOMEPAGE=http://shelx.uni-ac.gwdg.de/SHELX/
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
@@ -7,4 +7,4 @@ LICENSE=free-noncomm
 RESTRICT=fetch
 SLOT=0
 SRC_URI=amd64? ( anode_amd64.bz2 ciftab_amd64.bz2 shelxc_amd64.bz2 shelxd_amd64.bz2 shelxe_amd64.bz2 shelxl_amd64.bz2 shelxs_amd64.bz2 shelxt_amd64.bz2 shredcif_amd64.bz2 ) x86? ( anode_x86.bz2 ciftab_x86.bz2 shelxc_x86.bz2 shelxd_x86.bz2 shelxe_x86.bz2 shelxl_x86.bz2 shelxs_x86.bz2 shelxt_x86.bz2 shredcif_x86.bz2 )
-_md5_=b66443b048e30f88389ac6ad4c1ca172
+_md5_=b169253fd8af7308865dff74b5225d8f
diff --git a/metadata/md5-cache/sci-chemistry/suitename-0.3.070628 b/metadata/md5-cache/sci-chemistry/suitename-0.3.070628
index b62102b3dcad..455fc88379d5 100644
--- a/metadata/md5-cache/sci-chemistry/suitename-0.3.070628
+++ b/metadata/md5-cache/sci-chemistry/suitename-0.3.070628
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DESCRIPTION=The ROC RNA Ontology Consortium consensus RNA backbone nomenclature and conformer-list development
+DESCRIPTION=The ROC RNA Ontology nomenclature and conformer-list development
 EAPI=4
 HOMEPAGE=http://kinemage.biochem.duke.edu/software/suitename.php
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
@@ -7,4 +7,4 @@ LICENSE=richardson
 SLOT=0
 SRC_URI=http://kinemage.biochem.duke.edu/downloads/software/suitename/suitename.0.3.070628.src.tgz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f3751bdbdbce7b48ea8c66ac68009342
+_md5_=23e3046482e340a86f5452a8901c8c44
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index e9b33c1ce00b..e2188e79c6dd 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/electric-8.09 b/metadata/md5-cache/sci-electronics/electric-8.09
index 2ec0bacdab88..7ff065c2a093 100644
--- a/metadata/md5-cache/sci-electronics/electric-8.09
+++ b/metadata/md5-cache/sci-electronics/electric-8.09
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup
 DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design
+DESCRIPTION=Complete Electronic Design Automation system for many forms of circuit design
 EAPI=0
 HOMEPAGE=https://www.gnu.org/software/electric/electric.html
 IUSE=elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-confi
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-8.09.jar
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=772fde64e5190e7595aedde68d80d6ad
+_md5_=c65264dc7de171fb1bf1c3c4fdbb5620
diff --git a/metadata/md5-cache/sci-electronics/electric-8.11 b/metadata/md5-cache/sci-electronics/electric-8.11
index b8170bf3070b..3051f8a82b14 100644
--- a/metadata/md5-cache/sci-electronics/electric-8.11
+++ b/metadata/md5-cache/sci-electronics/electric-8.11
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup
 DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design
+DESCRIPTION=Complete Electronic Design Automation system for many forms of circuit design
 EAPI=0
 HOMEPAGE=https://www.gnu.org/software/electric/electric.html
 IUSE=elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-confi
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-8.11.jar
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9fe5480885b128f3e8d01ff6dd9def59
+_md5_=7f40ec0874183011e6c6e755d4fe4105
diff --git a/metadata/md5-cache/sci-electronics/electric-9.02 b/metadata/md5-cache/sci-electronics/electric-9.02
index a9bd4a20a588..dbf50789d375 100644
--- a/metadata/md5-cache/sci-electronics/electric-9.02
+++ b/metadata/md5-cache/sci-electronics/electric-9.02
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup
 DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design
+DESCRIPTION=Complete Electronic Design Automation system for many forms of circuit design
 EAPI=0
 HOMEPAGE=https://www.gnu.org/software/electric/electric.html
 IUSE=elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-confi
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.02.jar
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=772fde64e5190e7595aedde68d80d6ad
+_md5_=c65264dc7de171fb1bf1c3c4fdbb5620
diff --git a/metadata/md5-cache/sci-electronics/electric-9.03 b/metadata/md5-cache/sci-electronics/electric-9.03
index df17e3eeddd1..2675db86bf99 100644
--- a/metadata/md5-cache/sci-electronics/electric-9.03
+++ b/metadata/md5-cache/sci-electronics/electric-9.03
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup
 DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design
+DESCRIPTION=Complete Electronic Design Automation system for many forms of circuit design
 EAPI=0
 HOMEPAGE=https://www.gnu.org/software/electric/electric.html
 IUSE=elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-confi
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.03.jar
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9fe5480885b128f3e8d01ff6dd9def59
+_md5_=7f40ec0874183011e6c6e755d4fe4105
diff --git a/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1 b/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
index 11d9922071d1..b942cd35933f 100644
--- a/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
+++ b/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst prepare
 DEPEND=dev-libs/libxml2:2 x11-libs/gtk+:2 gnome-base/libglade:2.0 gnome-base/libgnome >=gnome-base/libgnomeui-2.12 >=gnome-base/libgnomecanvas-2.12 >=x11-libs/cairo-1.2 x11-libs/gtksourceview:2.0 >=dev-util/scons-0.96.1 virtual/pkgconfig dev-util/scons
-DESCRIPTION=Oregano is an application for schematic capture and simulation of electrical circuits
+DESCRIPTION=Application for the schematic capturing and simulation of electrical circuits
 EAPI=5
 HOMEPAGE=http://oregano.gforge.lug.fi.uba.ar/
 KEYWORDS=amd64 ~ppc x86
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/libxml2:2 x11-libs/gtk+:2 gnome-base/libglade:2.0 gnome-base/li
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/oregano/oregano_0.69.1.orig.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ae9e785d7d62f2db4b3c09591d495b8d
+_md5_=84990bb942c376fc2651ca4f694e7682
diff --git a/metadata/md5-cache/sci-electronics/oregano-0.82 b/metadata/md5-cache/sci-electronics/oregano-0.82
index 42c6adf43b93..6a9e39f5e301 100644
--- a/metadata/md5-cache/sci-electronics/oregano-0.82
+++ b/metadata/md5-cache/sci-electronics/oregano-0.82
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
 DEPEND=dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 app-text/rarian virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Oregano is an application for schematic capture and simulation of electrical circuits
+DESCRIPTION=Application for the schematic capturing and simulation of electrical circuits
 EAPI=4
 HOMEPAGE=https://github.com/marc-lorber/oregano
 KEYWORDS=~amd64 ~ppc ~x86
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 x11-libs/gtkso
 SLOT=0
 SRC_URI=https://github.com/marc-lorber/oregano/tarball/v0.82 -> oregano-0.82.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98bb621fa701fa44de29639a8f4775ca
+_md5_=fad5c5af074ea6cce14766190c0dc504
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 5f2c617aaed1..5496b56c888a 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/bmrblib-1.0.3 b/metadata/md5-cache/sci-libs/bmrblib-1.0.3
index 2b102ec966ba..306c008da2a4 100644
--- a/metadata/md5-cache/sci-libs/bmrblib-1.0.3
+++ b/metadata/md5-cache/sci-libs/bmrblib-1.0.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=API abstracting the BioMagResBank (BMRB) NMR-STAR format (http://www.bmrb.wisc.edu/)
+DESCRIPTION=API abstracting the BioMagResBank (BMRB) NMR-STAR format
 EAPI=5
 HOMEPAGE=http://gna.org/projects/bmrblib/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=http://download.gna.org/bmrblib/bmrblib-1.0.3.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c5a4d601926efbdd8004e1c13febe5ad
+_md5_=44ccc75f29658573371c505cb63cff23
diff --git a/metadata/md5-cache/sci-libs/inchi-1.04 b/metadata/md5-cache/sci-libs/inchi-1.04
index 2d8663155b03..f4918126535c 100644
--- a/metadata/md5-cache/sci-libs/inchi-1.04
+++ b/metadata/md5-cache/sci-libs/inchi-1.04
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=app-arch/unzip
-DESCRIPTION=A program and library for generating standard and non-standard InChI and InChIKeys
+DESCRIPTION=Program and library for generating standard and non-standard InChI and InChIKeys
 EAPI=5
 HOMEPAGE=http://www.iupac.org/inchi/
 IUSE=doc static-libs
@@ -9,4 +9,4 @@ LICENSE=IUPAC-InChi
 SLOT=0
 SRC_URI=http://www.inchi-trust.org/sites/default/files/inchi-1.04/INCHI-1-API.ZIP -> inchi-1.04.zip doc? ( http://www.inchi-trust.org/sites/default/files/inchi-1.04/INCHI-1-DOC.ZIP -> inchi-1.04-doc.zip )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d2c5c06e117e2e82a4448f3e350ec364
+_md5_=fab5b17db74d0d978ea9604c7546b235
diff --git a/metadata/md5-cache/sci-libs/ipp-7.1.0.079 b/metadata/md5-cache/sci-libs/ipp-7.1.0.079
index 036413cd8b28..4fcc9b4b295c 100644
--- a/metadata/md5-cache/sci-libs/ipp-7.1.0.079
+++ b/metadata/md5-cache/sci-libs/ipp-7.1.0.079
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=4
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( multilib? ( http://registrationcenter-download.intel.com/irc_nas/2749/parallel_studio_xe_2013.tgz ) ) amd64? ( !multilib? ( http://registrationcenter-download.intel.com/irc_nas/2749/parallel_studio_xe_2013_intel64.tgz ) ) x86? ( http://registrationcenter-download.intel.com/irc_nas/2749/parallel_studio_xe_2013_ia32.tgz )
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c08269a40c3c71cda50f7c829f5c13f7
+_md5_=804f63a052d45056f2ce69c30079d629
diff --git a/metadata/md5-cache/sci-libs/ipp-7.1.1.117 b/metadata/md5-cache/sci-libs/ipp-7.1.1.117
index f9589d2a240f..7dfd92739b4f 100644
--- a/metadata/md5-cache/sci-libs/ipp-7.1.1.117
+++ b/metadata/md5-cache/sci-libs/ipp-7.1.1.117
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=4
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( multilib? ( http://registrationcenter-download.intel.com/irc_nas/2872/parallel_studio_xe_2013_update1.tgz ) ) amd64? ( !multilib? ( http://registrationcenter-download.intel.com/irc_nas/2872/parallel_studio_xe_2013_update1_intel64.tgz ) ) x86? ( http://registrationcenter-download.intel.com/irc_nas/2872/parallel_studio_xe_2013_update1_ia32.tgz )
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c256d2825801df2a5a1f9ba16d211897
+_md5_=b4c746cdac8bba8e1bd076fe5624a740
diff --git a/metadata/md5-cache/sci-libs/ipp-7.1.1.146 b/metadata/md5-cache/sci-libs/ipp-7.1.1.146
index c690726daf32..4d775fa2c004 100644
--- a/metadata/md5-cache/sci-libs/ipp-7.1.1.146
+++ b/metadata/md5-cache/sci-libs/ipp-7.1.1.146
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=5
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( multilib? ( http://registrationcenter-download.intel.com/irc_nas/2987/parallel_studio_xe_2013_update2.tgz ) ) amd64? ( !multilib? ( http://registrationcenter-download.intel.com/irc_nas/2987/parallel_studio_xe_2013_update2_intel64.tgz ) ) x86? ( http://registrationcenter-download.intel.com/irc_nas/2987/parallel_studio_xe_2013_update2_ia32.tgz )
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3f7ad1e8f3b9654231d51749651b8ad8
+_md5_=78a5c7e10d652e3d5488ed9f90215bf5
diff --git a/metadata/md5-cache/sci-libs/ipp-7.1.1.192 b/metadata/md5-cache/sci-libs/ipp-7.1.1.192
index 8ab4ed0be854..d936d3c55c09 100644
--- a/metadata/md5-cache/sci-libs/ipp-7.1.1.192
+++ b/metadata/md5-cache/sci-libs/ipp-7.1.1.192
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=5
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( multilib? ( http://registrationcenter-download.intel.com/irc_nas/3266/parallel_studio_xe_2013_update4.tgz ) ) amd64? ( !multilib? ( http://registrationcenter-download.intel.com/irc_nas/3266/parallel_studio_xe_2013_update4_intel64.tgz ) ) x86? ( http://registrationcenter-download.intel.com/irc_nas/3266/parallel_studio_xe_2013_update4_ia32.tgz )
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=160669063901cc85d8dd7fbc28b809bf
+_md5_=b515dae8f5745206682be3611a8addb0
diff --git a/metadata/md5-cache/sci-libs/ipp-8.0.1.080 b/metadata/md5-cache/sci-libs/ipp-8.0.1.080
index 90f234255941..7d3a18b4e915 100644
--- a/metadata/md5-cache/sci-libs/ipp-8.0.1.080
+++ b/metadata/md5-cache/sci-libs/ipp-8.0.1.080
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=5
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://registrationcenter-download.intel.com/irc_nas/3447/parallel_studio_xe_2013_sp1.tgz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1de8077cf3307d26dc6d6edc73a5bd01
+_md5_=18078b3285ef43bfc163dc86dd017ded
diff --git a/metadata/md5-cache/sci-libs/ipp-8.2.0.090 b/metadata/md5-cache/sci-libs/ipp-8.2.0.090
index 638a5cbad24d..135a645b22e9 100644
--- a/metadata/md5-cache/sci-libs/ipp-8.2.0.090
+++ b/metadata/md5-cache/sci-libs/ipp-8.2.0.090
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=5
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://registrationcenter-download.intel.com/irc_nas/4584/parallel_studio_xe_2015.tgz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cc326214dbecc2273ed6d2e9421e9a82
+_md5_=b719b04ff10e6dacb102d19685dc87f0
diff --git a/metadata/md5-cache/sci-libs/ipp-8.2.1.164 b/metadata/md5-cache/sci-libs/ipp-8.2.1.164
index bc6dfa5cc079..5cc8b45f1d61 100644
--- a/metadata/md5-cache/sci-libs/ipp-8.2.1.164
+++ b/metadata/md5-cache/sci-libs/ipp-8.2.1.164
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=5
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://registrationcenter-download.intel.com/irc_nas/5207/parallel_studio_xe_2015_update2.tgz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=51627563df245ed401430b3159bc02c3
+_md5_=3f6732aa3deab886118a43617a209bf0
diff --git a/metadata/md5-cache/sci-libs/ipp-8.2.2.187 b/metadata/md5-cache/sci-libs/ipp-8.2.2.187
index bfd5a722d70e..c6642408745b 100644
--- a/metadata/md5-cache/sci-libs/ipp-8.2.2.187
+++ b/metadata/md5-cache/sci-libs/ipp-8.2.2.187
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=5
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://registrationcenter-download.intel.com/irc_nas/7538/parallel_studio_xe_2015_update3.tgz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=90eb5c19fb540bf3e1356156e09867a3
+_md5_=c207bb78026a7aad92534497dce065c6
diff --git a/metadata/md5-cache/sci-libs/libcerf-1.3 b/metadata/md5-cache/sci-libs/libcerf-1.3
index 749277833132..ed7066456526 100644
--- a/metadata/md5-cache/sci-libs/libcerf-1.3
+++ b/metadata/md5-cache/sci-libs/libcerf-1.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-portage/elt-patches-20170422
-DESCRIPTION=library that provides an efficient and accurate implementation of complex error functions
+DESCRIPTION=Efficient and accurate implementation of complex error functions
 EAPI=5
 HOMEPAGE=http://apps.jcns.fz-juelich.de/doku/sc/libcerf
 IUSE=doc static-libs test
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.3.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=819d810467516a6ded57ee8c12652987
+_md5_=e87b69a8b4fd8309a8c99981efa3a681
diff --git a/metadata/md5-cache/sci-libs/libcerf-1.4 b/metadata/md5-cache/sci-libs/libcerf-1.4
index 3391b0896bab..ad203667ddae 100644
--- a/metadata/md5-cache/sci-libs/libcerf-1.4
+++ b/metadata/md5-cache/sci-libs/libcerf-1.4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-portage/elt-patches-20170422
-DESCRIPTION=library that provides an efficient and accurate implementation of complex error functions
+DESCRIPTION=Efficient and accurate implementation of complex error functions
 EAPI=5
 HOMEPAGE=http://apps.jcns.fz-juelich.de/doku/sc/libcerf
 IUSE=doc static-libs test
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.4.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0325c18bcb9e969465ae070d90d000a0
+_md5_=cdc3912fa9dff7e7885200906c3ddfc5
diff --git a/metadata/md5-cache/sci-libs/libcerf-1.5 b/metadata/md5-cache/sci-libs/libcerf-1.5
index 0f1d301b3fac..ca64c1588aad 100644
--- a/metadata/md5-cache/sci-libs/libcerf-1.5
+++ b/metadata/md5-cache/sci-libs/libcerf-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install
-DESCRIPTION=efficient and accurate implementation of complex error functions
+DESCRIPTION=Efficient and accurate implementation of complex error functions
 EAPI=6
 HOMEPAGE=http://apps.jcns.fz-juelich.de/doku/sc/libcerf
 IUSE=doc static-libs test
@@ -7,4 +7,4 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.5.tgz
-_md5_=e3532cdf3c735c9e90f9e579b836ff67
+_md5_=96c9c8cb652c82dec0e7fd1f77ebb515
diff --git a/metadata/md5-cache/sci-libs/mmdb-1.25.5-r1 b/metadata/md5-cache/sci-libs/mmdb-1.25.5-r1
index 31e33622da34..97e1fd06a852 100644
--- a/metadata/md5-cache/sci-libs/mmdb-1.25.5-r1
+++ b/metadata/md5-cache/sci-libs/mmdb-1.25.5-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-portage/elt-patches-20170422
-DESCRIPTION=The Coordinate Library, designed to assist CCP4 developers in working with coordinate files
+DESCRIPTION=The Coordinate Library for working with CCP4 coordinate files
 EAPI=5
 HOMEPAGE=https://launchpad.net/mmdb/
 IUSE=static-libs
@@ -9,4 +9,4 @@ LICENSE=GPL-2 LGPL-3
 SLOT=0
 SRC_URI=ftp://ftp.ccp4.ac.uk/opensource/mmdb-1.25.5.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fe794a1ac987742b8df2f06108af988a
+_md5_=20ad17298c2203b0d1a9205b768ed8f0
diff --git a/metadata/md5-cache/sci-libs/mmdb-2.0.1 b/metadata/md5-cache/sci-libs/mmdb-2.0.1
index c27e2a6b5da8..2669ff98e4d9 100644
--- a/metadata/md5-cache/sci-libs/mmdb-2.0.1
+++ b/metadata/md5-cache/sci-libs/mmdb-2.0.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-portage/elt-patches-20170422
-DESCRIPTION=The Coordinate Library, designed to assist CCP4 developers in working with coordinate files
+DESCRIPTION=The Coordinate Library for working with CCP4 coordinate files
 EAPI=5
 HOMEPAGE=https://launchpad.net/mmdb/
 IUSE=static-libs
@@ -9,4 +9,4 @@ LICENSE=GPL-2 LGPL-3
 SLOT=2
 SRC_URI=ftp://ftp.ccp4.ac.uk/opensource/mmdb2-2.0.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=862f7269d59fb6173a97367e8d729f4d
+_md5_=0833867713e000eedd683494f5b125ab
diff --git a/metadata/md5-cache/sci-libs/pymmlib-1.2.1 b/metadata/md5-cache/sci-libs/pymmlib-1.2.1
index 8bb2f3c08b33..48861a53627c 100644
--- a/metadata/md5-cache/sci-libs/pymmlib-1.2.1
+++ b/metadata/md5-cache/sci-libs/pymmlib-1.2.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtkglext[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freeglut virtual/glu virtual/opengl x11-libs/libXmu doc? ( dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Toolkit and library for the analysis and manipulation of macromolecular structural models
+DESCRIPTION=Toolkit and library for the analysis and manipulation of macromolecular models
 EAPI=5
 HOMEPAGE=http://pymmlib.sourceforge.net/
 IUSE=doc python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://github/masci/mmLib/pymmlib-1.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c25fea18d56c308b3ccbb216626d9c6
+_md5_=44fa7a29c2c139ded173740e4b87fda2
diff --git a/metadata/md5-cache/sci-mathematics/Macaulay2-1.7_pre b/metadata/md5-cache/sci-mathematics/Macaulay2-1.7_pre
deleted file mode 100644
index 4feb26cab8f3..000000000000
--- a/metadata/md5-cache/sci-mathematics/Macaulay2-1.7_pre
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-process/time virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Research tool for commutative algebra and algebraic geometry
-EAPI=5
-HOMEPAGE=http://www.math.uiuc.edu/Macaulay2/
-IUSE=debug emacs +optimization python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-libs/gdbm <dev-libs/ntl-7 sci-mathematics/pari[gmp] >=sys-libs/readline-6.1 dev-libs/libxml2:2 sci-mathematics/flint[gc] sci-mathematics/frobby sci-mathematics/4ti2 sci-mathematics/nauty >=sci-mathematics/normaliz-2.8 sci-mathematics/gfan sci-libs/mpir[cxx] dev-libs/mpfr sci-libs/cdd+ sci-libs/cddlib sci-libs/lrslib[gmp] virtual/blas virtual/lapack dev-util/ctags sys-libs/ncurses >=dev-libs/boehm-gc-7.4[threads] dev-libs/libatomic_ops emacs? ( virtual/emacs )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tomka/files/Macaulay2-1.7_pre.tar.bz2 http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/factory-4.0.0+m4.tar.gz http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/factory.4.0.1-gftables.tar.gz http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/gtest-1.7.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ccaebc921b22abc7637e44237212caf2
diff --git a/metadata/md5-cache/sci-mathematics/Macaulay2-1.8.2.1-r1 b/metadata/md5-cache/sci-mathematics/Macaulay2-1.8.2.1-r1
index e21e6f546153..5d7e6f6f2b9c 100644
--- a/metadata/md5-cache/sci-mathematics/Macaulay2-1.8.2.1-r1
+++ b/metadata/md5-cache/sci-mathematics/Macaulay2-1.8.2.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Research tool for commutative algebra and algebraic geometry
 EAPI=5
 HOMEPAGE=http://www.math.uiuc.edu/Macaulay2/
 IUSE=debug emacs +optimization python_targets_python2_7
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-libs/gdbm sci-mathematics/pari[gmp] >=sys-libs/readline-6.1 dev-libs/libxml2:2 sci-mathematics/flint[gc] sci-mathematics/frobby sci-mathematics/4ti2 sci-mathematics/nauty >=sci-mathematics/normaliz-2.8 sci-mathematics/gfan sci-libs/cdd+ sci-libs/cddlib sci-libs/lrslib[gmp] virtual/blas virtual/lapack dev-util/ctags sys-libs/ncurses >=dev-libs/boehm-gc-7.4[threads] dev-libs/libatomic_ops emacs? ( virtual/emacs )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomka/files//Macaulay2-1.8.2.1-fat.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3c24417a613de3940adb618f29f3cf08
+_md5_=666280fe16390a9154307e01c7d84f24
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 8ce5bbe99039..be09f4f308d9 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index e859e5489e50..f7898f7fe349 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/arrayprobe-2.0-r2 b/metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
index 4cbcaea1209a..d48d3fe6b8e2 100644
--- a/metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
+++ b/metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=prepare
 DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Utility to report status of an HP (Compaq) array controller (both IDA & CCISS)
-EAPI=4
+EAPI=6
 HOMEPAGE=http://www.strocamp.net/opensource/arrayprobe.php
 KEYWORDS=amd64 ~ia64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.strocamp.net/opensource/compaq/downloads/arrayprobe-2.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6c667b89c0c01885e085a3c74a02657b
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=42bc0b159ca8b210cb918f60727820c6
diff --git a/metadata/md5-cache/sys-apps/audio-entropyd-2.0.3-r1 b/metadata/md5-cache/sys-apps/audio-entropyd-2.0.3-r1
index 22b19a7c095c..23a01876f93e 100644
--- a/metadata/md5-cache/sys-apps/audio-entropyd-2.0.3-r1
+++ b/metadata/md5-cache/sys-apps/audio-entropyd-2.0.3-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/alsa-lib:= virtual/pkgconfig
 DESCRIPTION=Audio-entropyd generates entropy-data for the /dev/random device
-EAPI=4
+EAPI=6
 HOMEPAGE=http://www.vanheusden.com/aed/
 IUSE=selinux
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-entropyd ) media-sound/alsa-utils media-libs/alsa-lib
+RDEPEND=media-libs/alsa-lib:= media-sound/alsa-utils selinux? ( sec-policy/selinux-entropyd )
 SLOT=0
 SRC_URI=http://www.vanheusden.com/aed/audio-entropyd-2.0.3.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8929efb8ca2cf5a77082e8a9ced380a8
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=46cd76d062b8e0d7469d7fcf7883eb8b
diff --git a/metadata/md5-cache/sys-apps/bar-1.11.1 b/metadata/md5-cache/sys-apps/bar-1.11.1
index 16801543a510..688c291705d4 100644
--- a/metadata/md5-cache/sys-apps/bar-1.11.1
+++ b/metadata/md5-cache/sys-apps/bar-1.11.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare
 DEPEND=doc? ( >=app-doc/doxygen-1.3.5 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Console Progress Bar
-EAPI=4
+EAPI=6
 HOMEPAGE=http://clpbar.sourceforge.net/
 IUSE=doc
 KEYWORDS=amd64 ~arm x86
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/clpbar/bar_1.11.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=580c05b20f67802cdd95924b446bbcf2
+_md5_=3b6e823a54eb6343ea71a390c28e7a24
diff --git a/metadata/md5-cache/sys-apps/byld-1.0.3 b/metadata/md5-cache/sys-apps/byld-1.0.3
index 1713c229ca17..fbf50f12b493 100644
--- a/metadata/md5-cache/sys-apps/byld-1.0.3
+++ b/metadata/md5-cache/sys-apps/byld-1.0.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=build a Linux distribution on a single floppy
-EAPI=0
+EAPI=6
 HOMEPAGE=http://byld.sourceforge.net/
 KEYWORDS=x86
 LICENSE=GPL-2
@@ -8,4 +8,4 @@ RDEPEND=sys-apps/util-linux
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/byld/byld-1_0_3.tgz
-_md5_=05856d6a27f25e5cd04bd555cfe4bb2d
+_md5_=3b0af7f3b1d5d25bf3fe5f5cbb17e491
diff --git a/metadata/md5-cache/sys-apps/ccs-tools-1.8.3_p20130214 b/metadata/md5-cache/sys-apps/ccs-tools-1.8.3_p20130214
index fd2c420784ec..7a1700afa060 100644
--- a/metadata/md5-cache/sys-apps/ccs-tools-1.8.3_p20130214
+++ b/metadata/md5-cache/sys-apps/ccs-tools-1.8.3_p20130214
@@ -1,13 +1,13 @@
-DEFINED_PHASES=config install postinst prepare test
-DEPEND=sys-libs/ncurses sys-libs/readline
+DEFINED_PHASES=config configure postinst prepare test
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig
 DESCRIPTION=TOMOYO Linux tools
-EAPI=3
+EAPI=6
 HOMEPAGE=http://tomoyo.sourceforge.jp/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sys-libs/readline sys-apps/which
+RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= sys-apps/which
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/tomoyo/49693/ccs-tools-1.8.3-20130214.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a0db7ae31ef8b0105eb0e7a0b21e143a
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=82af2504b445eacee4da1cc2f0f89aa3
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.22 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.22
index 1aa9b756973b..33a1c9cc46a8 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.22
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.22
@@ -4,11 +4,11 @@ DESCRIPTION=PC/SC Architecture smartcard middleware library
 EAPI=6
 HOMEPAGE=https://pcsclite.alioth.debian.org/
 IUSE=python libusb policykit selinux +udev python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD ISC MIT GPL-3+ GPL-2
 RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-auth/polkit-0.111 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) !<app-crypt/ccid-1.4.1-r1 !<sys-apps/baselayout-2 !<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-pcscd )
 REQUIRED_USE=^^ ( udev libusb ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://alioth.debian.org/download.php/file/4225/pcsc-lite-1.8.22.tar.bz2
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=8109280e0f25cfd8e253607eefeddf2a
+_md5_=72850e77e3ccd18541bdad36c08a8aea
diff --git a/metadata/md5-cache/sys-apps/superiotool-6637 b/metadata/md5-cache/sys-apps/superiotool-6637
index 410c1a7d1933..e73a95475445 100644
--- a/metadata/md5-cache/sys-apps/superiotool-6637
+++ b/metadata/md5-cache/sys-apps/superiotool-6637
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile prepare
 DEPEND=pci? ( sys-apps/pciutils ) app-arch/xz-utils
 DESCRIPTION=util to detect Super I/O chips and functionality
-EAPI=4
+EAPI=6
 HOMEPAGE=http://www.coreboot.org/Superiotool
 IUSE=pci
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=pci? ( sys-apps/pciutils )
 SLOT=0
 SRC_URI=mirror://gentoo/superiotool-6637.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e4d88716e4bbd576ef02933c968cf526
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=148b8383db1aba2913e6b24a6183e3fa
diff --git a/metadata/md5-cache/sys-apps/superiotool-99999999 b/metadata/md5-cache/sys-apps/superiotool-99999999
index 80e54e3a3da9..9b0058128c17 100644
--- a/metadata/md5-cache/sys-apps/superiotool-99999999
+++ b/metadata/md5-cache/sys-apps/superiotool-99999999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install preinst prepare unpack
+DEFINED_PHASES=compile preinst prepare unpack
 DEPEND=pci? ( sys-apps/pciutils ) app-arch/xz-utils || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=util to detect Super I/O chips and functionality
-EAPI=4
+EAPI=6
 HOMEPAGE=http://www.coreboot.org/Superiotool
 IUSE=pci
 LICENSE=GPL-2
 RDEPEND=pci? ( sys-apps/pciutils )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e4d88716e4bbd576ef02933c968cf526
+_md5_=148b8383db1aba2913e6b24a6183e3fa
diff --git a/metadata/md5-cache/sys-apps/syscriptor-1.5.15 b/metadata/md5-cache/sys-apps/syscriptor-1.5.15
index 05a0c3661455..822f2e4e5d71 100644
--- a/metadata/md5-cache/sys-apps/syscriptor-1.5.15
+++ b/metadata/md5-cache/sys-apps/syscriptor-1.5.15
@@ -1,9 +1,9 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=-
 DESCRIPTION=display misc information about your hardware
-EAPI=0
+EAPI=6
 HOMEPAGE=http://syscriptor.sourceforge.net/
 KEYWORDS=~alpha amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/syscriptor/syscriptor-1.5.15.tar.bz2
-_md5_=e705d27c932ace009bc84297926d027c
+_md5_=af770b8c389c314d96b65c06d1c38a71
diff --git a/metadata/md5-cache/sys-apps/ultracopier-0.2.0.16 b/metadata/md5-cache/sys-apps/ultracopier-0.2.0.16
index 450d443eb70a..59bbebe522e2 100644
--- a/metadata/md5-cache/sys-apps/ultracopier-0.2.0.16
+++ b/metadata/md5-cache/sys-apps/ultracopier-0.2.0.16
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile configure install prepare unpack
+DEFINED_PHASES=configure install prepare
 DEPEND=dev-qt/qtgui:4
 DESCRIPTION=Advanced file copying tool
-EAPI=2
+EAPI=6
 HOMEPAGE=http://ultracopier.first-world.info/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtgui:4
 SLOT=0
 SRC_URI=http://files.first-world.info/ultracopier/0.2.0.16/ultracopier-src-0.2.0.16.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=dc0062e64480fbe6c9921dc0c922664e
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=88aeacb7099d064bde9ec3e41e5107de
diff --git a/metadata/md5-cache/sys-apps/utempter-0.5.5.6 b/metadata/md5-cache/sys-apps/utempter-0.5.5.6
index 73419bf36673..b44e512564f5 100644
--- a/metadata/md5-cache/sys-apps/utempter-0.5.5.6
+++ b/metadata/md5-cache/sys-apps/utempter-0.5.5.6
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install postinst setup unpack
+DEFINED_PHASES=configure install postinst setup unpack
 DEPEND=>=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=App that allows non-privileged apps to write utmp (login) info
-EAPI=0
+EAPI=6
 HOMEPAGE=https://www.redhat.com/
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=|| ( MIT LGPL-2 )
 RDEPEND=!sys-libs/libutempter !dev-python/utmp
 SLOT=0
 SRC_URI=mirror://gentoo/utempter-0.5.5-6.src.rpm
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5958d6505c7a226013319f15df4da3af
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=9c1112423183d31d45f4fe80314038a1
diff --git a/metadata/md5-cache/sys-apps/vbetool-1.1 b/metadata/md5-cache/sys-apps/vbetool-1.1
index bd7ca5205d43..e881b7324463 100644
--- a/metadata/md5-cache/sys-apps/vbetool-1.1
+++ b/metadata/md5-cache/sys-apps/vbetool-1.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure prepare
 DEPEND=sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Run real-mode video BIOS code to alter hw state (i.e. reinitialize video card)
-EAPI=4
+EAPI=6
 HOMEPAGE=http://www.codon.org.uk/~mjg59/vbetool/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1
 SLOT=0
 SRC_URI=http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=86d65688e0ce679237715a5456238fb6
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=ed59c3d771a60b19c3b72d62756cf512
diff --git a/metadata/md5-cache/sys-apps/watchdog-5.15 b/metadata/md5-cache/sys-apps/watchdog-5.15
index 2542395dd89d..939e42f3d139 100644
--- a/metadata/md5-cache/sys-apps/watchdog-5.15
+++ b/metadata/md5-cache/sys-apps/watchdog-5.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install
-DEPEND=nfs? ( net-libs/libtirpc ) virtual/pkgconfig
+DEPEND=nfs? ( net-libs/libtirpc ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=A software watchdog and /dev/watchdog daemon
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/watchdog/
@@ -10,4 +10,4 @@ RDEPEND=nfs? ( net-libs/libtirpc )
 SLOT=0
 SRC_URI=mirror://sourceforge/watchdog/watchdog-5.15.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d53601ea151cedb7be370f17be9d6201
+_md5_=111cb4c6c548607b38c71825e1c68bc3
diff --git a/metadata/md5-cache/sys-apps/which-2.21 b/metadata/md5-cache/sys-apps/which-2.21
index d2bfe59fc37c..e794840d8d5b 100644
--- a/metadata/md5-cache/sys-apps/which-2.21
+++ b/metadata/md5-cache/sys-apps/which-2.21
@@ -1,10 +1,10 @@
-DEFINED_PHASES=configure prepare
+DEFINED_PHASES=configure
 DESCRIPTION=Prints out location of specified executables that are in your path
-EAPI=4
+EAPI=6
 HOMEPAGE=https://carlowood.github.io/which/
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://carlowood.github.io/which/which-2.21.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=cd62cfa55a53d838389e1b5df3b9352b
+_md5_=ffc1ac7bd8b910b18046bec79b394fef
diff --git a/metadata/md5-cache/sys-apps/x86info-1.30 b/metadata/md5-cache/sys-apps/x86info-1.30
index 9f4dfc1e3b70..c99b7d96f1d1 100644
--- a/metadata/md5-cache/sys-apps/x86info-1.30
+++ b/metadata/md5-cache/sys-apps/x86info-1.30
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=sys-apps/pciutils
+DEFINED_PHASES=compile configure install preinst setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) sys-apps/pciutils:=
 DESCRIPTION=Dave Jones' handy, informative x86 CPU diagnostic utility
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.codemonkey.org.uk/projects/x86info/
 KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils
+RDEPEND=sys-apps/pciutils:=
 SLOT=0
 SRC_URI=http://www.codemonkey.org.uk/projects/x86info/x86info-1.30.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b5c41fc546aa8611e94ed9228eec8dd9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3a809e09ecb57a4ecf8b7599447e2a36
diff --git a/metadata/md5-cache/sys-apps/xmbmon-2.0.5-r1 b/metadata/md5-cache/sys-apps/xmbmon-2.0.5-r1
index 2039deb07f1b..6f0164a346ec 100644
--- a/metadata/md5-cache/sys-apps/xmbmon-2.0.5-r1
+++ b/metadata/md5-cache/sys-apps/xmbmon-2.0.5-r1
@@ -1,13 +1,12 @@
-DEFINED_PHASES=compile install postinst unpack
+DEFINED_PHASES=compile install postinst prepare
 DEPEND=X? ( x11-libs/libXt x11-libs/libSM x11-libs/libX11 x11-libs/libICE )
 DESCRIPTION=Mother Board Monitor Program for X Window System
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html
 IUSE=X
 KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=X? ( x11-libs/libXt x11-libs/libSM x11-libs/libX11 x11-libs/libICE )
 SLOT=0
-SRC_URI=http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/xmbmon205.tar.gz http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/xmbmon205_fflush.patch
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e760a6c34524398c8935b3f5bd8451a3
+SRC_URI=http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/xmbmon205.tar.gz
+_md5_=ebce6dbbce4b45f1f8872d7114d39ca4
diff --git a/metadata/md5-cache/sys-apps/zorroutils-0.04 b/metadata/md5-cache/sys-apps/zorroutils-0.04
index f1d519722d7f..7e6a2b55beb2 100644
--- a/metadata/md5-cache/sys-apps/zorroutils-0.04
+++ b/metadata/md5-cache/sys-apps/zorroutils-0.04
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=configure install
 DESCRIPTION=Zorro bus utility for Amigas running 2.1 and later kernels
-EAPI=0
+EAPI=6
 HOMEPAGE=http://users.telenet.be/geertu/Download/#zorro
 KEYWORDS=m68k ~ppc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://users.telenet.be/geertu/Download/zorroutils-0.04.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1d65cf2d7b8123393a338d44307390f8
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=4959fa42c79b8ba6c7eb4d6852ad4812
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index cfe9e9d1f15f..97924ce90847 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/pambase-20150213-r1 b/metadata/md5-cache/sys-auth/pambase-20150213-r1
index 45540f22c57f..5286573a93ba 100644
--- a/metadata/md5-cache/sys-auth/pambase-20150213-r1
+++ b/metadata/md5-cache/sys-auth/pambase-20150213-r1
@@ -4,10 +4,10 @@ DESCRIPTION=PAM base configuration files
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:PAM
 IUSE=consolekit cracklib debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-libs/pam-1.1.3 ( sys-auth/openpam || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) ) ) consolekit? ( sys-auth/consolekit[pam] ) cracklib? ( sys-libs/pam[cracklib] ) elogind? ( sys-auth/elogind[pam] ) gnome-keyring? ( gnome-base/gnome-keyring[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( || ( >=sys-libs/pam-1.1.3 sys-auth/openpam ) sys-auth/pam_krb5 ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( sys-auth/pam_passwdqc ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.1.3 ) systemd? ( sys-apps/systemd[pam] )
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~vapier/dist/pambase-20150213.tar.xz
-_md5_=49a9fc8ac083e4549a4a74d63032e2c8
+_md5_=368a03e83e72f547e0e74d0bc2df7795
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 6c5662912637..707c8d6aeba5 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/clang-5.0.1_rc2 b/metadata/md5-cache/sys-devel/clang-5.0.1_rc2
new file mode 100644
index 000000000000..89a4125bfc37
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-5.0.1_rc2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-5.0.1_rc2:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=C language family frontend for LLVM
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=debug default-compiler-rt default-libcxx +doc +static-analyzer test xml z3 kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
+LICENSE=UoI-NCSA
+PDEPEND=~sys-devel/clang-runtime-5.0.1_rc2 default-compiler-rt? ( =sys-libs/compiler-rt-5.0.1* ) default-libcxx? ( sys-libs/libcxx )
+RDEPEND=~sys-devel/llvm-5.0.1_rc2:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
+SLOT=5
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/cfe-5.0.1rc2.src.tar.xz http://prereleases.llvm.org/5.0.1/rc2/clang-tools-extra-5.0.1rc2.src.tar.xz test? ( http://prereleases.llvm.org/5.0.1/rc2/llvm-5.0.1rc2.src.tar.xz )
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=99aed9439f2b354a6d3ddfada9404464
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-5.0.1_rc2 b/metadata/md5-cache/sys-devel/clang-runtime-5.0.1_rc2
new file mode 100644
index 000000000000..4a4a43eae9d5
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-5.0.1_rc2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=6
+HOMEPAGE=https://clang.llvm.org/
+IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=metapackage
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-5.0.1_rc2:5.0.1 sanitize? ( ~sys-libs/compiler-rt-sanitizers-5.0.1_rc2:5.0.1 ) ) libcxx? ( >=sys-libs/libcxx-5.0.1_rc2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-5.0.1_rc2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sanitize? ( compiler-rt )
+SLOT=5.0.1
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=b231e657a2fc5fd85b7560f52ff5de5d
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0 b/metadata/md5-cache/sys-devel/gcc-6.4.0
index 74c4e11cc297..46cab19f04bc 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=regression-test vanilla altivec debug doc gcj awt hardened multilib objc pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv jit mpx +pie +ssp +pch +nls +nptl +cxx +fortran +openmp +sanitize
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/isl-0.14 )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	9147783f01244fc11a8b772e26e70ef3	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e496b1bcd029c72b439fbdf2a6117471
+_md5_=c01dc70788109e92bdaec7c9f456cd10
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.9.0 b/metadata/md5-cache/sys-devel/gcc-config-1.9.0-r1
similarity index 95%
rename from metadata/md5-cache/sys-devel/gcc-config-1.9.0
rename to metadata/md5-cache/sys-devel/gcc-config-1.9.0-r1
index eab1836d1500..3380aaea8623 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-1.9.0
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.9.0-r1
@@ -8,4 +8,4 @@ RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 SRC_URI=mirror://gentoo/gcc-config-1.9.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/gcc-config-1.9.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=910e1cc893304d7b15dcf3f966052eba
+_md5_=af7a18fc175993f4adc960b058e96a1f
diff --git a/metadata/md5-cache/sys-devel/lld-5.0.1_rc2 b/metadata/md5-cache/sys-devel/lld-5.0.1_rc2
new file mode 100644
index 000000000000..5bf0db6f0080
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-5.0.1_rc2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-5.0.1_rc2 test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-5.0.1_rc2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=test
+LICENSE=UoI-NCSA
+RDEPEND=~sys-devel/llvm-5.0.1_rc2
+SLOT=0
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/lld-5.0.1rc2.src.tar.xz test? ( http://prereleases.llvm.org/5.0.1/rc2/llvm-5.0.1rc2.src.tar.xz )
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5c9bc8d3c7e4a14ed067bc6458f21802
diff --git a/metadata/md5-cache/sys-devel/llvm-4.0.1 b/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
similarity index 98%
rename from metadata/md5-cache/sys-devel/llvm-4.0.1
rename to metadata/md5-cache/sys-devel/llvm-4.0.1-r1
index 9407c7740d05..27b956278c32 100644
--- a/metadata/md5-cache/sys-devel/llvm-4.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 SLOT=4
 SRC_URI=https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-4.0.1.tar.bz2 )
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=fb8a72137c7307483b6d34e428e78869
+_md5_=3221626dbf3a4feef4690b9c1a28c207
diff --git a/metadata/md5-cache/sys-devel/llvm-5.0.1_rc2 b/metadata/md5-cache/sys-devel/llvm-5.0.1_rc2
new file mode 100644
index 000000000000..1016e269f55b
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-5.0.1_rc2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( <sys-libs/libcxx-5.0.1.9999 ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=Low Level Virtual Machine
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=debug +doc gold libedit +libffi ncurses test kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
+PDEPEND=sys-devel/llvm-common gold? ( sys-devel/llvmgold )
+RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
+SLOT=5
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/llvm-5.0.1rc2.src.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d1e93e36633e267256364d79f8fb1f48
diff --git a/metadata/md5-cache/sys-devel/llvm-5.0.9999 b/metadata/md5-cache/sys-devel/llvm-5.0.9999
index fc551a02d75b..2d219191bd5a 100644
--- a/metadata/md5-cache/sys-devel/llvm-5.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-5.0.9999
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( d
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=5
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=bd329deb9a680439c3f170a75df21d5c
+_md5_=853009f23e42380d871149fee9e1dab8
diff --git a/metadata/md5-cache/sys-devel/llvm-common-5.0.1_rc2 b/metadata/md5-cache/sys-devel/llvm-common-5.0.1_rc2
new file mode 100644
index 000000000000..90e8e89176a5
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-5.0.1_rc2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=6
+HOMEPAGE=https://llvm.org/
+LICENSE=UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/llvm-5.0.1rc2.src.tar.xz
+_md5_=4dcff706e108b1edc0036f6d8ff476db
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index c8e1557064d5..1f17bced1b90 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.14 b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.14
new file mode 100644
index 000000000000..13a4159dbbaa
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.13.14
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.13_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.13-17.base.tar.xz mirror://gentoo/genpatches-4.13-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-17.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fc67655101b341aab0142e9514223f6f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.15 b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.15
new file mode 100644
index 000000000000..dd837a025d30
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.15
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.13.15
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.13_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.13-18.base.tar.xz mirror://gentoo/genpatches-4.13-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-18.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ab32fa1763c954cb8fa427727a83ff5f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.16 b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.16
new file mode 100644
index 000000000000..dfbabadaf587
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.16
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.13.16
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.13_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.13-19.base.tar.xz mirror://gentoo/genpatches-4.13-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-19.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=eca73530fdeb0b25308b9c7b7c851e0a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.1
new file mode 100644
index 000000000000..4e330fc0c447
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.14.1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-2.base.tar.xz mirror://gentoo/genpatches-4.14-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-2.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0d94a12594ece078934dc5e82be05813
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.2 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.2
new file mode 100644
index 000000000000..e03303a419ec
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.14.2
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-3.base.tar.xz mirror://gentoo/genpatches-4.14-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-3.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=08e672a72f1c43b63b1c9958fbee86e3
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.3 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.3
new file mode 100644
index 000000000000..52a750f0814f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.14.3
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-4.base.tar.xz mirror://gentoo/genpatches-4.14-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-4.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=98dbaed2bbe514d15f5a72678124e305
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.100 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.100
new file mode 100644
index 000000000000..ad2c4ec22c8c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.100
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.100
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-104.base.tar.xz mirror://gentoo/genpatches-4.4-104.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-104.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0de05f3854e953b8a1453e3d5f120803
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.102 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.102
new file mode 100644
index 000000000000..76e7da647785
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.102
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.102
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-105.base.tar.xz mirror://gentoo/genpatches-4.4-105.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-105.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=40df1e924202d7ce954ceb41036bc912
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.103 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.103
new file mode 100644
index 000000000000..3ea090499739
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.103
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.103
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-106.base.tar.xz mirror://gentoo/genpatches-4.4-106.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-106.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=cf1a7c79d1132650a4e09305448bf079
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.99 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.99
new file mode 100644
index 000000000000..f73208648f5c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.99
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.99
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-103.base.tar.xz mirror://gentoo/genpatches-4.4-103.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-103.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0514612f28cfb82989c8e3a8a617ebb4
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.63 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.63
new file mode 100644
index 000000000000..d448828f1d18
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.63
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.63
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-65.base.tar.xz mirror://gentoo/genpatches-4.9-65.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-65.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3a14818b85ae08935cbd1c5cea8aa7a7
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.64 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.64
new file mode 100644
index 000000000000..18da812cd062
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.64
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.64
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-66.base.tar.xz mirror://gentoo/genpatches-4.9-66.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-66.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=9461551c2e515d487230f45cf9b574a9
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.65 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.65
new file mode 100644
index 000000000000..79a2bd5fc21a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.65
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.65
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-67.base.tar.xz mirror://gentoo/genpatches-4.9-67.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-67.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=86a4c05c926792989c4b557a52999d73
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.66 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.66
new file mode 100644
index 000000000000..5f7a5254395e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.66
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.66
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171120.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-68.base.tar.xz mirror://gentoo/genpatches-4.9-68.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-68.experimental.tar.xz ) )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=bc292603d0125e4514d33562e41e520b
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index a2a5f0a99391..e1112663238d 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-5.0.1_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-5.0.1_rc2
new file mode 100644
index 000000000000..941084937a1f
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-5.0.1_rc2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=sys-devel/llvm-4 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-5.0.1_rc2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-5.0.1*:5 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test
+LICENSE=|| ( UoI-NCSA MIT )
+SLOT=5.0.1
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/compiler-rt-5.0.1rc2.src.tar.xz
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5244791e14914dbec8a8da8689ba503d
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.1_rc2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.1_rc2
new file mode 100644
index 000000000000..46b7666aadba
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.1_rc2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-4 test? ( app-portage/unsandbox || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-5.0.1_rc2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-5.0.1*:5 sys-libs/compiler-rt:5.0.1 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=test
+LICENSE=|| ( UoI-NCSA MIT )
+SLOT=5.0.1
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/compiler-rt-5.0.1rc2.src.tar.xz test? ( http://prereleases.llvm.org/5.0.1/rc2/llvm-5.0.1rc2.src.tar.xz )
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=ccd0372e2c7380dd3ea77963b8939c31
diff --git a/metadata/md5-cache/sys-libs/glibc-2.26-r3 b/metadata/md5-cache/sys-libs/glibc-2.26-r3
index 5345c85183d4..e6f8a9e56cc6 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.26-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.26-r3
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.26.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.26-patches-4.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	toolchain-glibc	f5c5d253dc6b28e3711b690fb3486f57	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8655856efc0d1807b632f83c89f9348d
+_md5_=9f495a63478374e4395a6c278c7d59ad
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 72c5c984f4f5..56597d6a9b8d 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/glibc-9999-patches-3.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	toolchain-glibc	f5c5d253dc6b28e3711b690fb3486f57	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6b01a4b0fc010711ea809ed7a539c4f2
+_md5_=aadd08f48e9acd9cdfeece5e9f81eea1
diff --git a/metadata/md5-cache/sys-libs/libcxx-5.0.1_rc2 b/metadata/md5-cache/sys-libs/libcxx-5.0.1_rc2
new file mode 100644
index 000000000000..37153b01c717
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-5.0.1_rc2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-5.0.1_rc2[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) ) test? ( >=sys-devel/clang-3.9.0 || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) app-arch/xz-utils >=sys-devel/llvm-4 dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=6
+HOMEPAGE=https://libcxx.llvm.org/
+IUSE=elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=|| ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-5.0.1_rc2[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )
+REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
+SLOT=0
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/libcxx-5.0.1rc2.src.tar.xz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e758218df9e0b9de1fc3f0057b7cf10f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-5.0.1_rc2 b/metadata/md5-cache/sys-libs/libcxxabi-5.0.1_rc2
new file mode 100644
index 000000000000..9eec4c14b4eb
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-5.0.1_rc2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-4 test? ( >=sys-devel/clang-3.9.0 ~sys-libs/libcxx-5.0.1_rc2[libcxxabi(-)] || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=6
+HOMEPAGE=https://libcxxabi.llvm.org/
+IUSE=+libunwind +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=|| ( UoI-NCSA MIT )
+RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+SLOT=0
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/libcxxabi-5.0.1rc2.src.tar.xz http://prereleases.llvm.org/5.0.1/rc2/libcxx-5.0.1rc2.src.tar.xz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=df6f2aadc51473fab474bfd76ecec9b2
diff --git a/metadata/md5-cache/sys-libs/libomp-5.0.1_rc2 b/metadata/md5-cache/sys-libs/libomp-5.0.1_rc2
new file mode 100644
index 000000000000..f3c9cb7fffd4
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-5.0.1_rc2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-devel/llvm >=sys-devel/clang-3.9.0 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=6
+HOMEPAGE=https://openmp.llvm.org
+IUSE=hwloc ompt test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=|| ( UoI-NCSA MIT ) MIT LLVM-Grant
+RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/openmp-5.0.1rc2.src.tar.xz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=cf1cfd49f04c9d31c2a07f3b64189429
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.1_rc2 b/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.1_rc2
new file mode 100644
index 000000000000..d83fdeed1661
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-5.0.1_rc2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=sys-devel/llvm-4 dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=6
+HOMEPAGE=https://github.com/llvm-mirror/libunwind
+IUSE=debug +static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=|| ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+SLOT=0
+SRC_URI=http://prereleases.llvm.org/5.0.1/rc2/libunwind-5.0.1rc2.src.tar.xz
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b61d79e372c4bd76a0bc8f0f334ed206
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index e1ee52582e64..af9aab1e2da5 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-62.0.3202.94 b/metadata/md5-cache/www-client/chromium-62.0.3202.94
index e496418c4375..a91c5c0fda14 100644
--- a/metadata/md5-cache/www-client/chromium-62.0.3202.94
+++ b/metadata/md5-cache/www-client/chromium-62.0.3202.94
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59 <dev-libs/icu-60:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=6
 HOMEPAGE=http://chromium.org/
 IUSE=component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59 <dev-libs/icu-60:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.4.2:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-62.0.3202.94.tar.xz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b090bc50c2e7609e00fa28a6f5de6fca
+_md5_=8940e8751f0fe8334f6ecb8d91f6a554
diff --git a/metadata/md5-cache/www-client/chromium-63.0.3239.52 b/metadata/md5-cache/www-client/chromium-63.0.3239.52
deleted file mode 100644
index e0b809efa42c..000000000000
--- a/metadata/md5-cache/www-client/chromium-63.0.3239.52
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=6
-HOMEPAGE=http://chromium.org/
-IUSE=component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-63.0.3239.52.tar.xz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9afd5dc45fb130437bd57a10c4bc129a
diff --git a/metadata/md5-cache/www-client/chromium-63.0.3239.70 b/metadata/md5-cache/www-client/chromium-63.0.3239.70
new file mode 100644
index 000000000000..d00998261d1f
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-63.0.3239.70
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59 <dev-libs/icu-60:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=6
+HOMEPAGE=http://chromium.org/
+IUSE=component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59 <dev-libs/icu-60:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-63.0.3239.70.tar.xz
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=607a7b7cf1d7ac687f7803292f623e2a
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index ca30ad25595e..39066993068d 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.10-r2 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.10-r2
index 6fa776606c79..5054abc2d4eb 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.10-r2
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.10-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Image loading library for GTK+
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
 IUSE=X debug +introspection jpeg jpeg2k tiff test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.10.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=784b2b627e2338113bdf1babe82eaa5b
+_md5_=d79f22a5afb1f9695e9173bbea0554a6
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.82 b/metadata/md5-cache/x11-libs/libdrm-2.4.82
index c09f5058c7d6..af83f76cfd29 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.82
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.82
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org libdrm library
 EAPI=5
 HOMEPAGE=https://dri.freedesktop.org/
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.82.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=6b5379dbf5285ab742aec29dd48caf86
+_md5_=9855c44146728b9f98f208baa5b43cbd
diff --git a/metadata/md5-cache/x11-libs/libgksu-2.0.12-r3 b/metadata/md5-cache/x11-libs/libgksu-2.0.12-r3
index 2083fc36fd27..8c53d8648466 100644
--- a/metadata/md5-cache/x11-libs/libgksu-2.0.12-r3
+++ b/metadata/md5-cache/x11-libs/libgksu-2.0.12-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A library for integration of su into applications
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/gksu/
 IUSE=nls static-libs
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 x11-libs/libX11 >=gnome-base/gconf-2 gnome-base/libgnome-keyring x11-libs/startup-notification >=gnome-base/libgtop-2:2= nls? ( >=sys-devel/gettext-0.14.1 ) app-admin/sudo
 SLOT=2
 SRC_URI=https://people.debian.org/~kov/gksu/libgksu-2.0.12.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9a88aa8f92777ae0f6553e5a9b7492c5
+_md5_=8554c91ef9a38d838fe919f41925a129
diff --git a/metadata/md5-cache/x11-libs/pango-1.40.12 b/metadata/md5-cache/x11-libs/pango-1.40.12
index 0c61e3fe691b..d7f7a7eac1ad 100644
--- a/metadata/md5-cache/x11-libs/pango-1.40.12
+++ b/metadata/md5-cache/x11-libs/pango-1.40.12
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized text layout and rendering library
 EAPI=6
 HOMEPAGE=http://www.pango.org/
 IUSE=X +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.40/pango-1.40.12.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c29c4f738b6604dd5dadde8a6469f8f
+_md5_=b674019e29c511dca38dc0b32560d74c
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 5eb16e483bf1..e495a34edf3a 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/eterm-0.9.6 b/metadata/md5-cache/x11-terms/eterm-0.9.6
deleted file mode 100644
index 9d165322d691..000000000000
--- a/metadata/md5-cache/x11-terms/eterm-0.9.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A vt102 terminal emulator for X
-EAPI=3
-HOMEPAGE=http://www.eterm.org/
-IUSE=escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen )
-SLOT=0
-SRC_URI=http://www.eterm.org/download/Eterm-0.9.6.tar.gz !minimal? ( http://www.eterm.org/download/Eterm-bg-0.9.6.tar.gz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=34c6ec8e556115278bb7323be190328f
diff --git a/metadata/md5-cache/x11-terms/eterm-0.9.6-r1 b/metadata/md5-cache/x11-terms/eterm-0.9.6-r1
new file mode 100644
index 000000000000..62e6b9822f7a
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/eterm-0.9.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install unpack
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto x11-libs/libast media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen )
+DESCRIPTION=A vt102 terminal emulator for X
+EAPI=6
+HOMEPAGE=http://www.eterm.org/
+IUSE=escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto x11-libs/libast media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen )
+SLOT=0
+SRC_URI=http://www.eterm.org/download/Eterm-0.9.6.tar.gz !minimal? ( http://www.eterm.org/download/Eterm-bg-0.9.6.tar.gz )
+_md5_=bd18e12df5880bb8d6655c7b8d458323
diff --git a/metadata/md5-cache/x11-terms/eterm-9999 b/metadata/md5-cache/x11-terms/eterm-9999
index ef95f0c23f6e..e3c7b0f6be09 100644
--- a/metadata/md5-cache/x11-terms/eterm-9999
+++ b/metadata/md5-cache/x11-terms/eterm-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto x11-libs/libast media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A vt102 terminal emulator for X
 EAPI=6
 HOMEPAGE=http://www.eterm.org/
 IUSE=escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter
 LICENSE=BSD
-RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen )
+RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto x11-libs/libast media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=182e65d16c93a5b41c64fb16eb58038e
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=52fbab9254e49f7384f3358b6253d57a
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index d5a1cf272e79..99d00053385f 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/chameleon-xcursors-0.5 b/metadata/md5-cache/x11-themes/chameleon-xcursors-0.5
deleted file mode 100644
index 399da56af2ec..000000000000
--- a/metadata/md5-cache/x11-themes/chameleon-xcursors-0.5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Style neutral scalable cursor theme
-EAPI=3
-HOMEPAGE=http://www.egregorion.net/2007/03/26/chameleon/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.egregorion.net/works/Chameleon-Anthracite-0.5.tar.bz2 http://www.egregorion.net/works/Chameleon-DarkSkyBlue-0.5.tar.bz2 http://www.egregorion.net/works/Chameleon-SkyBlue-0.5.tar.bz2 http://www.egregorion.net/works/Chameleon-Pearl-0.5.tar.bz2 http://www.egregorion.net/works/Chameleon-White-0.5.tar.bz2
-_md5_=9f761ee40e5acb294d70fb079d4ab8f8
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b8411eb0f8ac..3e16c26a90de 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Dec 2017 22:38:35 +0000
+Sat, 02 Dec 2017 17:38:37 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 548fe93ad6f4..8841cd3e9ac8 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Dec  1 22:38:34 UTC 2017
+Sat Dec  2 17:38:36 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f904477505c6..4c203723b657 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Dec 2017 23:00:01 +0000
+Sat, 02 Dec 2017 18:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 305cf20c6e62..4d53618fbb1a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-4c7b15f75b4a3de56b77492e10d4fb87c8d10582 1512167291 2017-12-01T22:28:11+00:00
+bb8c1d30722867d3514994c99dddcfadf9a0f0d3 1512235933 2017-12-02T17:32:13+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4aa73cc20173..d37523788e76 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1512167701 Fri 01 Dec 2017 10:35:01 PM UTC
+1512236101 Sat 02 Dec 2017 05:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 545ebe78bf7f..aff0ab3e8d78 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Dec 2017 22:38:34 +0000
+Sat, 02 Dec 2017 17:38:36 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8efc8866343e..eacb4af4a9a5 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/dhcp_probe/Manifest b/net-analyzer/dhcp_probe/Manifest
index bc495b2bcd6b..daa2b61e7d68 100644
--- a/net-analyzer/dhcp_probe/Manifest
+++ b/net-analyzer/dhcp_probe/Manifest
@@ -1 +1 @@
-DIST dhcp_probe-1.3.0.tar.gz 211613 SHA256 227cd6a82a7fa4d989994cb076f18092bc2c82592ceaeb31c4fdd09294b9265f SHA512 d643012529ee5149adbc0c1f19f8e579c55201e86de2aec9b3313be9412db4e973162f864d1baaf79fa340b7bd9a7385f0f1406d1b616e801ced3c7bb387c854 WHIRLPOOL 86a48b10f4a843b95b1b0ec0a3938d831966c701f5d341902595fb0d0b6fede2d9d5ba03a3e3ebaab6a311a6536df02ace1f36613a177392302b6e523a5e98f6
+DIST dhcp_probe-1.3.0.tar.gz 211613 BLAKE2B cbcc43b292fe537216ef40de9e417c1f700be4ad5f34feacd9475eb31866b68957ce66c5abc47db3b7e5a0dc8751ca6e54200b79ab2f1f8c3f308f6c1c7aef4d SHA512 d643012529ee5149adbc0c1f19f8e579c55201e86de2aec9b3313be9412db4e973162f864d1baaf79fa340b7bd9a7385f0f1406d1b616e801ced3c7bb387c854
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild
new file mode 100644
index 000000000000..9f05421d375a
--- /dev/null
+++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="discover DHCP and BootP servers on a directly-attached Ethernet network"
+HOMEPAGE="http://www.net.princeton.edu/software/dhcp_probe/"
+SRC_URI="http://www.net.princeton.edu/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="
+	net-libs/libpcap
+	>=net-libs/libnet-1.1.2.1-r2
+"
+RDEPEND="${DEPEND}"
+DOCS=(
+	"${FILESDIR}"/${PN}_mail
+	AUTHORS
+	ChangeLog
+	NEWS
+	README
+	TODO
+	extras/dhcp_probe.cf.sample
+)
+PATCHES=(
+	"${FILESDIR}"/${PV}/01_dhcp_probe.5.patch
+	"${FILESDIR}"/${PV}/02_dhcp_probe.8.patch
+	"${FILESDIR}"/${PV}/03_implicit_point_conv_bootp.c.patch
+	"${FILESDIR}"/${PV}/04_linux_32_or_64bits.patch
+	"${FILESDIR}"/${PV}/05-cleanup.patch
+	"${FILESDIR}"/${PV}/06-return.patch
+	"${FILESDIR}"/${PV}/07-comment.patch
+	"${FILESDIR}"/${PV}/08-man8.patch
+)
+
+src_configure() {
+	use amd64 && append-flags -D__ARCH__=64
+	STRIP=true econf
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
diff --git a/net-analyzer/tsung/Manifest b/net-analyzer/tsung/Manifest
index fdf769f42fac..eb155b1870f9 100644
--- a/net-analyzer/tsung/Manifest
+++ b/net-analyzer/tsung/Manifest
@@ -1,2 +1 @@
-DIST tsung-1.6.0.tar.gz 1585794 SHA256 56846c3a90fd7037d9a76330cb8f3052238344491e2fe6ef1ebdb0b620eb3d84 SHA512 c66a84fc9b6781398ed4dee67f076fcddca28c5156782c05d6f5d7ce3e5e2ed6dbdb4076585f45a42aea65237b68aa08c8c80539706202a10cfec4e3ac8170cd WHIRLPOOL 3f083239c6c0950b6420dd7d401d0267f30655f5a3470f136326e6cc35414f779d58eb8e8aeac40eecb279976f5228369e5786e9df2b582e4ed75b45dc9fd35b
 DIST tsung-1.7.0.tar.gz 1572265 SHA256 6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a SHA512 67490a95fb54f5196ae0302190190a6b8e79bbeba9a7c1932d83a949504489d4cc3ce048380c0cb09c6cae4c1e203d52de9ea0e2f4e7c3d7438b836aef532dac WHIRLPOOL f9175aebcff944b13550a11d10cd20cae8a0a1afadf6b40ab30aad6b02894008db0b340ff48f32ef76c0856be9921c4fcf2d877120937d1fe1ab869efe36825c
diff --git a/net-analyzer/tsung/tsung-1.6.0.ebuild b/net-analyzer/tsung/tsung-1.6.0.ebuild
deleted file mode 100644
index 532e451fbaf4..000000000000
--- a/net-analyzer/tsung/tsung-1.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-# Seems to be misconfigured
-RESTRICT="test"
-
-inherit eutils
-
-DESCRIPTION="Erlang's multi-protocol distributed load testing tool"
-HOMEPAGE="http://tsung.erlang-projects.org/"
-SRC_URI="http://tsung.erlang-projects.org/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnuplot"
-
-DEPEND="dev-lang/erlang"
-RDEPEND="
-	gnuplot? (
-		sci-visualization/gnuplot
-		dev-perl/Template-Toolkit
-	)
-	${DEPEND}
-"
-src_configure() {
-	./configure --prefix="/usr" || die "econf failed"
-}
-
-src_compile() {
-	emake || die "Failed building"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "Failed installing"
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 00756bcb3cfe..3674db50a366 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libflowmanager/Manifest b/net-libs/libflowmanager/Manifest
index 8bcd49389a32..4ddcc7916f47 100644
--- a/net-libs/libflowmanager/Manifest
+++ b/net-libs/libflowmanager/Manifest
@@ -1 +1 @@
-DIST libflowmanager-3.0.0.tar.gz 405501 SHA256 0866adfcdc223426ba17d6133a657d94928b4f8e12392533a27387b982178373 SHA512 7f6eebb996c50ffa7f2882e0448c95b88cbef433fbc40928a6d111a86c3006ef80cc71b4cb5e73dbe13753410cd88bfcfd32616a0969e417e5a832684b5f0aca WHIRLPOOL b1774686fc222c44598530f769b9658c8c07a470a0537f4ae7f2a655736651e34a712432496cfe468efec54b8ae484354e55af16bc9020d8428e6c9500c2e249
+DIST libflowmanager-3.0.0.tar.gz 405501 BLAKE2B bccc7b4bd83038e0f4016fcedcf7f8a808cd2e13f02bdb2e012cda5e2eea3a9cdc59df68e53a335a18004adc90f9308ca08be11ecf0f12429466d9671424c6d9 SHA512 7f6eebb996c50ffa7f2882e0448c95b88cbef433fbc40928a6d111a86c3006ef80cc71b4cb5e73dbe13753410cd88bfcfd32616a0969e417e5a832684b5f0aca
diff --git a/net-libs/libflowmanager/files/libflowmanager-3.0.0-stdint_h.patch b/net-libs/libflowmanager/files/libflowmanager-3.0.0-stdint_h.patch
new file mode 100644
index 000000000000..a82d116f5c50
--- /dev/null
+++ b/net-libs/libflowmanager/files/libflowmanager-3.0.0-stdint_h.patch
@@ -0,0 +1,10 @@
+--- a/lib/tcp_reorder.c
++++ b/lib/tcp_reorder.c
+@@ -47,6 +47,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <stdint.h> /* UINT32_MAX */
+ #include <assert.h>
+ #include <stdio.h>
+ #include <libtrace.h>
diff --git a/net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild b/net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild
index 05a50cf545b1..6705dcc8dc91 100644
--- a/net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild
+++ b/net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild
@@ -19,6 +19,9 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-stdint_h.patch
+)
 
 src_configure() {
 	econf $(use_enable static-libs static)
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 9cbc0ae64c3c..fba13d83980f 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -1,3 +1,2 @@
-DIST libnet-1.0.2a.tar.gz 140191 SHA256 7c7f2e8ccb47bb47072c5cd583fea5e90ab892c75889b625346b60d10464459a SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95 WHIRLPOOL 9b3748fe93191643a01cab0ce76283aa11079960efca5daaf52d7a0aa830c3791a200711c9d4b4634739328282bbc4f73b24a15406b4bf5353838ef24c19afcc
-DIST libnet-1.1.6.tar.gz 1202970 SHA256 d392bb5825c4b6b672fc93a0268433c86dc964e1500c279dc6d0711ea6ec467a SHA512 a67e502b0e6957ca590e47cb50b0472dd83d622d84c62818d665d771616df91b5a8fa8fcf1040d13b7860aaabaf338152ef40f66ab97c3fc9502edb08cea0bb6 WHIRLPOOL eb0596d8d6d1b0434ce8d1ec7069826e326effa5ad215e607dc7afc495ae0bdee443f6661deb5b54c8564abd8fa0ccbf4f509726d3caa81767d80f4f5079b379
-DIST libnet-1.2-rc3.tar.gz 676205 SHA256 72c380785ad44183005e654b47cc12485ee0228d7fa6b0a87109ff7614be4a63 SHA512 4f1c5c1a72e2c35ca3add772cb1af63e8245bb5c127e4a74fb9f619f987a4ea047bf17caaa292e9b7fa7642635773b90975d013644be0383dca93d688ca8430d WHIRLPOOL 617b01b3e0ec150b89fd0a5160a84704e82a14c584735d87bca6bf7f0847e461d99e72fe2d632761af229c4379881b0ddf270171071052cd288a2ab54c3d3a02
+DIST libnet-1.0.2a.tar.gz 140191 BLAKE2B 4107cb714b7be901250759ce5288a86922bd7cc20081a9d2c93758150d74c55844db98c43874befdfb593ec25e128d6ae2389eff7c46da79dcbb9681f649e059 SHA512 2e9a73bd767e1f46eea92e18ddd83cc3179144c8cc5b1a22b4dba50fee16173c951be4dd647a247bd7067c33b9e33489a6efb313ce1ea0c61c4a06009c3c4d95
+DIST libnet-1.2-rc3.tar.gz 676205 BLAKE2B f1aa199489e9aacc6b2bf567f5885e3b54b1044fb292693581c8fbc8fb99c565e0a9436b35914bdbda65798b00527049f279da3b3b6048e32f575f51b92c3309 SHA512 4f1c5c1a72e2c35ca3add772cb1af63e8245bb5c127e4a74fb9f619f987a4ea047bf17caaa292e9b7fa7642635773b90975d013644be0383dca93d688ca8430d
diff --git a/net-libs/libnet/files/libnet-1.0.2a-_SOURCE.patch b/net-libs/libnet/files/libnet-1.0.2a-_SOURCE.patch
new file mode 100644
index 000000000000..5c81dbfe9485
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.0.2a-_SOURCE.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -143,7 +143,7 @@
+     AC_DEFINE(_BSD_SOURCE)
+     AC_DEFINE(__BSD_SOURCE)
+     AC_DEFINE(__FAVOR_BSD)
+-    LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
++    LIBNET_CONFIG_DEFINES="-D_DEFAULT_SOURCE -D__FAVOR_BSD"
+     AC_CHECK_HEADERS(net/ethernet.h, \
+         LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
+     MAN_PREFIX="$prefix/man/man3/"
diff --git a/net-libs/libnet/files/1.0.2a-endian.patch b/net-libs/libnet/files/libnet-1.0.2a-endian.patch
similarity index 100%
rename from net-libs/libnet/files/1.0.2a-endian.patch
rename to net-libs/libnet/files/libnet-1.0.2a-endian.patch
diff --git a/net-libs/libnet/files/libnet-1.0.2a-funroll.patch b/net-libs/libnet/files/libnet-1.0.2a-funroll.patch
new file mode 100644
index 000000000000..dd77d05dff2a
--- /dev/null
+++ b/net-libs/libnet/files/libnet-1.0.2a-funroll.patch
@@ -0,0 +1,12 @@
+--- a/configure.in.JeR
++++ b/configure.in
+@@ -51,8 +51,7 @@
+ dnl
+ if test $ac_cv_prog_gcc = yes; then
+ dnl if test -z $CFLAGS; then 
+-    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
+-    CFLAGS="$CCOPTS"
++:
+ dnl fi
+ fi
+ 
diff --git a/net-libs/libnet/files/libnet-gcc33-fix b/net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch
similarity index 73%
rename from net-libs/libnet/files/libnet-gcc33-fix
rename to net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch
index 6f711abc8ebf..c4f3ae925705 100644
--- a/net-libs/libnet/files/libnet-gcc33-fix
+++ b/net-libs/libnet/files/libnet-1.0.2a-gcc33-fix.patch
@@ -1,5 +1,5 @@
---- Libnet-1.0.2a-orig/include/libnet.h	2001-02-07 00:19:25.000000000 +0100
-+++ Libnet-1.0.2a/include/libnet.h	2003-07-24 18:34:33.000000000 +0200
+--- a/include/libnet.h
++++ b/include/libnet.h
 @@ -84,8 +84,8 @@
  #define LIBNET_VERSION  "1.0.2a"
  
diff --git a/net-libs/libnet/files/1.0.2a-slot.patch b/net-libs/libnet/files/libnet-1.0.2a-slot.patch
similarity index 100%
rename from net-libs/libnet/files/1.0.2a-slot.patch
rename to net-libs/libnet/files/libnet-1.0.2a-slot.patch
diff --git a/net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch b/net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch
deleted file mode 100644
index 25ddbc7b1104..000000000000
--- a/net-libs/libnet/files/libnet-1.1.6-_SOURCE.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -157,14 +157,14 @@
- case "$target_os" in
- 
- *linux*)
--    AC_DEFINE(_BSD_SOURCE, 1,
-+    AC_DEFINE(_DEFAULT_SOURCE, 1,
-         [Define as necessary to "unhide" header symbols.])
--    AC_DEFINE(__BSD_SOURCE, 1,
-+    AC_DEFINE(__DEFAULT_SOURCE, 1,
-         [Define as necessary to "unhide" header symbols.])
-     AC_DEFINE(__FAVOR_BSD, 1,
-         [Define if we should favor the BSD APIs when possible in Linux.])
- 
--    LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD"
-+    LIBNET_CONFIG_DEFINES="-D_DEFAULT_SOURCE -D__DEFAULT_SOURCE -D__FAVOR_BSD"
-     AC_CHECK_HEADERS(net/ethernet.h, \
-         LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DHAVE_NET_ETHERNET_H")
-     ;;
diff --git a/net-libs/libnet/libnet-1.0.2a-r5.ebuild b/net-libs/libnet/libnet-1.0.2a-r5.ebuild
index babc5f8db28e..cef3b46b4cf7 100644
--- a/net-libs/libnet/libnet-1.0.2a-r5.ebuild
+++ b/net-libs/libnet/libnet-1.0.2a-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -16,10 +16,10 @@ IUSE=""
 S=${WORKDIR}/Libnet-${PV}
 
 src_prepare() {
-	epatch "${FILESDIR}"/libnet-gcc33-fix \
-		"${FILESDIR}"/${PV}-slot.patch
+	epatch "${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch \
+		"${FILESDIR}"/${PN}-1.0.2a-slot.patch
 
-	use arm && epatch "${FILESDIR}"/${PV}-endian.patch
+	use arm && epatch "${FILESDIR}"/${PN}-1.0.2a-endian.patch
 
 	cd "${S}"
 	mv libnet-config.in libnet-${SLOT}-config.in || die "moving libnet-config"
diff --git a/net-libs/libnet/libnet-1.0.2a-r6.ebuild b/net-libs/libnet/libnet-1.0.2a-r6.ebuild
new file mode 100644
index 000000000000..adba36bff7dc
--- /dev/null
+++ b/net-libs/libnet/libnet-1.0.2a-r6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="library providing an API for commonly used low-level network functions"
+HOMEPAGE="http://www.packetfactory.net/libnet/"
+SRC_URI="http://www.packetfactory.net/libnet/dist/deprecated/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 HPND"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2a-gcc33-fix.patch
+	"${FILESDIR}"/${PN}-1.0.2a-slot.patch
+	"${FILESDIR}"/${PN}-1.0.2a-endian.patch
+	"${FILESDIR}"/${PN}-1.0.2a-_SOURCE.patch
+	"${FILESDIR}"/${PN}-1.0.2a-funroll.patch
+
+)
+S=${WORKDIR}/Libnet-${PV}
+
+src_prepare() {
+	default
+
+	cd "${S}"
+	mv libnet-config.in libnet-${SLOT}-config.in || die "moving libnet-config"
+
+	cd "${S}"/include
+	ln -s libnet.h libnet-${SLOT}.h
+
+	cd libnet
+	for f in *.h ; do
+		ln -s ${f} ${f/-/-${SLOT}-} || die
+	done
+
+	cd "${S}"/doc
+	ln -s libnet.3 libnet-${SLOT}.3 || die
+
+	cd "${S}"
+
+	eautoconf
+
+	tc-export AR RANLIB
+}
+
+src_install() {
+	default
+	doman "${D}"/usr/man/man3/libnet-1.0.3
+	rm -r "${D}"/usr/man
+
+	dodoc VERSION doc/{README,TODO*,CHANGELOG*}
+	newdoc README README.1st
+	docinto example ; dodoc example/libnet*
+	docinto Ancillary ; dodoc doc/Ancillary/*
+}
diff --git a/net-libs/libnet/libnet-1.1.6-r1.ebuild b/net-libs/libnet/libnet-1.1.6-r1.ebuild
deleted file mode 100644
index 8311759829dc..000000000000
--- a/net-libs/libnet/libnet-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="library providing an API for commonly used low-level network functions"
-HOMEPAGE="http://libnet-dev.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}-dev/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 HPND"
-SLOT="1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs"
-
-DEPEND="sys-devel/autoconf"
-
-DOCS=(
-	README doc/{CHANGELOG,CONTRIB,DESIGN_NOTES,MIGRATION}
-	doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO}
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.6-_SOURCE.patch
-	"${FILESDIR}"/${PN}-1.1.6-musl.patch
-	"${FILESDIR}"/${PN}-1.2-sizeof.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure{.in,.ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		dodoc -r doc/html
-
-		docinto sample
-		dodoc sample/*.[ch]
-	fi
-
-	prune_libtool_files
-}
diff --git a/net-libs/libnet/libnet-1.1.6.ebuild b/net-libs/libnet/libnet-1.1.6.ebuild
deleted file mode 100644
index f73669dd3a78..000000000000
--- a/net-libs/libnet/libnet-1.1.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
-HOMEPAGE="http://libnet-dev.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}-dev/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 HPND"
-SLOT="1.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs"
-
-DEPEND="sys-devel/autoconf"
-RDEPEND=""
-
-DOCS=(
-	README doc/{CHANGELOG,CONTRIB,DESIGN_NOTES,MIGRATION}
-	doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO}
-)
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		dohtml -r doc/html/*
-		docinto sample
-		dodoc sample/*.[ch]
-	fi
-
-	if ! use static-libs; then
-		rm "${ED}"/usr/lib*/libnet.la || die
-	fi
-}
diff --git a/net-libs/libnet/libnet-1.2_rc3.ebuild b/net-libs/libnet/libnet-1.2_rc3.ebuild
deleted file mode 100644
index c541794f8e7d..000000000000
--- a/net-libs/libnet/libnet-1.2_rc3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
-HOMEPAGE="http://libnet-dev.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}-dev/${P/_/-}.tar.gz"
-
-LICENSE="BSD BSD-2 HPND"
-SLOT="1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs"
-
-DEPEND="sys-devel/autoconf"
-RDEPEND=""
-
-DOCS=(
-	README doc/{CHANGELOG,CONTRIB,DESIGN_NOTES,MIGRATION}
-	doc/{PACKET_BUILDING,PORTED,RAWSOCKET_NON_SEQUITUR,TODO}
-)
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2-rc.patch
-	eautoreconf
-}
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		dohtml -r doc/html/*
-		docinto sample
-		dodoc sample/*.[ch]
-	fi
-
-	use static-libs || prune_libtool_files
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8f31a746aaca..6b317f13117d 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 3d1ce32d366d..d3ca9ddeb0a9 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,4 +1,4 @@
-DIST chrony-2.3.tar.gz 355113 SHA256 58bffb523012fb0fa87cc0d94d6e36de9689fe9556519cbd0d1ba254af92ccb2 SHA512 2a9cda6c2bc931438b798bd037614196bdb1533d12432467a690d57095c74013c80c92fcaadbd43fd5b0c816872822527a1ade3014add458d669d7813d5fa080 WHIRLPOOL 06864181ac74b2cf13baf7d9098404f8540c26db41035fe38005fbfea8e12f2de179008f5b1a2544e24ebb7e4cca712421746690edb7f36b90416ad87901e920
+DIST chrony-2.3.tar.gz 355113 BLAKE2B 238269a79288186e93bd978bca1fb3258d35cfd72c0a90f888cdb35d0c5c01abbb80002e476478fd0fbc6fd1a080f68e0b6d2d11f13d9a37dff1c1068c13bd13 SHA512 2a9cda6c2bc931438b798bd037614196bdb1533d12432467a690d57095c74013c80c92fcaadbd43fd5b0c816872822527a1ade3014add458d669d7813d5fa080
 DIST chrony-2.4.1.tar.gz 390641 SHA256 0fd59e0ef625b4459e3a9c7f221c52f56596582bce31abfae5f7369702edb6e0 SHA512 7772065103ad95706f80374d88ba452b76cf8e29689abf22b38e7eb5ad2fcc491593e11702400daa8bf908218614df21b08ff15ab2d3d2347876119cd80abc4d WHIRLPOOL ed2c2ac8e11371e009d3e96553bb73e58b410bb38e6123a9e39a3451e5dc6860d981d45e67b4e2dc47b39f616f95146feb35efd15dbaa90932f07837172c440a
 DIST chrony-3.1.tar.gz 424109 SHA256 9d9107dcdb7768a03dc129d33b2a7a25f1eea2f5620bc85eb00cfea07c1b6075 SHA512 4ba3a75c3634050bb63ba9ee80d9be7a295f44ce4d195a050e4be4738bd7dd807fe37f2289d7ead4a75272bd5ebadbd03c233c67f859e9b68871fca5a6671427 WHIRLPOOL d1b499bbcdd74a049c972c183d4b88365db4c6512d8011ca8b87f15c4e0d1bc882bde4f742591f5cfe49e820a5884f6b1960d132d5787be02a36bd57b9e2605f
 DIST chrony-3.2.tar.gz 433882 SHA256 329f6718dd8c3ece3eee78be1f4821cbbeb62608e7d23f25da293cfa433c4116 SHA512 496af5bed91600f268c1a0fa577bb8c7785e485f78598b666829c674e94770c16548cec4289a2ae9d0a51191d2705eda00886cb6cccae3828aa201a49d4783a4 WHIRLPOOL b8a9045c81970653393c2afadece1e3a5e093c893b7ac3bae061bbd40bc043439e426df8da6598e36ef9589b4dd402419199307a9bfa48df526206952814667e
diff --git a/net-misc/chrony/chrony-3.1.ebuild b/net-misc/chrony/chrony-3.1.ebuild
index a69815d84f8a..25f2e711b846 100644
--- a/net-misc/chrony/chrony-3.1.ebuild
+++ b/net-misc/chrony/chrony-3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 arm hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns"
 REQUIRED_USE="
 	?? ( libedit readline )
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 85515d34bde8..1d528d227549 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index 4d111697c26f..c1cf4417bb35 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Michael Palimaka <kensington@gentoo.org> (02 Dec 2017)
+# Depends on dead Qt 4. Dead upstream.
+# Masked for removal in 30 days. Bug #639252.
+dev-vcs/qsvn
+
 # Ulrich Müller <ulm@gentoo.org> (01 Dec 2017)
 # Major breakage (network access in upstream configure), bug #639438.
 dev-db/qt5-sqlcipher
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3267e766ac7a..37f0fb6eb5d8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3653,14 +3653,16 @@ mail-client/evolution:ldap - Enable support for fetching contacts from an LDAP o
 mail-client/evolution:spamassassin - Build mail-filter/spamassassin plugin
 mail-client/evolution:weather - Enable optional weather calendar support
 mail-client/mail-notification:sylpheed - Enable support for MH mailboxes used by mail-client/sylpheed
-mail-client/mutt:gpg - Enable support for app-crypt/gpgme
-mail-client/mutt:hcache - Enable header cache
+mail-client/mutt:berkdb - Enable sys-libs/db database backend for header caching
+mail-client/mutt:gdbm - Enable sys-libs/gdbm database backend for header caching
+mail-client/mutt:gpg - Enable support for app-crypt/gpgme to sign/verify and encrypt/decrypt OpenPGP messages
+mail-client/mutt:hcache - Enable header cache, one database backend needs to be enabled
 mail-client/mutt:lmdb - Enable dev-db/lmdb database backend for header caching
 mail-client/mutt:notmuch - Enable support for net-mail/notmuch
-mail-client/mutt:pop - Enable support for POP3
+mail-client/mutt:pop - Enable support for POP3 mailboxes
 mail-client/mutt:sidebar - Enable the sidebar feature
-mail-client/mutt:smime - Enable support for S/MIME
-mail-client/mutt:smtp - Enable support for smtp
+mail-client/mutt:smime - Enable support for S/MIME mailparts
+mail-client/mutt:smtp - Enable support for direct SMTP delivery
 mail-client/mutt:tokyocabinet - Enable dev-db/tokyocabinet database backend for header caching
 mail-client/nail:kerberos - If network is enabled, this adds support for GSSAPI login on IMAP through virtual/krb5.
 mail-client/nail:net - Enable support for network protocols (POP, IMAP and SMTP). If you only need to send mail with the local Transport Agent, disabling this will get you support for only /usr/sbin/sendmail call.
@@ -3668,11 +3670,14 @@ mail-client/nail:ssl - If network is enabled, this adds support for S/MIME and S
 mail-client/neomutt:berkdb - Enable BDB (Berkley DB) backend for header caching
 mail-client/neomutt:gdbm - Enable GDBM (GNU dbm) backend for header caching
 mail-client/neomutt:gpg - Enable support for app-crypt/gpgme
+mail-client/neomutt:gpgme - Build gpgme backend to support S/MIME, PGP/MIME and traditional/inline PGP
 mail-client/neomutt:kyotocabinet - Enable Kyoto Cabinet database backend for header caching
 mail-client/neomutt:lmdb - Enable LMDB (Lightning Memory-Mapped Database) backend for header caching
 mail-client/neomutt:notmuch - Enable support for net-mail/notmuch
+mail-client/neomutt:pgp_classic - Build classic_pgp backend to support PGP/MIME and traditional/inline PGP
 mail-client/neomutt:qdbm - Enable QDBM (Quicker Database Manager) database backend for header caching
 mail-client/neomutt:smime - Enable support for smime
+mail-client/neomutt:smime_classic - Build classic_smime backend to support S/MIME
 mail-client/neomutt:tokyocabinet - Enable Tokyo Cabinet database backend for header caching
 mail-client/roundcube:enigma - Add dependencies to support server-side GnuPG signing and/or encryption through the enigma plugin
 mail-client/roundcube:ldap - Add dependencies to support connecting to an LDAP address book server
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index a533c91dacc3..515f77421774 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/gsim/gsim-21.3.ebuild b/sci-chemistry/gsim/gsim-21.3.ebuild
index 332b51b655e0..4aa1830ac648 100644
--- a/sci-chemistry/gsim/gsim-21.3.ebuild
+++ b/sci-chemistry/gsim/gsim-21.3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils qt4-r2 toolchain-funcs
 
-DESCRIPTION="Programm for visualisation and processing of experimental and simulated NMR spectra"
+DESCRIPTION="Visualisation and processing of experimental and simulated NMR spectra"
 HOMEPAGE="https://sourceforge.net/projects/gsim/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
diff --git a/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild b/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild
index 054edd99f7ff..87c16c05a6d7 100644
--- a/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild
+++ b/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="Display molecular 3D structures, such as proteins, in both schematic and detailed representations"
+DESCRIPTION="Display 3D molecules (e.g., proteins) in schematic and detailed representations"
 HOMEPAGE="http://www.avatar.se/molscript/"
 SRC_URI="${P}.tar.gz"
 
diff --git a/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild b/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
index 75e928623167..aaca48a6b1a8 100644
--- a/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
+++ b/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=4
 
-DESCRIPTION="MSMS allows to compute very efficiently triangulations of Solvent Excluded Surfaces"
+DESCRIPTION="MSMS very efficiently computes triangulations of Solvent Excluded Surfaces"
 HOMEPAGE="http://mgl.scripps.edu/people/sanner/html/msms_home.html"
 SRC_URI="
 			amd64? ( msms_i86_64Linux2_2.6.1.tar.gz )
diff --git a/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild
index 88c1f246e8a2..8dc55d31e546 100644
--- a/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild
+++ b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit fortran-2 python-single-r1 toolchain-funcs
 
 MY_PN="pdbTools"
 
-DESCRIPTION="Tools for manipulating and doing calculations on wwPDB macromolecule structure files"
+DESCRIPTION="Tools for manipulating and calculations on wwPDB macromolecule structure files"
 HOMEPAGE="https://github.com/harmslab/pdbtools"
 SRC_URI="https://${PN}.googlecode.com/files/${MY_PN}_${PV}.tar.gz"
 
diff --git a/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild
index 35910807746f..a476a801611a 100644
--- a/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild
+++ b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild
@@ -9,7 +9,7 @@ inherit fortran-2 python-single-r1 toolchain-funcs
 
 MY_PN="pdbTools"
 
-DESCRIPTION="Tools for manipulating and doing calculations on wwPDB macromolecule structure files"
+DESCRIPTION="Tools for manipulating and calculations on wwPDB macromolecule structure files"
 HOMEPAGE="https://github.com/harmslab/pdbtools"
 SRC_URI="https://${PN}.googlecode.com/files/${MY_PN}_${PV}.tar.gz"
 
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
index 8b58ae48c5c7..46766b7715e6 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit scons-utils fortran-2 flag-o-matic python-r1 toolchain-funcs
 
-DESCRIPTION="An automated pipeline for performing Poisson-Boltzmann electrostatics calculations"
+DESCRIPTION="Automated pipeline for performing Poisson-Boltzmann electrostatics calculations"
 HOMEPAGE="http://www.poissonboltzmann.org/"
 SRC_URI="https://github.com/Electrostatics/apbs-${PN}/releases/download/${P}/${PN}-src-${PV}.tar.gz"
 
diff --git a/sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild b/sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild
index 90903a11b2de..b0b57ed0d51f 100644
--- a/sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild
+++ b/sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=4
 
-DESCRIPTION="Convert atom names for common amino acids and nucleic acid bases from PDB format to CNS or back"
+DESCRIPTION="Convert atom names for amino acids/nucleic acid bases between PDB and CNS format"
 HOMEPAGE="http://www.mybiosoftware.com/3d-molecular-model/314/"
 #SRC_URI="http://kinemage.biochem.duke.edu/php/downlode.php?filename=/downloads/software/scripts/${PN}.${PV}.perl.tgz"
 SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${PN}.${PV}.perl.tgz"
diff --git a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
index 7f90ace13b9b..8bea9cc52301 100644
--- a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
+++ b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs eutils multilib
 
 MY_P=${PN}.${PV}
 
-DESCRIPTION="Prepares molecular kinemages (input files for Mage & KiNG) from PDB-format coordinate files"
+DESCRIPTION="Prepares molecular kinemages from PDB-format coordinate files"
 HOMEPAGE="http://kinemage.biochem.duke.edu/software/prekin.php"
 SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/${PN}/${MY_P}.src.tgz"
 
diff --git a/sci-chemistry/propka/propka-3.1_p140511.ebuild b/sci-chemistry/propka/propka-3.1_p140511.ebuild
index 2d34b8da5d5f..4b90e9aeab97 100644
--- a/sci-chemistry/propka/propka-3.1_p140511.ebuild
+++ b/sci-chemistry/propka/propka-3.1_p140511.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
-DESCRIPTION="Prediction of the pKa values of ionizable groups in proteins and protein-ligand complexes"
+DESCRIPTION="pKa-value prediction of ionizable groups in protein and protein-ligand complexes"
 HOMEPAGE="http://propka.ki.ku.dk/"
 SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
diff --git a/sci-chemistry/shelx/shelx-20141228.ebuild b/sci-chemistry/shelx/shelx-20141228.ebuild
index 541cbfb83802..d2b279bf8d1e 100644
--- a/sci-chemistry/shelx/shelx-20141228.ebuild
+++ b/sci-chemistry/shelx/shelx-20141228.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-DESCRIPTION="Programs for crystal structure determination from single-crystal diffraction data"
+DESCRIPTION="Crystal structure determination from single-crystal diffraction data"
 HOMEPAGE="http://shelx.uni-ac.gwdg.de/SHELX/"
 SRC_URI="
 	amd64? (
diff --git a/sci-chemistry/suitename/suitename-0.3.070628.ebuild b/sci-chemistry/suitename/suitename-0.3.070628.ebuild
index e0306fac8f29..8441770df5ca 100644
--- a/sci-chemistry/suitename/suitename-0.3.070628.ebuild
+++ b/sci-chemistry/suitename/suitename-0.3.070628.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 MY_P="${PN}.${PV}"
 
-DESCRIPTION="The ROC RNA Ontology Consortium consensus RNA backbone nomenclature and conformer-list development"
+DESCRIPTION="The ROC RNA Ontology nomenclature and conformer-list development"
 HOMEPAGE="http://kinemage.biochem.duke.edu/software/suitename.php"
 SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/${PN}/${MY_P}.src.tgz"
 
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 1806f37405ed..d06604871082 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/electric/electric-8.09.ebuild b/sci-electronics/electric/electric-8.09.ebuild
index 7ae942a08d6d..5c969c996b04 100644
--- a/sci-electronics/electric/electric-8.09.ebuild
+++ b/sci-electronics/electric/electric-8.09.ebuild
@@ -3,7 +3,7 @@
 
 inherit eutils java-pkg-2
 
-DESCRIPTION="Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design"
+DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
 HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
 SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
 
diff --git a/sci-electronics/electric/electric-8.11.ebuild b/sci-electronics/electric/electric-8.11.ebuild
index 98a75e61208e..e7c190691c95 100644
--- a/sci-electronics/electric/electric-8.11.ebuild
+++ b/sci-electronics/electric/electric-8.11.ebuild
@@ -3,7 +3,7 @@
 
 inherit eutils java-pkg-2
 
-DESCRIPTION="Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design"
+DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
 HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
 SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
 
diff --git a/sci-electronics/electric/electric-9.02.ebuild b/sci-electronics/electric/electric-9.02.ebuild
index 7ae942a08d6d..5c969c996b04 100644
--- a/sci-electronics/electric/electric-9.02.ebuild
+++ b/sci-electronics/electric/electric-9.02.ebuild
@@ -3,7 +3,7 @@
 
 inherit eutils java-pkg-2
 
-DESCRIPTION="Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design"
+DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
 HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
 SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
 
diff --git a/sci-electronics/electric/electric-9.03.ebuild b/sci-electronics/electric/electric-9.03.ebuild
index 98a75e61208e..e7c190691c95 100644
--- a/sci-electronics/electric/electric-9.03.ebuild
+++ b/sci-electronics/electric/electric-9.03.ebuild
@@ -3,7 +3,7 @@
 
 inherit eutils java-pkg-2
 
-DESCRIPTION="Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design"
+DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
 HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
 SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
 
diff --git a/sci-electronics/oregano/oregano-0.69.1-r1.ebuild b/sci-electronics/oregano/oregano-0.69.1-r1.ebuild
index 3c0355c51a5c..bd9baed4542d 100644
--- a/sci-electronics/oregano/oregano-0.69.1-r1.ebuild
+++ b/sci-electronics/oregano/oregano-0.69.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 inherit eutils fdo-mime flag-o-matic scons-utils
 
-DESCRIPTION="Oregano is an application for schematic capture and simulation of electrical circuits"
+DESCRIPTION="Application for the schematic capturing and simulation of electrical circuits"
 SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
 HOMEPAGE="http://oregano.gforge.lug.fi.uba.ar/" # broken
 SLOT="0"
diff --git a/sci-electronics/oregano/oregano-0.82.ebuild b/sci-electronics/oregano/oregano-0.82.ebuild
index a1afa0de72a1..ba7caa09a557 100644
--- a/sci-electronics/oregano/oregano-0.82.ebuild
+++ b/sci-electronics/oregano/oregano-0.82.ebuild
@@ -5,7 +5,7 @@ EAPI="4"
 
 inherit autotools eutils fdo-mime vcs-snapshot gnome2-utils
 
-DESCRIPTION="Oregano is an application for schematic capture and simulation of electrical circuits"
+DESCRIPTION="Application for the schematic capturing and simulation of electrical circuits"
 HOMEPAGE="https://github.com/marc-lorber/oregano"
 SRC_URI="https://github.com/marc-lorber/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 9fe529e8abb6..ba9ffe7ba07d 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/bmrblib/bmrblib-1.0.3.ebuild b/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
index 0b1e918d5776..dabaa86922d3 100644
--- a/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
+++ b/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
 inherit distutils-r1
 
-DESCRIPTION="API abstracting the BioMagResBank (BMRB) NMR-STAR format (http://www.bmrb.wisc.edu/)"
+DESCRIPTION="API abstracting the BioMagResBank (BMRB) NMR-STAR format"
 HOMEPAGE="http://gna.org/projects/bmrblib/"
 SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
 
diff --git a/sci-libs/inchi/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04.ebuild
index 84ae21c021e9..984b312edafc 100644
--- a/sci-libs/inchi/inchi-1.04.ebuild
+++ b/sci-libs/inchi/inchi-1.04.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="A program and library for generating standard and non-standard InChI and InChIKeys"
+DESCRIPTION="Program and library for generating standard and non-standard InChI and InChIKeys"
 HOMEPAGE="http://www.iupac.org/inchi/"
 SRC_URI="
 	http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-API.ZIP -> ${P}.zip
diff --git a/sci-libs/ipp/ipp-7.1.0.079.ebuild b/sci-libs/ipp/ipp-7.1.0.079.ebuild
index 307e7c0e4ae4..e6ff18149362 100644
--- a/sci-libs/ipp/ipp-7.1.0.079.ebuild
+++ b/sci-libs/ipp/ipp-7.1.0.079.ebuild
@@ -10,7 +10,7 @@ INTEL_SUBDIR=composerxe
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-7.1.1.117.ebuild b/sci-libs/ipp/ipp-7.1.1.117.ebuild
index 9ed49be71f15..71f55b5718bc 100644
--- a/sci-libs/ipp/ipp-7.1.1.117.ebuild
+++ b/sci-libs/ipp/ipp-7.1.1.117.ebuild
@@ -10,7 +10,7 @@ INTEL_SUBDIR=composerxe
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-7.1.1.146.ebuild b/sci-libs/ipp/ipp-7.1.1.146.ebuild
index fbc627c795aa..86f0c3766b74 100644
--- a/sci-libs/ipp/ipp-7.1.1.146.ebuild
+++ b/sci-libs/ipp/ipp-7.1.1.146.ebuild
@@ -10,7 +10,7 @@ INTEL_SUBDIR=composerxe
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-7.1.1.192.ebuild b/sci-libs/ipp/ipp-7.1.1.192.ebuild
index f4c227f95669..edfe81140352 100644
--- a/sci-libs/ipp/ipp-7.1.1.192.ebuild
+++ b/sci-libs/ipp/ipp-7.1.1.192.ebuild
@@ -10,7 +10,7 @@ INTEL_SUBDIR=composerxe
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-8.0.1.080.ebuild b/sci-libs/ipp/ipp-8.0.1.080.ebuild
index d277b4b54894..8396137d987d 100644
--- a/sci-libs/ipp/ipp-8.0.1.080.ebuild
+++ b/sci-libs/ipp/ipp-8.0.1.080.ebuild
@@ -11,7 +11,7 @@ INTEL_SINGLE_ARCH=false
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-8.2.0.090.ebuild b/sci-libs/ipp/ipp-8.2.0.090.ebuild
index a0d811280079..d43947ece3e9 100644
--- a/sci-libs/ipp/ipp-8.2.0.090.ebuild
+++ b/sci-libs/ipp/ipp-8.2.0.090.ebuild
@@ -11,7 +11,7 @@ INTEL_SINGLE_ARCH=false
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-8.2.1.164.ebuild b/sci-libs/ipp/ipp-8.2.1.164.ebuild
index eaacbe6a2faa..a1f5a2a57052 100644
--- a/sci-libs/ipp/ipp-8.2.1.164.ebuild
+++ b/sci-libs/ipp/ipp-8.2.1.164.ebuild
@@ -11,7 +11,7 @@ INTEL_SINGLE_ARCH=false
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-8.2.2.187.ebuild b/sci-libs/ipp/ipp-8.2.2.187.ebuild
index 1be53f0bef16..c9ce9ca2f3ae 100644
--- a/sci-libs/ipp/ipp-8.2.2.187.ebuild
+++ b/sci-libs/ipp/ipp-8.2.2.187.ebuild
@@ -11,7 +11,7 @@ INTEL_SINGLE_ARCH=false
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/libcerf/libcerf-1.3.ebuild b/sci-libs/libcerf/libcerf-1.3.ebuild
index f67d7d57f041..acbe684d255e 100644
--- a/sci-libs/libcerf/libcerf-1.3.ebuild
+++ b/sci-libs/libcerf/libcerf-1.3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit autotools-utils multilib
 
-DESCRIPTION="library that provides an efficient and accurate implementation of complex error functions"
+DESCRIPTION="Efficient and accurate implementation of complex error functions"
 HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/libcerf"
 SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
diff --git a/sci-libs/libcerf/libcerf-1.4.ebuild b/sci-libs/libcerf/libcerf-1.4.ebuild
index 670cf094a2f9..ccd7129f576e 100644
--- a/sci-libs/libcerf/libcerf-1.4.ebuild
+++ b/sci-libs/libcerf/libcerf-1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit autotools-utils
 
-DESCRIPTION="library that provides an efficient and accurate implementation of complex error functions"
+DESCRIPTION="Efficient and accurate implementation of complex error functions"
 HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/libcerf"
 SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index d9b9afe5569c..02ad27011f10 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-DESCRIPTION="efficient and accurate implementation of complex error functions"
+DESCRIPTION="Efficient and accurate implementation of complex error functions"
 HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/libcerf"
 SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
diff --git a/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild b/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild
index 5e96460fb6c5..e62be82bfb06 100644
--- a/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild
+++ b/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit autotools-utils
 
-DESCRIPTION="The Coordinate Library, designed to assist CCP4 developers in working with coordinate files"
+DESCRIPTION="The Coordinate Library for working with CCP4 coordinate files"
 HOMEPAGE="https://launchpad.net/mmdb/"
 SRC_URI="ftp://ftp.ccp4.ac.uk/opensource/${P}.tar.gz"
 
diff --git a/sci-libs/mmdb/mmdb-2.0.1.ebuild b/sci-libs/mmdb/mmdb-2.0.1.ebuild
index d93f9549df5c..e227efcef4d9 100644
--- a/sci-libs/mmdb/mmdb-2.0.1.ebuild
+++ b/sci-libs/mmdb/mmdb-2.0.1.ebuild
@@ -7,7 +7,7 @@ inherit autotools-utils
 
 MY_P="${PN}2-${PV}"
 
-DESCRIPTION="The Coordinate Library, designed to assist CCP4 developers in working with coordinate files"
+DESCRIPTION="The Coordinate Library for working with CCP4 coordinate files"
 HOMEPAGE="https://launchpad.net/mmdb/"
 SRC_URI="ftp://ftp.ccp4.ac.uk/opensource/${MY_P}.tar.gz"
 
diff --git a/sci-libs/pymmlib/pymmlib-1.2.1.ebuild b/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
index 380de4cff761..f533643cb1d6 100644
--- a/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
+++ b/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 multilib
 
-DESCRIPTION="Toolkit and library for the analysis and manipulation of macromolecular structural models"
+DESCRIPTION="Toolkit and library for the analysis and manipulation of macromolecular models"
 HOMEPAGE="http://pymmlib.sourceforge.net/"
 SRC_URI="mirror://github/masci/mmLib/${P}.tar.gz"
 
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild
deleted file mode 100644
index 4b4e620d27db..000000000000
--- a/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
-
-FACTORY="factory-4.0.0+m4"
-FACTORY_GFTABLES="factory.4.0.1-gftables"
-
-DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
-HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
-BASE_URI="http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk"
-SRC_URI="
-	https://dev.gentoo.org/~tomka/files/${P}.tar.bz2
-	${BASE_URI}/${FACTORY}.tar.gz
-	${BASE_URI}/${FACTORY_GFTABLES}.tar.gz
-	${BASE_URI}/gtest-1.7.0.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="debug emacs +optimization"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	sys-process/time
-	virtual/pkgconfig"
-
-RDEPEND="${PYTHON_DEPS}
-	sys-libs/gdbm
-	<dev-libs/ntl-7
-	sci-mathematics/pari[gmp]
-	>=sys-libs/readline-6.1
-	dev-libs/libxml2:2
-	sci-mathematics/flint[gc]
-	sci-mathematics/frobby
-	sci-mathematics/4ti2
-	sci-mathematics/nauty
-	>=sci-mathematics/normaliz-2.8
-	sci-mathematics/gfan
-	sci-libs/mpir[cxx]
-	dev-libs/mpfr
-	sci-libs/cdd+
-	sci-libs/cddlib
-	sci-libs/lrslib[gmp]
-	virtual/blas
-	virtual/lapack
-	dev-util/ctags
-	sys-libs/ncurses
-	>=dev-libs/boehm-gc-7.4[threads]
-	dev-libs/libatomic_ops
-	emacs? ( virtual/emacs )"
-
-SITEFILE=70Macaulay2-gentoo.el
-
-S="${WORKDIR}/M2/"
-
-pkg_setup () {
-	tc-export CC CPP CXX PKG_CONFIG
-	append-cppflags "-I/usr/include/frobby"
-	# gtest needs python:2
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Patching .m2 files to look for external programs in
-	# /usr/bin
-	epatch "${FILESDIR}"/1.6-paths-of-external-programs.patch
-
-	# Shortcircuit lapack tests
-	epatch "${FILESDIR}"/1.6-lapack.patch
-
-	# Factory is a statically linked library which (in this flavor) are not used by any
-	# other program. We build it internally and don't install it.
-	cp "${DISTDIR}/${FACTORY}.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-	cp "${DISTDIR}/${FACTORY_GFTABLES}.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-	# Macaulay2 developers want that gtest is built internally because
-	# the documentation says it may fail if build with options not the
-	# same as the tested program.
-	cp "${DISTDIR}/gtest-1.7.0.tar.gz" "${S}/BUILD/tarfiles/" \
-		|| die "copy failed"
-
-	eautoreconf
-}
-
-src_configure (){
-	# Recommended in bug #268064 Possibly unecessary
-	# but should not hurt anybody.
-	if ! use emacs; then
-		tags="ctags"
-	fi
-
-	# configure instead of econf to enable install with --prefix
-	./configure LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" \
-		--prefix="${D}/usr" \
-		--disable-encap \
-		--disable-strip \
-		--with-issue=Gentoo \
-		$(use_enable optimization optimize) \
-		$(use_enable debug) \
-		--enable-build-libraries="factory" \
-		--with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
-		|| die "failed to configure Macaulay"
-}
-
-src_compile() {
-	# Parallel build not supported yet
-	emake IgnoreExampleErrors=true -j1
-
-	if use emacs; then
-		cd "${S}/Macaulay2/emacs" || die
-		elisp-compile *.el
-	fi
-}
-
-src_test() {
-	# No parallel tests yet & Need to increase the time
-	# limit for long running tests in Schubert2 to pass
-	emake TLIMIT=550 -j1 check
-}
-
-src_install () {
-	# Parallel install not supported yet
-	emake IgnoreExampleErrors=true -j1 install
-
-	# Remove emacs files and install them in the
-	# correct place if use emacs
-	rm -rf "${ED}"/usr/share/emacs/site-lisp || die
-	if use emacs; then
-		cd "${S}/Macaulay2/emacs" || die
-		elisp-install ${PN} *.elc *.el
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "If you want to set a hot key for Macaulay2 in Emacs add a line similar to"
-		elog "(global-set-key [ f12 ] 'M2)"
-		elog "in order to set it to F12 (or choose a different one)."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild
index 0836337b8d5d..acd1d0deb899 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug emacs +optimization"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index 0ee77b1659da..30f7cc5f923b 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -1,5 +1 @@
-DIST Macaulay2-1.7_pre.tar.bz2 4639477 SHA256 b14918187724f8911bc50edf87c9692209ff0c2191feb257084adc87609eb1cd SHA512 e70376d1e54b6e239ebb3bf676507a2115fdf5c4fbe05f320553029a84114b74d78f54e4d1bdc7643131f3c45c301e83c21ff99e4d4b675372e971368398d6f5 WHIRLPOOL 396311aadb8a7845deaee5aeca49c431430abc46201e935ef72c4579c9cbe6cd4da85f3e09ff0fe647031f8050fb7c62f63ecce251bf34648c1848cd00eef68e
 DIST Macaulay2-1.8.2.1-fat.tar.bz2 26102483 SHA256 11e13fbb4aeeddae1547ed01e499e3f8961446cb9bec8b3162b29cadd2f280c1 SHA512 64f7ea9b01cdb308023a55d8ab8bd6733540f25161dacf27052c071e143418c68c639d5115cf32540c11594b70eae14473f4ef6ce5bd12b6df0722da7c13dd2c WHIRLPOOL 3f9c838d6624f95076957743bf402236708cb2af15b84d24c4446fb193f7608698cc63e43eb8eff8bf878963ce2a9fd85f37128f73d1dbd43d4c0bcda980753d
-DIST factory-4.0.0+m4.tar.gz 4711126 SHA256 9b2498cc7fc6765f1c586e8061ebe236cdce4b32a44721a235ad2644ec3124fb SHA512 1dacb9aae52e655bccbbc960397b02351050791594dd9c39771f0da7f8c6e8130a8827c2a675c3fbaaa214606e123ac9776e1c73d143649353cefc50cadeea3e WHIRLPOOL 47c4d6261fc6cc9c172035d8774f0cde9fa669fa164fc4a0f47e84ba789d69d14f5a16d042451564412fdedddec71335714ad751508495c22cea25b69f10b925
-DIST factory.4.0.1-gftables.tar.gz 2974152 SHA256 9cd158ceb1c2b1c47bdca2c0b004bba92cb0e0aaa0ea6a43ca784ebdce10eebd SHA512 060c58fe6e4565dd5e7649bfa070f14dec3c383a55ebab52a9f02b58a6405e2183e0c7e08964cddb87b81e872c0d8a52d7bd4575d07269547be544cf6a725a76 WHIRLPOOL a721a6824681118578c7289cea77a3f47e5c7654f30dc454eaac76b19cc89e416ae54b8d21a69f897d7087d4b67990634fc960f81df2ea53f428868d608dc9c2
-DIST gtest-1.7.0.tar.gz 1001582 SHA256 c0f860eee47c86e0aeb462fd0bdfd70e3975297e0b8b178e0e03a95e1f6c9bc4 SHA512 a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3 WHIRLPOOL 36edbdf8be7c3793a89918a3c43d74e75a6281a37c394f7d2f20506130a76aab04a3beddba01bf7f0e9b6901c7e834ca014c31c913c0ea846d3f6be9c93599d2
diff --git a/sci-mathematics/Macaulay2/files/1.6-lapack.patch b/sci-mathematics/Macaulay2/files/1.6-lapack.patch
deleted file mode 100644
index e9a434eeb28e..000000000000
--- a/sci-mathematics/Macaulay2/files/1.6-lapack.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- configure.ac	2012-10-24 09:29:55.240498786 -0700
-+++ configure.ac.2	2012-10-30 15:07:27.172846300 -0700
-@@ -1285,46 +1285,7 @@
- done
- test $BUILD_factory = yes && BUILTLIBS="$SINGULARLIBS $BUILTLIBS"
- 
--# we need to do the fortran library testing last, in case AC_SEARCH_LIBS adds
--# one of them to $LIBS, making it impossible to check for the presence of C or
--# C++ libraries.  (I'm not sure why putting -llapack on the gcc command line
--# needlessly causes the library to be linked against.)
--FORTRANUSED=no
--if test "$LAPACK" = yes
--then AC_MSG_CHECKING([whether the vecLib framework is available])
--     SAVELIBS=$LIBS LIBS="-framework vecLib $LIBS"
--     AC_LANG(C)
--     AC_LINK_IFELSE(
--	 [AC_LANG_PROGRAM(,[sgemv_();dgetrf_();])],
--	 [
--	     AC_MSG_RESULT(yes)
--	     ],
--	 [
--	     AC_MSG_RESULT(no)
--	     LIBS=$SAVELIBS
--	     FORTRANUSED=yes
--	     if test $BUILD_lapack = no
--	     then AC_LANG(Fortran)
--	     	  if test "$FC" = ""
--		  then AC_MSG_ERROR(no fortran compiler found)
--		  else AC_MSG_NOTICE(using fortran compiler $FC)
--		  fi
--		  AC_SEARCH_LIBS(sgemv,blas f77blas,,BUILD_lapack=yes)
--		  AC_SEARCH_LIBS(dgetrf,lapack,,BUILD_lapack=yes)
--	     fi
--	 ])
--fi
--test $BUILD_lapack = yes && BUILTLIBS="-llapack -lblas $BUILTLIBS"
--
--if test $BUILD_lapack = yes
--then # test whether the fortran compiler can handle lapack, which, starting with
--     # version 3.2, requires fortran 90, not fortran 77
--    AC_LANG(Fortran)
--    AC_MSG_CHECKING([whether the fortran compiler is modern enough for lapack])
--    AC_COMPILE_IFELSE([instrinsic maxloc],
--	AC_MSG_ERROR(the fortran compiler ($FC) does not support the Fortran 90 language required for compiling lapack),
--	AC_MSG_RESULT(yes))
--fi
-+BUILTLIBS="$(${PKG_CONFIG} --libs lapack) $BUILTLIBS"
- 
- if test $BUILD_memtailor = yes
- then BUILTLIBS="-lmemtailor $BUILTLIBS"
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 2c7284292b02..68c058496c1d 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index dae2c52ad8b2..5c8b6e20576f 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/arrayprobe/Manifest b/sys-apps/arrayprobe/Manifest
index f5eec1d05631..b514c97f48f3 100644
--- a/sys-apps/arrayprobe/Manifest
+++ b/sys-apps/arrayprobe/Manifest
@@ -1 +1 @@
-DIST arrayprobe-2.0.tar.gz 83831 SHA256 ccb560b5c7e8b378d110cad6e9245884e7e673acfa3c4016ef33acd699f1f4d0 SHA512 4664e20604697edf2f848447419b26ff860dd302b3d3e5aa0f3977855c590b5acbe23c39b684a2ecb1603c86cf7762e86bfc7125421ccad7f322e387c4178870 WHIRLPOOL 56eec2322f806f25e411614e12e9c584208202203f6d070846c73d04c0b379103ad2c45d3a6638a8cf6d66ea51173fbf0dcd91af3b01702a39848bb8a503cd34
+DIST arrayprobe-2.0.tar.gz 83831 BLAKE2B 6a9b76260c91b271068be914161bd99c4ce2285c58ce98c689f6bef32200701430bb65306e74a1d9277d7a4d9e4aa0adf4af60af0c4264020ae07a73f49a51de SHA512 4664e20604697edf2f848447419b26ff860dd302b3d3e5aa0f3977855c590b5acbe23c39b684a2ecb1603c86cf7762e86bfc7125421ccad7f322e387c4178870
diff --git a/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild b/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
index 98fae16e7682..5f961969810b 100644
--- a/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
+++ b/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Utility to report status of an HP (Compaq) array controller (both IDA & CCISS)"
 HOMEPAGE="http://www.strocamp.net/opensource/arrayprobe.php"
@@ -14,8 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 ~ia64 x86"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}/${PV}-malloc-strlen.patch"
+	"${FILESDIR}/${PV}-ida_headers.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-malloc-strlen.patch"
-	epatch "${FILESDIR}/${PV}-ida_headers.patch"
+	default
 	eautoreconf
 }
diff --git a/sys-apps/arrayprobe/files/2.0-ida_headers.patch b/sys-apps/arrayprobe/files/2.0-ida_headers.patch
index fbdb20b87ea6..3cd744b32a33 100644
--- a/sys-apps/arrayprobe/files/2.0-ida_headers.patch
+++ b/sys-apps/arrayprobe/files/2.0-ida_headers.patch
@@ -1,6 +1,5 @@
-diff -Naur arrayprobe-2.0.old/cciss_events.h arrayprobe-2.0/cciss_events.h
---- arrayprobe-2.0.old/cciss_events.h	2005-12-27 10:51:29.000000000 +0100
-+++ arrayprobe-2.0/cciss_events.h	2010-01-13 15:46:53.000000000 +0100
+--- a/cciss_events.h
++++ b/cciss_events.h
 @@ -27,8 +27,12 @@
  #define QWORD __u64
  
@@ -14,9 +13,8 @@ diff -Naur arrayprobe-2.0.old/cciss_events.h arrayprobe-2.0/cciss_events.h
  
  #define CompareEvent(event,par_class,par_subclass,par_detail) \
                       ((event.class.class==par_class) && \
-diff -Naur arrayprobe-2.0.old/configure.ac arrayprobe-2.0/configure.ac
---- arrayprobe-2.0.old/configure.ac	2006-01-03 13:58:31.000000000 +0100
-+++ arrayprobe-2.0/configure.ac	2010-01-13 15:42:49.000000000 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -19,38 +19,6 @@
  dnl Check for compile.h (2.6.x kernels only?
  AC_CHECK_HEADERS(linux/compiler.h)
@@ -56,9 +54,8 @@ diff -Naur arrayprobe-2.0.old/configure.ac arrayprobe-2.0/configure.ac
  # Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
  
-diff -Naur arrayprobe-2.0.old/cpqarray.h arrayprobe-2.0/cpqarray.h
---- arrayprobe-2.0.old/cpqarray.h	1970-01-01 01:00:00.000000000 +0100
-+++ arrayprobe-2.0/cpqarray.h	2010-01-13 15:40:11.000000000 +0100
+--- a/cpqarray.h
++++ b/cpqarray.h
 @@ -0,0 +1,126 @@
 +/*
 + *    Disk Array driver for Compaq SMART2 Controllers
@@ -186,9 +183,8 @@ diff -Naur arrayprobe-2.0.old/cpqarray.h arrayprobe-2.0/cpqarray.h
 +#endif
 +
 +#endif /* CPQARRAY_H */
-diff -Naur arrayprobe-2.0.old/ida_cmd.h arrayprobe-2.0/ida_cmd.h
---- arrayprobe-2.0.old/ida_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ arrayprobe-2.0/ida_cmd.h	2010-01-13 15:40:29.000000000 +0100
+--- a/ida_cmd.h
++++ b/ida_cmd.h
 @@ -0,0 +1,349 @@
 +/*
 + *    Disk Array driver for Compaq SMART2 Controllers
@@ -539,9 +535,8 @@ diff -Naur arrayprobe-2.0.old/ida_cmd.h arrayprobe-2.0/ida_cmd.h
 +#pragma pack()	
 +
 +#endif /* ARRAYCMD_H */
-diff -Naur arrayprobe-2.0.old/ida_ioctl.h arrayprobe-2.0/ida_ioctl.h
---- arrayprobe-2.0.old/ida_ioctl.h	1970-01-01 01:00:00.000000000 +0100
-+++ arrayprobe-2.0/ida_ioctl.h	2010-01-13 15:44:46.000000000 +0100
+--- a/ida_ioctl.h
++++ b/ida_ioctl.h
 @@ -0,0 +1,87 @@
 +/*
 + *    Disk Array driver for Compaq SMART2 Controllers
@@ -630,9 +625,8 @@ diff -Naur arrayprobe-2.0.old/ida_ioctl.h arrayprobe-2.0/ida_ioctl.h
 +} ida_ioctl_t;
 +
 +#endif /* IDA_IOCTL_H */
-diff -Naur arrayprobe-2.0.old/probe.c arrayprobe-2.0/probe.c
---- arrayprobe-2.0.old/probe.c	2006-01-03 14:11:17.000000000 +0100
-+++ arrayprobe-2.0/probe.c	2010-01-13 15:45:22.000000000 +0100
+--- a/probe.c
++++ b/probe.c
 @@ -33,10 +33,9 @@
  #include <getopt.h>
  #include <errno.h>
diff --git a/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch b/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch
index 8d955a8f933d..2732f75b939a 100644
--- a/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch
+++ b/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch
@@ -1,5 +1,5 @@
---- probe.c.old	2010-01-13 12:15:32.000000000 +0100
-+++ probe.c	2010-01-13 12:16:44.000000000 +0100
+--- a/probe.c
++++ b/probe.c
 @@ -354,7 +354,7 @@
  	int drivenum = event.detail.logstatchange.logicaldrivenumber;
  	logdrvs[drivenum].state.state = event.detail.logstatchange.newlogicaldrivestate;
diff --git a/sys-apps/audio-entropyd/Manifest b/sys-apps/audio-entropyd/Manifest
index f70abfd24266..6841c1811108 100644
--- a/sys-apps/audio-entropyd/Manifest
+++ b/sys-apps/audio-entropyd/Manifest
@@ -1 +1 @@
-DIST audio-entropyd-2.0.3.tgz 16681 SHA256 6fbaf1c4f77e988f4656cd079309d5eb6bd36cbae89c2ee01324c5690adaf3ff SHA512 d21c2d547235accdd460bcaf1ff5f5696db2988d385c3c52aad0d651865386409682f8747d1823765f0c0925bf28f38abdfc0b114d239f494c7eb699c5ed3ebf WHIRLPOOL e653b7cccda00323b5f17a675d72cef1a9adf9915dcd27041e63993073a378d92ab5779d25434ecd48ecbb74b45abc4217e4b629c98ba3885589727ef90edf6d
+DIST audio-entropyd-2.0.3.tgz 16681 BLAKE2B 36f9d7942f718af8e828ce6598ab8ea35945de1c60959e7bc2314b2440037f8bb661085a4cad12e62627d935797842616e486180945ff283937b499de163f068 SHA512 d21c2d547235accdd460bcaf1ff5f5696db2988d385c3c52aad0d651865386409682f8747d1823765f0c0925bf28f38abdfc0b114d239f494c7eb699c5ed3ebf
diff --git a/sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild b/sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild
index 5e5a60fb72c6..cab08ef38cf8 100644
--- a/sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild
+++ b/sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils systemd toolchain-funcs
+EAPI=6
+
+inherit systemd toolchain-funcs
 
 DESCRIPTION="Audio-entropyd generates entropy-data for the /dev/random device"
 HOMEPAGE="http://www.vanheusden.com/aed/"
@@ -13,25 +14,32 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="selinux"
 
-RDEPEND="selinux? ( sec-policy/selinux-entropyd )
+DEPEND="media-libs/alsa-lib:="
+RDEPEND="${DEPEND}
 	media-sound/alsa-utils
-	media-libs/alsa-lib"
+	selinux? ( sec-policy/selinux-entropyd )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.1-uclibc.patch
+	"${FILESDIR}"/${PN}-2.0.1-ldflags.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.1-uclibc.patch" \
-		"${FILESDIR}/${PN}-2.0.1-ldflags.patch"
+	default
+
 	sed -i -e "s:^OPT_FLAGS=.*:OPT_FLAGS=${CFLAGS}:" \
 		-e "/^WARNFLAGS/s: -g::" Makefile || die
 }
 
-src_compile() {
-	emake CC="$(tc-getCC)"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dosbin audio-entropyd
-	dodoc README TODO
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	newinitd "${FILESDIR}/${PN}.init-2" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf-2" ${PN}
+	einstalldocs
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	newinitd "${FILESDIR}"/${PN}.init-2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf-2 ${PN}
 }
diff --git a/sys-apps/bar/Manifest b/sys-apps/bar/Manifest
index 967642185f7a..edf1c0e40d4e 100644
--- a/sys-apps/bar/Manifest
+++ b/sys-apps/bar/Manifest
@@ -1 +1 @@
-DIST bar_1.11.1.tar.gz 187144 SHA256 fa0f5ec5c8400316c2f4debdc6cdcb80e186e668c2e4471df4fec7bfcd626503 SHA512 18a0cf1946155252fc84bce64a1789a2a497c8a870a8494e4b2caecde567121dc6404855c021900358659702a33f8c4f749e9cd0bb1eb761cd650e2c56347035 WHIRLPOOL b5e144841d92af9f23cc66ba81ad921a81729d58189ef8e82694b124e9f77fb36dc2f8f379a957c699b09ed405b5cf9891adb50f89a62e1ce2477ce48fe3ae5c
+DIST bar_1.11.1.tar.gz 187144 BLAKE2B 9181ade20a9450bdc7c4ae21bb79fea1d8666ebb78c1ae6403bbc1ad46ec968efb3795da3d5cd2e87aa02d28f33105abb3cf629e04051b84e763ddaea9c9ee18 SHA512 18a0cf1946155252fc84bce64a1789a2a497c8a870a8494e4b2caecde567121dc6404855c021900358659702a33f8c4f749e9cd0bb1eb761cd650e2c56347035
diff --git a/sys-apps/bar/bar-1.11.1.ebuild b/sys-apps/bar/bar-1.11.1.ebuild
index ff678910027e..0d1aadd2a030 100644
--- a/sys-apps/bar/bar-1.11.1.ebuild
+++ b/sys-apps/bar/bar-1.11.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 inherit autotools
 
@@ -18,31 +18,30 @@ DEPEND="doc? ( >=app-doc/doxygen-1.3.5 )"
 RDEPEND=""
 
 src_prepare() {
-	sed -e '/^LDFLAGS/d' \
-		-e '/cd $(WEB_DIR) && $(MAKE)/d' -i Makefile.am || die
+	default
+	sed '/cd $(WEB_DIR) && $(MAKE)/d' -i Makefile.am || die
 	eautomake
 }
 
 src_configure() {
-	local myconf
-
-	# Fix wrt #113392
-	use sparc && myconf="${myconf} --disable-use-memalign"
-	econf ${myconf}
+	# Fix bug 113392
+	econf $(use_enable !sparc use-memalign)
 }
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}"
+
 	if use doc; then
-		mkdir -p ../www/doxygen/${PV}
+		mkdir -p ../www/doxygen/${PV} || die
 		emake update-www
+		HTML_DOCS=( ../www/doxygen/${PV}/html/. )
+
+		# remove doxygen working files
+		find ../www/doxygen/${PV}/html \( -iname '*.map' -o -iname '*.md5' \) -delete || die
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS TODO TROUBLESHOOTING debian/changelog
-	if use doc ; then
-		dohtml -r ../www/doxygen/${PV}/html/*
-	fi
+	default
+	dodoc TROUBLESHOOTING debian/changelog
 }
diff --git a/sys-apps/byld/Manifest b/sys-apps/byld/Manifest
index a3c6984141e0..0f0a96f5889b 100644
--- a/sys-apps/byld/Manifest
+++ b/sys-apps/byld/Manifest
@@ -1 +1 @@
-DIST byld-1_0_3.tgz 1128317 SHA256 f5206f6eb0d85f6b9435c24e554262b69dede6dd7d24acd9faea1dc77549cde3 SHA512 ec141b5c7f636e611fd43bbfa69c8a06ebbfb766e5f58086ce4c0fce1271b8a0cd76333b748322efb19e46aaf2ed150cb3a5fc09c91aef55e10f80b1d1551eb0 WHIRLPOOL f2d43ba2c8820f16dcf6beda530e0c4fe3887fa4039b90d920516b4cf9ef25b736ef14133b0ed2924db0328362896eb6583b0ef2fd5d2c0e84b614d8b120de98
+DIST byld-1_0_3.tgz 1128317 BLAKE2B c096cc3cfa4f467c9e5310a6f17d97d5f690fed20a03ce2d70b1d8476003df87815f4ba7c6262be7bfa2597e467c64e750eed8d5da386950d86c1413b62ff380 SHA512 ec141b5c7f636e611fd43bbfa69c8a06ebbfb766e5f58086ce4c0fce1271b8a0cd76333b748322efb19e46aaf2ed150cb3a5fc09c91aef55e10f80b1d1551eb0
diff --git a/sys-apps/byld/byld-1.0.3.ebuild b/sys-apps/byld/byld-1.0.3.ebuild
index 2359a6e8dd48..2c9a65e33e97 100644
--- a/sys-apps/byld/byld-1.0.3.ebuild
+++ b/sys-apps/byld/byld-1.0.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="build a Linux distribution on a single floppy"
 HOMEPAGE="http://byld.sourceforge.net/"
 SRC_URI="mirror://sourceforge/byld/byld-${PV//./_}.tgz"
@@ -16,8 +18,9 @@ RDEPEND="sys-apps/util-linux"
 src_install() {
 	dodoc BYLDING CREDITS README INSTALL FHS PAKING
 	rm MAKEDEV.8 BYLDING CREDITS README INSTALL FHS LICENSE PAKING
-	dodir /usr/lib/${PN}
-	cp -rf * ${D}/usr/lib/${PN}/
+
+	insinto /usr/lib/${PN}
+	doins -r .
 }
 
 pkg_postinst() {
diff --git a/sys-apps/ccs-tools/Manifest b/sys-apps/ccs-tools/Manifest
index 5468277006dd..d17bc6c52e0c 100644
--- a/sys-apps/ccs-tools/Manifest
+++ b/sys-apps/ccs-tools/Manifest
@@ -1 +1 @@
-DIST ccs-tools-1.8.3-20130214.tar.gz 227657 SHA256 56bb03f1977346f4c7dc3a0c5da8df4a0451a79558c26564478cb87fbf3e3ade SHA512 256adf873dd99b811f5cf55e6b74e1ccdc2e54a2399724b694f22825c4d5e3167e7768bddc4952363ef835ec2b8405d5704572a9b9e214f3102bf594374325ba WHIRLPOOL d7f200842a10ca2c83a46a933beb7c70436ea36c8aad3569c33392a11360b88dbf7589ac720994fec9d5c49c46f1e1c9f97ec320d2057680a6bb0edf13c066eb
+DIST ccs-tools-1.8.3-20130214.tar.gz 227657 BLAKE2B 318e3899b85ee322b4391816d642ae855eb7cb03c345725c95e7e01a8e6acb54db900ccdd2f85b6d4ecab5ef40768e80b559979d7b37bf42679a520379d2b56c SHA512 256adf873dd99b811f5cf55e6b74e1ccdc2e54a2399724b694f22825c4d5e3167e7768bddc4952363ef835ec2b8405d5704572a9b9e214f3102bf594374325ba
diff --git a/sys-apps/ccs-tools/ccs-tools-1.8.3_p20130214.ebuild b/sys-apps/ccs-tools/ccs-tools-1.8.3_p20130214.ebuild
index d39fc9d54c65..4e3640cdef0a 100644
--- a/sys-apps/ccs-tools/ccs-tools-1.8.3_p20130214.ebuild
+++ b/sys-apps/ccs-tools/ccs-tools-1.8.3_p20130214.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
-inherit eutils multilib toolchain-funcs
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
 
 MY_P="${P/_p/-}"
+
 DESCRIPTION="TOMOYO Linux tools"
 HOMEPAGE="http://tomoyo.sourceforge.jp/"
 SRC_URI="mirror://sourceforge.jp/tomoyo/49693/${MY_P}.tar.gz"
@@ -13,35 +15,43 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-
 RESTRICT="test"
 
-DEPEND="sys-libs/ncurses
-	sys-libs/readline"
-RDEPEND="${DEPEND}
+CDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${CDEPEND}
 	sys-apps/which"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
 
-S="${WORKDIR}/ccs-tools"
+S="${WORKDIR}/${PN}"
+PATCHES=(
+	"${FILESDIR}"/${P}-warnings.patch
+	"${FILESDIR}"/${P}-ncurses-underlinking.patch
+	"${FILESDIR}"/${P}-GNU_SOURCE.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-warnings.patch
+	default
 	sed -i \
-		-e "s:gcc:$(tc-getCC):" \
-		-e "s/\(CFLAGS.*:=\).*/\1 ${CFLAGS}/" \
 		-e "s:/usr/lib:/usr/$(get_libdir):g" \
 		-e "s:= /:= ${EPREFIX}/:g" \
 		Include.make || die
 }
 
-src_test() {
-	cd "${S}/kernel_test"
-	emake || die
-	./testall.sh || die
+src_configure() {
+	append-cflags -Wall -Wno-unused-but-set-variable
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
+
+	tc-export CC
 }
 
-src_install() {
-	emake INSTALLDIR="${D}" install || die
-	dodoc README.ccs
+src_test() {
+	cd kernel_test || die
+	emake
+	./testall.sh || die
 }
 
 pkg_postinst() {
@@ -57,5 +67,5 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	/usr/$(get_libdir)/ccs/init_policy
+	"${EPREFIX}"/usr/$(get_libdir)/ccs/init_policy
 }
diff --git a/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20130214-GNU_SOURCE.patch b/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20130214-GNU_SOURCE.patch
new file mode 100644
index 000000000000..651bed1b5d08
--- /dev/null
+++ b/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20130214-GNU_SOURCE.patch
@@ -0,0 +1,11 @@
+--- a/usr_sbin/ccstools.h
++++ b/usr_sbin/ccstools.h
+@@ -23,7 +23,7 @@
+ #define _FILE_OFFSET_BITS 64
+ #define _LARGEFILE_SOURCE
+ #define _LARGEFILE64_SOURCE
+-#define _GNU_SOURCE
++
+ #include <arpa/inet.h>
+ #include <asm/types.h>
+ #include <dirent.h>
diff --git a/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20130214-ncurses-underlinking.patch b/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20130214-ncurses-underlinking.patch
new file mode 100644
index 000000000000..638e6f556712
--- /dev/null
+++ b/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20130214-ncurses-underlinking.patch
@@ -0,0 +1,108 @@
+--- a/Include.make
++++ b/Include.make
+@@ -3,6 +3,3 @@
+ USRSBINDIR      := /usr/sbin
+ USRLIBDIR       := /usr/lib
+ MAN8            := /usr/share/man/man8
+-ifndef CFLAGS
+-CFLAGS          := -Wall -O2
+-endif
+--- a/kernel_test/Makefile
++++ b/kernel_test/Makefile
+@@ -20,7 +20,7 @@
+ #
+ 
+ .c:
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ #
+ # Delete all test programs.
+--- a/sbin/Makefile
++++ b/sbin/Makefile
+@@ -5,11 +5,11 @@
+ all: $(BUILD_FILES)
+ 
+ install: all
+-	mkdir -p -m 0755 $(INSTALLDIR)$(SBINDIR)
+-	$(INSTALL) -m 0700 $(BUILD_FILES) $(INSTALLDIR)$(SBINDIR)
++	mkdir -p -m 0755 $(DESTDIR)$(SBINDIR)
++	$(INSTALL) -m 0700 $(BUILD_FILES) $(DESTDIR)$(SBINDIR)
+ 
+ .c:
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ clean:
+ 	rm -f -- $(BUILD_FILES)
+--- a/usr_lib_ccs/Makefile
++++ b/usr_lib_ccs/Makefile
+@@ -6,12 +6,12 @@
+ all: $(BUILD_FILES)
+ 
+ install: all
+-	mkdir -p -m 0755 $(INSTALLDIR)/$(USRLIBDIR)/ccs
+-	$(INSTALL) -m 0755 $(BUILD_FILES) $(INSTALLDIR)/$(USRLIBDIR)/ccs/
+-	$(INSTALL) -m 0644 ../README.ccs ../COPYING.ccs $(INSTALLDIR)/$(USRLIBDIR)/ccs/
++	mkdir -p -m 0755 $(DESTDIR)/$(USRLIBDIR)/ccs
++	$(INSTALL) -m 0755 $(BUILD_FILES) $(DESTDIR)/$(USRLIBDIR)/ccs/
++	$(INSTALL) -m 0644 ../README.ccs ../COPYING.ccs $(DESTDIR)/$(USRLIBDIR)/ccs/
+ 
+ .c:
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ clean:
+ 	rm -f -- $(BUILD_FILES)
+--- a/usr_sbin/Makefile
++++ b/usr_sbin/Makefile
+@@ -19,27 +19,27 @@
+ LDFLAGS_PIC := $(filter-out -pie,$(filter-out -fPIE,$(LDFLAGS)))
+ 
+ libccstools.so: ccstools.c ccstools.h
+-	$(CC) $(CPPFLAGS) $(CFLAGS_PIC) $(LDFLAGS_PIC) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.3 -o libccstools.so.3.0.2
++	$(CC) $(CPPFLAGS) $(CFLAGS_PIC) $(LDFLAGS_PIC) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.3 -o libccstools.so.3.0.2 $(LIBS)
+ 	ln -sf libccstools.so.3.0.2 libccstools.so
+ 
+ .c:
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< -lccstools -L. 
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< -lccstools -L. $(LIBS)
+ 
+ ccs-editpolicy: ccstools.h editpolicy*.c readline.h /usr/include/curses.h libccstools.so
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ccs-editpolicy editpolicy*.c -lccstools -L. -DCOLOR_ON $(LIBS)
+ 
+ ccs-queryd: ccstools.h ccs-queryd.c readline.h /usr/include/curses.h libccstools.so
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ccs-queryd ccs-queryd.c -lncurses -lccstools -L.
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ccs-queryd ccs-queryd.c -lccstools -L. $(LIBS)
+ 
+ install: all
+-	mkdir -p -m 0755 $(INSTALLDIR)$(USRLIBDIR)
+-	$(INSTALL) -m 0755 libccstools.so.3.0.2 $(INSTALLDIR)$(USRLIBDIR)
+-	ln -sf libccstools.so.3.0.2 $(INSTALLDIR)$(USRLIBDIR)/libccstools.so.3
+-ifeq ($(INSTALLDIR),)
++	mkdir -p -m 0755 $(DESTDIR)$(USRLIBDIR)
++	$(INSTALL) -m 0755 libccstools.so.3.0.2 $(DESTDIR)$(USRLIBDIR)
++	ln -sf libccstools.so.3.0.2 $(DESTDIR)$(USRLIBDIR)/libccstools.so.3
++ifeq ($(DESTDIR),)
+ 	ldconfig || true
+ endif
+-	mkdir -p -m 0755 $(INSTALLDIR)$(USRSBINDIR)
+-	$(INSTALL) -m 0755 $(BUILD_FILES) $(INSTALLDIR)$(USRSBINDIR)
++	mkdir -p -m 0755 $(DESTDIR)$(USRSBINDIR)
++	$(INSTALL) -m 0755 $(BUILD_FILES) $(DESTDIR)$(USRSBINDIR)
+ 
+ clean:
+ 	rm -f -- $(BUILD_FILES) libccstools.so*
+--- a/usr_share_man/Makefile
++++ b/usr_share_man/Makefile
+@@ -1,7 +1,7 @@
+ include ../Include.make
+ 
+ install:
+-	mkdir -p -m 0755 $(INSTALLDIR)$(MAN8)
+-	$(INSTALL) -m 0644 man8/* $(INSTALLDIR)$(MAN8)
++	mkdir -p -m 0755 $(DESTDIR)$(MAN8)
++	$(INSTALL) -m 0644 man8/* $(DESTDIR)$(MAN8)
+ 
+ .PHONY: install
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 8286eb6bc515..7088ed297524 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,3 +1,3 @@
-DIST pcsc-lite-1.8.20.tar.bz2 745049 SHA256 ec7d0114016c788c1c09859c84860f6cec6c4595436d23245105154b9c046bb2 SHA512 63fea660d71605ebced5600a59ab5b6a735c4ba3697faf7658d91b8e281a7fb2a2bca6831c8f8c8c87b87a54f7fd03ae818a4c496dcbac0afce523e3b6c606b8 WHIRLPOOL 1c758274a884cf5625d31ed4d56938ee147ba276613c701aee1465b70842a9a73daa92b889835decaaca55707da6be798e3b183aef16a64817d969734d19250a
+DIST pcsc-lite-1.8.20.tar.bz2 745049 BLAKE2B 211b463c63b25f1dab629e8c32ccc6f19f28baf7b62029610dc9c2163ba2392f9ffa3d17671ae93c35e0ae3768a82ed5a5f245b8d3ea5f4c46013a07896a00b5 SHA512 63fea660d71605ebced5600a59ab5b6a735c4ba3697faf7658d91b8e281a7fb2a2bca6831c8f8c8c87b87a54f7fd03ae818a4c496dcbac0afce523e3b6c606b8
 DIST pcsc-lite-1.8.21.tar.bz2 750879 SHA256 fe3365eb7d4ce0fe891e2b6d6248351c287435ca502103f1f1431b1710e513ad SHA512 bd3740f4444d2201efaa34a312d2a5f6b5808b0b7ff1d5696dce26df67ef198a63a96670d0acac97a6e693b33079afeeeaa6692746875b0ff72d69a2b0835990 WHIRLPOOL 7bc1040262974c94f9c15f48db5370f1ebd6d29f42267cbf73bcbe750974490dcc012f20a56213a17e26f1cb1dbbe2e9f8fbf0fb9c1db80841aa5863ffe4766c
-DIST pcsc-lite-1.8.22.tar.bz2 751724 SHA256 6a358f61ed3b66a7f6e1f4e794a94c7be4c81b7a58ec360c33791e8d7d9bd405 SHA512 762eccf6a25040653f563b93bf11262ddc015323d06d759a3472ba80af0489804410ba17c7e5330ccd4b5accc8b7314c80b5e99da278561d3818d8c381e6a025 WHIRLPOOL 39c7b6217fe75da42d062a2618cdb749b78c6a1dd04f60a92c45e974d551782ffa621f78198c600b350da9c7c30666a7e92409b7248b3642bc922f8ab9014036
+DIST pcsc-lite-1.8.22.tar.bz2 751724 BLAKE2B d11ca9588449ea8508550b60aad2d2bb6a140c02a86287f6d972ced97fdc8a5db80d542624cbaebdda564192217186c79c30b046cb7d6f6c7a450d91c0f1c9fb SHA512 762eccf6a25040653f563b93bf11262ddc015323d06d759a3472ba80af0489804410ba17c7e5330ccd4b5accc8b7314c80b5e99da278561d3818d8c381e6a025
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
index 9d136110c54b..a86d7bfce15b 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/superiotool/Manifest b/sys-apps/superiotool/Manifest
index f29ac5386668..81eb3d416236 100644
--- a/sys-apps/superiotool/Manifest
+++ b/sys-apps/superiotool/Manifest
@@ -1 +1 @@
-DIST superiotool-6637.tar.xz 27364 SHA256 e21e091c7679c2eeac66aa49499c02587d64a41b3b36449f4ec06dafc8f0ba21 SHA512 dafb732b33205d1bdd368c1f752c7ba78cfb9f6174fc72075b9e8dcae962ab9ef10eb0860052a5925167b91e5b056f6b8a4a316799661d3950a630020f4330fd WHIRLPOOL 70ee5da7946cd93d978db2094dee1466a91239db96f640e5e2b7aa6d9487ccc43229e570bd084dcd6ef27353752059dfaa6fdf5b414d4eadf657549d0998bf39
+DIST superiotool-6637.tar.xz 27364 BLAKE2B be0fd054f1385c20ca1d3da04052f7155da77211c1a4253c58c0ee272944e4134b1df6213934ea0ab6c297da9ab09ceab1cc00dcd775633d7ba50f46cba8ffb8 SHA512 dafb732b33205d1bdd368c1f752c7ba78cfb9f6174fc72075b9e8dcae962ab9ef10eb0860052a5925167b91e5b056f6b8a4a316799661d3950a630020f4330fd
diff --git a/sys-apps/superiotool/superiotool-6637.ebuild b/sys-apps/superiotool/superiotool-6637.ebuild
index 9cd57fadcfca..83db272b25ab 100644
--- a/sys-apps/superiotool/superiotool-6637.ebuild
+++ b/sys-apps/superiotool/superiotool-6637.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
-if [[ ${PV} == "99999999" ]] ; then
+if [[ ${PV} == *99999999 ]] ; then
 	ESVN_REPO_URI="svn://coreboot.org/coreboot/trunk/util/${PN}"
 	inherit subversion
-	SRC_URI=""
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -26,6 +25,8 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e 's:-Werror ::' \
 		-e 's:-O2 ::' \
@@ -40,8 +41,3 @@ src_compile() {
 		CC="$(tc-getCC)" \
 		SVNDEF="-D'SUPERIOTOOL_VERSION=\"${ESVN_WC_REVISION}\"'"
 }
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc README
-}
diff --git a/sys-apps/superiotool/superiotool-99999999.ebuild b/sys-apps/superiotool/superiotool-99999999.ebuild
index 9cd57fadcfca..83db272b25ab 100644
--- a/sys-apps/superiotool/superiotool-99999999.ebuild
+++ b/sys-apps/superiotool/superiotool-99999999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
-if [[ ${PV} == "99999999" ]] ; then
+if [[ ${PV} == *99999999 ]] ; then
 	ESVN_REPO_URI="svn://coreboot.org/coreboot/trunk/util/${PN}"
 	inherit subversion
-	SRC_URI=""
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -26,6 +25,8 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e 's:-Werror ::' \
 		-e 's:-O2 ::' \
@@ -40,8 +41,3 @@ src_compile() {
 		CC="$(tc-getCC)" \
 		SVNDEF="-D'SUPERIOTOOL_VERSION=\"${ESVN_WC_REVISION}\"'"
 }
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc README
-}
diff --git a/sys-apps/syscriptor/Manifest b/sys-apps/syscriptor/Manifest
index 3331582ee652..82cfe6f2e706 100644
--- a/sys-apps/syscriptor/Manifest
+++ b/sys-apps/syscriptor/Manifest
@@ -1 +1 @@
-DIST syscriptor-1.5.15.tar.bz2 58732 SHA256 74c8bedc473e3b55171b6e2fdc4ed694983fdfa36a213c1356f6ad49872b62ef SHA512 12fadc8bee58b8001f805383f0bab5ca4999f5d463eb69ec15486aeb2eb407671d2a4007f017e35df450f3616c4e1096bc86b34413485bae4ca6a9460e9056bd WHIRLPOOL 43af7a5c4a92065407dae68827be261f97c21e70b2daba69729d5f299f55bb94bfebd8d597c5761cb12d434183529cdcad07a6f662376770beafdff4056909f0
+DIST syscriptor-1.5.15.tar.bz2 58732 BLAKE2B 1527d9baf18d51543f2be07e55fe5e3557fcbf616a0770a1d17920361af41e45c7a0191246c6e833674c073bb06dd5b05eb54fbe882f9700fd928284277a232d SHA512 12fadc8bee58b8001f805383f0bab5ca4999f5d463eb69ec15486aeb2eb407671d2a4007f017e35df450f3616c4e1096bc86b34413485bae4ca6a9460e9056bd
diff --git a/sys-apps/syscriptor/syscriptor-1.5.15.ebuild b/sys-apps/syscriptor/syscriptor-1.5.15.ebuild
index eeba6012f3e6..adef11296006 100644
--- a/sys-apps/syscriptor/syscriptor-1.5.15.ebuild
+++ b/sys-apps/syscriptor/syscriptor-1.5.15.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="display misc information about your hardware"
 HOMEPAGE="http://syscriptor.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -11,8 +13,3 @@ KEYWORDS="~alpha amd64 ppc x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS CREDITS ChangeLog HISTORY NEWS README TODO
-}
diff --git a/sys-apps/ultracopier/Manifest b/sys-apps/ultracopier/Manifest
index e185c85fe508..c7ef5c94b1da 100644
--- a/sys-apps/ultracopier/Manifest
+++ b/sys-apps/ultracopier/Manifest
@@ -1 +1 @@
-DIST ultracopier-src-0.2.0.16.tar.bz2 430736 SHA256 3c965899c491ddaa7381de805a62557d224a70c3379f68bb2a24f4bf07d36f30 SHA512 7ca0698bca73c9fa696b48d5aee09a5159c7a1bb6c8d8194476ed13d189c4b16b42c8aff0013fe1107889c95d9a048cc86953698f90b731b48d8ededac350693 WHIRLPOOL 8c901099bedeca8edd89c60fa05e4fbf164d8c28bb9bdeae9ec5d16d1c257549f8bc343d780bfb79d46060403e1c62ffbf24ad4cc05f2ad02b13911f1b292c47
+DIST ultracopier-src-0.2.0.16.tar.bz2 430736 BLAKE2B 2af470ca2fb0671732e9fe528c12ba4c1957028cc0f7df512668670f011f5b34e6e73e91033b60bdb5a91a4520791e06fd0a606222637929b12a620ee252901a SHA512 7ca0698bca73c9fa696b48d5aee09a5159c7a1bb6c8d8194476ed13d189c4b16b42c8aff0013fe1107889c95d9a048cc86953698f90b731b48d8ededac350693
diff --git a/sys-apps/ultracopier/ultracopier-0.2.0.16.ebuild b/sys-apps/ultracopier/ultracopier-0.2.0.16.ebuild
index ba8896b647cd..d29381801355 100644
--- a/sys-apps/ultracopier/ultracopier-0.2.0.16.ebuild
+++ b/sys-apps/ultracopier/ultracopier-0.2.0.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
-inherit eutils qt4-r2
+inherit desktop qmake-utils
 
 DESCRIPTION="Advanced file copying tool"
 HOMEPAGE="http://ultracopier.first-world.info/"
@@ -18,22 +18,25 @@ RDEPEND="dev-qt/qtgui:4"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	local debugl=0
-	use debug && debugl=100
-	sed -i -e "s/\(DEBUG_ULTRACOPIER\) 0/\1 ${debugl}/" src/var.h || die
+	default
+	sed -i -e "s/\(DEBUG_ULTRACOPIER\) 0/\1 $(usex debug 100 0)/" src/var.h || die
+}
+
+src_configure() {
+	eqmake4
 }
 
 src_install() {
-	dodoc CHANGELOG README || die
+	einstalldocs
 
 	cd src || die
 	rm -f lang/en* lang/*.ts || die
 	rm -Rf styles/kde3 || die
 
-	dobin ${PN} || die
-	newicon other/${PN}-128x128.png ${PN}.png || die
-	domenu other/${PN}.desktop || die
+	dobin ${PN}
+	newicon other/${PN}-128x128.png ${PN}.png
+	domenu other/${PN}.desktop
 
 	insinto /usr/share/${PN}
-	doins -r lang styles || die
+	doins -r lang styles
 }
diff --git a/sys-apps/utempter/Manifest b/sys-apps/utempter/Manifest
index 8b18dda0755b..031d8a62a834 100644
--- a/sys-apps/utempter/Manifest
+++ b/sys-apps/utempter/Manifest
@@ -1 +1 @@
-DIST utempter-0.5.5-6.src.rpm 21099 SHA256 617c28d579fa54349b8a706e8346c2442f2ef39523db7e0501701a0919651f3c SHA512 81eeac830631922f2d1b2099a559b60bfd21818b38a524d3c5f61aec143b3e70e95a9ccc300f649dd81f515837fe3befaba6b93bb2e22767e71eee7acb711655 WHIRLPOOL 3ae0a32eae886f2ac14dcf36b4e96e4bb8c25966389c6608a83673149a3045b580b35832e5c69836a18a4f88b55e8c20d254470f84424e30f758a820a87ce13a
+DIST utempter-0.5.5-6.src.rpm 21099 BLAKE2B a4a8c53ab31d53ec56d60a16e5c1d3a0a2ec6c73c3c3025c15dfc389da75f969545392b46976017cfcde1d9f9ca974b14786bbf39709aebdda890df13a7866ed SHA512 81eeac830631922f2d1b2099a559b60bfd21818b38a524d3c5f61aec143b3e70e95a9ccc300f649dd81f515837fe3befaba6b93bb2e22767e71eee7acb711655
diff --git a/sys-apps/utempter/files/utempter-0.5.5.6-build.patch b/sys-apps/utempter/files/utempter-0.5.5.6-build.patch
deleted file mode 100644
index 8fbfb111196f..000000000000
--- a/sys-apps/utempter/files/utempter-0.5.5.6-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -37,7 +37,7 @@
- 	ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(SOMAJOR)
- 
- $(SHAREDLIB): utmpintf.os
--	$(CC) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc
-+	$(CC) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc
- 
- utmpintf.o: utmpintf.c utempter.h
- 
diff --git a/sys-apps/utempter/files/utempter-0.5.5.6-soname-makefile-fix.patch b/sys-apps/utempter/files/utempter-0.5.5.6-fix-build-system.patch
similarity index 55%
rename from sys-apps/utempter/files/utempter-0.5.5.6-soname-makefile-fix.patch
rename to sys-apps/utempter/files/utempter-0.5.5.6-fix-build-system.patch
index 123c77eb357c..83b41a04b25f 100644
--- a/sys-apps/utempter/files/utempter-0.5.5.6-soname-makefile-fix.patch
+++ b/sys-apps/utempter/files/utempter-0.5.5.6-fix-build-system.patch
@@ -1,6 +1,6 @@
---- Makefile.orig	2005-04-15 08:54:32.000000000 -0400
-+++ Makefile	2005-04-15 08:56:17.000000000 -0400
-@@ -5,6 +5,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,12 +5,14 @@
  CVSROOT=$(shell cat CVS/Root)
  # major number of the .so lib
  SOMAJOR = 0
@@ -11,7 +11,22 @@
  
  SHAREDLIB = lib$(NAME).so
  SONAME = $(SHAREDLIB).$(SOMAJOR)
-@@ -29,6 +33,8 @@
+ 
+-CFLAGS = -Wall $(RPM_OPT_FLAGS)
+-
+ TARGETS = $(NAME) utmp $(SHAREDLIB)
+ 
+ all:	$(TARGETS)
+@@ -19,7 +21,7 @@
+ 	rm -f *.so utempter utmp *.os
+ 
+ %.os : %.c
+-	$(CC) -c $(CFLAGS) -fPIC $< -o $@
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC $< -o $@
+ 
+ install:
+ 	mkdir -p $(RPM_BUILD_ROOT)/usr/sbin
+@@ -29,9 +31,11 @@
  	install -m 644 utempter.h $(RPM_BUILD_ROOT)/usr/include
  	install -m 644 $(SHAREDLIB) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(VERSION)
  	ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB)
@@ -19,4 +34,8 @@
 +	ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(SOMAJOR)
  
  $(SHAREDLIB): utmpintf.os
- 	$(CC) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc
+-	$(CC) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc
++	$(CC) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc $(LIBS)
+ 
+ utmpintf.o: utmpintf.c utempter.h
+ 
diff --git a/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch b/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch
index 8644db837f4a..b6fc7ea7d27e 100644
--- a/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch
+++ b/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch
@@ -1,5 +1,5 @@
---- utempter-0.5.5/utempter.c.mps	2004-12-11 14:54:06.000000000 +0100
-+++ utempter-0.5.5/utempter.c	2004-12-11 14:57:46.000000000 +0100
+--- a/utempter.c
++++ b/utempter.c
 @@ -11,7 +11,9 @@
  #include <sys/stat.h>
  #include <sys/sysmacros.h>
diff --git a/sys-apps/utempter/utempter-0.5.5.6.ebuild b/sys-apps/utempter/utempter-0.5.5.6.ebuild
index 4866160d3cd1..6fd2931dcb40 100644
--- a/sys-apps/utempter/utempter-0.5.5.6.ebuild
+++ b/sys-apps/utempter/utempter-0.5.5.6.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit rpm eutils user
+EAPI=6
+
+inherit flag-o-matic rpm toolchain-funcs user
 
 MY_P=${P%.*}-${PV##*.}
-S=${WORKDIR}/${P%.*}
+
 DESCRIPTION="App that allows non-privileged apps to write utmp (login) info"
 HOMEPAGE="https://www.redhat.com/"
 SRC_URI="mirror://gentoo/${MY_P}.src.rpm"
@@ -14,43 +16,43 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-RDEPEND="!sys-libs/libutempter
+RDEPEND="
+	!sys-libs/libutempter
 	!dev-python/utmp"
 
+S=${WORKDIR}/${P%.*}
+PATCHES=(
+	"${FILESDIR}"/${P}-no_utmpx.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
+
 pkg_setup() {
 	enewgroup utmp 406
 }
 
-src_unpack() {
-	rpm_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-soname-makefile-fix.patch
-	epatch "${FILESDIR}"/${P}-no_utmpx.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	emake RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" || die
+src_configure() {
+	tc-export CC
+	append-cflags -Wall
 }
 
 src_install() {
 	emake \
-		RPM_BUILD_ROOT="${D}" \
+		RPM_BUILD_ROOT="${ED}" \
 		LIBDIR=/usr/$(get_libdir) \
-		install || die
-	dobin utmp || die
+		install
+	dobin utmp
 
 	fowners root:utmp /usr/sbin/utempter
 	fperms 2755 /usr/sbin/utempter
 }
 
 pkg_postinst() {
-	if [ -f "${ROOT}"/var/log/wtmp ] ; then
-		chown root:utmp "${ROOT}"/var/log/wtmp
-		chmod 664 "${ROOT}"/var/log/wtmp
+	if [[ -f "${EROOT%/}"/var/log/wtmp ]] ; then
+		chown root:utmp "${EROOT%/}"/var/log/wtmp
+		chmod 664 "${EROOT%/}"/var/log/wtmp
 	fi
-	if [ -f "${ROOT}"/var/run/utmp ] ; then
-		chown root:utmp "${ROOT}"/var/run/utmp
-		chmod 664 "${ROOT}"/var/run/utmp
+	if [[ -f "${EROOT%/}"/var/run/utmp ]] ; then
+		chown root:utmp "${EROOT%/}"/var/run/utmp
+		chmod 664 "${EROOT%/}"/var/run/utmp
 	fi
 }
diff --git a/sys-apps/vbetool/Manifest b/sys-apps/vbetool/Manifest
index a2f0cdf04bae..4a22534a6505 100644
--- a/sys-apps/vbetool/Manifest
+++ b/sys-apps/vbetool/Manifest
@@ -1 +1 @@
-DIST vbetool-1.1.tar.gz 182826 SHA256 4d26ddc43144593742349e69481e3536ce3482faaa9ad4494fdc7c8b7662f954 SHA512 09d8713516f074fe8e901ab3e24aba7e8b9ddf459b3ee3394b7604e4489a70a27c6dc3604cf1284c49233dba908f00da746c583562af2bc93b6df8ff413efd96 WHIRLPOOL 9b6d6b616c0b074e49c80291e48e2c951e83a2981780cf942ca535f2909e7e83a0d7cf1f9efdc6cea779a5db688635bb7a3740c3bd77a80a268776dea9b1d147
+DIST vbetool-1.1.tar.gz 182826 BLAKE2B 6b30eb468e55bedd766161e373e042b5fdf38fd2926bfc8aeb94404350864e835d41642f19be155fcf9a8fbfdc8b4e237e742cabd00626db5e8d17e7c7c5cf6f SHA512 09d8713516f074fe8e901ab3e24aba7e8b9ddf459b3ee3394b7604e4489a70a27c6dc3604cf1284c49233dba908f00da746c583562af2bc93b6df8ff413efd96
diff --git a/sys-apps/vbetool/vbetool-1.1.ebuild b/sys-apps/vbetool/vbetool-1.1.ebuild
index 60ec4a9872c8..fd6c4d5d9ce2 100644
--- a/sys-apps/vbetool/vbetool-1.1.ebuild
+++ b/sys-apps/vbetool/vbetool-1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Run real-mode video BIOS code to alter hw state (i.e. reinitialize video card)"
 HOMEPAGE="http://www.codon.org.uk/~mjg59/vbetool/"
@@ -14,13 +14,17 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="sys-libs/zlib
+RDEPEND="
+	sys-libs/zlib
 	sys-apps/pciutils
 	>=dev-libs/libx86-1.1-r1"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0-build.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0-build.patch
+	default
+
 	eaclocal # temp fix for #439614
 	eautoreconf
 }
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index b521b01b07f8..8d7c98b5cbca 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -1,2 +1,2 @@
 DIST watchdog-5.14.tar.gz 216384 SHA256 620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1 SHA512 ccfaca7a68a47cff42dbeae047dfa691e1cfc23851f9ca0634ea6315ff55a13cdbb0020bde7df38b702c82c0535ad41f520617dd639037e171701a6b0f8991aa WHIRLPOOL 5520e0a4970a20c25780d507260380acf2056828bad8702de98039876526c39a40f884eb1b684cf39386479e6d40c08f3134b138cc6caf51b4150289a364239c
-DIST watchdog-5.15.tar.gz 228132 SHA256 ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c18947c SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75 WHIRLPOOL ebd7ee604ddbad856760949b16615693b1665289d57312f7dee10cea1d358dbd20f2beb2656e549a80c81ad08e5e6de8621cda3ad4eb696e9af7b63b8b4045b9
+DIST watchdog-5.15.tar.gz 228132 BLAKE2B 040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323 SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild b/sys-apps/watchdog/watchdog-5.15.ebuild
index 887cff300800..1c38ff5e0028 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit toolchain-funcs flag-o-matic systemd
+inherit flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="A software watchdog and /dev/watchdog daemon"
 HOMEPAGE="https://sourceforge.net/projects/watchdog/"
@@ -14,8 +14,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="nfs"
 
-DEPEND="nfs? ( net-libs/libtirpc )"
-RDEPEND="${DEPEND}"
+RDEPEND="nfs? ( net-libs/libtirpc )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-musl.patch
@@ -23,18 +24,16 @@ PATCHES=(
 )
 
 src_configure() {
-	if use nfs ; then
-		tc-export PKG_CONFIG
-		append-cppflags $(${PKG_CONFIG} libtirpc --cflags)
-		export LIBS+=" $(${PKG_CONFIG} libtirpc --libs)"
+	if use nfs; then
+		append-cppflags "$($(tc-getPKG_CONFIG) libtirpc --cflags)"
+		append-libs "$($(tc-getPKG_CONFIG) libtirpc --libs)"
 	fi
 	econf $(use_enable nfs)
 }
 
 src_install() {
 	default
-	docinto examples
-	dodoc examples/*
+	dodoc -r examples
 
 	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
 	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index 6b3a8cd0e8cf..75aa5ac8b288 100644
--- a/sys-apps/which/Manifest
+++ b/sys-apps/which/Manifest
@@ -1 +1 @@
-DIST which-2.21.tar.gz 149305 SHA256 f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61 WHIRLPOOL e1712d2f2b48467300f5947d0a72c0cf759bc33001661ba41cd57cefe21cb9974cc318748d76ff73c71fb869c4d7a445973ad95777ab380f673c85095360fd57
+DIST which-2.21.tar.gz 149305 BLAKE2B 355888b0dfe3e4e1679a8a9e1255a935fa48be220408abc441fae69fe0b26bd39e0544ed20e75497ed5bccaa75e788d9aec17007c668f15eaf6b1599faa131a0 SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61
diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild
index 8afa8dab5298..4b01ed6b5168 100644
--- a/sys-apps/which/which-2.21.ebuild
+++ b/sys-apps/which/which-2.21.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
 inherit flag-o-matic toolchain-funcs
 
@@ -14,11 +14,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-src_prepare() {
-	append-lfs-flags
-}
-
 src_configure() {
+	append-lfs-flags
 	tc-export AR
 	default
 }
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index c0ebbfda4233..bcc650214b00 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1 +1 @@
-DIST x86info-1.30.tgz 95727 SHA256 fe3009850e93a9c5fa38ed6bf74d72686043329fead8f1b2be4b5943d4fc9428 SHA512 0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f WHIRLPOOL 112b91421b8ff3ce8c01f7f22c5b26cad09a9d222fe4259b6644d8f28887a909f94947f1cd94325ae3acab7d440338bbea5693d2ed014f7464c8279a6079a336
+DIST x86info-1.30.tgz 95727 BLAKE2B 6e9e345c6b4d05d4a137b898f1cc8a31e901b25b8a3822c06c103298e2ee60c6fada8e1fc314a5fcec04618b9a8a9ce05a4e631dbf9f03a24c5349f13d1e2301 SHA512 0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f
diff --git a/sys-apps/x86info/files/1.21-pic.patch b/sys-apps/x86info/files/1.21-pic.patch
index ddf24b293e14..7bf89240c2c0 100644
--- a/sys-apps/x86info/files/1.21-pic.patch
+++ b/sys-apps/x86info/files/1.21-pic.patch
@@ -1,6 +1,5 @@
-diff -Nuar x86info-1.21.orig/bench/benchmarks.c x86info-1.21/bench/benchmarks.c
---- x86info-1.21.orig/bench/benchmarks.c	2007-11-26 17:53:58.278467889 -0800
-+++ x86info-1.21/bench/benchmarks.c	2007-11-26 17:54:32.014318066 -0800
+--- a/bench/benchmarks.c
++++ b/bench/benchmarks.c
 @@ -19,7 +19,10 @@
  #ifdef __linux__
  	TIME(asm volatile("int $0x80" :"=a" (tmp) :"0" (__NR_getppid)), "int 0x80");
diff --git a/sys-apps/x86info/files/x86info-1.24-pic.patch b/sys-apps/x86info/files/x86info-1.24-pic.patch
index 5cbd3a586f8e..b4098c5c68c2 100644
--- a/sys-apps/x86info/files/x86info-1.24-pic.patch
+++ b/sys-apps/x86info/files/x86info-1.24-pic.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/270388
 
---- cpuid.c
-+++ cpuid.c
+--- a/cpuid.c
++++ b/cpuid.c
 @@ -62,12 +62,28 @@
  		sched_setaffinity(getpid(), sizeof(set), &set);
  	}
diff --git a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch b/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch
index 54208cab0843..a9cec0397fac 100644
--- a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch
+++ b/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch
@@ -1,12 +1,11 @@
-diff -Nuar x86info-1.29.orig/Makefile x86info-1.29/Makefile
---- x86info-1.29.orig/Makefile	2011-04-05 22:54:04.000000000 +0000
-+++ x86info-1.29/Makefile	2011-05-15 18:19:42.204228978 +0000
+--- a/Makefile
++++ b/Makefile
 @@ -12,7 +12,8 @@
  LSMSR_TMP_HEADERS=AMD/k8.h AMD/fam10h.h AMD/fam11h.h generic_msr.h
  
  %.h: %.regs scripts/createheader.py
 -	python scripts/createheader.py $< `basename $< .regs` >$@
-+	python scripts/createheader.py $< `basename $< .regs` >$@.tmp ; \
++	$(PYTHON) scripts/createheader.py $< `basename $< .regs` >$@.tmp ; \
 +	mv $@.tmp $@
  
  LSMSR_SRC = \
diff --git a/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch b/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch
new file mode 100644
index 000000000000..21034d99edc5
--- /dev/null
+++ b/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,5 @@
+ VERSION=1.30
+ 
+-CFLAGS = -g -O2 -Werror -Wall -Wshadow -Wextra -Wmissing-declarations -Wdeclaration-after-statement -Wredundant-decls
+-LDFLAGS = -Wl,-z,relro,-z,now
+-CC = gcc
+-
+ SHELL = /bin/sh
+ 
+ all: x86info test lsmsr
diff --git a/sys-apps/x86info/x86info-1.30.ebuild b/sys-apps/x86info/x86info-1.30.ebuild
index 7ef0bfa3f20b..358f453ebbbe 100644
--- a/sys-apps/x86info/x86info-1.30.ebuild
+++ b/sys-apps/x86info/x86info-1.30.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
-inherit eutils flag-o-matic linux-info toolchain-funcs
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
 
 DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
 HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
@@ -14,48 +16,57 @@ SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE=""
 
-RDEPEND="sys-apps/pciutils"
-DEPEND="${RDEPEND}"
+RDEPEND="sys-apps/pciutils:="
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}"
 
 CONFIG_CHECK="~MTRR ~X86_CPUID"
 
-src_prepare() {
-	epatch "${FILESDIR}"/1.21-pic.patch
-	epatch "${FILESDIR}"/${PN}-1.24-pic.patch #270388
-	epatch "${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
+PATCHES=(
+	"${FILESDIR}"/1.21-pic.patch
+	"${FILESDIR}"/${PN}-1.24-pic.patch #270388
+	"${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
+	"${FILESDIR}"/${PN}-1.30-fix-build-system.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-any-r1_pkg_setup
 }
 
-src_compile() {
+src_configure() {
 	# These flags taken from the 1.29 ebuild
-	append-flags -Wall -Wshadow -Wextra -Wmissing-declarations -Wdeclaration-after-statement -Wredundant-decls
+	append-flags -Wall -Wshadow -Wextra -Wmissing-declarations \
+		-Wdeclaration-after-statement -Wredundant-decls
 	append-ldflags -Wl,-z,relro,-z,now
-	emake x86info lsmsr \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
+
+	tc-export CC
+}
+
+src_compile() {
+	emake x86info lsmsr
 }
 
 src_install() {
-	dobin x86info lsmsr || die
+	dobin x86info lsmsr
 
 	insinto /etc/modprobe.d
 	newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
 
-	dodoc TODO README
+	einstalldocs
 	doman x86info.1 lsmsr.8
-	insinto /usr/share/doc/${PF}
-	doins -r results
-	prepalldocs
+
+	dodoc -r results
 }
 
 pkg_preinst() {
-	if [ -a "${ROOT}"/etc/modules.d/x86info ] && [ ! -a "${ROOT}"/etc/modprobe.d/x86info ] ; then
+	if [[ -a "${EROOT%/}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT%/}"/etc/modprobe.d/x86info ]]; then
 		elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/"
-		mv "${ROOT}"/etc/{modules,modprobe}.d/x86info
+		mv "${EROOT%/}"/etc/{modules,modprobe}.d/x86info
 	fi
-	if [ -a "${ROOT}"/etc/modprobe.d/x86info ] && [ ! -a "${ROOT}"/etc/modprobe.d/x86info.conf ] ; then
+	if [[ -a "${EROOT%/}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT%/}"/etc/modprobe.d/x86info.conf ]]; then
 		elog "Adding .conf suffix to x86info in /etc/modprobe.d/"
-		mv "${ROOT}"/etc/modprobe.d/x86info{,.conf}
+		mv "${EROOT%/}"/etc/modprobe.d/x86info{,.conf}
 	fi
 }
diff --git a/sys-apps/xmbmon/Manifest b/sys-apps/xmbmon/Manifest
index c1b6979699ed..2107a452de12 100644
--- a/sys-apps/xmbmon/Manifest
+++ b/sys-apps/xmbmon/Manifest
@@ -1,2 +1 @@
-DIST xmbmon205.tar.gz 142987 SHA256 65b10ebfe53585ac22d6a31d8ef3fea552cb266cf2c124c00421dec1df5a4a4f SHA512 0ee2f3616976af6edc3777391f657d12670be1557f726f67f51edc23866d96d5cd4cfa9ac8aaad52cce2bdd2b9c616efd6edba1a019e4360a0fcaae0aef99a9c WHIRLPOOL f4a77e88315cb86fb6aa61566804cb22b382a6a18d56c96a09dd991033be005ec638361a03cfde21a95e6ef316ed65bbf15d72d03b10810e4dee59e1790e3d7b
-DIST xmbmon205_fflush.patch 242 SHA256 f837f465861ce46e4a90d1d3c7a680c1904f7fb91e14efcbad22313c90e2cdc7 SHA512 4ebd6f3870f3b35aafe9424da9e007b269bbdd6944a012e45a6bb18871a1df649245a0992862a2346dd92026e36430130b2061d8308286b93e13571e028684b5 WHIRLPOOL 3bb1a83e9e753642fe6a9bf0deea8743829fe3e27759786f049e03b3fb862adb5c7ed2d69a045d682e1e7afbb207d5f496dbff9d938625d1292583271a804b69
+DIST xmbmon205.tar.gz 142987 BLAKE2B 7c39c78068106c828273c077a2a375bfd4dbfa686a4f6b592a986b6cebec6b3e2ae7c9318ecd1b1d91c0757fe7ebb023ac135aa8167b5c86c3e42c1c173cdb72 SHA512 0ee2f3616976af6edc3777391f657d12670be1557f726f67f51edc23866d96d5cd4cfa9ac8aaad52cce2bdd2b9c616efd6edba1a019e4360a0fcaae0aef99a9c
diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch
index 27b150e9b0ba..bac206905107 100644
--- a/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch
+++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch
@@ -1,6 +1,5 @@
-diff -Naur xmbmon205.orig/configure xmbmon205/configure
---- xmbmon205.orig/configure	2004-08-13 16:22:18.000000000 +0900
-+++ xmbmon205/configure	2005-02-05 11:02:02.496163477 +0900
+--- a/configure
++++ b/configure
 @@ -3489,7 +3489,7 @@
  	i?86-*-freebsd*)
    		CC=cc
@@ -10,9 +9,8 @@ diff -Naur xmbmon205.orig/configure xmbmon205/configure
    		CC=gcc
  		HOSTDEF="-DLINUX"
  		;;
-diff -Naur xmbmon205.orig/configure.in xmbmon205/configure.in
---- xmbmon205.orig/configure.in	2004-08-13 16:06:31.000000000 +0900
-+++ xmbmon205/configure.in	2005-02-05 11:01:35.414957216 +0900
+--- a/configure.in
++++ b/configure.in
 @@ -19,7 +19,7 @@
  	i?86-*-freebsd*)
    		CC=cc
diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-fflush.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-fflush.patch
new file mode 100644
index 000000000000..655b30f75517
--- /dev/null
+++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-fflush.patch
@@ -0,0 +1,10 @@
+--- a/mbmon.c
++++ b/mbmon.c
+@@ -640,6 +640,7 @@
+ 		else if (fanspeed == 7)
+ 			fprintf(out, "%4d\n%4d\n%4d\n", rot1, rot2, rot3);
+ 	}
++	fflush(out);
+ 	if (port) {
+ #ifdef LOGGING
+ 		if (nfd)
diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch
index 5a28b52f9ea2..e501f448dcfa 100644
--- a/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch
+++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch
@@ -2,8 +2,8 @@ Listen on loopback only with the -l option
 
 patch by Mike Frysinger
 
---- mbmon.c
-+++ mbmon.c
+--- a/mbmon.c
++++ b/mbmon.c
 @@ -41,4 +41,5 @@
  static const char *MyName = "mbmon";
  int port = 0;
diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch
index aecb5e7a9b7c..1ca30657c230 100644
--- a/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch
+++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch
@@ -2,8 +2,8 @@ Write a pid when we daemonize
 
 patch by Mike Frysinger
 
---- mbmon.c
-+++ mbmon.c
+--- a/bmon.c
++++ b/mbmon.c
 @@ -229,4 +229,5 @@
  static void daemonize()
  {
diff --git a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild b/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
index da5cef958ffd..2b128239d11e 100644
--- a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
+++ b/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils
+EAPI=6
 
 MY_P=${PN}${PV//.}
+
 DESCRIPTION="Mother Board Monitor Program for X Window System"
 HOMEPAGE="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html"
-SRC_URI="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}.tar.gz
-	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}_fflush.patch"
+SRC_URI="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}.tar.gz"
 #	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}_A7N8X-VM.patch
 
 LICENSE="BSD"
@@ -15,21 +15,27 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="X"
 
-DEPEND="X? ( x11-libs/libXt
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libICE )"
+RDEPEND="
+	X? (
+		x11-libs/libXt
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libICE
+	)"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
+PATCHES=(
+	# "${DISTDIR}"/${MY_P}_A7N8X-VM.patch
+	"${FILESDIR}"/${P}-fflush.patch
+	"${FILESDIR}"/${P}-amd64.patch
+	"${FILESDIR}"/${P}-pid.patch
+	"${FILESDIR}"/${P}-loopback.patch
+)
+
+src_prepare() {
+	default
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# epatch "${DISTDIR}"/${MY_P}_A7N8X-VM.patch
-	epatch "${DISTDIR}"/${MY_P}_fflush.patch
-	epatch "${FILESDIR}"/${P}-amd64.patch
-	epatch "${FILESDIR}"/${P}-pid.patch
-	epatch "${FILESDIR}"/${P}-loopback.patch
 	sed -i \
 		-e "/^CFLAGS=/s/-O3/${CFLAGS}/" \
 		-e '/^LDFLAGS=-s$/d' \
@@ -40,21 +46,19 @@ src_unpack() {
 }
 
 src_compile() {
-	econf || die "Configure failed"
-	emake mbmon || die "Make mbmon failed"
-	if use X ; then
-		emake xmbmon || die "Make xmbmon failed"
-	fi
+	emake mbmon
+	use X && emake xmbmon
 }
 
 src_install() {
-	dosbin mbmon || die "mbmon failed"
+	dosbin mbmon
 	doman mbmon.1
 	dodoc ChangeLog* ReadMe* mbmon-rrd.pl
 
-	if use X ; then
-		dosbin xmbmon || die "xmbmon failed"
+	if use X; then
+		dosbin xmbmon
 		doman xmbmon.1x
+
 		insinto /etc/X11/app-defaults/
 		newins xmbmon.resources XMBmon
 	fi
@@ -64,10 +68,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
 	einfo "These programs access SMBus/ISA-IO ports without any kind"
 	einfo "of checking.  It is, therefore, very dangerous and may cause"
 	einfo "a system-crash. Make sure you read ReadMe,"
 	einfo "section 4, 'How to use!'"
-	echo
 }
diff --git a/sys-apps/zorroutils/Manifest b/sys-apps/zorroutils/Manifest
index dfd9a261847a..c35fb560fd29 100644
--- a/sys-apps/zorroutils/Manifest
+++ b/sys-apps/zorroutils/Manifest
@@ -1 +1 @@
-DIST zorroutils-0.04.tar.gz 12205 SHA256 5aca30dec4f29b918d6b899d0467c95e4b9d0016dd7c647e9022bd7d4864676c SHA512 e00a621cc64f3c50ae940809eb79ee145dab7d042e5a2b7fafe14bc7f9f85ff2e1b592d8922e628c5dbcecab95e6bd634d0cbbc1cc84f72136a5235480e6274f WHIRLPOOL ca81347f5fca3ad595b6f50556fe295f680ca160b72dd2b05b7d13ee90c502a369d31a5741ad30e81c902d1ac385ee3c39b4f7ef2d81cbc751b995d42c86c3ef
+DIST zorroutils-0.04.tar.gz 12205 BLAKE2B b5818073551b39d715c8e8fbaaba2b827a7a4f4442bac76876037721d1202cf5893779cd22fba0451d2a0e7eb15266b08af242a1fa1c6be3eff2e65949523803 SHA512 e00a621cc64f3c50ae940809eb79ee145dab7d042e5a2b7fafe14bc7f9f85ff2e1b592d8922e628c5dbcecab95e6bd634d0cbbc1cc84f72136a5235480e6274f
diff --git a/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff b/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff
index 70edf2fce1d7..9475390ff4ce 100644
--- a/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff
+++ b/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff
@@ -1,15 +1,5 @@
-diff -Nru zorroutils-0.04.orig/zorro.ids zorroutils-0.04/zorro.ids
---- zorroutils-0.04.orig/zorro.ids	2000-09-28 20:45:47.000000000 +0200
-+++ zorroutils-0.04/zorro.ids	2002-10-14 15:08:58.000000000 +0200
-@@ -4,7 +4,7 @@
- #	Maintained by Geert Uytterhoeven <zorro@linux-m68k.org>
- #	If you have any new entries, please send them to the maintainer.
- #
--#	$Id$
-+#	$Id$
- #
- 
- # Manufacturers and Products. Please keep sorted.
+--- a/zorro.ids
++++ b/zorro.ids
 @@ -42,7 +42,7 @@
  	5000  A2620 68020 [Accelerator and RAM Expansion]
  	5100  A2630 68030 [Accelerator and RAM Expansion]
diff --git a/sys-apps/zorroutils/files/zorroutils-0.04-fix-build-system.patch b/sys-apps/zorroutils/files/zorroutils-0.04-fix-build-system.patch
new file mode 100644
index 000000000000..6e05cab86d81
--- /dev/null
+++ b/sys-apps/zorroutils/files/zorroutils-0.04-fix-build-system.patch
@@ -0,0 +1,15 @@
+Respect user variables
+
+--- a/Makefile
++++ b/Makefile
+@@ -2,10 +2,6 @@
+ # Makefile for Linux Zorro Utilities
+ # Copyright (C) 1998--2000 Geert Uytterhoeven <geert@linux-m68k.org>
+ 
+-CC=gcc
+-OPT=-O3 -fomit-frame-pointer
+-CFLAGS=$(OPT) -Wall
+-
+ ROOT=/
+ PREFIX=/usr
+ 
diff --git a/sys-apps/zorroutils/files/zorroutils-gentoo.diff b/sys-apps/zorroutils/files/zorroutils-gentoo.diff
index a0a7e44872bc..97c545e0ed5d 100644
--- a/sys-apps/zorroutils/files/zorroutils-gentoo.diff
+++ b/sys-apps/zorroutils/files/zorroutils-gentoo.diff
@@ -1,6 +1,5 @@
-diff -Nru zorroutils-0.04.orig/zorroutils.h zorroutils-0.04/zorroutils.h
---- zorroutils-0.04.orig/zorroutils.h	2000-09-28 20:46:14.000000000 +0200
-+++ zorroutils-0.04/zorroutils.h	2006-09-16 18:08:17.000000000 +0200
+--- a/zorroutils.h
++++ b/zorroutils.h
 @@ -16,1 +16,1 @@
 -#define ZORRO_ID_DB "/usr/share/zorro.ids"
 +#define ZORRO_ID_DB "/usr/share/misc/zorro.ids"
diff --git a/sys-apps/zorroutils/zorroutils-0.04.ebuild b/sys-apps/zorroutils/zorroutils-0.04.ebuild
index 59c90eecef3d..e6f9de0d1603 100644
--- a/sys-apps/zorroutils/zorroutils-0.04.ebuild
+++ b/sys-apps/zorroutils/zorroutils-0.04.ebuild
@@ -1,32 +1,32 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Zorro bus utility for Amigas running 2.1 and later kernels"
 HOMEPAGE="http://users.telenet.be/geertu/Download/#zorro"
 SRC_URI="http://users.telenet.be/geertu/Download/${P}.tar.gz"
-IUSE=""
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="m68k ~ppc"
 
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-0.04-20021014.diff
-	epatch "${FILESDIR}"/${PN}-gentoo.diff
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.04-20021014.diff
+	"${FILESDIR}"/${PN}-gentoo.diff
+	"${FILESDIR}"/${PN}-0.04-fix-build-system.patch
+)
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
+src_configure() {
+	tc-export CC
+	append-cflags -Wall
 }
 
 src_install() {
 	dosbin lszorro
+	einstalldocs
 	doman *.8
 
 	insinto /usr/share/misc
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 59d77c850cf3..63d5b04b126d 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/pambase/pambase-20150213-r1.ebuild b/sys-auth/pambase/pambase-20150213-r1.ebuild
index 02840a946ec7..4bf18ef0c143 100644
--- a/sys-auth/pambase/pambase-20150213-r1.ebuild
+++ b/sys-auth/pambase/pambase-20150213-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -sparc-fbsd -x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="consolekit cracklib debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh passwdqc securetty selinux +sha512 systemd"
 
 RESTRICT="binchecks"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 5eb23e12f050..1621a595a705 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/clang-runtime/clang-runtime-5.0.1_rc2.ebuild b/sys-devel/clang-runtime/clang-runtime-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..013e661624c8
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-5.0.1_rc2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="${PV%_*}"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}
+		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
+
+REQUIRED_USE="sanitize? ( compiler-rt )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index e85f2684ef76..9cda082e140e 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,8 +1,11 @@
 DIST cfe-4.0.1.src.tar.xz 10933628 SHA256 61738a735852c23c3bdbe52d035488cdb2083013f384d67c1ba36fabebd8769b SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964 WHIRLPOOL 1cb56b36e21eab8004eec43d9c0f7377588cdbcd1d654cd0e6d836d43bc68dc0759993215439c1607e09ed3fa1f68b80504a222f73c1b76d3841cdf638dcbef2
 DIST cfe-5.0.0.src.tar.xz 11437024 SHA256 019f23c2192df793ac746595e94a403908749f8e0c484b403476d2611dd20970 SHA512 14acdd622310122b544c952ee5b932b7006d9d8424319f0e3974f2503d40a0cec4200fdd3d813a32ce0d877bcfbb9a5bd5c36f6142b4330e6c814f113ca2efe8 WHIRLPOOL 9d2fff35324621be191cc69b45db472681c9ebdf05aead09510f3178853ac8a179f2c454c2e6513e57f84a99980052671cd9a23d38d6d14b42dfda1853a7844a
+DIST cfe-5.0.1rc2.src.tar.xz 11512960 BLAKE2B f6f53a985abfc07869984a8b6461549df80d8511645ff0ba46c035b04f247d9f56a63a178da7496b60064aed059518175d2d34aa661b72877f3e62b27c9eed13 SHA512 069fa3dc549ed046a004ca31a1e571fe83fca986635b5515e9eab3f91e3a962af99022e927d15fa2482969c64fa9b33c9c7e79a8cd9dd8fa77b554ba3f08d1ea
 DIST clang-tools-extra-4.0.1.src.tar.xz 581788 SHA256 35d1e64efc108076acbe7392566a52c35df9ec19778eb9eb12245fc7d8b915b6 SHA512 ea26d926f428e62e76cf8a073e63ffe05645f6592e05d7717d5c257908870ae9217727d3e1578227b14eda5937085872463f1a8e99970256179c68b8a92e69e0 WHIRLPOOL 7db97e7164657af786ec49975e730e8731bece87cfeb1e45894be6d5e3455530c17461ce894b263a0cdfee917d97566db49225374112a543f6355419f15c1d8f
 DIST clang-tools-extra-5.0.0.src.tar.xz 646416 SHA256 87d078b959c4a6e5ff9fd137c2f477cadb1245f93812512996f73986a6d973c6 SHA512 bf51c4d851bdc25bd2162e186b3080a30ad523f68859fd3dbce6c1094465382f794917b66406088c3bb1b15bee49821bcef5ef4b1a1e18704596354f7d0639bc WHIRLPOOL ffa57d51ad1b1c3d485f21aaf4cd82336ab6d9291b1e49af07ad05c0c9cc5b529b5571e49a6139c43afb4bcc1e920c1129f3dce73e73792bc965ec9cb8ed1db4
+DIST clang-tools-extra-5.0.1rc2.src.tar.xz 647236 BLAKE2B d916baf928e46f8222b95ca1be715ac16548730035d3a96172ec5f1cd0761c3b5d37b676038a02e78d5e13e95a64784664b60e1a1656798294b2da2d02b6dbe5 SHA512 0186de93b95c19b5d45089479fc7354f5294d78cbd1dee8e03145e7d6cb0f0974dc342636c1e464717af5acd41566ba6971e278ad4e2aca0937fb617970c52aa
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
+DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
 DIST llvm-manpages-4.0.1.tar.bz2 87981 SHA256 28fa1dcd4774156247ba253d2d79c81796ef0f0763b4f37c9c5ae27af93f4320 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415 WHIRLPOOL da897ea8d3713a5c4c10a6320f0e7dd13e0125e942e3444b0e8a2a062b83a8e86e3754be025b89ae00f63f557ec0518ab62d8cd21237962e93c708ca72c8e3f5
 DIST llvm-manpages-5.0.0.tar.bz2 94240 SHA256 5082c316cf09e6c15d76f0b184745bf3392d3fd42a56cf0a5119b45918a67cb9 SHA512 0bccfb00caa0796bed8ea4e591616e025e43d304f05589180820c17f8567fa3a1f1f76c323098ed0d0e4590765415b1c1c272a94c6e2e7544788f4088ef0ffea WHIRLPOOL 410fe9eda01519c7ded00b2ca61dd323bafb3418a0a81fdc5c3b60d64ee80b75a6372ea29eb66a1b1ce6bb020c011cff7d9e896469dd6f9534fc19fb5b5a4696
diff --git a/sys-devel/clang/clang-5.0.1_rc2.ebuild b/sys-devel/clang/clang-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..941177f9291f
--- /dev/null
+++ b/sys-devel/clang/clang-5.0.1_rc2.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eapi7-ver flag-o-matic llvm \
+	multilib-minimal pax-utils python-single-r1 toolchain-funcs
+
+MY_P=cfe-${PV/_/}.src
+EXTRA_P=clang-tools-extra-${PV/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	http://prereleases.llvm.org/${PV/_//}/${EXTRA_P}.tar.xz
+	test? ( http://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+#	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-${PV}.tar.bz2 )"
+
+# Keep in sync with sys-devel/llvm
+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="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx +doc +static-analyzer
+	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
+	static-analyzer? (
+		dev-lang/perl:*
+		z3? ( sci-mathematics/z3:0= )
+	)
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	xml? ( virtual/pkgconfig )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!<sys-devel/llvm-4.0.0_rc:0
+	!sys-devel/clang:0"
+PDEPEND="
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-libcxx? ( sys-libs/libcxx )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+# We need extra level of indirection for CLANG_RESOURCE_DIR
+S=${WORKDIR}/x/y/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+PATCHES=(
+	# fix finding compiler-rt libs
+	"${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
+)
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	# create extra parent dir for CLANG_RESOURCE_DIR
+	mkdir -p x/y || die
+	cd x/y || die
+
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+	einfo "Unpacking ${EXTRA_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${EXTRA_P}.tar.xz" || die
+
+	mv "${EXTRA_P}" "${S}"/tools/extra || die
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/utils/{lit,unittest} || die
+		mv "${LLVM_P}" "${WORKDIR}"/llvm || die
+	fi
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		# ensure that the correct llvm-config is used
+		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+		# z3 is not multilib-friendly
+		-DCLANG_ANALYZER_BUILD_Z3=$(multilib_native_usex z3)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			# normally copied from LLVM_INCLUDE_DOCS but the latter
+			# is lacking value in stand-alone builds
+			-DCLANG_INCLUDE_DOCS=$(usex doc)
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
+		)
+		use doc && mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=ON
+			-DLLVM_ENABLE_SPHINX=ON
+			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+		use z3 && mycmakeargs+=(
+			-DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3"
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-clang
+	# clang-tidy requires [static-analyzer] and tests are not split
+	# correctly, so they are all disabled when static-analyzer is off
+	if multilib_is_native_abi && use static-analyzer; then
+		cmake-utils_src_make check-clang-tools
+	fi
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED%/}"/usr/include/clangrt "${ED%/}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-2 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X.Y
+	# - clang -> clang-X.Y
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X.Y
+	# - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED%/}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+}
+
+pkg_postrm() {
+	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/gcc-config/gcc-config-1.9.0.ebuild b/sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild
similarity index 93%
rename from sys-devel/gcc-config/gcc-config-1.9.0.ebuild
rename to sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild
index f6b9422871d9..b27cc3b5c419 100644
--- a/sys-devel/gcc-config/gcc-config-1.9.0.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild
@@ -18,7 +18,9 @@ IUSE=""
 RDEPEND=">=sys-apps/gentoo-functions-0.10"
 
 src_compile() {
-	emake CC="$(tc-getCC)"
+	emake CC="$(tc-getCC)" \
+		PV="${PV}" \
+		SUBLIBDIR="$(get_libdir)"
 }
 
 src_install() {
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 5381b2d98828..3f462553c718 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,15 +1,15 @@
 DIST bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 829688 SHA256 eacdaecd9c07b6573a6522ac776d8daad7658c4214a7fb0ff950cd47ff811ae6 SHA512 d4533d02289dcd2ee11952f83dc687d82624d6e31ddb548e4f54cde4ef9cced5a1aac5b64086441f8930274e31f20d0ee82850fe1257f96c08b05d406d3b2e26 WHIRLPOOL c9d39cef9408472634a689a61e914ea01e6f67294162d16fcd5b451d1b33aed86f842adca8e4995c863ca1ed7a4e5fc0ce68d99a78f1e765cc3caad06ecbf6e9
 DIST bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 815566 SHA256 6568f904eb26ff4bc90e23792b3346aaf98c0ffe38a1abe853d823b3c2157e96 SHA512 da11cb354d5ec95c74081c2cbb29bcb49817a1f9d6875587b4a27f1c9fdea8f07eec8147b739bd18a4fa2365e5da50e4bca7d7531612fbf2514c50516d225ac2 WHIRLPOOL fedeb8ca85af5bcc924243cafde3a96f0ddf69df13a1e2c68a207c0dda3d598af59b49a92c35e104a16f70af86a0027a7630306d23aaf873f48149a64e86347f
-DIST ecj-4.3.jar 1377431 SHA256 9de193ea393ed50d868b730bad6916f7a8ef4ba80216f8606d3e1a0dd886e74b SHA512 c4be72186d81747f1adce5a50de303c24bd6ed9f401bfa8871b1b864fe7591392218b1937b10d0e76014de8e0b6a1d5c4280475976218141cd1878c4a35217ff WHIRLPOOL 9137d6aa5b0e34a596e8d3de8843b5478cec8cdd4113303d554120ba8c6d467e802414f861ff0d7ef1d85dbcb09d4ccc10668385460d1a476345e2de86798bce
+DIST ecj-4.3.jar 1377431 BLAKE2B 1d6a8ae1cef0fc4ee325f935873e4a2e560c34cac929bc4190c7dd47e1ca4480ad608f0b7a5d00f2bde30ff2dc78f74ccb0effa48db1df9358a6e35ebce32100 SHA512 c4be72186d81747f1adce5a50de303c24bd6ed9f401bfa8871b1b864fe7591392218b1937b10d0e76014de8e0b6a1d5c4280475976218141cd1878c4a35217ff
 DIST ecj-4.5.jar 1470676 SHA256 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e WHIRLPOOL db54206cfd5eba935e707b8d36ebac40f3c4ed3c1f06ede794288cbdd9c7da9d90c0898e8c98b383af276ea4c1b40c861ebd9e1fc1dce712946184321339d3ad
 DIST gcc-2.95.3-patches-1.4.tar.bz2 125654 SHA256 dbbefc926fb07b17eb18d4c8bfa8b8d1d956f4484c19e8afecb0ecb995232886 SHA512 7cc79439162ddf6f5dea4fd88e172e815684a34ed70e67f33c6acf4e1a687a748a78dee232d462adb5858cc3f9609e34cf1b8a75707947f4fcdf3d33251738e5 WHIRLPOOL d10f43b3081eaac83b6e22cb9aa863380415fe73da9e167b9b961b37419161d385e70b4f0fa9bb03399ecf77ff289b58cafd804a510d7366c21496c82ec416f3
 DIST gcc-2.95.3.tar.bz2 9848842 SHA256 cf91a6b4f41248895f06bcd0570a62d2417ee99d32e6e2c5f70490e0eb6af5e4 SHA512 683eafd1788a0021867797796444868100d244f72749dd8f014eb04495554ca43eba852179554710d516ff4b94527f40ff9c9189e007ef6fd958ec7293f17e4d WHIRLPOOL 7605984ae8bd948f116e319a47b668327d0e83c301e4391abb66a72a58868fc90e5c8d3298d9444d4852a0073f71a9f36389add96bc5b54364d7943b397bd027
 DIST gcc-3.3.6-patches-1.9.tar.bz2 51760 SHA256 9759a4dc139c9c739a179fdabff484c8b2d036707f0be03ca54fdb7f7d4ffdb4 SHA512 306220c537c5cd90af7638431e6547ee9a80199c384629b5fbda06c28b2d6168fcf1dd448c0e178b104f41e03a8ebda4f389489d205b9e66ade6637e4747196c WHIRLPOOL 0a49ae8fe42f24c8c0e1a9d7671c462219e501bbe2fb27c78a723889cb084632899403d78230e7618899d2cb639bdeada0d5c577949a87c1d249891cd22a5b01
 DIST gcc-3.3.6-uclibc-patches-1.0.tar.bz2 28882 SHA256 c007f38cb0c57291adf0b367f31e14c84dd1d6f48a388896eb63b6cd4328e418 SHA512 d060c1552d4f21b8b1cd6a6e56b9af4f62f61ce8ef4362afb1982b2ad9defe6a9648705cf780103d4f2061737553b6737c276d79b803b6b75ae94035bc881f0e WHIRLPOOL 524204cc41097f13e0de2ad8e99ff80d449c490d602625d24ddda6b874cf63194d62c22f98469f5ee89c8283df82a25fbc989db32a52f31f2a31928b5a522f2f
-DIST gcc-3.3.6.tar.bz2 23972413 SHA256 1c1aa533c67e9da5e55ed4f5736258dc753466bd716bdae3fb88fb66e6ff1d7f SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed WHIRLPOOL 27372f9d12cdedaad38e75c3efea3430d6873d92f85ec0024e2cc5ad986c710ed940edecc926a4c25ce14d14cddc1aec3eb35ac2c29e8c85309685d525a99cf1
-DIST gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923 SHA256 5b92fac2afe835a127976fdb6602fb5628cf28e67dd19e8289768a3bb8631ec2 SHA512 c0534a374e2e0416d0792373f9d11526226f9ce1a98e771469efa68388b709c72672b8db8fe77901144a96a23e4fd9f9a99f1d278f1e8fffda8a6b01e3b770fa WHIRLPOOL 79a7bb14e220dad7ea818afae12839ff7cc624f128bbf7a29c8005478f6da9742ff08100088baeaf36c038f7ddadc4ec64e78d5283ed19efb4d3625916a3b00a
+DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
+DIST gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923 BLAKE2B 174eb5e437367a8e64a48f3764b4a3971afc7f5bffac583b7cf4e98a2ea2241ff896751137cc59d45a12b12333319efd52094925ba175073fe70dc143a5ea7fa SHA512 c0534a374e2e0416d0792373f9d11526226f9ce1a98e771469efa68388b709c72672b8db8fe77901144a96a23e4fd9f9a99f1d278f1e8fffda8a6b01e3b770fa
 DIST gcc-3.4.6-patches-1.8.tar.bz2 61940 SHA256 69822a3b93d8288a1e2c2536c738f0af5ccd286143000c43fecbf62c90861655 SHA512 14c12628e0ccdc47492890a46d45f9ef1df3970d1103116c3c3be76ecf1b3560088232819891662f44d621877b59ed38dab48053885bd34e6516d7de514f42d6 WHIRLPOOL 74e2046a4f04fe1127ae67f29ffdfcd5ff5e0ac27c62e03252a8e754a74bd8f9771d43a53818272f165bcbb38bdc5c15729910f63616fb8494e09dde15f8fd86
-DIST gcc-3.4.6.tar.bz2 28193401 SHA256 7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39 SHA512 d235e1223d5faf8f37f2d73db35edeff44c88974b09dfcf325f4b181b16d7124710d93b1b65b60206ce3525f062236ea0f338b3a5341d7ecbe196d8e90c3ff18 WHIRLPOOL 19fc447592f1feee56da74ee6d9436e0813e5a29ced37f8bf91836bbf0b1b9023fe2f717f8c3cf6dc84f11d2029cd87b65e9176b19727996420b589716cdfa45
+DIST gcc-3.4.6.tar.bz2 28193401 BLAKE2B b3e2d52269e59acbdb04248d8d95bee957da29722f998ef39731b8f4fe9ce29ab6b29020be440d7d5db2b56f93fa77bc7e56f979912d03ebb755a92ab14927c9 SHA512 d235e1223d5faf8f37f2d73db35edeff44c88974b09dfcf325f4b181b16d7124710d93b1b65b60206ce3525f062236ea0f338b3a5341d7ecbe196d8e90c3ff18
 DIST gcc-4.0.4-patches-1.3.tar.bz2 41994 SHA256 2995b5c8f29f9f6c0a8d5039d24c3af62fd8a707ea81a7ffd978ca5f336bca75 SHA512 34999c783b0b2af782ae316c7a874a40a3e98faa8eb48409f951fc167ad4fb56c4fec93dc5cb6831b89f2dd90c80e3c89778fd73b9f176cb4470d8f5d1537b03 WHIRLPOOL 5f56b4ac0ef4df6a34c099b505a8cce01d277ee7d17dd79e542f1b9513cb24a0c23f1191e3933b6a0782d3c181c1c6d72a72837e9c9da1c1685c10103b8a37f5
 DIST gcc-4.0.4-uclibc-patches-1.0.tar.bz2 20164 SHA256 2f4386f423de421b1171c6312d82be3f646fa249df9672687bf8c37a72d8d1ab SHA512 67bdb8be3b7d173795ae3692f8f76fb6c236bfe3054112db30e3f0a56982685fe0b15e2c37f7d9e15e6198e4a41e47e1434a2befeee4e9e460e7bc9e0fa9d235 WHIRLPOOL f7cc0a984272187e88683683e7c484d6d40cf70efce4ded1ad5cae2849a6a51214280453eb60400d3b43a310a319b39dc8f7f88a5857d69ea91d73e0bfe6b663
 DIST gcc-4.0.4.tar.bz2 32642939 SHA256 f3fde051c96d2fc084f6f4d6114ce4c1a079fcd1247d947d50a3d1641acafc47 SHA512 194c12b5a1bc50c003f6fc849a4c0032388a960fb4b769bdb6e76cf330f04f880a0723661c991ec03742443c21ccba9af8599ae648a0777e0a5875c5fe7f6abd WHIRLPOOL 58749231707c5007f5907ef3916c9f2941bb42e0890d754c9e62692f5e049955a766bae502f233fa1ac084279432b15effa4b632a87c2c50db4f24c070ae9762
@@ -17,42 +17,42 @@ DIST gcc-4.1.2-patches-1.6.tar.bz2 54513 SHA256 ce3653368abca2cde342cc68dc1288a8
 DIST gcc-4.1.2-uclibc-patches-1.0.tar.bz2 20980 SHA256 c6ed88711a727ed11847c9b9f1cef7023037bc80c0840eda5fca6d60fa02e35a SHA512 57789f4236a3085136afa83be3cef677bd813afd258d67bfdbecd2058f497cd459366d5515044c0208ab753946dc951dac6a3889752ca6dae836d837c22ce33b WHIRLPOOL 6a0eee923be11ad415eed56f4acc11480747aff92d97baf083526866d3c7eb63ca1fe51375fa70b9223f863a25e4487ebe9ce9da2acf1bbf6b55c6ad2d1a7010
 DIST gcc-4.1.2.tar.bz2 39707720 SHA256 cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc SHA512 b97d3b72a3b0355611d5090b2c715b7a774f0e466a89326a0226c2809d12dfafb2d7c5a7af54bd5e00c135bbb6596f535e1a484740f7f1f691e8a57e6f0425cc WHIRLPOOL 5822040f7e96919bb906ce55e0bd19c4c85b3a47ce73f0a4b6d0da62ce9d7651b6cbeb6199dafc38582b206a98126e3efec8d54cc58c7f303ca708c9261bec57
 DIST gcc-4.2.4-patches-1.4.tar.bz2 25768 SHA256 425b423a1ed8f0eefcf244f1d4462cb1e11699befc2a1d2b3f908ea5d123668d SHA512 dacd9d13f29e1e7baf136dee564fd0d128c20f77a8f7ab745263ad9dea8c694c006b89baf93f9aab7a0f93b48c2a54d80c4196f83f0f27c0fe17f7fba9a4fcfd WHIRLPOOL 69cb826a6a7914e121732208b95450bc0fc1b9dc9ad08d67c87fb7643b7777ee51fea5a699a8dc94b5abe570d6a1b47d95027764fd695e5572ba3c32c27f59ea
-DIST gcc-4.2.4-uclibc-patches-1.0.tar.bz2 19167 SHA256 45fe49c144db3c23f928f0303a80071145361242566671afc96b6dfea5ece221 SHA512 5545cfe6bfa7ab9a69a474cc051cc8744380077dcc193afefeb455e959e408a5e4dfd1adde5357886c7f598835400273ef80ad5c14976c0552b44f5cd48704ed WHIRLPOOL baa4c6bc76deff38d3f85e7b91f53e6f3785e2d315cd835aa8d4a80b580f43c2fa21046df85f17d8c81f95a91c0fa782078963a2849ee1604f3202c9790b9d27
-DIST gcc-4.2.4.tar.bz2 44025458 SHA256 afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a SHA512 c6e3e4fce1d27d0c56ab24f4809367d9329b620b7c124e88de190f2ea2ae57b5e06d0bda85c5a74237a4f94ddba53dc91faea0611fff7b19ad720edc312cb0d9 WHIRLPOOL 242177c7adc1538dfbf0b5519132902479c9a8f21158ed04bcf29a3616bbf98d0cf4def13e602ad0226e745875c327d33e8f45eae1b1e6de6d61e2a0ca1b0b90
+DIST gcc-4.2.4-uclibc-patches-1.0.tar.bz2 19167 BLAKE2B bf2bcc9ece9096cf7fda9999c56073774072fa03e5dbf389a617888b2269bc79a7cfb68a6e26da66dedce9f954a1766ed21bbdd907b747e9fb5ea3a0fbbb6474 SHA512 5545cfe6bfa7ab9a69a474cc051cc8744380077dcc193afefeb455e959e408a5e4dfd1adde5357886c7f598835400273ef80ad5c14976c0552b44f5cd48704ed
+DIST gcc-4.2.4.tar.bz2 44025458 BLAKE2B 1d9645298dbbb1aba7b2957acf5b9839bd702a85120aa82d4cada0e4ea68a1d633422d8fcedc405504768e2f932e4b9d1a70a86da0b8efa5fc923b786ebc259f SHA512 c6e3e4fce1d27d0c56ab24f4809367d9329b620b7c124e88de190f2ea2ae57b5e06d0bda85c5a74237a4f94ddba53dc91faea0611fff7b19ad720edc312cb0d9
 DIST gcc-4.3.6-patches-1.2.tar.bz2 76826 SHA256 55fd71e268afd1bdbc799a4dfb69c86ff6e08019159ff94d9cea5512a5f29af7 SHA512 229692a6026ebadc4d87342fd11695338c0fb2a13c43ed6288710fbdca4d7330c74a2c8a46f60637be9c4c38365076f068d35c5a91faa1c69a55e5e7aeac79f8 WHIRLPOOL b0f282a8579261af35609e3e4b5a3998067e16e8b75a65da866893052be023032e3108f2500681ab9e30e4ed673f6eb6a61dd51de17476e831a1f8dd11db2ca3
 DIST gcc-4.3.6-uclibc-patches-1.0.tar.bz2 3021 SHA256 6ad4c3a5f6c359eaa2b6d1996cb2098c4265d00b7d3a33e9db880301b1166e69 SHA512 6b85bf4caf5662ae114e472199c2f77d1fef63c485c073643968b6e0575c13bfa4ce9a32191908f34e70d41fd9fb5b9bc2b527542d82dac881a0462bfe89b120 WHIRLPOOL a2855f10474da54173930eccdcd9a6afe8bfd54d2d612c4ee1060e0bd68d83cbaa7aef9efc5ec2c329ebdbe903c2bbd7ea589b2b391f896409b8f04df46617a0
 DIST gcc-4.3.6.tar.bz2 59756702 SHA256 f3765cd4dcceb4d42d46f0d53471d7cedbad50f2112f0312c1dcc9c41eea9810 SHA512 0cb43f523135c6d54b3b5e26de7044fe096c16e7c3af8e400b2b48c5e52b4b5aa56615b1eca5e326b0202cf34870daa6ac44ec9633762acafa4425552b4029ee WHIRLPOOL 43694948728163150276be24b386a6ba5c12ade91a3836059f2665e7670ed011216fb144e73fc79de8a16988f77a3d789f781ff595ea241a7f2ba88e4f624306
-DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 SHA256 f6c7cb99beead66dd4d06f7004c5731a9360330cbe878ce79792c618e008eed2 SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 WHIRLPOOL 8a1e45aad9d306cb19de93c63b5854a97e629d90852feb6861dcfca042b6257705304fc13ad65655a4cb227d36b83fc6063648c94f270821574ee0e85307094e
+DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
 DIST gcc-4.4.7-patches-1.3.tar.bz2 25866 SHA256 26daf24267edc8d1b9974d18df770652fa90d3a2062ddff2933997646f93b3bd SHA512 cb59c8bb72a5414a9930f63e55a175bdc57d51dc518ec7d1245684f4576daa139e10dbe050a75ac960607cb0a5ed52c49ed7139d74398278bb7012ecda7be09d WHIRLPOOL b9e79660977ca3d82fea5f957270003ac27c3fab7f4da72d7bc169c3a7158b95084ceb8c537b86f9f67a3bb966533d1fbfd1f40463d8fa4daf1c20033048d256
-DIST gcc-4.4.7-uclibc-patches-1.0.tar.bz2 3016 SHA256 f68c52de7aa8b172f7b43c3b576902c3d02ceafdef954cbb76f4fa2e02dd66f2 SHA512 46a69cb8e2e3b97116d012b95a515953b2629be04228a2ac90fe628705e6bc3bdf05ee22e3ed7d5fd0fe6e60aad8f1f96f36e8dd3b231bdfd048e61c6cc15beb WHIRLPOOL f28c1d2b7ede7315e60eef0651580b716ed89f0cfbeac59705537f3cb70ee748eeb3913e0344a40421e27d2aebf3162466178acbc7c8a555e06bd4b3818fa43a
-DIST gcc-4.4.7.tar.bz2 63179340 SHA256 5ff75116b8f763fa0fb5621af80fc6fb3ea0f1b1a57520874982f03f26cd607f SHA512 5562a7319cfd8cc7c5261de9170f2cda86cbd3a231a444a5ec0ad3d8fd60af6f8bd86af8f201cebb7bddcd083d761834d1cbd652c68af0f5607d22a63439ed0e WHIRLPOOL 588dc683b0526d0d9f0b178cab54e30340741a49752097ad4fbbe2da4d7fef5e6d17e321a078726e2797604de280f8ad39309e05eaf6b4cfb0d1e7167c2a0aeb
+DIST gcc-4.4.7-uclibc-patches-1.0.tar.bz2 3016 BLAKE2B cced59dc8f03a2f8bce7f95c5028164b41189b2272ae6a0d525241dd24df827292dda39b1bd9b4d6c0741be0ff0eb4df62d7c6aadf54d54c2bf64f268c68988f SHA512 46a69cb8e2e3b97116d012b95a515953b2629be04228a2ac90fe628705e6bc3bdf05ee22e3ed7d5fd0fe6e60aad8f1f96f36e8dd3b231bdfd048e61c6cc15beb
+DIST gcc-4.4.7.tar.bz2 63179340 BLAKE2B e01c90907228572c3d25bbb776c8232fa3f8e8f4112a27f69be2bad8eec50b68add39839f8d5726f5f82491f50e71fa1b44d98b60a3e0f145848a0e0e8760700 SHA512 5562a7319cfd8cc7c5261de9170f2cda86cbd3a231a444a5ec0ad3d8fd60af6f8bd86af8f201cebb7bddcd083d761834d1cbd652c68af0f5607d22a63439ed0e
 DIST gcc-4.5.4-patches-1.3.tar.bz2 20108 SHA256 4859c23ff400061d8bf3fb961f025b321700ad49f27badd9bd6ed204ea3bb49c SHA512 ba5781da360b5049ba07aa46dd45b8405540dadd717ceb88c07d8803ba91a90b9ee32147932d3dddf1ae1ece148589cc2b0e709a3fbec7fe56266f6e925fa8a5 WHIRLPOOL d2b82ac67bf0a574c7fc9976831cce175af78f08cbbffc1b0fb95ce9748d65906c70fc681ea4390bc76222f1042c9d6fe7a879700aeb0b0f60ac89328643c64d
-DIST gcc-4.5.4-uclibc-patches-1.0.tar.bz2 3019 SHA256 bcfaac58ee057ca9fdbee9295100379051b3b7df8abdf33f24da6cb3c75b4d20 SHA512 b6aa0a7d029a2a00b36fe8906d76b434fcdfc7191cbc8fffbcb8b89a66eba61ba6cd0cfdba94a79929487fbbad2163083b085476498f8be77ad473d078b0095a WHIRLPOOL f3cae558649cdbce9a7dbf0d006845d88349926d1e3d7a4717f2df5c413a1da236b9e35fe0618844578408825b6130533570146c525525a0df18223b3ebf479f
-DIST gcc-4.5.4.tar.bz2 66426133 SHA256 eef3f0456db8c3d992cbb51d5d32558190bc14f3bc19383dd93acc27acc6befc SHA512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115 WHIRLPOOL 1d3aa5f344171a75144118101bf475536940eeb80f73849827ee4103c52dfb6504d9b26e21fa0984c65c5e6267e02fa6e7f8ef539c44f45470790781080aadca
+DIST gcc-4.5.4-uclibc-patches-1.0.tar.bz2 3019 BLAKE2B abf53f85a4af1336437963595b04d2c24284ebf7cc76d845bc3502cf54ef2dcfc21f76fda336f99165cc9939daa8b8c8dc9493c276879670a3cd0ac0efe526da SHA512 b6aa0a7d029a2a00b36fe8906d76b434fcdfc7191cbc8fffbcb8b89a66eba61ba6cd0cfdba94a79929487fbbad2163083b085476498f8be77ad473d078b0095a
+DIST gcc-4.5.4.tar.bz2 66426133 BLAKE2B 8725c7868e1fc9e72a28635f39aa014681aa502db4687e5d2d6ec7cf6d30b04902eca2ebbc1ef2b0e20b89908424d0053f0958e24ded5366fa1c38469913caa2 SHA512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115
 DIST gcc-4.6.4-patches-1.3.tar.bz2 16443 SHA256 0ff58a1142164ccbcc172470945812343d467da3ba0cdfa338deef75252316b8 SHA512 ed904bb8438a23a2e1ec3aff28c4451128421426305ff07de50edbad51a066bee9d1a9042a9b26c36dbd57e1eb044a474088945d6d780c6e98d7563947fb9b9a WHIRLPOOL 0fbcb26fdde71415e492f86d5bdf4605ebea283192426f121f6d34c2401b093a06ef0eae61c64abee653621efb1611ef39902d535ee8742061af8459131632d5
-DIST gcc-4.6.4-uclibc-patches-1.0.tar.bz2 3010 SHA256 946334cc62c0afa2f50a435dffbed12fd32c170f0850bbdce47df188a1eb8918 SHA512 fd289089a30c768b0ec4e3459cf494bc5e9d4ecf87056dc183277c712f7d69ac4cf900950270d8eacfe686b4aa906e1ece87cae52f2cb00642e96c0b95dcf133 WHIRLPOOL 2ce7f308a21fb5072d08a640390eb3f453ad8d811df897b0f9d3e917eef4680fce6cce231159ffe96e371f3c299264eaa51cd110124a3a126f04fb6d8531639e
-DIST gcc-4.6.4.tar.bz2 72006076 SHA256 35af16afa0b67af9b8eb15cafb76d2bc5f568540552522f5dc2c88dd45d977e8 SHA512 b5a5395782e0b9e61cda052f6e00c8575d1aa0b7e8db9e34c06e4e45f12ff37b436018536b7fa69a04a4235b5b368895652e3ed8fab2fe11763f9782ed9161dc WHIRLPOOL ab1b035f43aec669640b36037e65ae0edceb3b13b1ce4f7900aeff5ee06686dc2d66c3dd81156f53c4e9a9a806e4becd4462f72a6c4ad7e646b632c10c23356c
-DIST gcc-4.7.4-patches-1.4.tar.bz2 18072 SHA256 cef0f9d5624fd583eddffe060fb882e2e3b7ed43e517e03df7b3472189237327 SHA512 9f5d68ba62aee909023542dcece81e4e448ea750254258107d4f70291d8ae99469c4518e42ffddbe6b622b258f463127be6e6ef7eaaeeeb0f59b3b719f3eadca WHIRLPOOL a5d76b577615de7a472f591bc031552f7b3e4dec7fb58385709235d763d416f47c2fa8ff4c73531ad023ee50dfd25b1e0c1752dbdca4ae19f736cc79428d63bd
-DIST gcc-4.7.4-piepatches-v0.5.5.tar.bz2 15358 SHA256 6b568bd204e3ffb177df1830e5a888be3987491b4183bdb6ad75ad83c642a348 SHA512 f5e078bf4c17f7b5be102f1e3358d91c72e80363b5e055a92461f78399a1bf27bf6cb690d41900719bb260b6529f5d1aac999e613fda6ac5e4efa27f622510e6 WHIRLPOOL 42e348d5925cf4d43697a6dc06c911cc617f89037949ce1d8f7aa0fa93405f460e7416d6cd00e8fb2aac54c6f26fcae00691917f1517fcfb6891925efa3d3400
-DIST gcc-4.7.4-uclibc-patches-1.0.tar.bz2 3019 SHA256 cbdfe2947f653e11ac391dded461416e5cef1ff8900cf8fe92672de797b4018b SHA512 c2e6c96b74365f8233f6106fa03d94075b60f6f77c683aa2e27aceb007da723243f8e3ddea8b178e6a0f7939b8e35615165534dc74e5050f87680ab261a31c52 WHIRLPOOL 53c8bd64336eb55d8e3d62a33267d3d99c0239d5c818985a9830fd776d766aabf4b0bce630949c5b522580566e2eeba1b59bfc1b8388dee7ec6c990512d2c499
-DIST gcc-4.7.4.tar.bz2 82935453 SHA256 92e61c6dc3a0a449e62d72a38185fda550168a86702dea07125ebd3ec3996282 SHA512 dfcb737073191e628231031a3571ec77ee760a59377630f4a6e4fdfa66f9ddad39fde47e3f0f227eb43cdf90e0d34cde5abdc9ac892c1e111a911062a66c9189 WHIRLPOOL df8408e80634ce28f105f9abcdcf38fba5c130795cbe48428527a68819abebc3bc7152bb6ad714e40c71450a08986b48ddd630c887e1b2faf07c3babfe720969
-DIST gcc-4.8.5-patches-1.3.tar.bz2 26025 SHA256 4a165e6a387421f581f49c742243bf013c9fb7c91f44514be7b38292178ebbb4 SHA512 8d190f81ca0d25281250dbf0a670fcf12334b0811a5bf664e6450942a2996d02b979c6e8f8760b287edad06df3d1f8e2fe5cb0c3dcf9677c3420457d841d9506 WHIRLPOOL d31b3f48e13e5a9292b704afc745cbea038e61eedc4dba0d659558b56feeafec118043f3430457f71dc938760d72860e4318b2238b3bee9fba069c740327b78a
-DIST gcc-4.8.5-piepatches-v0.6.2.tar.bz2 14265 SHA256 3a823af1b4c590076b95790614d49448dc0ee6ff0ace221f2dacd9033b58eac7 SHA512 cd6af4047d4719dae9dbe86ce5342c7d8ddec38aad032486713b08e1b0cb711f5ca017e08d583137d51b8d4ef673366ba310e71bca7b49b82e9314781d6e9d99 WHIRLPOOL ca1d0a9cb9abdfddd95d433b2f0424fd7cc9d514cf4c91fb266af4c43e26e0b3084adfae0eb5c998dbee83551e916dba3cf438b338f7e4ac1a133f06018e398d
-DIST gcc-4.8.5-uclibc-patches-1.0.tar.bz2 2976 SHA256 3654cc2bb47173b9d40650374c465a0798faab53be5ee4446389af1acd610a27 SHA512 5469128eab06525915c75241797ad9ec4b63072ebfd5e110319bf810633cf3fbed39bbda4f6a0c74e537b248e7642780ecbe2086ad10be6e66b7dd289fa6534f WHIRLPOOL d5e11a7d83d11455d84deaa464b8cde0865c730cc140daa5d7b0e700a79f188c6efba88b1c5704b20ede2dca701fb88cf581bada2f4352fbd0e0a5571c436612
-DIST gcc-4.8.5.tar.bz2 86165587 SHA256 22fb1e7e0f68a63cee631d85b20461d1ea6bda162f03096350e38c8d427ecf23 SHA512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea WHIRLPOOL 026253cd2f3706871dfe2525c0302b38b3f513f6a62666d0ba0ca2e62d6513f09ad5c1177f2a63ae3bad660fe60e7909b6930d26df2b367b9ec68e14552c6e11
-DIST gcc-4.9.4-patches-1.2.tar.bz2 25447 SHA256 a278642313473db7bf4f7f51985f21e4b45a9cf68cf37ba80ef6d355a82bfb57 SHA512 61b1e86e8dbc2838e7b5c88c4a3bab9ed5b6485258b7971799850ffd97cb67ad2564552af4e9ebc860dcc2a4b786c91d2079469468fb95f8e28e2fc981b4c812 WHIRLPOOL ea48877b970180e442b1808f3aca80b92148722640d257629026dc74b7c9b9791c3c284a47191c827f667b594dbb6f5d49075783e0eebb5a58ec28624a005093
-DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 SHA256 c67b56f04c653e6a19e36abed8391f8b6bed426bfcfc907237cc37f02dbb5015 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285 WHIRLPOOL 1e5959441210af6f690398efab96444ab11d136238a9428912e8441eaf0509fe6db359a8aca92a446fce0c75777385475af73b20165a8593f9969e3a25fd0b0f
-DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 SHA256 95f290d0b68114d835515afc424d6096476a45665671784aa71a7a506296e465 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db WHIRLPOOL e46b08737cfdc235bfb80117e0389f3969167adf59bcba2a0a1094a20eab2b62f0c952dac44781e43957cb1507cd4e80f37bd8aecbc55dbda6382d93b3a4cf94
-DIST gcc-4.9.4.tar.bz2 90097606 SHA256 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe WHIRLPOOL e20045126c21a3edea1fa4a2185ec2bc5feec77ddf967ab9d1e8c33322ad4eafe013bfcaab1ed4e35971d3b70ef373ea3585ebb089c9bbf91bbfca1f1da71236
-DIST gcc-5.4.0-patches-1.7.tar.bz2 32316 SHA256 5d7b5b135d9a411943521cd3c5c32f1fc84fe82c27a8fa378e0e1d437b71e46b SHA512 a9da763a19a616a70324721013cb6f1749deb20a5d1994273683ea43436f09a97b5e9898b0f605354d5c0310e23a8a7b8c8ccd28631cefc240cebf969f18657e WHIRLPOOL 5af43acb3206816ac4e1cd3c922755f784d77e54dc110aa040c0b0ea574815d8c1a9eb984bb9cdc2e20935c47a0dab027a3733974a1211223d48240560365eb7
-DIST gcc-5.4.0-piepatches-v0.6.5.tar.bz2 14551 SHA256 495eb9110244dac17408cd0eb6977a593577eeb0437e72b60339b8ec394f2fb0 SHA512 4890f0713d261982ab81a20f93c5f65193aa1dfa171e3f9e5867f0b80ec7c1e76c5a997b1a4e6f47f8ce36af54ac91125c5bff8bf6d971b7d77c65a57a40a3c0 WHIRLPOOL 13b74b1ca75cc94f9624fe1b52221a953962c918c2cb932302a3078b6deba4f3e501647ad8a2915edef6301e64c820ed612a6fbb9e1178cf1711fe0045686969
-DIST gcc-5.4.0-uclibc-patches-1.0.tar.bz2 3731 SHA256 a3145faa6c81c0753ba754b735834c38987c356dadaa7c4a625c738e374604b5 SHA512 009f34197e79c5e8c6497a0db01ac45cc657e92e56a663b4f3281661d108b2a129cd977fab5f0064f225d6812ae91e82bab22a2b10ae02c486881eeed85ec7a3 WHIRLPOOL a3598ce0aad7e9110db156005190739abc5b4ceea3c327cb9c747c4cf1b99589c1a9fac170aea346eae030b09ee563f9f990e031ad7dfa1aa19b895898bf2608
-DIST gcc-5.4.0.tar.bz2 95661481 SHA256 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a SHA512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b WHIRLPOOL ec81c8143e48bc8d9d0bbdc0fa3ca553c805193f53ac46c86127b54565894780dd97281485e396a130567464c753f043458c8e450018c957813f50ff90a40708
-DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 SHA256 6c880468ffa4ad2b324fd18c762dbdf10646089c8ab865c228e166f99a0e049c SHA512 8fc96086bd3da3726687ee9d180d3b5d0a7d5814141d44eac8eb01566a783ec780c8fb8f55f75d6e9c9006b2e407e20cdb5835d541b0b66a47dd60642861734c WHIRLPOOL b1bce94d6134db6c9aff4298c6c7af003e39d0411aa40cd027d2c7d6a256971c81fb557e85b25f1107e9a474cb7d772c3bc62a7a4ab7ff7fca5eeae5b2ca0c94
-DIST gcc-6.3.0.tar.bz2 99903185 SHA256 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78 WHIRLPOOL e79a2d6ad199396b6efd835c1129d049a367174ea33dd3b6247d72461f117c2dd81e5a66f3dd6427ce500e768d3a4453efd0debcb56966d00c7df79d05d54b7d
-DIST gcc-6.4.0-patches-1.1.tar.bz2 10762 SHA256 19e1c07f87b34626ed0d73f73cfcdff7ca8f7abed172fc6832bb7b08ed5140a9 SHA512 5c2d5a227788e174d4d8d3c137d315a93ed5e1e6fcb9fb43b56e801fe63d973f25cf72ee8cd32752e98a9da17bd07064344c4299270d4b1992bdcb31682ae10e WHIRLPOOL 583bdc54b07da7ab9a9bf84f0fc66be2c1212f4dc9835f9bbd4a3474800246f82dc195f7b2ccd40077082ead1f8c57e02d54ba13cb779c30acfdc40fb1c6b0bd
+DIST gcc-4.6.4-uclibc-patches-1.0.tar.bz2 3010 BLAKE2B e841db5125638b0ec34323d0500786ab6577042a22af3b423433542164408199ac4ff1036d27999aa01aa96e9e50988df2e86835102142f74c3f8fb33096a47e SHA512 fd289089a30c768b0ec4e3459cf494bc5e9d4ecf87056dc183277c712f7d69ac4cf900950270d8eacfe686b4aa906e1ece87cae52f2cb00642e96c0b95dcf133
+DIST gcc-4.6.4.tar.bz2 72006076 BLAKE2B 321c14c097c18cf60c32d228720980717e25e22e26ce5e75c3a411c423f9657eb896974200664132e2fb10c3010c5136d2da7f3c916fffddf7e4afe4e8bfdc20 SHA512 b5a5395782e0b9e61cda052f6e00c8575d1aa0b7e8db9e34c06e4e45f12ff37b436018536b7fa69a04a4235b5b368895652e3ed8fab2fe11763f9782ed9161dc
+DIST gcc-4.7.4-patches-1.4.tar.bz2 18072 BLAKE2B 6bab25aee9f9ef605ce2942928a9d1aa91371b8fdec00643805e5010a4b0ffb043e0dd1a119d1064f79e499983374ed39e475a9718fce632cad07811363ed56b SHA512 9f5d68ba62aee909023542dcece81e4e448ea750254258107d4f70291d8ae99469c4518e42ffddbe6b622b258f463127be6e6ef7eaaeeeb0f59b3b719f3eadca
+DIST gcc-4.7.4-piepatches-v0.5.5.tar.bz2 15358 BLAKE2B e0df0b19829d9f9b1e8719467a6e15336d58ccf50c182c3d14438bc7e8690940535f6391b83f359c4e0bedf16814b7d4e2b0888f4698740be511bf6a574f9556 SHA512 f5e078bf4c17f7b5be102f1e3358d91c72e80363b5e055a92461f78399a1bf27bf6cb690d41900719bb260b6529f5d1aac999e613fda6ac5e4efa27f622510e6
+DIST gcc-4.7.4-uclibc-patches-1.0.tar.bz2 3019 BLAKE2B b24522bd5516e0f2bb4e8d20437e0a0aed22ea8cae3c78fc600688f71a57bb7fbd3d431737a30e4406a9ff5426ed7d2289b3efac4d5efaa5841f7db290ef023c SHA512 c2e6c96b74365f8233f6106fa03d94075b60f6f77c683aa2e27aceb007da723243f8e3ddea8b178e6a0f7939b8e35615165534dc74e5050f87680ab261a31c52
+DIST gcc-4.7.4.tar.bz2 82935453 BLAKE2B 98cc902dd1506161b96c8eba10e5a5c7fb11d2dfd95ebac15825806fcdb262a1ff962b72275dcfc8453b753164fc234bdd666b207202cfd5a0a2b4cd09b8c741 SHA512 dfcb737073191e628231031a3571ec77ee760a59377630f4a6e4fdfa66f9ddad39fde47e3f0f227eb43cdf90e0d34cde5abdc9ac892c1e111a911062a66c9189
+DIST gcc-4.8.5-patches-1.3.tar.bz2 26025 BLAKE2B 3744dfcac069b5f8321fc9cfb019d44c848d70d17e5908d3d97f0c314b98a7fd884235fec2b21c93027f6152577439f6d424f96836b113dcd589604af969c756 SHA512 8d190f81ca0d25281250dbf0a670fcf12334b0811a5bf664e6450942a2996d02b979c6e8f8760b287edad06df3d1f8e2fe5cb0c3dcf9677c3420457d841d9506
+DIST gcc-4.8.5-piepatches-v0.6.2.tar.bz2 14265 BLAKE2B b3bb37957ba8ee446967a3a60fee61c26a49f237241bbaf8bb3c3ec63656dd0492f518b129c8ef43cc06091742bc9c0b1042bb612c1110732b1e9608f28753ad SHA512 cd6af4047d4719dae9dbe86ce5342c7d8ddec38aad032486713b08e1b0cb711f5ca017e08d583137d51b8d4ef673366ba310e71bca7b49b82e9314781d6e9d99
+DIST gcc-4.8.5-uclibc-patches-1.0.tar.bz2 2976 BLAKE2B 1a804fd0b2fd5756e824f3eb511cf62d6af0fa8059ebcffadf6deb85e242ec8728b7883f2e054b465b87e4b61b6a2b55061a68eb8329c3a79a659d4c15808d21 SHA512 5469128eab06525915c75241797ad9ec4b63072ebfd5e110319bf810633cf3fbed39bbda4f6a0c74e537b248e7642780ecbe2086ad10be6e66b7dd289fa6534f
+DIST gcc-4.8.5.tar.bz2 86165587 BLAKE2B 760931013f96083078e74b8376eede6c23954e1f41cb44dbbdd8220fdede48807d89b9ca44fc4ae309f7cef441831b533512f1145cd563c5c797e96cf6cf1bfa SHA512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea
+DIST gcc-4.9.4-patches-1.2.tar.bz2 25447 BLAKE2B 3141897688409c84cab4ffea67deb220d2218107f279a0cc1758d08c858f3a3856150df48ae37d2f14c6f69bc82de1e87f22cc356f179dfdf47ae9eef28a4182 SHA512 61b1e86e8dbc2838e7b5c88c4a3bab9ed5b6485258b7971799850ffd97cb67ad2564552af4e9ebc860dcc2a4b786c91d2079469468fb95f8e28e2fc981b4c812
+DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
+DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
+DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
+DIST gcc-5.4.0-patches-1.7.tar.bz2 32316 BLAKE2B e913960ae76931acdd93aaf4414b4da1d4d043854548f865f07b8f3df968e9c87783965e3aff2e89468f9433185029d66c2e2e719b492d747fa280861cbb0cd8 SHA512 a9da763a19a616a70324721013cb6f1749deb20a5d1994273683ea43436f09a97b5e9898b0f605354d5c0310e23a8a7b8c8ccd28631cefc240cebf969f18657e
+DIST gcc-5.4.0-piepatches-v0.6.5.tar.bz2 14551 BLAKE2B 6f3de9be0990a7580785821d8c85114a1907571c06bdf3a15ad91258f7c9e8bb6a4d2ddb8615f33bedf0ad036d215507e004fc095f788e40c824ae0ab3ffbb05 SHA512 4890f0713d261982ab81a20f93c5f65193aa1dfa171e3f9e5867f0b80ec7c1e76c5a997b1a4e6f47f8ce36af54ac91125c5bff8bf6d971b7d77c65a57a40a3c0
+DIST gcc-5.4.0-uclibc-patches-1.0.tar.bz2 3731 BLAKE2B fa436d1c1d9c150714092132f816740f8218dfeb4f9a6a8c830ea54d211a020f209e6fd1fcc313b2560b82c7855120053d346af72b7c12c88a7a948379dd2356 SHA512 009f34197e79c5e8c6497a0db01ac45cc657e92e56a663b4f3281661d108b2a129cd977fab5f0064f225d6812ae91e82bab22a2b10ae02c486881eeed85ec7a3
+DIST gcc-5.4.0.tar.bz2 95661481 BLAKE2B bf882acfa28cc1064cddd21e25332fff6bc65505d6af9acb2e455916edbc4f6b1de9b3524867f51d7819fc4f213ce21332fbf67cf71cd6c7b96fb8907e51d570 SHA512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b
+DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f28153bf959da1e54307909383efecd2bf0e7e0cc9d9b27529e5f00b2e27132bf5ff6afd2129d061d3b111f9cfe732a874 SHA512 8fc96086bd3da3726687ee9d180d3b5d0a7d5814141d44eac8eb01566a783ec780c8fb8f55f75d6e9c9006b2e407e20cdb5835d541b0b66a47dd60642861734c
+DIST gcc-6.3.0.tar.bz2 99903185 BLAKE2B 3dc1e965afcad665d659fbb953978ef297ddbdd4d8918d36b35e977f8a2786b986f6875af2f12c599cc827b2b725d8b79ac021c9b51fb1d6d274318a59aa182c SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
+DIST gcc-6.4.0-patches-1.1.tar.bz2 10762 BLAKE2B 13ea709b6816adb52d7d82540b55eaea87e9790b88556cba1065a28078f071a4287fad598c7b677f429fb1463ca20a0d05a6884bae0be2e0026c5e998573a35b SHA512 5c2d5a227788e174d4d8d3c137d315a93ed5e1e6fcb9fb43b56e801fe63d973f25cf72ee8cd32752e98a9da17bd07064344c4299270d4b1992bdcb31682ae10e
 DIST gcc-6.4.0-uclibc-patches-1.0.tar.bz2 1586 BLAKE2B 21f97a9e1c349b3d52def092a03e5a90533521da9af586be7ee527594f2d65745491ff8758d88c99a7ac215bde7ebf4e47a0a36cfcd7e66f70e0bebf2dadd922 SHA512 266dbe2bb53d892a24cd752d5c6833ea33f8df8b11b0471700ee53865243cd41f412f9bea8a369b474c9cd1435faff2e03902c7cb5638dd3ddcaa665aa2ec522
-DIST gcc-6.4.0.tar.xz 76156220 SHA256 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 WHIRLPOOL 136b282c6957877d2f463d83740fa65a4e7a346ac94e4baabea25cec41ae307f34409b1e518a22927821d564b8634a48978dc8e1d0b988999e924adcbf3f5cc9
-DIST gcc-7.1.0-patches-1.1.tar.bz2 6746 SHA256 39d4a0c659cc361bd3c71fdc9b793bccfa2bce06ede65ac49b805d1e236fcc8e SHA512 1bf95a505dc6c37bf6924bb69fd0670c8f3355b6690c94edf4a4248649accbd426575b40cb7a473dfb0ae09a924b05619e5c633384bae0293edb670cfd0d3a30 WHIRLPOOL 9682649fff62b56683637d25a58d11928342d99e52b2269f42369fd1d691208a7645802cb0d609ac30e20593ecdceb8cb1ab9b216963afe14db1b17ed43d5eb7
-DIST gcc-7.2.0.tar.xz 62312628 SHA256 1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a SHA512 f853cd6530b4055d8d8289da74687cb4c6d5f363598d386332d31852b581bac76c3adb7d61889edec3b779f63d8646f0122840f12965ce4a4389ba535dbbb6e1 WHIRLPOOL 9503fb08731d94b5d79b182579f41992e9db16dba8a034cbfa8a2703a975185859e79c1e3f6094d14d08c7f5d7135c2ca5ffd8d6f7ae7820c20d4076fe5e9f65
-DIST gdc-0.24-src.tar.bz2 1012099 SHA256 cc6a97c76c9e6db31e76ff97014d24b3d43e21f018a3c6218e3fb2a4500fc79a SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686 WHIRLPOOL 22322b0c3e2d67b3b37bd7fa92a29c593688f934d4ffd62b9cc87eb63a44a4f8bbc9d75cadf11209c73bdc9942c9b4430036629d0eefcd04de9055c502b85f12
+DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa2010357c93f7e71969f587c58d3fdfa2bb4c82a309490c48bc86924400022fa93f41dc6c4345878d1bc1d8204265 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90
+DIST gcc-7.1.0-patches-1.1.tar.bz2 6746 BLAKE2B 29ed4ff1ce6412a0c1a88f613377883ef5d391e7f681989295ac84dbb1950d99a17472d8b95a9351970ee5837cc3bfc4711101042c0e792c0bac3327bfa24d2e SHA512 1bf95a505dc6c37bf6924bb69fd0670c8f3355b6690c94edf4a4248649accbd426575b40cb7a473dfb0ae09a924b05619e5c633384bae0293edb670cfd0d3a30
+DIST gcc-7.2.0.tar.xz 62312628 BLAKE2B 35e4b732f1a4515fc1a9d4424797177112847588e600dc5531bc9bf72305619d4100e8fd9d945920245e704fc9ac5bc5e3dbd20be6c3af49e689fc5bd1eca10f SHA512 f853cd6530b4055d8d8289da74687cb4c6d5f363598d386332d31852b581bac76c3adb7d61889edec3b779f63d8646f0122840f12965ce4a4389ba535dbbb6e1
+DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
diff --git a/sys-devel/gcc/gcc-6.4.0.ebuild b/sys-devel/gcc/gcc-6.4.0.ebuild
index 43364f617286..dc74a919609a 100644
--- a/sys-devel/gcc/gcc-6.4.0.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 2005b824ae27..ace84e279a6a 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,4 +1,6 @@
 DIST lld-4.0.1.src.tar.xz 593796 SHA256 63ce10e533276ca353941ce5ab5cc8e8dcd99dbdd9c4fa49f344a212f29d36ed SHA512 63bd0813094dc7fa9a95fdee93eb7b97026882a15548f819b5c67f3f0f9fa2a582d968af27ad8f802dbff1f6cd1b8c2fb26b3c7c80379488d05c4a4984d7af68 WHIRLPOOL e7adca75f7f5fbb6136d01544798e969cba69b86c5b76a7fdcf7918564aa13eb868f4fa41102d7a4c501f741664ae309d6842c821ac974503431722ae963f93f
-DIST lld-5.0.0.src.tar.xz 668344 SHA256 399a7920a5278d42c46a7bf7e4191820ec2301457a7d0d4fcc9a4ac05dd53897 SHA512 984606a8c8aa753805d30602ce851a70d5427ee0ec098e3fcb2751e58d36c601f59f17f5c9ab90a430bc670f689c3b86b6ecbeccb6ff187f108f6e2000621eb7 WHIRLPOOL 111f38f1005f2e4a7c31435acaaff133c3a2dec695f615f25b3872801c5865c5057bcc7e75551fd8d65abafe7f1637498853ca78840731cfae91b0ae3972b4c6
-DIST llvm-4.0.1.src.tar.xz 21065652 SHA256 da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51 SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d WHIRLPOOL 1626ff270f7ce4801d02a0797b227fda9314ff5c0c01d653111599e9a4d2854c4d9edc3c698a7abee8d79d6bce8b18dc619fbced3c07ca610d44a248d65830cc
-DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d63b733852ccdb31e06f1373136da SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a WHIRLPOOL 6a99edbdc3e6726dc8ff9126b110fd7560faac46601407722e6dd80b5d894ff242521dc8fda7f4d879de83dac51c65645a37224f7e8def0d8d2f1e564b0531bb
+DIST lld-5.0.0.src.tar.xz 668344 BLAKE2B 2d027f44aa8487c2edffb53eba1eafc7bb7ef8d6b7b32ee93dcf906df249d69242ec90817b267604260d9616fb2934e78e6954e76e8adc68d6e38cea8ca24097 SHA512 984606a8c8aa753805d30602ce851a70d5427ee0ec098e3fcb2751e58d36c601f59f17f5c9ab90a430bc670f689c3b86b6ecbeccb6ff187f108f6e2000621eb7
+DIST lld-5.0.1rc2.src.tar.xz 668368 BLAKE2B 1a2323b08e35bd157ac7ea2743ff6e86dc928ea4388e19b9c79bf65716e3b3ada18d80ce5610ca6ecc80dfac97061894741e31abf42f72e4a20fe31f0afff8a3 SHA512 374eee52382df093cd16c8f91f54b5b76e10427a6fd03ea9d25c3c03122d6b330b1650a02b1e7ec726900eca41ea501d076f1ff704e9b99da5e6c7553aa9c140
+DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
+DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
+DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
diff --git a/sys-devel/lld/lld-5.0.1_rc2.ebuild b/sys-devel/lld/lld-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..5d89edc60527
--- /dev/null
+++ b/sys-devel/lld/lld-5.0.1_rc2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm python-any-r1
+
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( http://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/utils/{lit,unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lld
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 69c3374ad8e4..f3885fe97a4b 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,2 +1,3 @@
-DIST llvm-4.0.1.src.tar.xz 21065652 SHA256 da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51 SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d WHIRLPOOL 1626ff270f7ce4801d02a0797b227fda9314ff5c0c01d653111599e9a4d2854c4d9edc3c698a7abee8d79d6bce8b18dc619fbced3c07ca610d44a248d65830cc
-DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d63b733852ccdb31e06f1373136da SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a WHIRLPOOL 6a99edbdc3e6726dc8ff9126b110fd7560faac46601407722e6dd80b5d894ff242521dc8fda7f4d879de83dac51c65645a37224f7e8def0d8d2f1e564b0531bb
+DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
+DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
+DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
diff --git a/sys-devel/llvm-common/llvm-common-5.0.1_rc2.ebuild b/sys-devel/llvm-common/llvm-common-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..a42a1fc3e505
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-5.0.1_rc2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/vim" || die
+}
+
+src_configure() { :; }
+src_compile() { :; }
+src_test() { :; }
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r utils/vim/*/
+	# some users may find it useful
+	newdoc utils/vim/README README.vim
+	dodoc utils/vim/vimrc
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index a7ce94d288ce..f732e737bceb 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -29,5 +29,6 @@ DIST llvm-3.9.1-patchset.tar.xz 16404 SHA256 a4b3e5887b53af47984ea39ff8640f11e8a
 DIST llvm-3.9.1.src.tar.xz 18130436 SHA256 1fd90354b9cf19232e8f168faf2220e79be555df3aa743242700879e8fd329ee SHA512 50cbe8ee911080f586e77861c442348701bd02e2de0c090c54c34f82ac275ecfcd712af0f41e387c33b4a6057778a4258a27554292fe68ab4af3fd9dd6d90683 WHIRLPOOL 1cd1a25befcb178bec4a4aace4367167f3838d32edbe9db9de8c6e558c01c1fcf123f6d6f80b7ec9ff32b3d6dcf2de2f4eb4201d417c3d17a5c8a69934832903
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
+DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
 DIST llvm-manpages-4.0.1.tar.bz2 87981 SHA256 28fa1dcd4774156247ba253d2d79c81796ef0f0763b4f37c9c5ae27af93f4320 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415 WHIRLPOOL da897ea8d3713a5c4c10a6320f0e7dd13e0125e942e3444b0e8a2a062b83a8e86e3754be025b89ae00f63f557ec0518ab62d8cd21237962e93c708ca72c8e3f5
 DIST llvm-manpages-5.0.0.tar.bz2 94240 SHA256 5082c316cf09e6c15d76f0b184745bf3392d3fd42a56cf0a5119b45918a67cb9 SHA512 0bccfb00caa0796bed8ea4e591616e025e43d304f05589180820c17f8567fa3a1f1f76c323098ed0d0e4590765415b1c1c272a94c6e2e7544788f4088ef0ffea WHIRLPOOL 410fe9eda01519c7ded00b2ca61dd323bafb3418a0a81fdc5c3b60d64ee80b75a6372ea29eb66a1b1ce6bb020c011cff7d9e896469dd6f9534fc19fb5b5a4696
diff --git a/sys-devel/llvm/files/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch b/sys-devel/llvm/files/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
new file mode 100644
index 000000000000..b857136498b0
--- /dev/null
+++ b/sys-devel/llvm/files/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
@@ -0,0 +1,56 @@
+From 937b23b5fffa59deb1dc342cc5602d387d84a762 Mon Sep 17 00:00:00 2001
+From: Michal Gorny <mgorny@gentoo.org>
+Date: Mon, 27 Nov 2017 22:23:09 +0000
+Subject: [PATCH] [cmake] Pass -Wl,-z,nodelete on Linux to prevent unloading
+
+Prevent unloading shared libraries on Linux when dlclose() is called.
+This is necessary since command-line option parsing API relies on
+registering the global option instances in the option parser instance
+which can be loaded in a different shared library.
+
+Given that we can't reliably remove those options when a library is
+unloaded, the parser ends up containing dangling references. Since glibc
+has relatively complex library unloading rules, some of the LLVM
+libraries can be unloaded while others (including the Support library)
+stay loaded causing quite a mayhem. To reliably prevent that, just
+forbid unloading all libraries -- it's a very bad idea anyway.
+
+While the issue arguably happens only with BUILD_SHARED_LIBS, it may
+affect any library reusing llvm::cl interface.
+
+Based on patch provided Ross Hayward on https://bugs.gentoo.org/617154.
+Previously hit by Fedora back in Feb 2016:
+https://lists.freedesktop.org/archives/mesa-dev/2016-February/107242.html
+
+Differential Revision: https://reviews.llvm.org/D40459
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319105 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ cmake/modules/HandleLLVMOptions.cmake           | 8 ++++++++
+ unittests/Support/DynamicLibrary/CMakeLists.txt | 7 +++++++
+ 2 files changed, 15 insertions(+)
+
+ 4.0.1 backport: removed the unittest part
+
+diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
+index c5390371845..b5059a8a60e 100644
+--- a/cmake/modules/HandleLLVMOptions.cmake
++++ b/cmake/modules/HandleLLVMOptions.cmake
+@@ -151,6 +151,14 @@ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR
+   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
+ endif()
+ 
++# Pass -Wl,-z,nodelete. This makes sure our shared libraries are not unloaded
++# by dlclose(). We need that since the CLI API relies on cross-references
++# between global objects which became horribly broken when one of the libraries
++# is unloaded.
++if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,nodelete")
++endif()
++
+ 
+ function(append value)
+   foreach(variable ${ARGN})
+-- 
+2.15.1
+
diff --git a/sys-devel/llvm/files/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch b/sys-devel/llvm/files/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
new file mode 100644
index 000000000000..21702748893c
--- /dev/null
+++ b/sys-devel/llvm/files/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
@@ -0,0 +1,71 @@
+From 937b23b5fffa59deb1dc342cc5602d387d84a762 Mon Sep 17 00:00:00 2001
+From: Michal Gorny <mgorny@gentoo.org>
+Date: Mon, 27 Nov 2017 22:23:09 +0000
+Subject: [PATCH] [cmake] Pass -Wl,-z,nodelete on Linux to prevent unloading
+
+Prevent unloading shared libraries on Linux when dlclose() is called.
+This is necessary since command-line option parsing API relies on
+registering the global option instances in the option parser instance
+which can be loaded in a different shared library.
+
+Given that we can't reliably remove those options when a library is
+unloaded, the parser ends up containing dangling references. Since glibc
+has relatively complex library unloading rules, some of the LLVM
+libraries can be unloaded while others (including the Support library)
+stay loaded causing quite a mayhem. To reliably prevent that, just
+forbid unloading all libraries -- it's a very bad idea anyway.
+
+While the issue arguably happens only with BUILD_SHARED_LIBS, it may
+affect any library reusing llvm::cl interface.
+
+Based on patch provided Ross Hayward on https://bugs.gentoo.org/617154.
+Previously hit by Fedora back in Feb 2016:
+https://lists.freedesktop.org/archives/mesa-dev/2016-February/107242.html
+
+Differential Revision: https://reviews.llvm.org/D40459
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319105 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ cmake/modules/HandleLLVMOptions.cmake           | 8 ++++++++
+ unittests/Support/DynamicLibrary/CMakeLists.txt | 7 +++++++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
+index c5390371845..b5059a8a60e 100644
+--- a/cmake/modules/HandleLLVMOptions.cmake
++++ b/cmake/modules/HandleLLVMOptions.cmake
+@@ -151,6 +151,14 @@ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR
+   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
+ endif()
+ 
++# Pass -Wl,-z,nodelete. This makes sure our shared libraries are not unloaded
++# by dlclose(). We need that since the CLI API relies on cross-references
++# between global objects which became horribly broken when one of the libraries
++# is unloaded.
++if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,nodelete")
++endif()
++
+ 
+ function(append value)
+   foreach(variable ${ARGN})
+diff --git a/unittests/Support/DynamicLibrary/CMakeLists.txt b/unittests/Support/DynamicLibrary/CMakeLists.txt
+index 9355979221a..c6201b1ad31 100644
+--- a/unittests/Support/DynamicLibrary/CMakeLists.txt
++++ b/unittests/Support/DynamicLibrary/CMakeLists.txt
+@@ -24,5 +24,12 @@ function(dynlib_add_module NAME)
+   add_dependencies(DynamicLibraryTests ${NAME})
+ endfunction(dynlib_add_module)
+ 
++# Revert -Wl,-z,nodelete on this test since it relies on the file
++# being unloaded.
++if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++  string(REPLACE "-Wl,-z,nodelete" "" CMAKE_SHARED_LINKER_FLAGS
++    ${CMAKE_SHARED_LINKER_FLAGS})
++endif()
++
+ dynlib_add_module(PipSqueak)
+ dynlib_add_module(SecondLib)
+-- 
+2.15.1
+
diff --git a/sys-devel/llvm/llvm-4.0.1.ebuild b/sys-devel/llvm/llvm-4.0.1-r1.ebuild
similarity index 97%
rename from sys-devel/llvm/llvm-4.0.1.ebuild
rename to sys-devel/llvm/llvm-4.0.1-r1.ebuild
index 6ee123541ac5..1931365e8a7e 100644
--- a/sys-devel/llvm/llvm-4.0.1.ebuild
+++ b/sys-devel/llvm/llvm-4.0.1-r1.ebuild
@@ -75,6 +75,10 @@ src_prepare() {
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
 	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
 
+	# Backport the fix for dlclose() causing option parser mess
+	# e.g. https://bugs.gentoo.org/617154
+	eapply "${FILESDIR}"/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
+
 	# support building llvm against musl-libc
 	use elibc_musl && eapply "${FILESDIR}"/9999/musl-fixes.patch
 
diff --git a/sys-devel/llvm/llvm-5.0.1_rc2.ebuild b/sys-devel/llvm/llvm-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..42978ec5cce1
--- /dev/null
+++ b/sys-devel/llvm/llvm-5.0.1_rc2.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \
+	pax-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
+#	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-${PV}.tar.bz2 )"
+
+# Keep in sync with CMakeLists.txt
+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_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. ARM backend: LLVM Software Grant by ARM.
+# 3. MD5 code: public-domain.
+# 4. Tests (not installed):
+#  a. gtest: BSD.
+#  b. YAML tests: MIT.
+
+LICENSE="UoI-NCSA rc BSD public-domain
+	llvm_targets_ARM? ( LLVM-Grant )"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug +doc gold libedit +libffi ncurses test
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND="
+	sys-libs/zlib:0=
+	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
+		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
+	)
+	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
+	kernel_Darwin? ( <sys-libs/libcxx-$(ver_cut 1-3).9999 )
+	doc? ( dev-python/sphinx )
+	gold? ( sys-libs/binutils-libs )
+	libffi? ( virtual/pkgconfig )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( sys-devel/llvmgold )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+S=${WORKDIR}/${P/_/}.src
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	# Fix llvm-config for shared linking and sane flags
+	# https://bugs.gentoo.org/show_bug.cgi?id=565358
+	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+
+	# Backport the fix for dlclose() causing option parser mess
+	# e.g. https://bugs.gentoo.org/617154
+	eapply "${FILESDIR}"/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
+
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# User patches + QA
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DWITH_POLLY=OFF # TODO
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=$(usex doc)
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=$(usex doc)
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use doc && mycmakeargs+=(
+			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
+
+	# install fuzzer libraries for clang (cmake rules were added in 6)
+	# https://bugs.gentoo.org/636840
+	into "/usr/lib/llvm/${SLOT}"
+	dolib.a "$(get_libdir)"/libLLVMFuzzer*.a
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	cat <<-_EOF_ > "${T}/10llvm-${revord}" || die
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+_EOF_
+	doenvd "${T}/10llvm-${revord}"
+
+	# install pre-generated manpages
+	if ! use doc; then
+		# (doman does not support custom paths)
+		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
+		doins "${WORKDIR}/llvm-manpages-${PV}/llvm"/*.1
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+}
diff --git a/sys-devel/llvm/llvm-5.0.9999.ebuild b/sys-devel/llvm/llvm-5.0.9999.ebuild
index 3bf676e43609..2c8a9d8ecf07 100644
--- a/sys-devel/llvm/llvm-5.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-5.0.9999.ebuild
@@ -75,6 +75,10 @@ src_prepare() {
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
 	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
 
+	# Backport the fix for dlclose() causing option parser mess
+	# e.g. https://bugs.gentoo.org/617154
+	eapply "${FILESDIR}"/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
+
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
 
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 5d36a6194b21..fb8fcf630e88 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 3a86ddb30403..944397b3919b 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -2,13 +2,17 @@ DIST aufs-sources-4.12_p20170925.tar.xz 180468 SHA256 e02115928ec0571e03f55a3ff5
 DIST aufs-sources-4.13_p20171002.tar.xz 180448 SHA256 6d950b11af80c3f87cbea2684f9884b83664a3d11c5142a0baebbbdce6bfd2b8 SHA512 0557cd49d759bdde8b846a8d2f6459d7015e17f79f289dbb82a0c788e56933a81ef00fe56610e17d3041a5b02fcb6290ae43942e173df4e94482cd5d549530c2 WHIRLPOOL 75bc259126b0e25b334efced43077148d9ea1b8d607d19638ceeee1f4bf805c0a11af3ec87c1a1880c436c885385234f68dca621d133c5d4bbef44975c0615db
 DIST aufs-sources-4.13_p20171030.tar.xz 181416 SHA256 7a7a55a5c7edcdfa89d65facf7776b1accbd19bd4a6137837313341c28422278 SHA512 2d10a4e190c7a0bab9fde23fe93614bdd0c8113f0848054b3690888a41f39cbbfc835ecac39cc79141070021895265bee874405f87097dc9caaaea1ec2c45fcc WHIRLPOOL b7cc5e69afd328cb9f962d34e3bb079ebf6b38b75640e4bc3109bbb6f8540836a7123a6dd2097514bea36d5a642f116b0b51e5b44aaed4164041b30af2149bd1
 DIST aufs-sources-4.13_p20171106.tar.xz 181364 SHA256 b113b9b5073c44cd507f5ae9f833e500232de6bb63555c9ad574ad5bfe914999 SHA512 465050b243a62da38a8035494fcf12222bb0dc0b47334c8a7022d31781a875089e794454985c954630197fb3ee6acfcc65f4fa2cd06927873d8150e0d7f0b58a WHIRLPOOL 071a4187938288f09205e450759b2a8c19ff9401e829b2314e2ea2a9ed482a60cc28138c8a4d8efe6cde8076cc7b3102f11e2e848942447ea9e20a031adb84a7
+DIST aufs-sources-4.13_p20171120.tar.xz 181364 BLAKE2B 5e9df28387ec85d0435558b1233b67ae91ba140a0a9c054a957699882657b4277cf315141c996145a3166b136e9a4f6ab06af8babc4c8947036d84a57f655e16 SHA512 465050b243a62da38a8035494fcf12222bb0dc0b47334c8a7022d31781a875089e794454985c954630197fb3ee6acfcc65f4fa2cd06927873d8150e0d7f0b58a
+DIST aufs-sources-4.14_p20171120.tar.xz 181180 BLAKE2B 477af999db606c6a915b80cdf43d9f6f2c0b838cfcbecad71ed172bef2bf6333f3346be6e774066b70f0a8f54efd354b2c236aba714d46582321eaa05486700a SHA512 d5adf1fbee31861c659690ee126925df2eb75c2a18d6ea45342fad424be6d1370d0db04a86b051e631c8dfe8464454f0709f0129dc39b63f3b43b79ab7a7953e
 DIST aufs-sources-4.4_p20170925.tar.xz 171260 SHA256 7b48764f00046a32c900a4c3feecfa7a9c87f26eec3d8c0bcefffe667ea41e4b SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8 WHIRLPOOL 7f1c79ce272216bb19987aa653874bca37fd39a131d482ac40a739a83db49bf79ff94b1d1c16db4b8c7f1af3034dc0451f7cd9e4d2f90f8a4a5f9897e5a69a3a
 DIST aufs-sources-4.4_p20171002.tar.xz 171260 SHA256 7b48764f00046a32c900a4c3feecfa7a9c87f26eec3d8c0bcefffe667ea41e4b SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8 WHIRLPOOL 7f1c79ce272216bb19987aa653874bca37fd39a131d482ac40a739a83db49bf79ff94b1d1c16db4b8c7f1af3034dc0451f7cd9e4d2f90f8a4a5f9897e5a69a3a
 DIST aufs-sources-4.4_p20171106.tar.xz 171260 SHA256 7b48764f00046a32c900a4c3feecfa7a9c87f26eec3d8c0bcefffe667ea41e4b SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8 WHIRLPOOL 7f1c79ce272216bb19987aa653874bca37fd39a131d482ac40a739a83db49bf79ff94b1d1c16db4b8c7f1af3034dc0451f7cd9e4d2f90f8a4a5f9897e5a69a3a
+DIST aufs-sources-4.4_p20171120.tar.xz 171260 BLAKE2B c7a49fe6bfe4d2a83143872c32e987633db5c698d0ee3bf5018ac7091e1a421df7974fa129cb093dee52fdb6640827a784be5b5fe55a5b63fcc2815fc1228c8c SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8
 DIST aufs-sources-4.9_p20170925.tar.xz 180584 SHA256 a26b314e1f84a849a67bb35b0f46796d77f95eb2aa9c9363feda41a0c4eb5808 SHA512 06d8db9f115fbf89f5bd8f47ff5ef3b0643b7a5d925d82a113c203272d234b9261a214e4eb9ea4fd083c9cf5d6a8bb64e37a7d4b1c47e1e636f6e56eeebe863f WHIRLPOOL cb305effeb391750ab615fa80c6b840c178deb2798d616bd0f1d7621766e73d05b2a3dcc830fdcf8316a51ea4bbae8c4f0ac80f03f0241b4696467f8d1c6aab6
 DIST aufs-sources-4.9_p20171002.tar.xz 180576 SHA256 fc8b7e2c09d738a2606365ce46098e91b6afd5d24214b85b76b3087675a08365 SHA512 a9b3bae581b900e7b16e27b5a33c930835f9924c2af0f8d0c02ce55ac635e990671df87f7d2dba10402e965835b9ecfbd0bae155d17aaac0b440873ea30ec541 WHIRLPOOL a78d2bbd817ba09171dd023583e42028814ec08bf256f1e8a9f41e56ab1f5636f5f0826aef9f016481fb4e6e51a7da45e2a9b9a0e3cea87392430833849a24f6
 DIST aufs-sources-4.9_p20171030.tar.xz 180656 SHA256 b1e56823e0eed435dc44fefe0a1cd256208df3870ea0d8fd132bcda02f07a7d7 SHA512 934756ed0d6030853e7fcd2f3458936ed25829dc1f882b7bd3bdf308dadf1d33135411dec438f1515372838300f1acef53f46b2e2c39228df7c6429f27270a9a WHIRLPOOL 03b94101b3638c7ab07e0f295cfb0f3d49d41e2a4bd2f8a84070ddf0050ae83d068520ec51d94b6cc5c4a89cbd9e8b9625d8f1ccda8d642890cce5f51ab6bd28
 DIST aufs-sources-4.9_p20171106.tar.xz 180656 SHA256 b1e56823e0eed435dc44fefe0a1cd256208df3870ea0d8fd132bcda02f07a7d7 SHA512 934756ed0d6030853e7fcd2f3458936ed25829dc1f882b7bd3bdf308dadf1d33135411dec438f1515372838300f1acef53f46b2e2c39228df7c6429f27270a9a WHIRLPOOL 03b94101b3638c7ab07e0f295cfb0f3d49d41e2a4bd2f8a84070ddf0050ae83d068520ec51d94b6cc5c4a89cbd9e8b9625d8f1ccda8d642890cce5f51ab6bd28
+DIST aufs-sources-4.9_p20171120.tar.xz 180656 BLAKE2B 35826be242a2da7c1bb47aa81e14e6020345825a52d108f2c0a6dde7637ea6c8943b3f1c6d654811b9bd18b285d1dda96a29580d4338330de45c8ea68874e8d4 SHA512 934756ed0d6030853e7fcd2f3458936ed25829dc1f882b7bd3bdf308dadf1d33135411dec438f1515372838300f1acef53f46b2e2c39228df7c6429f27270a9a
 DIST genpatches-4.12-13.base.tar.xz 227724 SHA256 3267458204389194a541fe3b887b3f42ea143f2f0eb6d7e7196eaf07ab32cd83 SHA512 6088bbe9b0007715e146917cb4288df69ee0d6a4e5628db90005c68d025bd12e304dd9e00e51a5a1a6844ed06a09571e9faec494257fd2aa3d6abc3bc9838000 WHIRLPOOL 87a4ec363cc74a12b76211f89db421062ae16ad453816384ef47782d3cd1dc609d103ab8746f7a5f41851355bc300931a4815bf33f42290eaad8c23c5c97f3d3
 DIST genpatches-4.12-13.experimental.tar.xz 5188 SHA256 93fee6ffdc200c451bbe3a8c96feb343819390171d7d11d0559bd7c2eb24f6c1 SHA512 80adbc13d7478b5c55b0b6380ffb1ba42cc10de8eb996db0457a1df6677e401d612f74ab756a9bab83b99f857af323d9d7fa6c36ace9aa0950671e1843c84777 WHIRLPOOL 43a63c45959046f616619cfcce36c398e55a2aca8c58d744f2a2fbd1123964a5d3d32905878a63e929ba7b73527753e305a1b52e9ba7af66247b714472e6734e
 DIST genpatches-4.12-13.extras.tar.xz 17352 SHA256 89e50dd5fdfe8736684b8b9da3980ef29865c28bdb2f9a86a91b5d90c4c7d3de SHA512 2f7f76e090926cff4c2980215a51cc745d8aa14a9153a8cd6170fee94e21d1b31beae0209d23963c7cc71bbcd0dbc6789e4b3eb0d8c6a0184c128a54bef44bdd WHIRLPOOL bdc6b2b96d38c8d34d384d75d1e95a988fa091295afad6242509ac56cc998784746e2e5e9571a7e2667173d45f9facc1ec498966a3f19c1ce4cd0a6e3c8b80a0
@@ -30,6 +34,24 @@ DIST genpatches-4.13-14.extras.tar.xz 17396 SHA256 dc3c9d2b5c8c5f95af5e3da9463e0
 DIST genpatches-4.13-15.base.tar.xz 254132 SHA256 42f1e2ba1ea6218492b7aa39553aec4497955eea9cca383ee757d30aaa5f58c0 SHA512 7d38c30f213a1bc0a38d2bb8e97f1f6b86ecff60779aa36cd1c9bd9cd2726c16b8bd3067364cae716d38e22d8f34dd34cac3072d5fe2c8256de229b99cb9a4b3 WHIRLPOOL 0457c37dae998872a21a84ae5e07259afa759f27cc61a27bd2b29fe4a530330ccce9acdf2f48c9b95af4f38a3e67c551d4f1f09afbedfdafc27f00e454db930b
 DIST genpatches-4.13-15.experimental.tar.xz 5184 SHA256 86e11d4000233f7832090f20771cb0b9b5fb68f630ded53e0492da79a54ae4ac SHA512 4c5416bdfa602ae083a9058d04d2dede66bef95e5c589dd211aa82264c044a1102b63459dc384e7bdd6c10678b440542db2b274ebeb4456aeef93f09aea4693f WHIRLPOOL d13f518bb332ff5c5daa9a4ec1e949ed93936d69c248f62b596e8426ace5a00b27cd907d40e2610d46fcc3ef6dace2a56d15969762645d8406b8c0d8e9d3ba47
 DIST genpatches-4.13-15.extras.tar.xz 17400 SHA256 28a3431e5d8aca353b9d763c67261ccf3f07209d3f622d118b6025c7b1b31f38 SHA512 4e41c0780bc7c37fa5e13847ee203cefc6e1676921d1560fef9a198ffcb948c7df38acb642098a1266661bf5ddeb022510aa0ab6863e654e29400eeccf093cc9 WHIRLPOOL d0ef7f5de7f12f94030676c9b9c94834b95dcf23d4607c1e33ee2c1a87830d136ae184ec61e27410b6cdab716b21959d681ddcb90f34b3599b51a8272d46146d
+DIST genpatches-4.13-17.base.tar.xz 266392 BLAKE2B 3c244e967b874c6cb3a0f286466e7994f4c2cf12bbca4a557e30014c0bdd85dba883bd2dea52b90f938e48c7cf6fefb12c6788dcd3c85cad521c3cf0501a6061 SHA512 8cd638064078eef540f614f766b89d845208082109f7af71013ab210ef4f0b7f483eefc112805646cc99b8517c3d938dcbe2eab4fcd4b35be14969c83f71b858
+DIST genpatches-4.13-17.experimental.tar.xz 5184 BLAKE2B 793202f126069c7abf0518cb280766450d777515b7ac74f6303e85781fb57c05e10389423163b18b54cb445874d3f4a230a3bbe792070e4c542b249a8646b0ae SHA512 9f74b4ad9970941ffc931faf933dcd4e3e6fa3b5090c629db4fcac99d07613e0953d33fdae629359fec58207c245627e963e4b6e36e2a13ffc3c654f592cf7bc
+DIST genpatches-4.13-17.extras.tar.xz 17384 BLAKE2B 5ff2388104deb932ce55581405aeaafa1442814875c6bdb9802d7c42dd654201505ca73f92402e062cc73c1303f4570da9f28d448b9179c392e84518e1e379ca SHA512 2e6a14b9a40ea92af1ab79db66892d7f77bfc54380f08e8214ba1ce8d3d3de36e1be4c979ac3cd257545faf364002b7def9f7614bdbe73751692e8aed753ca5a
+DIST genpatches-4.13-18.base.tar.xz 273920 BLAKE2B a399354f7f7d6aedea1c0a16821d79a06c7cb560f66fc4da680dc59cb63d0d4d1b15a94d00c682b42e3123bec5930f70180c7dc6a4122c726736108734642193 SHA512 3164f77eef84977602beed2acc59739d8d8ed99a0e9ea02a1f9a1e8ba95b35c8e7566e020ea88ed73f6bb0d359daa207d9e08d6cecf9cebe9b93fb86ff6280ac
+DIST genpatches-4.13-18.experimental.tar.xz 5180 BLAKE2B 041818f6cae40ec0f39d6b696c67471671036f521d033e5165fc77b3fb8901c49da7f52ac96f0fc057bd076bd068024d82cac9abe311ce78ddf7553c0d4c2f55 SHA512 09a53e6b53c20ddc857b7ff7001be326adacf9d24a565922c8ceae35a98e9a5a1bd214fd6a227115ea90436d3504154cd6ae3e47e5eac270f220ec16255b16ca
+DIST genpatches-4.13-18.extras.tar.xz 17408 BLAKE2B 863c54f3451fff15f51bd65ea9ff1c2f6e42f587323c1251e8e5f1c3edec2653c079b87a87da1358bd06116a49986e5c347a761020d3966198d7a5371ec03524 SHA512 eb0505e6f54051ca3f1cdf3070092d5e78831a649582021a19878d6ada2d47d0c960d1726201c0d276a2eb4eed2ed72dd162dbc0ce0185a82f4a4e9580e7c804
+DIST genpatches-4.13-19.base.tar.xz 281648 BLAKE2B b2dded0ed572fcce3f2b0e361732edad617728eac80a8febe2f2fc8f01faf9de3ded6d392bfa7bfaa7b0c221d292bf902c18d5961ad80db3a7d62e8754c84e97 SHA512 a3c26828df68e1e7595f47612f6a54d7e773feafa3e4ee2fdd0592d74c6e13bd3c50195696408a7d53a10f59e70072626b982f42b678d64bfce055100eb48307
+DIST genpatches-4.13-19.experimental.tar.xz 5180 BLAKE2B 8641931516f97fb88415f6d1496ec3c68efb75bd188f77746068e35d011f71c3ff7246dd2f427eed905ceb3db06327a31678179457280b2f82e7290d1821e4ab SHA512 cf8feb8cea668f2f94b85e211274a186631193f0f0ee2bc8d5c51e8b7a159d0ff9f79e484ca90163de44c1a024e973b69ac4d6730c7aae15c60bab44854c0db1
+DIST genpatches-4.13-19.extras.tar.xz 17404 BLAKE2B 351c85e48c7757bf2bf99cdd8deff6a7a9aee3b5d122a43ec38c4339b1c1ff71fa8a1d7cdee980823d69699a699ea20d0e0fc30011e6b47df905834473f656de SHA512 e3ff1ed750609e8e2625bb97c348e84b0e19577cf382a393d7bdcacd4a8dea8dc605afee8e60b162d08781df2bdb9d380004550c6f46c0b93e274057d2322d3f
+DIST genpatches-4.14-2.base.tar.xz 17648 BLAKE2B 8e97f8aa8b8c45605f920cdbbfc9e55212e16ee33d2776dcc5d741ea68272234bd976fffaffc425e2c7c020bd154301ca06774f2401da8f012c770b183bb9efb SHA512 8562287eef0efd1df7816c65eb452e2b1a037cf572cc5131cc27526a7e93cb610d49b6855eae28039c922c5ce1ca270da1cf4070aa5ceb32edb260c5ca82717a
+DIST genpatches-4.14-2.experimental.tar.xz 5184 BLAKE2B 793202f126069c7abf0518cb280766450d777515b7ac74f6303e85781fb57c05e10389423163b18b54cb445874d3f4a230a3bbe792070e4c542b249a8646b0ae SHA512 9f74b4ad9970941ffc931faf933dcd4e3e6fa3b5090c629db4fcac99d07613e0953d33fdae629359fec58207c245627e963e4b6e36e2a13ffc3c654f592cf7bc
+DIST genpatches-4.14-2.extras.tar.xz 17480 BLAKE2B 16712b535d1548ad14e7c6b21a85f04830d4c7d3617764658d7423e4122c17af5008560ae48090f44d8b4248595b6fd1004333d63f63d747d1fbf36904f07623 SHA512 75ce75cb5248c8822e3798203b6836d689d32d54dc387f8a879d7cdd5aa81decbe7f3794861a92039b2b16a69e5a3de90dadca015eedc88d5d5d92883a6f0ff4
+DIST genpatches-4.14-3.base.tar.xz 22980 BLAKE2B 1856fe273ec373a059be489157cc268f079e3b6fa552f948732aca985b6a039aed0bde1a6e7be64b2c964a4c8a8ee00e02a427a56f72d278e757b1ebae0fc477 SHA512 ad4d27211b69a184ec82f34167b38cf16bee96a6242201304c683aec6d29c3a829202f5ea4ef4a73504f5ff90db22f471bdbf8c643ebfd2c1789c510cd6dabb9
+DIST genpatches-4.14-3.experimental.tar.xz 5180 BLAKE2B 8641931516f97fb88415f6d1496ec3c68efb75bd188f77746068e35d011f71c3ff7246dd2f427eed905ceb3db06327a31678179457280b2f82e7290d1821e4ab SHA512 cf8feb8cea668f2f94b85e211274a186631193f0f0ee2bc8d5c51e8b7a159d0ff9f79e484ca90163de44c1a024e973b69ac4d6730c7aae15c60bab44854c0db1
+DIST genpatches-4.14-3.extras.tar.xz 17480 BLAKE2B 346a3292223a5e046c019a50cce2bf7fbc8f2ab08ac281e0a82e8fec32193750767653f93f2f3e314c749b24ba4da1c4fad0176ade5871b17377b238cf57522e SHA512 1116a712bf223d670eb5eb4f01ed8a916a362d0accb525d2a8fab5b8a4c1c27120a566add7b0ca2658833b4f802db83e094185ecdec4ad2b9d2e07dbfd0bcbd8
+DIST genpatches-4.14-4.base.tar.xz 87480 BLAKE2B 753bc9a5145ae32f1d4562862449f798ac9c78111819c7c279327039f74142fd0ae6955d559801736b6d2a0b074cae56d53226e5745cb8c85e76b0bd42ea0673 SHA512 8c0d8d864dea85f6730cc8c5bb1bcefefc8ef3ee5254ba62f0d4e90c5787ea6423988f4c303e0e32aa41fc9e5d4fc01103136556daa826a57403522066c3c949
+DIST genpatches-4.14-4.experimental.tar.xz 5184 BLAKE2B f1d9938a476a958a5fb42b60589234df5c85211b2ebfe59316dd32036ce2a93fdd405f02976ed8eb9312841a4853bac0baec4df52cfc09278b7cdd1fe76e0718 SHA512 85f3055ce8ee187fc7105bf338dc18fbbf02e9cec27aedec10a6fde4db89dec70e666e63dd24497decfefb4b1f59c74789079614025304df67484d80f81d7ede
+DIST genpatches-4.14-4.extras.tar.xz 17488 BLAKE2B ddab5ff81dc6cfe85ce3805846d8d74ce1eb8a2c79b2156e4363fa9592d1a0edec9f9812b9f41bd9ed955ac7030188776a7da5ff4a59408a0d5cf74bf0e629d6 SHA512 7ab148e3db28367ac7d8e56f75e65cafc3b80fd0932018d5ebd1ba1ba1b97521c94e30055fd653803806825bbc8be65e4fff2924907f9144b5ccdb48a53b00c8
 DIST genpatches-4.4-100.base.tar.xz 1513104 SHA256 46ccb979e540dcb77f7af38d07c5f66a396a128f74c4af38aa7dc43e86ce2c48 SHA512 75324834165e3493387e635918cb81d73d27b3274cc6826557df548f7f84a0aab456faf1b60e1e4bf35d8ae5fef00d1bdb4298f43208440c0422e006a3b248ef WHIRLPOOL 1db08d1b79e29854e830ac9e4b167cf076620a9da8db8c3b0ae18679cab90fd3333b43b1479f68372b04daf4acefb6dbd2c97fc65f660ae9c685d617ab5b8576
 DIST genpatches-4.4-100.experimental.tar.xz 87748 SHA256 c0d5113ebed9c284738d8999e48734f2834f42d8583ff86899f82014bf4c69f2 SHA512 822c943f114c35a8caeea20ee5f6c56d67f0d1122ca9db8f3bd9f34561735b0eaa72f9be7161b55c390ab5adf967ee64540a81a042746e39c6d294158cfd52b9 WHIRLPOOL 27fd96867ba9dad975cc401737d979867582742bd68cd14c24edae86ceb155d2d9db72c5fcc61964b48fb1c6c44f9652709ca6963cf705435b3e8ff88c6feb95
 DIST genpatches-4.4-100.extras.tar.xz 16464 SHA256 68ddbd5cbab566284824a0458e40982c467aee31bc84bc7107ad95de97971bf1 SHA512 b9ae815130b993cd2723ba54c41aa62b04e8e373b4b26f63ad0c511c445eaa1af71e7d63f0eaecd23b6ded8589b65b4e9da0dd62349a0b8b836b15b01a4e523b WHIRLPOOL 6e9b183367a2327a957130b83cea4cd8b4f1faf01e12eed927c2ea7463d72533c275e6ec7f20c73813c4b2649e0a4b050187416fc019e8842d9c42677a94826b
@@ -39,6 +61,18 @@ DIST genpatches-4.4-101.extras.tar.xz 16468 SHA256 17d08fbb9f38fb01ae0877fc2c17b
 DIST genpatches-4.4-102.base.tar.xz 1534876 SHA256 87f89f0d5912a9ed843d2c4ed8d45377e878a4df98101d99c10ef915b30c9479 SHA512 bc314f6a6bd7477ae3e217ce27c8b859f4574de76a7e5f3c1e70247eb3236d7bfd8e37a12d27a46cded56e49056e6e7d646c2814935634f387d2ab680b23e5af WHIRLPOOL b2dc5d694dda0c899877532918c636c3c265296e46f3aed31883e1d8da896607786f13a748e6ac5f6e2514a2ca3850b9a01369955cd4f5694ec5adae7cc255fc
 DIST genpatches-4.4-102.experimental.tar.xz 87724 SHA256 d76def758c05682a2bba83a4f86b933ca027d54212dfe33b4d87de26cdf1f42e SHA512 f38af999df68a51778d44aa83dc442824f09cdc4a743ebf1f96cb091338bd77ac0f8a0d49d04ddeca80c5930fc10fb00e3589ad5074e0ec08cdc9c7f09b7316e WHIRLPOOL 15f0aa454442407e6893d28f6526d6b3fd0edda15d5c40ad710f9ddfdd0f72511c25c16b9f8c11663b3dc2caf6c76dd76b8fdee3c654a65ac8f7f54977e516e9
 DIST genpatches-4.4-102.extras.tar.xz 16460 SHA256 6f58d9d2058c087bd1e09eca3b445b3012fa2805e3f5992a6121f99b13b3c2c9 SHA512 c93def08004c8a7f15aae95d8be454c2ff9142dc0721eb6623cb18fa621093539fa9458a3735cbc803aa76b8353b8e6ae421b32bb38bfafdcaaf131179b8c5e3 WHIRLPOOL e54226b1c873e07bda99939c700e3ba983d4f67b978b59857b1f0b9e4e402224fef5ec6f370861992b130c3d032430a13f8831c637f2b3f978c908853f93157c
+DIST genpatches-4.4-103.base.tar.xz 1542244 BLAKE2B 7f94fd8ca4721047a81fc6f94427c17c7fd5617daa3b8092508f01d6ebafc099a09db2918194d2f404e1d1ace9bfa0ed6dea486d43a21bd8b3d94848e56bfd32 SHA512 d3d615dd6e912afa23db3b23c88f0adcf55b2cec987ad6902e997d55cf8ef6af48a01e576c5d9dad998c2ef6963cf9f5b56a605dac08dc8f8c9a2d0732c22f79
+DIST genpatches-4.4-103.experimental.tar.xz 87784 BLAKE2B 7b41ad75cafba6778aabfa4278a1b731ca236f20b989373ae2400c0b137aea124520ae2e6056a7419a70702eb1c147d8f82ff5c0d66364db7ff1d220c53b60bd SHA512 71747c2a01baa8f288d720b093a9035bd0ecb65a6c22a308c9f97c150f7c8ffdba48172b2cd18730298b6cbfe0f9718737f2975017382d15d403eabcba3f3198
+DIST genpatches-4.4-103.extras.tar.xz 16460 BLAKE2B e5e601bf64497ddf2674b5cef052e692e4d5cfe9e109048e55bc550facc7c309ec27262b7282145744997105f14190b5e8d1f082960b499620afed3daf429e1a SHA512 7caee6577147b750fb178126b73f7204082c1b353720695abd091e004211f42b0a5ec279783a98a5cbe294239eb1b29a2492a1af662a8efb70263403604715a7
+DIST genpatches-4.4-104.base.tar.xz 1555020 BLAKE2B 650c7e4538cf8635495bac98b05519941022ae2f29a8b59a95bc1f34b39bbf6730f16f54f4b691538c4f328fce17745d491f2febe766997fd00c70ed2dfa1367 SHA512 7b6625a1dc8669e25f5702509c7f25d7e72c102c6eb959afe295000cbd320db18a4d896fe385751cbbc569d74f056db70f610053a165f2f01683a411acc120b4
+DIST genpatches-4.4-104.experimental.tar.xz 87752 BLAKE2B fcd492594ce917948f596983f5950275cb2d5a4a9cb44dd417209a1fd6006b71d84b18cd6d54ab13538d6a842eb61eff50a3a664eef25fdc943d9a5c3a3e3b5c SHA512 75148631440426b827ea17e397212594c7e6b99e5ef6913c96f39ed9cbc25a4078d6ccb0be0a375eb88a1db952a4c7a877df05f6fda98c6e8ae5ec91ea1c19be
+DIST genpatches-4.4-104.extras.tar.xz 16464 BLAKE2B 5e9a96777058c213d9dc5495bbd6e0b97422bf7d0de4ebd09475b6e50a338daa2120b551bbeb2a5c041899f717f1618105c6033cf1039834ca0519ec71f094b3 SHA512 6248bb8482697705b3c339c70cb1c64e286cde8d454051a5aa5633220a31e310ab77080e6acca6b4afcb60ba317763ed179e3789ce5587527229fe6dae6fdf1c
+DIST genpatches-4.4-105.base.tar.xz 1559072 BLAKE2B cd0c70448977b247cf1bd67878fd2cc335179de501b115f5be14441c6b0f5680dc0b0f14aec42f2072ba8c63c812203a0d03e86fef4958f4b0f1ce141362066c SHA512 9129608889884057651a8532492f6ad2b5cb4ddc18bd21dfdc64c1dc97c43b97ef2ca3188808ff1d101ddcdf2f44661f8de363bc4a1bc53c07df22b719b5e6eb
+DIST genpatches-4.4-105.experimental.tar.xz 87780 BLAKE2B ccc052ca22d8b44df734c70872a07d2b7898b2320d47f038a13c55e9b072437d73d795ce3705f552b985a70fe329df09d9a19b7a8231a60d07d9cd227791e5a0 SHA512 3c80f5b4d54d9d1890f8a2ee2442b1da29b83bee4502371974d096731f85bbe18d79a3201a23ede662e762e6a1c4af8cf7c05280e81eb5e1308f5fa310ee4a14
+DIST genpatches-4.4-105.extras.tar.xz 16460 BLAKE2B 672957c70a6d024dc6791e643ad29e9f3e91972df1f66aa126744f31ac00475e10f84bfde3721ed9d6f997b23f01c4e5ece93de056dec31e984768a683ba3e04 SHA512 b2df138aff124f426cc88fc15e6931c19371c5d59de294f529828a0b8fb46197638a69d67995fa0f8ffc40202d94692904d4ea790de3ff62206498f6fef046ee
+DIST genpatches-4.4-106.base.tar.xz 1578596 BLAKE2B db4ebc32b4af5b13d436eeb28370207d308c8795dcad3f19e1213040584a114fe85622b7681765699d5e5e1ca6924c92409814d769a1434d6126b4e066ddbefe SHA512 927e4ab34c59e1a1a22c4fb2f162f7883188339b67688a31c707a7edaf33f5de36cabd709fab484b43da2dd0ec5101857a4c9be5ed10e490b36182fc208036f5
+DIST genpatches-4.4-106.experimental.tar.xz 87780 BLAKE2B 2e5ee20d172653a7d05495ced9cf759ab1ba8e8d20cefffa6c41c2fceb1192eaad2c8956b22ad7db88ffc8e3b068929d92b3042572f84028b9fe295382606e5f SHA512 a231ffa95aa64325a0d09cdd61d4515f17768b13c21c38c817e57b57dc244c1a162fd05bc408f94bd3cc5ec99a55748065e0384b9ff99bee2582203a7778c510
+DIST genpatches-4.4-106.extras.tar.xz 16460 BLAKE2B 7911a046df74d53a7ce79ed6c8e89f635f2e038806eeeb90fe19541cdef743992982a599a5f8e30a2079303112629d942f4e4eb31ae71a43168e6d74adf25a2b SHA512 3da45183686a962d33f6ae7a9ae10cd275bced09dba0913874737ba5915970e7142fe9ea96c1c294f6f43f10d24560a42d78edf664c3e6d0f1318ceb753a85ac
 DIST genpatches-4.4-91.base.tar.xz 1428436 SHA256 d6c806bd868856a9021b35d0bc3ced37029c8803846d6b251fe7fefadfe46c69 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554 WHIRLPOOL 8de12e7bdba76256e8fc41738605bbe961fa3fa0ccbe1fccaf0c8cb3708c692bb65a27db7675e42ce5558a22c81b9017742b14d6776ee2b93f4d1d92535942a9
 DIST genpatches-4.4-91.experimental.tar.xz 87760 SHA256 e04a99c94b4dd9f5856dd08ed4b286b19c765d8d0fe40237dce256f7c874dbf8 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f WHIRLPOOL fb6306af0191198d466b3349c348139342a70de118bcce0563e3209a7ead8a9d56291f3a4155ba4a4d211db8fc1e20ddec3a3b463d62fff5375df823646f7b02
 DIST genpatches-4.4-91.extras.tar.xz 16468 SHA256 6cc85cbae6d2ccf087104b5f719abf10d186d3b630572caeb1906c344c66de76 SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d WHIRLPOOL 81f8fa1676856f0941bc6d09e7e602d2213740bed6edc914d9341bad590650d5a5249fd8bbd2d640380a638ce2a12fd4ec66e0c3753c8d9d22c1fa2c3f07aacb
@@ -60,7 +94,20 @@ DIST genpatches-4.9-63.extras.tar.xz 17348 SHA256 28408ae0b16962f032f994635723a6
 DIST genpatches-4.9-64.base.tar.xz 1203336 SHA256 218a08e0f85e6cadfddaf34cfb187b3eaf3f7aeed6f78f932a6ecb197196e07a SHA512 34bfbd0f72570d6f50b6d22b10dc2aa742b9554e467cbe82fad8c9fb463baaaaf7cad9acb46a4f65f44c3d720af539fa5923647afb144363110ec0cc3928bf65 WHIRLPOOL 331e3c21cc59e62f9f7d287fc2e441ca602affb828ba4cc59487ce2ba2af84de53e4820bf6a332c3fc1f5858e89f526ea07a321cfeb6041780b6c13e77de170f
 DIST genpatches-4.9-64.experimental.tar.xz 106388 SHA256 88279fabd32a49fce437d4dcc1c16539db18211e3ddba3dbfe29e02409cefaf9 SHA512 9ba6da1ae2a618b5c766a1b9cabb459d5e3296643ede83fc9a2eb3991030abcd37652e1cdcfa9f1756f42b386b2fccdfd498ccd6e7b54f87e7c953cd05faa8a7 WHIRLPOOL 16f76f83c2d91b7648b435308b27335734247402d36b1113b8fe1b7f4a47917a19c8d636b49e36a73879ba39a8b0175ba50f3b890ccad8d496ea8b225c451619
 DIST genpatches-4.9-64.extras.tar.xz 17356 SHA256 91388a8444f98a0535cade4b901a9480e6802f0895696c62b19377ec667d2d67 SHA512 2788478d0f659ab53b9fb5569cb6286b7db457520b2257db19ba8b9e2ef08be7e20e1901fe6d09069da09c8504507b2c1ea8ef3483ea5fda5272902ad49c18fe WHIRLPOOL 7c86180c55b4ebe26b93b4d8f1b280ec54c56d55b106109a614cfec211222f1c4e17803b1537c3179760a12dc12483951698c81bd2f7bf8deefcd5f454453180
+DIST genpatches-4.9-65.base.tar.xz 1214800 BLAKE2B c96065b56d5467506fa62e14ab0887e2ca8cca54f356f9bd600ef6f8fd344d55fcddb0dcbe018302b51096c5d0026e870032467504a5e5ae14606b2d6dd0ce3a SHA512 7610c1ea5d98ffb5d7f1f036c6dd9d67dac5edc64d5e161f551e3091f295a2c5c1e8f4c0be02450c6c50baa65435b127d0c57c7118184d59377c13ecf6b9880e
+DIST genpatches-4.9-65.experimental.tar.xz 106380 BLAKE2B ab340f99943fd160d3180be21cbc0f736816888d96af6f8e23faf05701576450e00736e734e129d9b5daa8fcb61e5fa1478191b1600573f64008428f1f9ba3f8 SHA512 6463eda4311ea2e47233076970a196fc6a55f79791c9e776b77ad54e326c9dfcdad1befb677323befec068bfe4740b137b7af82118920ddc6241c002c7040466
+DIST genpatches-4.9-65.extras.tar.xz 17352 BLAKE2B fa70933a00c725c6f5514529d37cfcc27730cd719f0b86c981e3b538ba822ba32d1d64b7801e092eb20fc7058a876b33cc87dbb9e9b8332db60455dda3ea580b SHA512 ced79ee5bd932605f3c183b19acd8a4b38a0119bcb74908e5949f37060479a3bb7b69dd0081f38e23aff2c572778d59939def79fab02b4026e6c496e1c19b8ba
+DIST genpatches-4.9-66.base.tar.xz 1230840 BLAKE2B 18b0dafafa5789b8ff3dcf0b04043bcf9ec36c4024de9b0a2acdadd8caa62ef5a2449a66274cd7f884e671bedecfa1d689e6c0bfea460a14d338d964f2cb5c94 SHA512 b0a3ad38f32e4ddaf591977144ff7d292822433ee87c0af3adf5b6493feda8f9e3f9d49a7c1813529cb24ae4f83b434f7e75513ba068a2fafed4039a1383e8b1
+DIST genpatches-4.9-66.experimental.tar.xz 106396 BLAKE2B d194ac6b8374707be1445458a5ee26f47154adf11e87668a5a0487cca0e7e42ebf365df3910ec66729954cab9de4ce7711679e311bcfe7a22566e3e4085a282a SHA512 efe86fb3f0e29e62919cf4c175405fefa0f9a3a6d9fa02bb98a922a513c1a3672ca059058004cd023509b87499772a0b634db0d8595d7d947652813c03dee341
+DIST genpatches-4.9-66.extras.tar.xz 17348 BLAKE2B 979895fd39c5c51a7a6aec25594247b8b8d980aa7ec79e293e9d963cb2769e7e6a4272590ebea381446c0d8689cdb4bf6c689827db1cf1f72122954cbadee26d SHA512 d16849e39d0fae50deb3aba0824020a7a64f1c4f566ab8bf0e90a8adb21fe94c06191651315f3607ede253dd6369cddec142d51438cd5bfdfe686a3af27bef0f
+DIST genpatches-4.9-67.base.tar.xz 1234920 BLAKE2B f0d33a73b4565b4dc52443af1197d4707cbc2678c787d52ac08ac355ae0bb95fe8affec304ba68fc72c1ce4e9a9af403770da1b0dc6393e251a722feb1896d67 SHA512 837b32b66b046e7de0927b39fe049f5d556a053cb49c53e1214da31d1e6a18604edd0204ee9d1d7cf873908f06d9808c500f4c8b597f6c974a0a07daa0d9f7f4
+DIST genpatches-4.9-67.experimental.tar.xz 106376 BLAKE2B 8dfc71899c2cab0235d1ec697ba8b6b127b9563dec410275e7af97f1bf6a54965e17e11747e8aaebd621194db4c160987279a550a1291da4af3928c4511d3fdc SHA512 7d536a0e5feae1045cf820840b50f0d8ff28c0e255d45c09ff80692c681aa287ccad3fb5336d3597aa99e599c73a750ff408e945366acfb9f1e23dc0b691eed3
+DIST genpatches-4.9-67.extras.tar.xz 17352 BLAKE2B c56b8e7483fc9f44fcaf9303136143932f6abaa27e92be5cc4c1bf946b208a56247dc34e205dfb355d6664e5666858213f7b11853660e832f8bee49f5bed3265 SHA512 500793184ddaad5efabf43dabee89fecbadab3a3a2c1d3c6e9ccddf3099f42fab3b3714f711a1ee640aeb0dd1a3b52728a5b11a9f6f8f20bbe83362e82592141
+DIST genpatches-4.9-68.base.tar.xz 1266744 BLAKE2B 287306aeecbab6cf9b9c08440ee333e729d0af555fec354400c54e407a1c3b8a723ea95c28b7d3c13fe37f4c7fb78c273eec8d6a68f31b68ec24ba45a374bef7 SHA512 4ba94ae3f592cdc466ab58e4bba9781fee915df4994beb6c9dec4efd3622b180cf0d145de585ec9a7361ed2ec636910a42b449d937dca50983bd7f13494edd16
+DIST genpatches-4.9-68.experimental.tar.xz 106380 BLAKE2B e360ddf86cc6db981937c188ccd5106754c7533ec01e6e4d4c9dcef72092b11c4d9accf0389414c3f20032977e010d29344f1014f490e9e13cc51b59d1f59d1b SHA512 000567fef478babbe86b706bc9532756bf42f2c2e09aa3f4e39f7fff8d90fd9dfe65929fb1b9473031d6529ce4ea4a9a8dd8bb7dc615a58f5157ccb2ad4b9249
+DIST genpatches-4.9-68.extras.tar.xz 17352 BLAKE2B 215a823f33f6d5cccbfd9597ae123a885abaf1bd2deef215b1f4c76dbd0652c4160152b96b62cfaa7523899f49263a48d49c9bfc43cab3fd44ca3aabadb54605 SHA512 549e8fc65d62b5197ffd047b7c281c183d267a7d93dbe4c46fe19c161fa84db9a00db9e4cf254431303dbfc8652dc360aa53af8057ab5a433fcc98dbc3748c9f
 DIST linux-4.12.tar.xz 99186576 SHA256 a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 WHIRLPOOL 3b97da251c2ba4ace4a27b708f2b1dcf94cb1b59aaeded6acb74bd98f0d3e33f1df83670665e4186d99a55daa84c88d539d93e20f0ff18a6d46ef326c48dd375
 DIST linux-4.13.tar.xz 100579888 SHA256 2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 WHIRLPOOL d3d332e02cd3c5056c76c28cf1f81504c6f7b8f2caed7238e7dd7866747fb03154b88d8d7aec4d0eddf5760624bc7d6c5485fb52a3e32d098a2742eba96c0d05
+DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
 DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.14.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.13.14.ebuild
new file mode 100644
index 000000000000..cc313fa2f463
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.13.14.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=17
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.13_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.15.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.13.15.ebuild
new file mode 100644
index 000000000000..5f278440c55f
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.13.15.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=18
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.13_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.16.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.13.16.ebuild
new file mode 100644
index 000000000000..02a82fe6ba42
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.13.16.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=19
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.13_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.1.ebuild
new file mode 100644
index 000000000000..ceda58312b59
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=2
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.2.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.2.ebuild
new file mode 100644
index 000000000000..0309ddd87426
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=3
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.14.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.14.3.ebuild
new file mode 100644
index 000000000000..4f93b362f283
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.14.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=4
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.14_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.100.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.100.ebuild
new file mode 100644
index 000000000000..2a952b3f79f0
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.100.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=104
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.102.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.102.ebuild
new file mode 100644
index 000000000000..c2c67fb9734d
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.102.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=105
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.103.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.103.ebuild
new file mode 100644
index 000000000000..446c1233cc3c
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.103.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=106
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.99.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.99.ebuild
new file mode 100644
index 000000000000..583f3e51ff8e
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.99.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=103
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.63.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.63.ebuild
new file mode 100644
index 000000000000..0ba18b8c6912
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.63.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=65
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.64.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.64.ebuild
new file mode 100644
index 000000000000..b45bc40d39e6
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.64.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=66
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.65.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.65.ebuild
new file mode 100644
index 000000000000..7b6cec71e1b4
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.65.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=67
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.66.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.66.ebuild
new file mode 100644
index 000000000000..30741b99b987
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.66.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=68
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20171120
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 2da0ca2dec3a..6e388d89d622 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 7c6cf8713296..ed51de7c6444 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,4 +1,6 @@
 DIST compiler-rt-4.0.1.src.tar.xz 1434100 SHA256 a3c87794334887b93b7a766c507244a7cdcce1d48b2e9249fc9a94f2c3beb440 SHA512 cfeb625884b273f7c0e6767b81a8d3e5f24e0b96a510d5764d9d47a0e215fc841b4cb9d1843c8fb428cd21def720cfbfe8d3593ff5bb390548ebc8c32a902649 WHIRLPOOL 8b33c6841cacefe98da92435418b13b8f8ed97a982903be827e5c37f937dc9001975d6a709d60423b21509dd5670ee2e90cb34c96473fb4a66c2ab6f47af09e5
 DIST compiler-rt-5.0.0.src.tar.xz 1507996 SHA256 d5ad5266462134a482b381f1f8115b6cad3473741b3bb7d1acc7f69fd0f0c0b3 SHA512 5f3fd49736fba35232b0baa19a5f03c4ab3bf85ec16f23355eb3c516fe6d861c14272c224ca2f2092a80636df4307e49a3df1b60a3791949b3f1ba4a0c8c81fb WHIRLPOOL 7ac0eb36b59a7917b694e4b5e9a425a3ffed7c48eda0c211a7d1c52596b2d39fa4bc0a84db5f58492bf7b5b64c22b81cd2fcd8dee2bceb89583b6e190c70d2d8
-DIST llvm-4.0.1.src.tar.xz 21065652 SHA256 da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51 SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d WHIRLPOOL 1626ff270f7ce4801d02a0797b227fda9314ff5c0c01d653111599e9a4d2854c4d9edc3c698a7abee8d79d6bce8b18dc619fbced3c07ca610d44a248d65830cc
-DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d63b733852ccdb31e06f1373136da SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a WHIRLPOOL 6a99edbdc3e6726dc8ff9126b110fd7560faac46601407722e6dd80b5d894ff242521dc8fda7f4d879de83dac51c65645a37224f7e8def0d8d2f1e564b0531bb
+DIST compiler-rt-5.0.1rc2.src.tar.xz 1509784 BLAKE2B 898e32e189589b6b72073cb791dc9498201d7267e13ad60704b9a66f3e4e839497a84c7cfc5817e72263b5287d00cf25debd2e739ea4174213c56ddb2aed6e38 SHA512 ec2a91e81bc7ac069849f07c31335c88734fd34b512ca3bedaed9c33116549853ac6ac7188552c181900ed8d7ff14ec08c004c87d7fbcbc234e73710c2047d2b
+DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
+DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
+DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..b21d511f6b07
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1_rc2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils flag-o-matic llvm python-any-r1
+
+MY_P=compiler-rt-${PV/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( http://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="${PV%_*}"
+KEYWORDS=""
+IUSE="test"
+
+LLVM_SLOT=${SLOT%%.*}
+# llvm-4 needed for --cmakedir
+DEPEND="
+	>=sys-devel/llvm-4
+	test? (
+		app-portage/unsandbox
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${LLVM_SLOT}
+		sys-libs/compiler-rt:${SLOT} )
+	${PYTHON_DEPS}"
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/utils/{lit,unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# built-ins installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=ON
+		-DCOMPILER_RT_BUILD_XRAY=ON
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+			-DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	cmake-utils_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake-utils_src_make check-all
+}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index d03d168bb4df..ff880467dc3a 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,2 +1,3 @@
 DIST compiler-rt-4.0.1.src.tar.xz 1434100 SHA256 a3c87794334887b93b7a766c507244a7cdcce1d48b2e9249fc9a94f2c3beb440 SHA512 cfeb625884b273f7c0e6767b81a8d3e5f24e0b96a510d5764d9d47a0e215fc841b4cb9d1843c8fb428cd21def720cfbfe8d3593ff5bb390548ebc8c32a902649 WHIRLPOOL 8b33c6841cacefe98da92435418b13b8f8ed97a982903be827e5c37f937dc9001975d6a709d60423b21509dd5670ee2e90cb34c96473fb4a66c2ab6f47af09e5
 DIST compiler-rt-5.0.0.src.tar.xz 1507996 SHA256 d5ad5266462134a482b381f1f8115b6cad3473741b3bb7d1acc7f69fd0f0c0b3 SHA512 5f3fd49736fba35232b0baa19a5f03c4ab3bf85ec16f23355eb3c516fe6d861c14272c224ca2f2092a80636df4307e49a3df1b60a3791949b3f1ba4a0c8c81fb WHIRLPOOL 7ac0eb36b59a7917b694e4b5e9a425a3ffed7c48eda0c211a7d1c52596b2d39fa4bc0a84db5f58492bf7b5b64c22b81cd2fcd8dee2bceb89583b6e190c70d2d8
+DIST compiler-rt-5.0.1rc2.src.tar.xz 1509784 BLAKE2B 898e32e189589b6b72073cb791dc9498201d7267e13ad60704b9a66f3e4e839497a84c7cfc5817e72263b5287d00cf25debd2e739ea4174213c56ddb2aed6e38 SHA512 ec2a91e81bc7ac069849f07c31335c88734fd34b512ca3bedaed9c33116549853ac6ac7188552c181900ed8d7ff14ec08c004c87d7fbcbc234e73710c2047d2b
diff --git a/sys-libs/compiler-rt/compiler-rt-5.0.1_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..f0801a9eab43
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-5.0.1_rc2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils flag-o-matic llvm python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="${PV%_*}"
+KEYWORDS=""
+IUSE="+clang test"
+
+LLVM_SLOT=${SLOT%%.*}
+# llvm-4 needed for --cmakedir
+DEPEND="
+	>=sys-devel/llvm-4
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${LLVM_SLOT} )
+	${PYTHON_DEPS}"
+
+S=${WORKDIR}/${P/_/}.src
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	local nolib_flags=( -nodefaultlibs -lc )
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+		strip-unsupported-flags
+	elif ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang++"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake-utils_src_make check-builtins
+}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 9639f2ede6da..74e080de5dea 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -17,4 +17,4 @@ DIST glibc-2.25-patches-12.tar.bz2 65396 BLAKE2B b23d5d681314c03b8dd5ad20516324c
 DIST glibc-2.25.tar.xz 13873900 BLAKE2B 73ef792fff059f6ad154c9af2155ea15b7869ec1b93e557b6c58129bfb50f863c06f8b49425d75fd2df537dd9c4a68bad790cff770c50a6889732d66f507d349 SHA512 5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e
 DIST glibc-2.26-patches-4.tar.bz2 315447 BLAKE2B 038926c8c187cfea5c00a7017a486356adf0f0959dc8868847f26877b4b441bd76629f20d52967f9da878f69a1ac2859332ed3984b4ebb5cb528d50e0b012736 SHA512 04d229e5f9342d62f2fce039c70489609886782d8aabd49403863a1a679e3b0890ca26c129088738a4af7ef6d95c74f24fb3c4d03695bf7ba6e45eca4de1a5f0
 DIST glibc-2.26.tar.xz 14682748 BLAKE2B c1c9dbec110dd4e25b2f463a96d8afc43b8e3ebfe3c958107032beaa879710252be3bc4122bb62166408725d43785f233544df6159d29cce0fc5b2c08f45adbe SHA512 6ed368523bc55f00976f96c5177f114e3f714b27273d7bffc252812c8b98fb81970403c1f5b5f0a61da678811532fb446530745492d2b49bfefc0d5bd71ce8c0
-DIST glibc-9999-patches-3.tar.bz2 19892 SHA256 97f60ed6debd495610b123d7a27227e75942bea1a0fb1e5f78833a6f3bbe6c64 SHA512 75084b86a83d447d3a4b3959fa2a93d849e304ba9473ebec5570ca4fb5e2f8dfb38548faf3abc9fbd29b529f2c608b52eb2ef2e6e9a2ad5bea9a9298a19ef596 WHIRLPOOL 04a5c30aabf72530fa96fa3a8eadf8207d85d3a2a948ba5f4b72c0deeeae24e7eb71b99875f0e9b1018051fabb4a23630b41873fa4ff0d6ba9778ca6051212bf
+DIST glibc-9999-patches-3.tar.bz2 19892 BLAKE2B e0a51f376e7142f56ae2a0862a7723343ee378275c1a0c6c3a69607b5bb7f9bd655f0a68f8f9cfc32008e06852d0eb0a9e16c85ea9a395dc36b428f1ea6100d8 SHA512 75084b86a83d447d3a4b3959fa2a93d849e304ba9473ebec5570ca4fb5e2f8dfb38548faf3abc9fbd29b529f2c608b52eb2ef2e6e9a2ad5bea9a9298a19ef596
diff --git a/sys-libs/glibc/glibc-2.26-r3.ebuild b/sys-libs/glibc/glibc-2.26-r3.ebuild
index 13aa5ad8bfb6..c2f060799403 100644
--- a/sys-libs/glibc/glibc-2.26-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r3.ebuild
@@ -34,8 +34,8 @@ SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOO
 
 IUSE="audit caps debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
 
-# Min kernel version nptl requires
-: ${NPTL_KERN_VER:="2.6.32"}
+# Min kernel version glibc requires
+: ${NPTL_KERN_VER:="3.2.0"}
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 732d684a7281..60b17cfe67bc 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -35,8 +35,8 @@ SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOO
 
 IUSE="audit caps compile-locales debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
 
-# Min kernel version nptl requires
-: ${NPTL_KERN_VER:="2.6.32"}
+# Min kernel version glibc requires
+: ${NPTL_KERN_VER:="3.2.0"}
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 08a9273d67b4..e1c0dd0e41fa 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -4,3 +4,4 @@ DIST libcxx-3.9.0.src.tar.xz 1198308 SHA256 d0b38d51365c6322f5666a2a8105785f2e11
 DIST libcxx-3.9.1.src.tar.xz 1209020 SHA256 25e615e428f60e651ed09ffd79e563864e3f4bc69a9e93ee41505c419d1a7461 SHA512 a5976e4096624a7307b3e43f4a22ac2dc74572226e0f57af9f3ef537a14c3cff1601b7042aef9dc40a0ee53ca76b08d72eb9c253dcf34f115d3153c302db7070 WHIRLPOOL cad439979570192b195338d752a24fb0ad8704c0c8efed3b6d7724437763eab7bc3b8baaf2f0e6fff55c6d9be211dff6f7baf18dec55e3a29ad3b8a423cefb1e
 DIST libcxx-4.0.1.src.tar.xz 1446380 SHA256 520a1171f272c9ff82f324d5d89accadcec9bc9f3c78de11f5575cdb99accc4c SHA512 91f3f397be606989be99865d0b279557f9afb93f7a74ed10c3a74f4440e38b5694ddf452bbf2f487cacd4391606dd5c7edfe5130f2de19e2acfd6cce619d028a WHIRLPOOL fe7c71e8dc2d17d14e94896837229c5ed872e7c04aea79a207e8fa98aa4539a7445e402b848d0c0d009f154f00d970159ad009d16bfdb9ae012ce5c7c6d9ba51
 DIST libcxx-5.0.0.src.tar.xz 1518940 SHA256 eae5981e9a21ef0decfcac80a1af584ddb064a32805f95a57c7c83a5eb28c9b1 SHA512 210749f6585d8fd39fc63a32dd85d68de4aa480c91915cbf419b9e8a3b300fa4624f03200ed963cecc8ab233777c36e8c522fa0762a2aa068bc65e6f48118328 WHIRLPOOL c791f6718e1c2a97fae26741284d861fc869721fca11b4ab4d3e9b4052ce17fca1fd99f945f406fdcdbfde43622cb7afe351e0268d773f6b42d1da2f5dc0f1f5
+DIST libcxx-5.0.1rc2.src.tar.xz 1533332 BLAKE2B 7ac60315ca68054cafdfa3814daea3fe288c140e397b78474b657d7816dfb00c0b84715fac41a7257e85c61f27d7eaefaed7096356c39f02ff2c305440e00bd3 SHA512 aaf9aeded70f948440cb55f3c8a7633be6edb8abde496d5f1571d62fb5d34d8f3ec27935a774224e620b26845ab1081189511a5eb223b5611ec4adfbbc3a2641
diff --git a/sys-libs/libcxx/libcxx-5.0.1_rc2.ebuild b/sys-libs/libcxx/libcxx-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..ab78b95992b4
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-5.0.1_rc2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Ninja provides better scalability and cleaner verbose output, and is used
+# throughout all LLVM projects.
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib llvm python-any-r1 toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
+REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
+	?? ( libcxxabi libcxxrt )"
+
+RDEPEND="
+	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	!libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )"
+# LLVM 4 required for llvm-config --cmakedir
+# clang-3.9.0 installs necessary target symlinks unconditionally
+# which removes the need for MULTILIB_USEDEP
+DEPEND="${RDEPEND}
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )
+	app-arch/xz-utils
+	>=sys-devel/llvm-4"
+
+S=${WORKDIR}/${P/_/}.src
+
+DOCS=( CREDITS.TXT )
+
+PATCHES=(
+	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
+	# out-of-tree build.
+	"${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
+)
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+	if tc-is-gcc && [[ $(gcc-version) < 4.7 ]] ; then
+		eerror "${PN} needs to be built with gcc-4.7 or later (or other"
+		eerror "conformant compilers). Please use gcc-config to switch to"
+		eerror "gcc-4.7 or later version."
+		die
+	fi
+}
+
+multilib_src_configure() {
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+	elif use libcxxrt; then
+		cxxabi=libcxxrt
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxrt"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	# we want -lgcc_s for unwinder, and for compiler runtime when using
+	# gcc, clang with gcc runtime (or any unknown compiler)
+	local extra_libs=() want_gcc_s=ON
+	if use libunwind; then
+		# work-around missing -lunwind upstream
+		extra_libs+=( -lunwind )
+		# if we're using libunwind and clang with compiler-rt, we want
+		# to link to compiler-rt instead of -lgcc_s
+		if tc-is-clang; then
+			# get the full library list out of 'pretend mode'
+			# and grep it for libclang_rt references
+			local args=( $($(tc-getCC) -### -x c - 2>&1 | tail -n 1) )
+			local i
+			for i in "${args[@]}"; do
+				if [[ ${i} == *libclang_rt* ]]; then
+					want_gcc_s=OFF
+					extra_libs+=( "${i}" )
+				fi
+			done
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			# this can be any directory, it just needs to exist...
+			# FIXME: remove this once https://reviews.llvm.org/D25093 is merged
+			-DLLVM_MAIN_SRC_DIR="${T}"
+			-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+
+	[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+	sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die
+
+	cmake-utils_src_make check-libcxx
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	local libdir=$(get_libdir)
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "$(usex libcxxrt "libcxxrt.a" "libsupc++.a")")
+
+	# Move it first.
+	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=" libpthread.a libdl.a"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
+}
+
+gen_shared_ldscript() {
+	local libdir=$(get_libdir)
+	# libsupc++ doesn't have a shared version
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt "libcxxrt.so" "libsupc++.a")")
+
+	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
+	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	gen_shared_ldscript
+	use static-libs && gen_static_ldscript
+}
+
+pkg_postinst() {
+	elog "This package (${PN}) is mainly intended as a replacement for the C++"
+	elog "standard library when using clang."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 5bd32556761c..46269ea54875 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -2,7 +2,9 @@ DIST libcxx-3.9.0.src.tar.xz 1198308 SHA256 d0b38d51365c6322f5666a2a8105785f2e11
 DIST libcxx-3.9.1.src.tar.xz 1209020 SHA256 25e615e428f60e651ed09ffd79e563864e3f4bc69a9e93ee41505c419d1a7461 SHA512 a5976e4096624a7307b3e43f4a22ac2dc74572226e0f57af9f3ef537a14c3cff1601b7042aef9dc40a0ee53ca76b08d72eb9c253dcf34f115d3153c302db7070 WHIRLPOOL cad439979570192b195338d752a24fb0ad8704c0c8efed3b6d7724437763eab7bc3b8baaf2f0e6fff55c6d9be211dff6f7baf18dec55e3a29ad3b8a423cefb1e
 DIST libcxx-4.0.1.src.tar.xz 1446380 SHA256 520a1171f272c9ff82f324d5d89accadcec9bc9f3c78de11f5575cdb99accc4c SHA512 91f3f397be606989be99865d0b279557f9afb93f7a74ed10c3a74f4440e38b5694ddf452bbf2f487cacd4391606dd5c7edfe5130f2de19e2acfd6cce619d028a WHIRLPOOL fe7c71e8dc2d17d14e94896837229c5ed872e7c04aea79a207e8fa98aa4539a7445e402b848d0c0d009f154f00d970159ad009d16bfdb9ae012ce5c7c6d9ba51
 DIST libcxx-5.0.0.src.tar.xz 1518940 SHA256 eae5981e9a21ef0decfcac80a1af584ddb064a32805f95a57c7c83a5eb28c9b1 SHA512 210749f6585d8fd39fc63a32dd85d68de4aa480c91915cbf419b9e8a3b300fa4624f03200ed963cecc8ab233777c36e8c522fa0762a2aa068bc65e6f48118328 WHIRLPOOL c791f6718e1c2a97fae26741284d861fc869721fca11b4ab4d3e9b4052ce17fca1fd99f945f406fdcdbfde43622cb7afe351e0268d773f6b42d1da2f5dc0f1f5
+DIST libcxx-5.0.1rc2.src.tar.xz 1533332 BLAKE2B 7ac60315ca68054cafdfa3814daea3fe288c140e397b78474b657d7816dfb00c0b84715fac41a7257e85c61f27d7eaefaed7096356c39f02ff2c305440e00bd3 SHA512 aaf9aeded70f948440cb55f3c8a7633be6edb8abde496d5f1571d62fb5d34d8f3ec27935a774224e620b26845ab1081189511a5eb223b5611ec4adfbbc3a2641
 DIST libcxxabi-3.9.0.src.tar.xz 511324 SHA256 b037a92717856882e05df57221e087d7d595a2ae9f170f7bc1a23ec7a92c8019 SHA512 500207bfd59664bd42d920741d6b467c4b88569453742db6470af081c77be04894e097a14b8419e333b51abce484566366e35cbc3ed2607cd86dfc0ec0ddd0c5 WHIRLPOOL 7b2d3b022c4c539596ce7be0afac724df929f19fb80e6f5b14074e240fb252b04389fe121f987ceaf6f3567d59735238b2940546475e4107f3c32eb55a5f8a80
 DIST libcxxabi-3.9.1.src.tar.xz 510964 SHA256 920d8be32e6f5574a3fb293f93a31225eeba15086820fcb942155bf50dc029e2 SHA512 4f5603f1476b759c86d4784728fbdd212c59b30dc56d787c1834bf68a9cd83071fa22658d24e5a58beb94c0c656b0e4457d7da6e3048715dd36bd68380fc336e WHIRLPOOL 8ff9d0a2d5657e384f3b624fe514ae4074552c34672e8b7caeb4870d700e71913447af75d56021d393c6eebd45018e5e80b706747b1433d9ec608a1d5b0b3051
 DIST libcxxabi-4.0.1.src.tar.xz 515820 SHA256 8f08178989a06c66cd19e771ff9d8ca526dd4a23d1382d63e416c04ea9fa1b33 SHA512 e94315ba8a507d8481d70c33e7ab2d724d51726edb8412c70a1b5f59e3f15d5825f1502dc2db138b20e5293fb90a184050be94d5ac270fd7ce78b502efb9f86a WHIRLPOOL 8771bb1f5ac8cb1d22a4606bfd3b448e1e3b942be0d5639a7c8c36abcc550a59cf2e530558aeb486294b642fdcd10c56695b59d094bed41e0115980cb587c8af
 DIST libcxxabi-5.0.0.src.tar.xz 521524 SHA256 176918c7eb22245c3a5c56ef055e4d69f5345b4a98833e0e8cb1a19cab6b8911 SHA512 88f48a3232c220a7d22ee31121e5c2bd09b506177079a1ff567eeae213e24a9bb8bd13e59f0c6ca5ec995c60bf516e3c2507d342a149a2c4cef8aad7b4b330f8 WHIRLPOOL 13ca81abc08afd73b557d71dd0041851fedcecc2f525a902c92ba16f6693c1df3a88acceede5c15a2186ef78dea9187d3ffd3212ced5e07c852404a55626cc59
+DIST libcxxabi-5.0.1rc2.src.tar.xz 522200 BLAKE2B 765a73431a01adfa81b06205e8e8646d5faae86bc7c9e84680b48f8aa65854a3cad64ba560aef39376176e73a71d0e318aeea931c24e3f1f935324726bfbd7ae SHA512 88e6f5d8622c6a675c79db8787ed19d71539ec14bb33f990928ea65aa96bad8accf761d4eb90c5462379e6526b18f8067b89c9ecb4eab5b756c79ff7522b1bf2
diff --git a/sys-libs/libcxxabi/libcxxabi-5.0.1_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..70f374bfdaeb
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-5.0.1_rc2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib llvm python-any-r1
+
+MY_P=${P/_/}.src
+LIBCXX_P=libcxx-${PV/_/}.src
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	http://prereleases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libunwind +static-libs test"
+
+RDEPEND="
+	libunwind? (
+		|| (
+			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
+		)
+	)"
+# LLVM 4 required for llvm-config --cmakedir
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-4
+	test? ( >=sys-devel/clang-3.9.0
+		~sys-libs/libcxx-${PV}[libcxxabi(-)]
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	einfo "Unpacking parts of ${LIBCXX_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${LIBCXX_P}.tar.xz" \
+		"${LIBCXX_P}"/{include,utils/libcxx} || die
+	mv "${LIBCXX_P}" libcxx || die
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+
+	[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+	sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die
+
+	cmake-utils_src_make check-libcxxabi
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r include/.
+}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 78f1468c3605..c7906cb851d3 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -4,3 +4,4 @@ DIST openmp-3.9.0.src.tar.xz 2257596 SHA256 df88f90d7e5b5e9525a35fa2e2b93cbbb83c
 DIST openmp-3.9.1.src.tar.xz 2031588 SHA256 d23b324e422c0d5f3d64bae5f550ff1132c37a070e43c7ca93991676c86c7766 SHA512 80924a6f9765f634d24d7b0aa036d92c912dbd8e067487a14bdd03b4c587fdfc92e83eb29926bfa637ef45be3f133a924f77ab12099ea3706c18e9c42774708b WHIRLPOOL b6ec75d4f9d2b86bb8e2927791cb46e61ff8657fc21f9e0ba9893d81d3382522aca330564f3156c1fbbf765de0499e875e41e11199abe2da8ed1bef057d5e8d8
 DIST openmp-4.0.1.src.tar.xz 2275240 SHA256 ec693b170e0600daa7b372240a06e66341ace790d89eaf4a843e8d56d5f4ada4 SHA512 0b737dde832c5907a0cac41fe1d594b61e85dd405eee42b39f09233db62b44543204ccc775e52e2981f9c9f0683b234526e288a3a7a04f712280fb3a575abcaf WHIRLPOOL 102f4b6984e6bc4dc08349e7f1f0ff31646bad923018cfd342e0bee760d8b1036f0c54c565af3b0730c470d584e37ed905bcbfa1ffc2325dafa0a02d91088b05
 DIST openmp-5.0.0.src.tar.xz 2074004 SHA256 c0ef081b05e0725a04e8711d9ecea2e90d6c3fbb1622845336d3d095d0a3f7c5 SHA512 038cc1d262414fac9a05eabdce97b21eb04fc1b3609d07f8da2c9da6b1aaa143f8b26953cb799e7dde82f708103539fe03fe939ba7323a71bd3e9e3925bd5513 WHIRLPOOL e32436cc925173db2f58dc0b454ed046c733877edce3383da0a621ea90e9c30d9e45c0063451feb9b0dc95102893db02832d97bfb3a200e3440e4cad7fb9720a
+DIST openmp-5.0.1rc2.src.tar.xz 2076308 BLAKE2B 8728f9da3f8627ff10dadf36eeabeeb6b7228a2c36fec13f679c7f4cbed680fb7b177f7d188dd001292062577468b71b0d14643df86974c9849c0e9876726821 SHA512 9d4464f4f22164057bd8d0225d1c5d90df54331a6b63a905032c7b0e3e380b2d689dd08b3175c53e6aae95315060f107a2fb15bc23738a20cbd6e1751c5d789b
diff --git a/sys-libs/libomp/libomp-5.0.1_rc2.ebuild b/sys-libs/libomp/libomp-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..174b86c806f4
--- /dev/null
+++ b/sys-libs/libomp/libomp-5.0.1_rc2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"
+
+# Additional licenses:
+# - MIT-licensed Intel code,
+# - LLVM Software Grant from Intel.
+
+LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
+SLOT="0"
+KEYWORDS=""
+IUSE="hwloc ompt test"
+
+RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		sys-devel/llvm
+		>=sys-devel/clang-3.9.0
+	)"
+
+S=${WORKDIR}/openmp-${PV/_/}.src
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLIBOMP_LIBDIR_SUFFIX="${libdir#lib}"
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+		-DLIBOMP_TEST_COMPILER="$(type -P "${CHOST}-clang")"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake-utils_src_make check-libomp
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index cfc1e8ceaed3..418cfac5306d 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -3,3 +3,4 @@ DIST libunwind-3.9.0.src.tar.xz 61764 SHA256 66675ddec5ba0d36689757da6008cb2596e
 DIST libunwind-3.9.1.src.tar.xz 61788 SHA256 0b0bc73264d7ab77d384f8a7498729e3c4da8ffee00e1c85ad02a2f85e91f0e6 SHA512 a80f5d0660e209f5bf709316b5df2ca63b9f0db49f5f74dfe9c9e580c654f61a15acc071a739fdb84baf5ffa9420b92498f8560331173642d80f6b74e1e2afb7 WHIRLPOOL d79928771468e344bd4c73ec458f4994fbfa04b4f625e559f3ef20c75d504d06f8edc1051d1444d8b4260f253716333ecd4bc7a18e8aca822dd77245a5a99ac2
 DIST libunwind-4.0.1.src.tar.xz 63388 SHA256 3b072e33b764b4f9b5172698e080886d1f4d606531ab227772a7fc08d6a92555 SHA512 8a0552a8ab830010d81420f4b778a3b831bff85b19bcce972958fc30e1ba5a2fa26a3deba499985a43dd7a103690775f6a20e7b3edda55f4eaff3541002d6b59 WHIRLPOOL 2544b14afb6a2d545ed68c267389e7438c3dd4d244dd1cce8583f2aba2e90017a027c27c87a9a7336ea3c5ada3388414d4e357ad1c1db0d23ee52b178f45b563
 DIST libunwind-5.0.0.src.tar.xz 72236 SHA256 9a70e2333d54f97760623d89512c4831d6af29e78b77a33d824413ce98587f6f SHA512 20d54d5342d67425f5e36e9c690f1bb67bc2a3b7184b3ad546b689e510728d7c596f178d4f5186daf7480409ed4e455848b4ad1d9d896370fac1db69885fc793 WHIRLPOOL 0ecdf40e6cde7012f6949015b5030a4206b2c0d293159864466b58a9f34b193245daf90c95417b66e3c15191b1418a94b65893efbe216d144a4de4ffb6107925
+DIST libunwind-5.0.1rc2.src.tar.xz 72024 BLAKE2B af3644806722f1ffd844b4ba4c6d14e249b421fdd5b3acc1cfbfc3a421e76993305121fef044163384274cfd31f4b83e88c456d05ad0c9cff0036d4e6e4be95a SHA512 ab95a87ed35f8ae07702bbd58afee4adb7ecae039c41da86d389d0a8584fee830dfb3ac34f1783b878b86b1d0ec43845141dd9cc727940da68079711e8dfa2c1
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-5.0.1_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..c7915c92206c
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-5.0.1_rc2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+inherit cmake-multilib llvm
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://github.com/llvm-mirror/libunwind"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/libunwind-${PV/_/}.src.tar.xz"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug +static-libs"
+
+RDEPEND="!sys-libs/libunwind"
+# LLVM 4 required for llvm-config --cmakedir
+DEPEND=">=sys-devel/llvm-4"
+
+S=${WORKDIR}/libunwind-${PV/_/}.src
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# install headers like sys-libs/libunwind
+	doheader "${S}"/include/*.h
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 027788127a8e..c9f4a3ba5b0e 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ca095a458402..43bda01f1265 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,6 @@
 DIST chromium-62.0.3202.89.tar.xz 517100784 BLAKE2B c257a554c12bba7b38c85de41e97f900efc43578f3d5a5de5adbb01eebba8ef75c885db3e9c052ce2dabf9bf63b02dbea7b54606cb8d412fb9d5f433d919dee4 SHA512 11ed71d2c9ebf82c9b704111d85d01c5600fc1caeb66e0dfaca172b20bb357817d717b3bcc13f704072b77550fa7fa74f990725b1d7d85d4d2b82cc1baec9578
 DIST chromium-62.0.3202.94.tar.xz 517173548 BLAKE2B 1ec2cadd6581ea14566a0ae9803aecbf176712379a5d56e9f970e7cf5de06d51e2812247c09e96fcfcd3d8f671cead224089479855379be72b591455c76b3c77 SHA512 09e05aec663de94633fb7b658154a5b0146159dea0f434ef412405530274daefc5e554be8120653b840d2b55f5e35202be1a653ece7796d00956df58bc7608ad
-DIST chromium-63.0.3239.52.tar.xz 561145768 BLAKE2B ced3001113f4d0b97be47b19d0769ba4383e837ade8d405588f495be4e51a95351ad7c5e6dbcf6e8b38c06f872ee76cfb3ac351ab181d1dbe865acfa6e2d1432 SHA512 5d0cccf89dc5555f9c966315d3927bd107605cc6b72e808c498b054eee66ae9966aa640d8c19728f9988590ff2deabacbbba04333a83794c4f4812ef28945a66
 DIST chromium-63.0.3239.59.tar.xz 561128012 BLAKE2B c98c17c0c135c28fc6a556af93585016ea72c864f72cc586b3291461584c74df57271a85794065502bf3090f4a8bcb5ed24a42c482cff98cadab97a58924ae11 SHA512 bc7c632a32039063cb596a646e25c5dd81867bf2e249ff0f371b2d1bb9af50eda83d8fb856df22e181b69ee950b2979aed8a85fdda786b5f97d1d7cf2c3048b1
+DIST chromium-63.0.3239.70.tar.xz 534258328 BLAKE2B 8e6d846333bfea5e28f04cf2f856a295f0a179bb5d8fa8777d9b4ec8808814b79475a10a4c22dfd7bd606e7cdd99e15a32eb0aae7027a42f4526a05942f6ec85 SHA512 fdc5f433e3520cd053a48dfb107b33da6d844429169047e132663435708ed8fbbabf6949290aca0ff15eecd66fc470c9218bb9fc0376811c7684c8c67fdded6c
 DIST chromium-64.0.3253.3.tar.xz 567976356 BLAKE2B 2dbef0c2b3454b52a39ec03c3af618108e47bbefd63b4e3addbb64d2526778e14299a8597246876d30aed7e37ce8b6e0b227915e2d625202353594a9eb2032d4 SHA512 fd0307337eec5513d73c14a0d8bf494d87e1a658c48585afbf7d0c08314297bf28825ee99bbeab95ccaae8a0e5b1536794c3b4c94f996ba0a4a217cdbc224267
 DIST chromium-64.0.3260.2.tar.xz 568772508 BLAKE2B 8aee43fded3504c5a64b537d8845096a4412353c16ae24b405c10b20b0e49e926bf8db531fa03390cc608c39e5cb09a2b2aab659ceda9320bf8e1f69d75e8bd2 SHA512 f7003976c8c5449569e0017fae5e1f2f7150a297a4bb4ad2a9bafe69e9fb4e931c76efeecbe07cc11a00af5a49591655734f21892e69e3ac523fc4d3faa2795f
diff --git a/www-client/chromium/chromium-62.0.3202.94.ebuild b/www-client/chromium/chromium-62.0.3202.94.ebuild
index 987424e04650..1b1e954e64df 100644
--- a/www-client/chromium/chromium-62.0.3202.94.ebuild
+++ b/www-client/chromium/chromium-62.0.3202.94.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 	cups? ( >=net-print/cups-1.3.11:= )
 	dev-libs/expat:=
 	dev-libs/glib:2
-	system-icu? ( >=dev-libs/icu-59:= )
+	system-icu? ( >=dev-libs/icu-59 <dev-libs/icu-60:= )
 	>=dev-libs/libxml2-2.9.4-r3:=[icu]
 	dev-libs/libxslt:=
 	dev-libs/nspr:=
diff --git a/www-client/chromium/chromium-63.0.3239.52.ebuild b/www-client/chromium/chromium-63.0.3239.70.ebuild
similarity index 99%
rename from www-client/chromium/chromium-63.0.3239.52.ebuild
rename to www-client/chromium/chromium-63.0.3239.70.ebuild
index 82207820db52..c228cfc0c39d 100644
--- a/www-client/chromium/chromium-63.0.3239.52.ebuild
+++ b/www-client/chromium/chromium-63.0.3239.70.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 	cups? ( >=net-print/cups-1.3.11:= )
 	dev-libs/expat:=
 	dev-libs/glib:2
-	system-icu? ( >=dev-libs/icu-59:= )
+	system-icu? ( >=dev-libs/icu-59 <dev-libs/icu-60:= )
 	>=dev-libs/libxml2-2.9.4-r3:=[icu]
 	dev-libs/libxslt:=
 	dev-libs/nspr:=
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 4876eca4c9b6..f958de74e5e1 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
index c31d5737a832..ade9611f9c38 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 420ee7565435..89f286d4bed2 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,9 +1,9 @@
-DIST libdrm-2.4.75.tar.bz2 774589 SHA256 2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f SHA512 7d30029dfc384024eb6a82a04122064366572f5888ac4594fd9e02bc0a22ed2d154bef1840bd24f0543b77460d6359d7e424d424e10f4256ee3c898041be2292 WHIRLPOOL 24134409e59fe48bae02890b8153c063a49b114bcad9911487aa25ee594fe622ba04a3b2e486a2944ebe4177e205a8a970dd8d584550022780a70cb0447decf9
-DIST libdrm-2.4.79.tar.bz2 783711 SHA256 c6aaf319293bce38023e9a637471b0f45c93c807d2a279060d741fc7a2e5b197 SHA512 62d6dbdf5e4e73e948fcb128a3ee76c88843d0aabf0af5751526829e9b95cff151a121af88ba9625acc7f5bc4ecfa71f9a3762005d5da76cff1d91dfc8ea8ea7 WHIRLPOOL 38e64cad8cd49a44931b598896d9ced625560a0d9da4f095d4d76eff3b64d8ab80285a6df2ff3c27ab41946fa0dcc718960cf01ac662be891c0f561997058208
-DIST libdrm-2.4.80.tar.bz2 771243 SHA256 a82a519601e9cdfad795e760807eb07ac8913b225e25fc8fe9bc03e3be6549f1 SHA512 478f64bcc6f4815368ae86d023f11ba6b37595bb9d8baa588b466c6c0e2aae48a50a489137750ed21fbabef5afabf183c78c152eb770bfe316fa7401b191a30b WHIRLPOOL 210f62c21aa27fb93eba3a8303daeab80b9da4b20ec6a70649fbad88f4277559a58018fbb12ff4b92bc6b8dc16b7ccbec1724bfcafe353382673352e9ac6d16d
-DIST libdrm-2.4.81.tar.bz2 786276 SHA256 8cc05c195ac8708199979a94c4e4d1a928c14ec338ecbcb38ead09f54dae11ae SHA512 5f7a1524acad59890d3f890bed90a660a424e18a88d587ca356223bde4a7446d1c540f97ec11cb10d2e7ed1b4ae86127957634354a1be6d04199295ab24782e5 WHIRLPOOL 2694fe988c7ebf34b30076a10dcb2d5ba8a24ddddb1ad348da69874814d64e78ad48f959275faa02fabd798ae214f386ef8437bdf48d485f77519b8759d695df
-DIST libdrm-2.4.82.tar.bz2 754053 SHA256 43fa2dbd422d6d41ac141272cc9855360ce4d08c7cf7f2c7bb55dfe449c4ce1c SHA512 e69fd8c2b392daabbb3a548179e3a21a555d5174c11d76a288eb2a08850849aa867c7777b67798ec00e026e998a3b128c22698f05a7b44eb24cddc5c8a3a02d0 WHIRLPOOL bf600559faf5ffe45b6f0192a561875e5284ea76d7611724c2e7f21e6f8aaa6d2e368546102170cffb713bb37fc4c5f98a08b6828e4f6f48f774d7b9b9d96906
-DIST libdrm-2.4.84.tar.bz2 794348 SHA256 7ae9c24d91139ac9a2cdee06fe46dbe1c401a1eda1c0bd2a6d1ecf72f479e0aa SHA512 860ebc5fa934edee97e9e7e13aaa2f2e70a68b946f4f3893cd7f93b8296c10b3cd4ce4c23b1676eefe375286e6e2292b96e917d7976f65c61da3fa661e5e641a WHIRLPOOL 8984374145694034626d6ccd15d72123989f5e8a127922dd0be5ae26866f8ef9179617689bc75d9a9170bbc55419c7cb2762363e700e91291a78dfb7df740dc9
-DIST libdrm-2.4.85.tar.bz2 795471 SHA256 64e4cd87eaee38ae60b2984ef02b66159b9bdd33030040db2a04339cf15f6173 SHA512 c13b266ca2efd28506b9910306db4be378537dc13229b4d4d8f525e224d0f6a2a9ce326b9ae37dae1d716ae81c9c3bcc88d875104d567899e5854da3c63aa147 WHIRLPOOL ed8f0edf717a09d78d2a2c9d33e806d1eea024a0357c68df5aac684de8587f0ddc437bf03be078062600c0d9d7cee1b4bf8af625f1cea5155b2a6d621d803c52
-DIST libdrm-2.4.87.tar.bz2 796368 SHA256 4c1c5293bdbfa248e029d3e6446767e17a3208387a719ec9da2d20c19849ed48 SHA512 9ce259d38eaffbcaf82a6975ffa513307da6750bcc31a53cade5717f854151b0e7b6d4ce25c0b518cab5a542c544d5984329f216dc4cdc9369b4adae19a68e48 WHIRLPOOL 28a188da6652a9e02d0421ee50ba8c4d46b41b4d52563a39d4d1700c25da77635cccc9afbfb5573dbae07a5d53233f977a976be8075c5126344cdbd10dff5251
-DIST libdrm-2.4.88.tar.bz2 796583 SHA256 b5e55dbac2124e742e639f5b8553e8b7395863bf73dab4f77e99fe2fc25572b5 SHA512 0d9d4bcc0d9be1fb6b1ca075339b22b0f927288a4c02bbcbf95406b5c095051890f3d2e0d32e529ef9b6952ce1250afd1e0765ad3188c2bac924dda8c33afabb WHIRLPOOL 50abb9c520570469451015cf1b56a6ba17c6fb4609c7780a4f9e2209651c5eefcf389006ffec5f24a742c2eef57a32722b4dbe75a51ed56229db1cc10f27a212
+DIST libdrm-2.4.75.tar.bz2 774589 BLAKE2B cb32eb5fbd5976e3ce8b1240d3dad3694f19628b0a6626a88a54d9ca0ab5f36155ace11b5d4ef6180cada41eff4f2922ed15a3376aa2c094e4286d7747cb0a63 SHA512 7d30029dfc384024eb6a82a04122064366572f5888ac4594fd9e02bc0a22ed2d154bef1840bd24f0543b77460d6359d7e424d424e10f4256ee3c898041be2292
+DIST libdrm-2.4.79.tar.bz2 783711 BLAKE2B 92b94f08bcd99fbb308dca4bdb6702b5b80df5aaa2567f729d6f10783d057440c0ba1b2ae9f12687d2955629888a78fd2771f3bff7eef8b2ab6e69bd1bca7f33 SHA512 62d6dbdf5e4e73e948fcb128a3ee76c88843d0aabf0af5751526829e9b95cff151a121af88ba9625acc7f5bc4ecfa71f9a3762005d5da76cff1d91dfc8ea8ea7
+DIST libdrm-2.4.80.tar.bz2 771243 BLAKE2B 99b15a356558133952a0a121e832d5baf21a053f07ff89c516d432689398d6829f4d119950d772718576910c5ff34e5ecd8c4a79fd54f39f5cc0fc6b5db0c63d SHA512 478f64bcc6f4815368ae86d023f11ba6b37595bb9d8baa588b466c6c0e2aae48a50a489137750ed21fbabef5afabf183c78c152eb770bfe316fa7401b191a30b
+DIST libdrm-2.4.81.tar.bz2 786276 BLAKE2B 8d07917cbc46ba21ea848c8c63fdc3718a9f765b418fb7d9f078a6b3e3384cddb9320ffdc67b1947a69bd1f272843a094df76340e55c4be4761a043e79126589 SHA512 5f7a1524acad59890d3f890bed90a660a424e18a88d587ca356223bde4a7446d1c540f97ec11cb10d2e7ed1b4ae86127957634354a1be6d04199295ab24782e5
+DIST libdrm-2.4.82.tar.bz2 754053 BLAKE2B 83d0a7203826c093bfb6b3ce4836f3ec6182a75f08f4cecb142e5707eb525cfbba9a123a94235b09370ac53cb7beb443604cb7dfba4cf375e0d0a74f71ce8bb4 SHA512 e69fd8c2b392daabbb3a548179e3a21a555d5174c11d76a288eb2a08850849aa867c7777b67798ec00e026e998a3b128c22698f05a7b44eb24cddc5c8a3a02d0
+DIST libdrm-2.4.84.tar.bz2 794348 BLAKE2B 0ef897506eaa9986292ecabba8351f6e81d37276656405f7d54517ea5783bf6a57d6105dcfac2da96aa116243d0b9c93f1ee7c51168a74b57f8f595e9a1aa699 SHA512 860ebc5fa934edee97e9e7e13aaa2f2e70a68b946f4f3893cd7f93b8296c10b3cd4ce4c23b1676eefe375286e6e2292b96e917d7976f65c61da3fa661e5e641a
+DIST libdrm-2.4.85.tar.bz2 795471 BLAKE2B a2bc8a65c0c5c6f789d5723c5c3e4b3a34c1a7c7ac07590990f9b3eaae891639434c45ceaba53d8b0a3d022d2bbdd9812c397aa851a12a9ea98b352658ed4a6e SHA512 c13b266ca2efd28506b9910306db4be378537dc13229b4d4d8f525e224d0f6a2a9ce326b9ae37dae1d716ae81c9c3bcc88d875104d567899e5854da3c63aa147
+DIST libdrm-2.4.87.tar.bz2 796368 BLAKE2B 5dae1afc9d3c8a9a2fbb8957887e0e4c3eee2a10add049313b5ad338a674eedc2e23702fe680fbd6bbc2a8c7651ef1f9dd6dbf59c036aad037215730e9eba919 SHA512 9ce259d38eaffbcaf82a6975ffa513307da6750bcc31a53cade5717f854151b0e7b6d4ce25c0b518cab5a542c544d5984329f216dc4cdc9369b4adae19a68e48
+DIST libdrm-2.4.88.tar.bz2 796583 BLAKE2B 4130633fea39e12514e6c6e7a926ca7ccca618ecb15a67cd27ee577a4ad56ecf6d09e20a323546a2b9698d7e41bd28377e7e04e8f478a3ca957868e1ac51cf98 SHA512 0d9d4bcc0d9be1fb6b1ca075339b22b0f927288a4c02bbcbf95406b5c095051890f3d2e0d32e529ef9b6952ce1250afd1e0765ad3188c2bac924dda8c33afabb
diff --git a/x11-libs/libdrm/libdrm-2.4.82.ebuild b/x11-libs/libdrm/libdrm-2.4.82.ebuild
index 8c54159af237..e71d0e9ab282 100644
--- a/x11-libs/libdrm/libdrm-2.4.82.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.82.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
 fi
 
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
diff --git a/x11-libs/libgksu/Manifest b/x11-libs/libgksu/Manifest
index c16ea441da13..3f4cddacd70c 100644
--- a/x11-libs/libgksu/Manifest
+++ b/x11-libs/libgksu/Manifest
@@ -1 +1 @@
-DIST libgksu-2.0.12.tar.gz 477903 SHA256 22f9cfc3627dcb6774b9aff66c6ea6554f3b34b82bbfa2467b821e67874c3faf SHA512 06935583787c2d63db5ee345efeabd46ce1b2f36ec5c94ba0219d7c27d0935ddbf9987c0368158e57486d541b4a8e75140da53a806061d465985452fd1128573 WHIRLPOOL 429808802e740880c786c00f2abfaab564178c1da06be5023f1ee17aa766e10d61c3d3aad14affee834c928822a2b92cfac7e5fa2b326725497cdaa1334fb55d
+DIST libgksu-2.0.12.tar.gz 477903 BLAKE2B c4a130b43d1e9acffd740b9160f98ed318f9861db90acaa047fd9c2a162707fdffa86a4b0854b81486f982099f9440ee7d5b8c5ca65122e0cb2872e3a8aa508f SHA512 06935583787c2d63db5ee345efeabd46ce1b2f36ec5c94ba0219d7c27d0935ddbf9987c0368158e57486d541b4a8e75140da53a806061d465985452fd1128573
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
index 6e98ea70e18c..60528693a745 100644
--- a/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
+++ b/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd"
 IUSE="nls static-libs"
 
 COMMON_DEPEND="
diff --git a/x11-libs/pango/pango-1.40.12.ebuild b/x11-libs/pango/pango-1.40.12.ebuild
index 7d2656b9c8d8..e9eb936879ef 100644
--- a/x11-libs/pango/pango-1.40.12.ebuild
+++ b/x11-libs/pango/pango-1.40.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 08eee5e2d448..2aa65316fa87 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 5d89a30677ec..179e40cf1d3c 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,4 +1,4 @@
 DIST Eterm-0.9.5.tar.gz 796872 SHA256 63ad6e3d89571a72d8302274ebb00d569b8789e24fae038beaee7aa4b8362bd2 SHA512 ef16ec5ddf0dd91ed4c40eff2289f7a61aa5c0fbf3b95bd14afe38557572f586f1dcd459c258cdfadb1dfbc1c50874492c9cc69ee4152a569b097e86c0d7cc44 WHIRLPOOL a9f9b3ad8343caa084a4cfd9b900d15eb90b657dd5cfdf4746e0d42ab84bc8b7ee6a9e17c4da658cec44d69b30a682900a753d178ad42ae58bc87b15dbb16522
-DIST Eterm-0.9.6.tar.gz 831756 SHA256 72b907aa64f8bcf053f2ecbc8a2e243c6de353a94ecaf579ff2c4e3ae5d7e13c SHA512 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe WHIRLPOOL 51a958675fba197ec0dd069028e6a6066ab1133c030ddaad1bccf8c2e541b5063b0612ae7db80e40f30331ab5930da2b7d628b21c7da4d64eb9697163f05d90b
+DIST Eterm-0.9.6.tar.gz 831756 BLAKE2B cd309f2bd74c44066d5811845c2cfe7407064186ce445246af352e3dfe47c5a6a58730069f653bb15891b2fdde7d6e84eaf1b92e64978552aab36bd20dee10a1 SHA512 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe
 DIST Eterm-bg-0.9.5.tar.gz 1883627 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8 WHIRLPOOL f03b6432d406b7882ab28f80fd0f4b63bee15d8c720a54eb42f400f7cae51c2d96641656b5e779d5ccdc19c098b1c54e03d1dc0cb27a344dad5a5c5181b571a1
-DIST Eterm-bg-0.9.6.tar.gz 1883627 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8 WHIRLPOOL f03b6432d406b7882ab28f80fd0f4b63bee15d8c720a54eb42f400f7cae51c2d96641656b5e779d5ccdc19c098b1c54e03d1dc0cb27a344dad5a5c5181b571a1
+DIST Eterm-bg-0.9.6.tar.gz 1883627 BLAKE2B eef174aa7734dc4795c76213468ae2465d5d484aee73d7d6a09e181547614b9ac23dd55b3991e1d5daa7defd65e91d40a0e01e7a44c64968e94fc6ace3ed18d6 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
diff --git a/x11-terms/eterm/eterm-0.9.6-r1.ebuild b/x11-terms/eterm/eterm-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..f7c451c110ee
--- /dev/null
+++ b/x11-terms/eterm/eterm-0.9.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A vt102 terminal emulator for X"
+HOMEPAGE="http://www.eterm.org/"
+SRC_URI="
+	http://www.eterm.org/download/${P^}.tar.gz
+	!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-libs/libast
+	media-libs/imlib2[X]
+	media-fonts/font-misc-misc
+	escreen? ( app-misc/screen )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README ReleaseNotes bg/README.backgrounds )
+PATCHES=( "${FILESDIR}"/${P}-asm-gnu-stack.patch )
+
+S=${WORKDIR}/${P^}
+
+src_unpack() {
+	unpack ${P^}.tar.gz
+	cd "${S}" || die
+	use minimal || unpack Eterm-bg-${PV}.tar.gz
+}
+
+src_configure() {
+	export TIC="true"
+	econf \
+		--disable-static \
+		$(use_enable escreen) \
+		--with-imlib \
+		--enable-trans \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable unicode multi-charset) \
+		$(use_enable utempter utmp) \
+		--with-delete=execute \
+		--with-backspace=auto
+}
+
+src_install() {
+	use escreen && DOCS+=( doc/README.Escreen )
+	default
+	# We don't install headers to link against this library
+	rm -f "${ED%/}"/usr/*/libEterm.{so,la} || die
+}
diff --git a/x11-terms/eterm/eterm-0.9.6.ebuild b/x11-terms/eterm/eterm-0.9.6.ebuild
deleted file mode 100644
index 9743d88c9aa9..000000000000
--- a/x11-terms/eterm/eterm-0.9.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-inherit eutils autotools
-
-MY_P=Eterm-${PV}
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/eterm/Eterm"
-	inherit subversion
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
-		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
-fi
-
-DESCRIPTION="A vt102 terminal emulator for X"
-HOMEPAGE="http://www.eterm.org/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-proto/xextproto
-	x11-proto/xproto
-	>=x11-libs/libast-0.6.1
-	media-libs/imlib2[X]
-	media-fonts/font-misc-misc
-	escreen? ( app-misc/screen )"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV} == "9999" ]] ; then
-	S=${WORKDIR}/${ECVS_MODULE}
-else
-	S=${WORKDIR}/${MY_P}
-fi
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		subversion_src_unpack
-		cd "${S}"
-		eautoreconf
-	else
-		unpack ${MY_P}.tar.gz
-		cd "${S}"
-		use minimal || unpack Eterm-bg-${PV}.tar.gz
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asm-gnu-stack.patch #440618
-}
-
-src_configure() {
-	export TIC="true"
-	econf \
-		--disable-static \
-		$(use_enable escreen) \
-		--with-imlib \
-		--enable-trans \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable unicode multi-charset) \
-		$(use_enable utempter utmp) \
-		--with-delete=execute \
-		--with-backspace=auto
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README ReleaseNotes
-	use escreen && dodoc doc/README.Escreen
-	dodoc bg/README.backgrounds
-
-	# We don't install headers to link against this library
-	rm -f "${D}"/usr/*/libEterm.{so,la}
-}
diff --git a/x11-terms/eterm/eterm-9999.ebuild b/x11-terms/eterm/eterm-9999.ebuild
index dfc9e2055dbb..6d24ce22d910 100644
--- a/x11-terms/eterm/eterm-9999.ebuild
+++ b/x11-terms/eterm/eterm-9999.ebuild
@@ -2,21 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils autotools
-
-MY_P=Eterm-${PV}
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.enlightenment.org/apps/eterm.git"
-	inherit git-r3
-else
-	SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
-		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
-fi
+inherit autotools git-r3
 
 DESCRIPTION="A vt102 terminal emulator for X"
 HOMEPAGE="http://www.eterm.org/"
+EGIT_REPO_URI="https://git.enlightenment.org/apps/eterm.git"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,35 +14,23 @@ IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
 
 RDEPEND="
 	x11-libs/libX11
-	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-proto/xextproto
 	x11-proto/xproto
-	>=x11-libs/libast-0.6.1
+	x11-libs/libast
 	media-libs/imlib2[X]
 	media-fonts/font-misc-misc
 	escreen? ( app-misc/screen )
 "
 DEPEND="${RDEPEND}"
 
-if [[ ${PV} == "9999" ]] ; then
-	S=${WORKDIR}/${P}
-else
-	S=${WORKDIR}/${MY_P}
-fi
+DOCS=( ChangeLog README ReleaseNotes bg/README.backgrounds )
 
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		eautoreconf
-	else
-		unpack ${MY_P}.tar.gz
-		cd "${S}" || die
-		use minimal || unpack Eterm-bg-${PV}.tar.gz
-	fi
+src_prepare() {
+	default
+	eautoreconf
 }
 
 src_configure() {
@@ -71,11 +49,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README ReleaseNotes
-	use escreen && dodoc doc/README.Escreen
-	dodoc bg/README.backgrounds
-
+	use escreen && DOCS+=( doc/README.Escreen )
+	default
 	# We don't install headers to link against this library
-	rm -f "${D}"/usr/*/libEterm.{so,la}
+	rm -f "${ED%/}"/usr/*/libEterm.{so,la} || die
 }
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index edeaf179504a..1238e2cd874f 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/chameleon-xcursors/chameleon-xcursors-0.5.ebuild b/x11-themes/chameleon-xcursors/chameleon-xcursors-0.5.ebuild
deleted file mode 100644
index 9ea2137e66c8..000000000000
--- a/x11-themes/chameleon-xcursors/chameleon-xcursors-0.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-MY_PN="Chameleon"
-
-DESCRIPTION="Style neutral scalable cursor theme"
-HOMEPAGE="http://www.egregorion.net/2007/03/26/chameleon/"
-
-COLOURS="Anthracite DarkSkyBlue SkyBlue Pearl White"
-SRC_URI=""
-for COLOUR in ${COLOURS} ; do
-	SRC_URI="${SRC_URI} http://www.egregorion.net/works/${MY_PN}-${COLOUR}-${PV}.tar.bz2"
-done
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
-	dodir /usr/share/cursors/xorg-x11/
-	for COLOUR in ${COLOURS}; do
-		for SIZE in Large Regular Small; do
-			local name=${MY_PN}-${COLOUR}-${SIZE}
-			cp -r "${WORKDIR}"/${name}-${PV} \
-				"${ED}"/usr/share/cursors/xorg-x11/${name}
-		done
-	done
-}
-
-pkg_postinst() {
-	elog "To use one of these sets of cursors, edit or create the file ~/.Xdefaults"
-	elog "and add the following line:"
-	elog "Xcursor.theme: ${MY_PN}-Pearl-Regular"
-	elog "(for example)"
-	elog
-	elog "You can change the size by adding a line like:"
-	elog "Xcursor.size: 48"
-	elog
-	elog "Also, to globally use this set of mouse cursors edit the file:"
-	elog "    /usr/share/cursors/xorg-x11/default/index.theme"
-	elog "and change the line:"
-	elog "    Inherits=[current setting]"
-	elog "to"
-	elog "    Inherits=${MY_PN}-Pearl-Regular"
-	elog
-	elog "Note this will be overruled by a user's ~/.Xdefaults file."
-	elog
-	ewarn "If you experience flickering, try setting the following line in"
-	ewarn "the Device section of your xorg.conf file:"
-	ewarn "    Option  \"HWCursor\"  \"false\""
-}