diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index ec71b4ff16b7..cc3448310dc4 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -3,3 +3,4 @@ DIST puppet-2.7.25.tar.gz 2020161 SHA256 daf6eb2e05cab13f40c520ca6777038f052082a
 DIST puppet-3.4.1.tar.gz 1949373 SHA256 e6a929699a83c2bc1d1661674172ba7e92b6fb4235fa594cc2f3219925504b93 SHA512 0bbdd35387d4f1693023d2fe45d089453386d7bfb279365cf019081641298034b8cd84398567b7ce1868ec02406a51a53afc6842059442467e474bb26838d80b WHIRLPOOL 1a5d88f40d69c692a443dece46e282ce8a0415daa56ca1f62391d9d8a9d2f1da77a799605deda384b6c2f7760a7e0046a0c457216b8f350308b5c30d9b40f990
 DIST puppet-3.6.2.tar.gz 2252186 SHA256 9114c63108c58e39db84937cb8f7e1add3dcbaa08fd730f631de6a7f64a3c360 SHA512 a1bed4023f880e271f3f35900e158bb7fffa39ac5fde3f8f3a9c4ae416b85bf6e3cce76fd22a3778afcbe218cb7a3fe3137be16cd04eb3dfb4ea72f614276ac6 WHIRLPOOL 5f92b9a853c59706a57b6d0c4ffcd22f2d2d1b923e47f6f1e8dca8241d9ec329f95005e1eb8685eaf35f925c6c70afe17b19208da398402108f1cad31dbb2ab7
 DIST puppet-3.7.1.tar.gz 2586237 SHA256 46951c96560fb39bd717b6f4502199772617021f9574fedef00bdd04afb750a2 SHA512 dbb9994764d0da2eceafda3ca9d08fd3cd0f8c4e22980bc54f92c6232d4ef9f5af28fd792c1dc88f1a26363c16430cab67967c54cc3921892fdfb46022a32887 WHIRLPOOL df2cf03baf5ca656c7a7ac36ab9de0c100e0c2f59a897a014ef9d7057a73835541deeaf7db6e1ba8bce56d4292f82ff82e25ee935fbc174e928ea8bfb419d576
+DIST puppet-3.7.2.tar.gz 2592103 SHA256 f762c43da42c4b164afe70046ef65de88a389d718e37c79a1e92f4aa4ff571c5 SHA512 c513b5bccbe1e8bbaab49cc67956c4119dd13708d3a5d425221ab53db8fc22076f3f6dc56e9901ab109b4607f8a4c859e84f307d97fe17c675ea1d6b94d08b80 WHIRLPOOL 29131c40ba4f99fa99342653b1ff92cd1460043d58f3c31db7ab12fe3bca495f0277004478f02140780cb3b333f74169a61e6dedd9f138540170ac9ab8bacfb4
diff --git a/app-admin/puppet/puppet-3.7.2.ebuild b/app-admin/puppet/puppet-3.7.2.ebuild
new file mode 100644
index 000000000000..9d62955215a3
--- /dev/null
+++ b/app-admin/puppet/puppet-3.7.2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.7.2.ebuild,v 1.1 2014/10/23 23:24:19 robbat2 Exp $
+
+EAPI="5"
+
+USE_RUBY="ruby19 ruby20"
+
+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://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
+	>=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 )
+	sqlite3? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+DEPEND="${DEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )"
+RDEPEND="${RDEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	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() {
+	# 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
+
+	if [ "$(get_major_version $REPLACING_VERSIONS)" = "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
+
+	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/sysklogd/sysklogd-1.5.1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1.ebuild
index 3c0f8c6c9fe9..41a2b5f04fd6 100644
--- a/app-admin/sysklogd/sysklogd-1.5.1.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.5.1.ebuild,v 1.9 2014/10/18 14:09:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.5.1.ebuild,v 1.10 2014/10/24 07:26:01 pinkbyte Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="logrotate"
 RESTRICT="test"
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index a20d9d7eb962..b57ad8821063 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,5 @@
 DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
 DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512 2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff WHIRLPOOL f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
-DIST mysql-5.5.39.tar.gz 21713567 SHA256 1893a00b034da6ff4159b81348388dc65eca6c3ae12962bd446e9b3d105b4862 SHA512 1da29663720d94cc5cf5d76f7bc1534c638ed66f78533f9eac167575acd772498d409b931a9dffd7f863a0c2e4659fc4d4687ae363ca427ad49b8558c8747aa8 WHIRLPOOL be884564757bfe579cdd39161732d42abe041102162d2edd6c441214df2f3928a3e58d8e9acd7d06b96cb59be0fa28e05d8ae7cab0a6de4779ae9c79912f4d59
 DIST mysql-5.5.40.tar.gz 21727672 SHA256 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960 SHA512 9adc3c0ace48a84ee87fb7e1f36b2f3d3e5cd95d50ca3012828c7fb33b723cfbfdf85760a30ea38c719a90cc449613747e974768b7f0b070dc346e05a5c418b3 WHIRLPOOL e8a5e8c6e4b816d935fd5368a9f38eaea23b1269c39e6ceed54c13bfaa85586ea81d1c4386f4f3d520cdb3d16b023afa3dab763629e388bc0759389e0eddec43
 DIST mysql-5.6.21.tar.gz 33009070 SHA256 ea4daf6a8f4b1a9c62e416249a08fbdcbf686667d738004ef82044def96feb7c SHA512 0a15c30d17324eb123d7953a2564fea43a3d288dfe098dc419096c40101f8ee2fe201dab1a4860158b72a259040cab7a45073576a1a24879b1e1dc9990c190bd WHIRLPOOL 8a00b0fe04df901aece356f979e29b47c4361fa5e14ec76c36e0bc43da4049de265b547f9a27b6c948d5989c04a784c6dca547e86cc380bbb57d477b614f8e31
 DIST mysql-extras-20130626-0127Z.tar.bz2 1476503 SHA256 a3c791b7b95fe170c4071feed11699146fc8f9de6a9f2ffa67214c2e50644b4f SHA512 4ee19cb5960ba24f2db16e7c5b647d1b7bb9fadbc73bbd8125bbac7e926c569a9a585a4d1d92b851ea6653d9c15eeb00f1592880f104520dc040e5af19943ac7 WHIRLPOOL 739f5762fa24b0feb40848ddb83f2ed95fb650933920b3d9e55c5e90f907d4ac74dfb00e4b9189cda8f9af4317478f3132daf789d7c91196827f645dd3e37d61
diff --git a/dev-db/mysql/mysql-5.5.39.ebuild b/dev-db/mysql/mysql-5.5.39.ebuild
deleted file mode 100644
index 0158c94d99ac..000000000000
--- a/dev-db/mysql/mysql-5.5.39.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.12 2014/10/06 17:35:01 grknight Exp $
-
-EAPI="5"
-
-MY_EXTRAS_VER="20140801-1950Z"
-MY_PV="${PV//_alpha_pre/-m}"
-MY_PV="${MY_PV//_/-}"
-
-# Build type
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# Define the mysql-extras source
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mysql-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
-	local retstatus_unit
-	local retstatus_tests
-
-	# Bug #213475 - MySQL _will_ object strenously if your machine is named
-	# localhost. Also causes weird failures.
-	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
-	if ! use "minimal" ; then
-
-		if [[ $UID -eq 0 ]]; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-		fi
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		# Run CTest (test-units)
-		cmake-utils_src_test
-		retstatus_unit=$?
-		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-		# Ensure that parallel runs don't die
-		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-		# create directories because mysqladmin might right out of order
-		mkdir -p "${T}"/var-tests{,/log}
-
-		# create symlink for the tests to find mysql_tzinfo_to_sql
-		ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
-
-		# These are failing in MySQL 5.5 for now and are believed to be
-		# false positives:
-		#
-		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
-		# fails due to USE=-latin1 / utf8 default
-		#
-		# main.mysql_client_test:
-		# segfaults at random under Portage only, suspect resource limits.
-		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
-		#
-		# main.openssl_1
-		# error message changing
-		# -mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: ASN: bad other signature confirmation
-		# +mysqltest: Could not open connection 'default': 2026 SSL connection
-		#  error: error:00000001:lib(0):func(0):reason(1)
-		#
-		# main.mysql_tzinfo_to_sql_symlink
-		# fails due to missing mysql_test/std_data/zoneinfo/GMT file from archive
-
-		for t in main.mysql_client_test \
-			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 mysql_tzinfo_to_sql_symlink ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
-		done
-
-		# Run mysql tests
-		pushd "${TESTDIR}"
-
-		# run mysql-test tests
-		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30
-		retstatus_tests=$?
-		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		popd
-
-		# Cleanup is important for these testcases.
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-
-		failures=""
-		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
-		[[ -z "$failures" ]] || die "Test failures: $failures"
-		einfo "Tests successfully completed"
-
-	else
-
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-libs/appstream-glib/appstream-glib-0.3.0.ebuild b/dev-libs/appstream-glib/appstream-glib-0.3.0.ebuild
index c06abfc9b1a3..5651a26baeb9 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.3.0.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.0.ebuild,v 1.4 2014/10/16 02:43:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.0.ebuild,v 1.5 2014/10/23 19:44:41 maekke Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/7"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
 IUSE="+introspection nls"
 
 # FIXME: yaml is optional but not properly handled in autofoo
diff --git a/dev-libs/collada-dom/collada-dom-2.4.0.ebuild b/dev-libs/collada-dom/collada-dom-2.4.0.ebuild
index bcb8712de1d9..b7a139e22669 100644
--- a/dev-libs/collada-dom/collada-dom-2.4.0.ebuild
+++ b/dev-libs/collada-dom/collada-dom-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/collada-dom/collada-dom-2.4.0.ebuild,v 1.2 2014/10/23 15:40:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/collada-dom/collada-dom-2.4.0.ebuild,v 1.3 2014/10/24 09:19:49 aballier Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/collada-dom/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-ml/cppo/Manifest b/dev-ml/cppo/Manifest
index 73c35893c818..81964749e245 100644
--- a/dev-ml/cppo/Manifest
+++ b/dev-ml/cppo/Manifest
@@ -1 +1,2 @@
 DIST cppo-0.9.3.tar.gz 20393 SHA256 40a0acba9bd3b0bd8890ae2a87f479090bc4de7fa83b8ead028d08a34937923c SHA512 17726128d3c2cbd07fc70b8200f4a0a3ffed349c5d655bea9791302e88b0731cd93cdabd492e88db170fd1f6c4ed4760a65567c0265a7d1b745885be346c18b8 WHIRLPOOL ec865dff33d6278273dccb348d60d4aa783ae4348a164f08f578aef68200cbb7701fac03a39d8992a48869cf674390d0fa020c3910f62b93c4b13f96bb8c84df
+DIST cppo-1.0.1.tar.gz 21655 SHA256 bf08976e8d3bb1614094fec8e4066c6df178e2aa6f96b883fa571aaad3c6e1e4 SHA512 50f84d30c69c245db960ea11d1cc9f2b15d5333ae9f848387c212cc9a0f8e4383cc1bca10c351b460a0ef0849bed62c6a916869a036a985e267c167216c1ddb5 WHIRLPOOL c5f35ad25a4e4cfd11721ae41df5928fb65c2f20af0660a5729d6e59361bb18c819b624dd506d2fc81b165023c6b6711e695ef24b365c34f55af3173c556af81
diff --git a/dev-ml/cppo/cppo-1.0.1.ebuild b/dev-ml/cppo/cppo-1.0.1.ebuild
new file mode 100644
index 000000000000..ec942b562354
--- /dev/null
+++ b/dev-ml/cppo/cppo-1.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/cppo/cppo-1.0.1.ebuild,v 1.1 2014/10/24 07:39:26 aballier Exp $
+
+EAPI="5"
+
+inherit findlib
+
+DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
+HOMEPAGE="http://mjambon.com/cppo.html"
+SRC_URI="http://mjambon.com/releases/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+
+IUSE="examples"
+
+RDEPEND=">=dev-lang/ocaml-3.12:="
+DEPEND="${RDEPEND}"
+
+src_install() {
+	findlib_src_preinst
+	mkdir -p "${ED}"/usr/bin
+	emake PREFIX="${ED}"/usr install
+	dodoc README.md Changes
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
new file mode 100644
index 000000000000..352242463efd
--- /dev/null
+++ b/dev-ml/cudf/Manifest
@@ -0,0 +1 @@
+DIST cudf-0.7.tar.gz 54821 SHA256 92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701 SHA512 6adf17c076c0308416f6f8bccb361d03645909f535e6cd0ba34860706e5f26628d33ab4f208fb8def28de1499649279febafd895bdde498f35a77e06128e64fa WHIRLPOOL 798ca87c1cc48d00e62a1e6d627fe6d35839fb16d6b2b10ba42f3eea29e3a48e2f5b070b93647a53833a471b1a6a665e759ab3b7cc2bda238d2dec4a8eb0866e
diff --git a/dev-ml/cudf/cudf-0.7.ebuild b/dev-ml/cudf/cudf-0.7.ebuild
new file mode 100644
index 000000000000..96453ec58bf9
--- /dev/null
+++ b/dev-ml/cudf/cudf-0.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/cudf/cudf-0.7.ebuild,v 1.2 2014/10/24 08:35:05 aballier Exp $
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents"
+HOMEPAGE="http://www.mancoosi.org/cudf/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/33593/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+
+RDEPEND="
+	>=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/extlib:=
+	dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit )
+	dev-ml/findlib
+	dev-lang/perl
+"
+
+src_compile() {
+	emake -j1 all
+	emake c-lib
+	if use ocamlopt ; then
+		emake -j1 opt
+		emake c-lib-opt
+	fi
+}
+
+src_test() {
+	emake test
+	emake c-lib-test
+}
+
+src_install() {
+	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
+	dodoc BUGS ChangeLog README TODO
+}
diff --git a/dev-ml/cudf/metadata.xml b/dev-ml/cudf/metadata.xml
new file mode 100644
index 000000000000..2193d772e351
--- /dev/null
+++ b/dev-ml/cudf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ml</herd>
+</pkgmetadata>
diff --git a/dev-ml/custom_printf/custom_printf-109.60.00.ebuild b/dev-ml/custom_printf/custom_printf-109.60.00.ebuild
index f4bc09fa16bf..14b4114e8e5b 100644
--- a/dev-ml/custom_printf/custom_printf-109.60.00.ebuild
+++ b/dev-ml/custom_printf/custom_printf-109.60.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/custom_printf/custom_printf-109.60.00.ebuild,v 1.1 2014/01/19 13:42:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/custom_printf/custom_printf-109.60.00.ebuild,v 1.2 2014/10/24 07:30:15 aballier Exp $
 
 EAPI="5"
 
@@ -16,5 +16,9 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND=">=dev-ml/type-conv-109.20.00:="
+DEPEND="
+	>=dev-ml/type-conv-109.20.00:=
+	dev-ml/sexplib:=
+	dev-ml/pa_ounit:=
+"
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ocaml-re/Manifest b/dev-ml/ocaml-re/Manifest
new file mode 100644
index 000000000000..587b9c158be6
--- /dev/null
+++ b/dev-ml/ocaml-re/Manifest
@@ -0,0 +1 @@
+DIST ocaml-re-1.2.2.tar.gz 89639 SHA256 fdc5233c8ff14394f39b0137029fd61f36cc17c703cbd54b173a94cdb827d62e SHA512 8b9c4d66b2ee8dcee1910979c23731ef5c89aea9e2a8074445b597e28bd84499b4ff007963f44cb6a599c2610cf87263755ae3e1da192b4d6205422ebd46d0c7 WHIRLPOOL 9797a9064a7365d4fe8a798d9ff4353953826a5058ec8f4d1cc1badd408d4a935196b6ab1c68cf6c8e99f7a6847b7919b2489cd3078d800d6b51478bfb706bce
diff --git a/dev-ml/ocaml-re/metadata.xml b/dev-ml/ocaml-re/metadata.xml
new file mode 100644
index 000000000000..2193d772e351
--- /dev/null
+++ b/dev-ml/ocaml-re/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ml</herd>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-re/ocaml-re-1.2.2.ebuild b/dev-ml/ocaml-re/ocaml-re-1.2.2.ebuild
new file mode 100644
index 000000000000..cd2b167190a4
--- /dev/null
+++ b/dev-ml/ocaml-re/ocaml-re-1.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-re/ocaml-re-1.2.2.ebuild,v 1.1 2014/10/24 07:54:03 aballier Exp $
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Regular expression library for OCaml"
+HOMEPAGE="http://github.com/ocaml/ocaml-re"
+SRC_URI="https://github.com/ocaml/ocaml-re/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DOCS=( "CHANGES" "TODO.txt" "README.md" )
+S="${WORKDIR}/${PN}-${P}"
diff --git a/dev-ml/utop/Manifest b/dev-ml/utop/Manifest
index d3230bd3763b..61fdc0bf4934 100644
--- a/dev-ml/utop/Manifest
+++ b/dev-ml/utop/Manifest
@@ -1,4 +1 @@
-DIST utop-1.10.tar.gz 99399 SHA256 929db54cb96ccddea33a5714e8d70c40f501e57c3910ef1f0048181100dada7c SHA512 19c405c29667184f4e40a2143b6963bc5fefb87a171b456e15ccc2f801b5d2850992f070c72824b6cb60ca76e75f047806bd543cc5be5690db53e997162857fc WHIRLPOOL 56e900515791e3e2a2666c75ad28ec9395ee0402ea4e0ef037511c0897857bd6d6007a748fda55750dd5bb23b3614ea8442aa868f06ad63e3be1b836816a6bfb
 DIST utop-1.11.tar.gz 102730 SHA256 07dff727de3db9b9014f7ece3e94f044b50f9f0896e982c99efaa5199d4ccf2d SHA512 b26513f081e1ef6a139d74ca63b7d96a16d89a03d2dd42ccb4bc21463104184147c636bf26e44116fbba2330b8116ff9ee884fcc042fac89356f65ac2b133a92 WHIRLPOOL 4f0ca27eae1d2bc5a382d35b4bcfd4ad0ab581727df700047a9b71dc15a8b609ee5262911216456cea7f7e7b45a3f441fe80288a67e18283eb13e11d2f9a12b0
-DIST utop-1.5.tar.gz 96814 SHA256 5a190c5c328df5f5705113063d093f73d01fd205bea20fcf8fda8db972bc8bd5 SHA512 2fd1c73f25a96853f03c53b36a4d3ad6550f9812db471781aaf27a27c0afa04669c6f82b521c37061d6467336bd9b5125365916d9e53bb60d81f34c3a77b11af WHIRLPOOL f3370fc90302768ab950ae6510399d7d34d6a46eb862f366b085cc646c6c898a0e65631b0e3dbbb95659d27f54adf19971cd621415f3949c1a29d1008b75b15c
-DIST utop-1.8.tar.gz 98753 SHA256 658625fb5ffbb4df76c1e7622c5ce979a16b65fcc5c0958b3ed558d22ed7d08a SHA512 33b4abe7c74cdf29719f29b8692b53e1a076b3e53a947daa81034f0164ed08737e5e957d7c07a5c5c2b413250870929601fd5b35e52d93e85b65b11d464e8d39 WHIRLPOOL d441953065f75fc5eb867a889ac10e326363bf3c85dc9e9d837b5c996b336d4685a1c6d6d75331a636e416f35f28064653d2dc228d9e0ac1d56a7ac6b11f76f3
diff --git a/dev-ml/utop/utop-1.10.ebuild b/dev-ml/utop/utop-1.10.ebuild
deleted file mode 100644
index eaf453872025..000000000000
--- a/dev-ml/utop/utop-1.10.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/utop/utop-1.10.ebuild,v 1.1 2013/12/11 19:35:12 aballier Exp $
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-inherit oasis elisp-common
-
-DESCRIPTION="A new toplevel for OCaml with completion and colorization"
-HOMEPAGE="http://github.com/diml/utop"
-SRC_URI="http://github.com/diml/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs"
-
-DEPEND=">=dev-ml/lwt-2.4.0:=[react]
-	>=dev-ml/lambda-term-1.2:=
-	>=dev-ml/zed-1.2:=
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-DOCS=( "CHANGES.md" "README.md" )
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	sed -i "s/(\"utop.el.*)//" setup.ml
-}
-
-src_compile() {
-	oasis_src_compile
-	if use emacs; then
-		elisp-compile src/top/*.el
-	fi
-}
-
-src_install() {
-	oasis_src_install
-	if use emacs; then
-		elisp-install "${PN}" src/top/*.el src/top/*.elc || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-ml/utop/utop-1.5.ebuild b/dev-ml/utop/utop-1.5.ebuild
deleted file mode 100644
index 56ec595a86b3..000000000000
--- a/dev-ml/utop/utop-1.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/utop/utop-1.5.ebuild,v 1.1 2013/07/22 12:31:51 aballier Exp $
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-inherit oasis elisp-common
-
-DESCRIPTION="A new toplevel for OCaml with completion and colorization"
-HOMEPAGE="http://forge.ocamlcore.org/projects/utop/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1169/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs"
-
-DEPEND=">=dev-ml/lwt-2.4.0:=[react]
-	>=dev-ml/lambda-term-1.2:=
-	>=dev-ml/zed-1.2:=
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-DOCS=( "CHANGES.md" "README.md" )
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	sed -i "s/(\"utop.el.*)//" setup.ml
-}
-
-src_compile() {
-	oasis_src_compile
-	if use emacs; then
-		elisp-compile src/top/*.el
-	fi
-}
-
-src_install() {
-	oasis_src_install
-	if use emacs; then
-		elisp-install "${PN}" src/top/*.el src/top/*.elc || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-ml/utop/utop-1.8.ebuild b/dev-ml/utop/utop-1.8.ebuild
deleted file mode 100644
index 147d9b6bd22d..000000000000
--- a/dev-ml/utop/utop-1.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/utop/utop-1.8.ebuild,v 1.1 2013/10/26 09:54:28 aballier Exp $
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-inherit oasis elisp-common
-
-DESCRIPTION="A new toplevel for OCaml with completion and colorization"
-HOMEPAGE="http://github.com/diml/utop"
-SRC_URI="http://github.com/diml/utop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs"
-
-DEPEND=">=dev-ml/lwt-2.4.0:=[react]
-	>=dev-ml/lambda-term-1.2:=
-	>=dev-ml/zed-1.2:=
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-DOCS=( "CHANGES.md" "README.md" )
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	sed -i "s/(\"utop.el.*)//" setup.ml
-}
-
-src_compile() {
-	oasis_src_compile
-	if use emacs; then
-		elisp-compile src/top/*.el
-	fi
-}
-
-src_install() {
-	oasis_src_install
-	if use emacs; then
-		elisp-install "${PN}" src/top/*.el src/top/*.elc || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-perl/Class-Accessor/Class-Accessor-0.340.0-r1.ebuild b/dev-perl/Class-Accessor/Class-Accessor-0.340.0-r1.ebuild
index 2bf64ac871e0..efd463e37d1a 100644
--- a/dev-perl/Class-Accessor/Class-Accessor-0.340.0-r1.ebuild
+++ b/dev-perl/Class-Accessor/Class-Accessor-0.340.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Accessor/Class-Accessor-0.340.0-r1.ebuild,v 1.1 2014/08/20 18:05:01 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Accessor/Class-Accessor-0.340.0-r1.ebuild,v 1.2 2014/10/23 19:38:59 maekke Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Automated accessor generation"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-perl/Sub-Name"
diff --git a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r1.ebuild b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r1.ebuild
index ce008bbf164b..0c7820616544 100644
--- a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r1.ebuild
+++ b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r1.ebuild,v 1.1 2014/08/22 17:16:15 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r1.ebuild,v 1.2 2014/10/23 19:39:27 maekke Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Inheritable, overridable class data"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 export OPTIMIZE="${CFLAGS}"
diff --git a/dev-perl/Devel-StackTrace/Devel-StackTrace-1.300.0-r1.ebuild b/dev-perl/Devel-StackTrace/Devel-StackTrace-1.300.0-r1.ebuild
index 36a5a149b471..15165ce69cb3 100644
--- a/dev-perl/Devel-StackTrace/Devel-StackTrace-1.300.0-r1.ebuild
+++ b/dev-perl/Devel-StackTrace/Devel-StackTrace-1.300.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Devel-StackTrace/Devel-StackTrace-1.300.0-r1.ebuild,v 1.1 2014/08/22 20:42:24 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Devel-StackTrace/Devel-StackTrace-1.300.0-r1.ebuild,v 1.2 2014/10/23 19:39:57 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Devel-StackTrace module for perl"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 
 RDEPEND="virtual/perl-File-Spec"
diff --git a/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild b/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild
index 35fb3cf4daea..19e56c32d079 100644
--- a/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild
+++ b/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild,v 1.1 2014/08/23 01:26:32 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild,v 1.2 2014/10/23 19:41:52 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="A module that allows you to declare real exception classes in Perl"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild b/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild
index a1b9055ef3d8..619d49e0dc26 100644
--- a/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild
+++ b/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild,v 1.1 2014/08/26 14:49:20 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild,v 1.2 2014/10/23 19:38:29 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Change directory temporarily for a limited scope"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild b/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
index 5051f2e25952..dd2547375374 100644
--- a/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
+++ b/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild,v 1.1 2014/10/14 21:04:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild,v 1.2 2014/10/23 19:42:22 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Perl encapsulation of invoking the Latex programs"
 
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild b/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild
index 4911c54c265d..60d3d8fa7fe4 100644
--- a/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild
+++ b/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild,v 1.1 2014/10/14 21:20:31 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild,v 1.2 2014/10/23 19:41:24 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Encode characters for LaTeX formatting"
 
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild b/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild
index cc7829a5ee54..d829fbc82f14 100644
--- a/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild
+++ b/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild,v 1.1 2014/10/14 21:37:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild,v 1.2 2014/10/23 19:42:53 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for the automatic generation of LaTeX tables"
 
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild b/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild
index 0ecdc266de80..10997a1f1b96 100644
--- a/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild
+++ b/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild,v 1.1 2014/10/14 21:33:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild,v 1.2 2014/10/23 19:40:26 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Name your accessors get_foo() and set_foo(), whatever that may mean
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
index f7af142d5450..bfa523fec3fa 100644
--- a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
+++ b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild,v 1.1 2014/10/14 21:17:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild,v 1.2 2014/10/23 19:40:55 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Convert Pod data to formatted LaTeX"
 
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild b/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild
index bc4128602547..ba490715f891 100644
--- a/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild
+++ b/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild,v 1.1 2014/10/14 21:41:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild,v 1.2 2014/10/23 19:43:24 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="LaTeX support for the Template Toolkit"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pathtools/pathtools-0.1.2.ebuild b/dev-python/pathtools/pathtools-0.1.2.ebuild
index b5ee660ce8bc..d8d53ff04b6e 100644
--- a/dev-python/pathtools/pathtools-0.1.2.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pathtools/pathtools-0.1.2.ebuild,v 1.4 2014/10/10 15:23:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pathtools/pathtools-0.1.2.ebuild,v 1.5 2014/10/24 02:34:24 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Pattern matching and various utilities for file systems paths"
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index 0fbd06fb4019..36e13db16a04 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -1,3 +1,3 @@
 DIST pycups-1.9.62.tar.bz2 52859 SHA256 7cad7d676d6e4b759d07ecefe2519cb438a7d074e67b4103efdeff8247cc51ab SHA512 2a988d403e828b5210d5e88a136adbaa626bd978d151b734371386a08a3bfac7258b1ea83913b55a62dd12ca60c0cdd60a0eebafd0505b264ffbfc80a190247d WHIRLPOOL 1698955c0aa14ce0ae7b2885135f8852b0638dba8ee2e220087b68b8e6810e936b72c90955f2e1ba08b4e18f4bb6e1cbdaff5e556399cd0ffdcfc90d9df60900
 DIST pycups-1.9.63.tar.bz2 53004 SHA256 82fa731a34afe30206bd2a8f4b2ee6a317d8da62a73aa1a2e837b9a217acf797 SHA512 5714e824e98cedd86552d2cb28b4899471dc4edf7e13a8c34071c490f5429b45b3024982720eb4bda2cc0630508e638614798b45a6297cc6de0b9e7bed0da0d1 WHIRLPOOL 5cdef8e790eb7a3ef52b8e697537b6b91b08ac81aeba2e10bf012545e867a42f842a9293a20ee0e1a45a5b4f2bbb3add8c98ea6bf63f6e01a60de9b57ba0e691
-DIST pycups-1.9.66.tar.bz2 55436 SHA256 cdde311fb375c827fb357665248c153000bc62b407bca281a9ea21772911680a SHA512 7cece17443e11e3016ce3e2d034023d5988eb04e5a3b3db5d02eb60908f5d6a5ab0c827066431674571706bbbc77a0ecfa376e0773b3780156ed658e79709639 WHIRLPOOL 44ef872fc0be2bb95a4b62a6d862443c83885051e95ed585c7623c52c6c9e3f3cff8c827d691f81037fb79afc4c71d9c9ba41890dcbb26daec7014110e499240
+DIST pycups-1.9.68.tar.bz2 56383 SHA256 44346cbd9d6d1785e5cb5d76b661aff2039e920283bd6af251b72a1e668237c4 SHA512 63776b79ef9f24f7a98e71fbaa4a08bc9a31b1b20a8414368095706d02fa17b428544414822b3330ef68b38f812aa90eca01a3a5c0d632ff839f1068280ed103 WHIRLPOOL 456e587504b20e6d1e7c1d683f68cf12f15a7392224320eea165f161c6ed08e8deb07797cda027e3445d16ebc6f73ee523e7daaf2908ff2bb64458fdcf8f1350
diff --git a/dev-python/pycups/pycups-1.9.62.ebuild b/dev-python/pycups/pycups-1.9.62.ebuild
index d35dbbdca7e3..a2ea993bb10e 100644
--- a/dev-python/pycups/pycups-1.9.62.ebuild
+++ b/dev-python/pycups/pycups-1.9.62.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.62.ebuild,v 1.7 2012/12/01 19:08:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.62.ebuild,v 1.8 2014/10/23 23:18:26 tamiko Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="doc examples"
 
 RDEPEND="
-	net-print/cups
+	<net-print/cups-2.0.0
 "
 DEPEND="${RDEPEND}
 	doc? ( dev-python/epydoc )
diff --git a/dev-python/pycups/pycups-1.9.63.ebuild b/dev-python/pycups/pycups-1.9.63.ebuild
index 6293b9b74418..fdd5674fc274 100644
--- a/dev-python/pycups/pycups-1.9.63.ebuild
+++ b/dev-python/pycups/pycups-1.9.63.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.63.ebuild,v 1.14 2014/03/31 21:06:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.63.ebuild,v 1.15 2014/10/23 23:18:26 tamiko Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="doc examples"
 
 RDEPEND="
-	net-print/cups
+	<net-print/cups-2.0.0
 "
 
 # epydoc kinda sucks and supports python2 only (it's dead too),
diff --git a/dev-python/pycups/pycups-1.9.66.ebuild b/dev-python/pycups/pycups-1.9.68.ebuild
similarity index 96%
rename from dev-python/pycups/pycups-1.9.66.ebuild
rename to dev-python/pycups/pycups-1.9.68.ebuild
index c20cc88e2252..37f8be7bc5ff 100644
--- a/dev-python/pycups/pycups-1.9.66.ebuild
+++ b/dev-python/pycups/pycups-1.9.68.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.66.ebuild,v 1.2 2014/03/31 21:06:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.68.ebuild,v 1.1 2014/10/23 23:18:26 tamiko Exp $
 
 EAPI=5
 
diff --git a/dev-python/scientificpython/Manifest b/dev-python/scientificpython/Manifest
index 01ad65afc067..a3ffbf9380d5 100644
--- a/dev-python/scientificpython/Manifest
+++ b/dev-python/scientificpython/Manifest
@@ -1,2 +1,3 @@
 DIST ScientificPython-2.9.1.tar.gz 595239 SHA256 b45305b03d8238fe1be74d6bbd5541d452d9705ab15069dcd506d38e137e9c5c SHA512 08c609d9204088fa1f9a2563f5321ed7e248469e44c86b5d5bc56dc3f975854c4e2b266a8e750fbdc858ed58a466487da4fe986c15a077319ab1a73d8e9b0305 WHIRLPOOL b731e0aaac972c118519cea9b9076cb449294c3929b4f7baceda69293a1a5c153952b5e46b54e111d1bcdcb2f1ea05162141c8c1f88d284071a7a341218b730d
 DIST ScientificPython-2.9.3.tar.gz 689431 SHA256 a4dfc55c2ec84a0795b0641e5571b79b25a5ef6d92bbb01e934c298ee34b5bc8 SHA512 8633726c8a05f45ac4262dd52213c2dc10148a03b67364d4e50d57953ca410a596f9ba64ee68d3b058dcdc1e7decab21c8b8e9b58e5ac1cf5049cb4588117fa8 WHIRLPOOL 2a7d47770dd1ec7b6eadc85ebdd10ad40f6f3eca873cfc3f4937fdf678d697ac5947e7af9b8caf866b4fe0efb7a2746e684ff8d5775f4f53aafddaed6d110c23
+DIST ScientificPython-2.9.4.tar.gz 688704 SHA256 c397fedf76500dc4c010785a82204a45ee51a04a54fabfb6142d594de14f8639 SHA512 8bd3ce3ead090832582711c25f7d4c7a5a55642ef9a1e845fb68b4b3dba833ba86baf9c444fd9948ce761a5357dbf388a2c1a860a66ee13fdf1f26d1010cc8c8 WHIRLPOOL 7890b534cffa53f258a5db8aa974805055773dc9be5ee9862e9c66f7c07df52e2abb36cc30a07e9bb9c8ee61183f44336643191f41e757ce31fa63773b0df8de
diff --git a/dev-python/scientificpython/scientificpython-2.9.1.ebuild b/dev-python/scientificpython/scientificpython-2.9.1.ebuild
index 1995402c4a7b..a95fbb80579e 100644
--- a/dev-python/scientificpython/scientificpython-2.9.1.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.9.1.ebuild,v 1.11 2012/02/23 04:54:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.9.1.ebuild,v 1.12 2014/10/24 09:52:20 jlec Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -21,7 +21,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc mpi test"
 
-RDEPEND="dev-python/numpy
+RDEPEND="
+	<dev-python/numpy-1.9
 	dev-python/pyro:3
 	sci-libs/netcdf
 	mpi? ( virtual/mpi )"
diff --git a/dev-python/scientificpython/scientificpython-2.9.3.ebuild b/dev-python/scientificpython/scientificpython-2.9.3.ebuild
index fa8438dbee80..9c1b40c06403 100644
--- a/dev-python/scientificpython/scientificpython-2.9.3.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.9.3.ebuild,v 1.1 2014/03/13 14:58:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.9.3.ebuild,v 1.2 2014/10/24 09:52:20 jlec Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc mpi test"
 
 RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
+	<dev-python/numpy-1.9[${PYTHON_USEDEP}]
 	dev-python/pyro:3[${PYTHON_USEDEP}]
 	sci-libs/netcdf
 	mpi? ( virtual/mpi )"
diff --git a/dev-python/scientificpython/scientificpython-2.9.4.ebuild b/dev-python/scientificpython/scientificpython-2.9.4.ebuild
new file mode 100644
index 000000000000..5c49eed426ff
--- /dev/null
+++ b/dev-python/scientificpython/scientificpython-2.9.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.9.4.ebuild,v 1.1 2014/10/24 09:52:20 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="ScientificPython"
+MY_P="${MY_PN}-${PV}"
+DOWNLOAD_NUMBER=4570
+
+DESCRIPTION="Scientific Module for Python"
+SRC_URI="http://sourcesup.cru.fr/frs/download.php/${DOWNLOAD_NUMBER}/${MY_P}.tar.gz"
+HOMEPAGE="http://sourcesup.cru.fr/projects/scientific-py/"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc mpi test"
+
+RDEPEND="
+	<dev-python/numpy-1.9[${PYTHON_USEDEP}]
+	dev-python/pyro:3[${PYTHON_USEDEP}]
+	sci-libs/netcdf
+	mpi? ( virtual/mpi )"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.9-mpi.patch )
+DOCS=( README README.MPI Doc/CHANGELOG Examples/demomodule.c Examples/netcdf_demo.py )
+
+python_prepare_all() {
+	use mpi && PATCHES+=( "${FILESDIR}"/${PN}-2.9.3-mpi-netcdf.patch )
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use mpi; then
+		cd Src/MPI || die
+		${PYTHON} compile.py || die
+		mv -f mpipython mpipython-${EPYTHON} || die
+	fi
+}
+
+python_test() {
+	cd "${S}"/Tests || die
+	python_foreach_impl nosetests
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if use mpi; then
+		cd Src/MPI || die
+		python_newexe mpipython-${EPYTHON} mpipython
+	fi
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( Doc/Reference/. )
+	use mpi && EXAMPLES=( Examples/mpi.py )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/watchdog/watchdog-0.8.1.ebuild b/dev-python/watchdog/watchdog-0.8.1.ebuild
index 0d5164214948..c9b399851256 100644
--- a/dev-python/watchdog/watchdog-0.8.1.ebuild
+++ b/dev-python/watchdog/watchdog-0.8.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/watchdog/watchdog-0.8.1.ebuild,v 1.1 2014/07/28 17:53:35 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/watchdog/watchdog-0.8.1.ebuild,v 1.2 2014/10/24 02:37:33 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="Python API and shell utilities to monitor file system events"
diff --git a/dev-util/appdata-tools/appdata-tools-0.1.8.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.8.ebuild
index f542456e252b..0b428d4a3387 100644
--- a/dev-util/appdata-tools/appdata-tools-0.1.8.ebuild
+++ b/dev-util/appdata-tools/appdata-tools-0.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/appdata-tools/appdata-tools-0.1.8.ebuild,v 1.3 2014/10/16 02:44:19 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/appdata-tools/appdata-tools-0.1.8.ebuild,v 1.4 2014/10/23 19:45:13 maekke Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
 IUSE="nls"
 
 RDEPEND="
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.584-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.584-r1.ebuild
index 381b4caea003..98b477f13cdb 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.584-r1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.584-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.584-r1.ebuild,v 1.1 2014/10/21 08:38:20 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.584-r1.ebuild,v 1.2 2014/10/24 10:42:46 chainsaw Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ S=${WORKDIR}
 
 pkg_setup() {
 	enewgroup jenkins
-	enewuser jenkins -1 /sbin/nologin /var/lib/jenkins jenkins
+	enewuser jenkins -1 -1 /var/lib/jenkins jenkins
 }
 
 src_install() {
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.585.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.585.ebuild
index 839d244b9814..28633f03fa0a 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.585.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.585.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.585.ebuild,v 1.1 2014/10/22 14:02:29 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.585.ebuild,v 1.2 2014/10/24 10:42:46 chainsaw Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ JENKINS_DIR=/var/lib/jenkins
 
 pkg_setup() {
 	enewgroup jenkins
-	enewuser jenkins -1 /sbin/nologin ${JENKINS_DIR} jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
 }
 
 src_install() {
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 6d5a8d74bbc9..ddd4e30b3f04 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,12 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.640 2014/10/20 17:16:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.643 2014/10/24 05:32:14 vapier Exp $
 
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
 DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="http://gcc.gnu.org/"
-LICENSE="GPL-2 LGPL-2.1"
 RESTRICT="strip" # cross-compilers need controlled stripping
 
 inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator
@@ -87,9 +86,9 @@ elif [[ ${GCC_PV} == *_rc* ]] ; then
 	SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc}
 fi
 
-if [[ ${SNAPSHOT} == 5.0.0-* ]] ; then
+if [[ ${SNAPSHOT} == 5.0-* ]] ; then
 	# The gcc-5 release has dropped the .0 for some reason.
-	SNAPSHOT=${SNAPSHOT/5.0.0/5}
+	SNAPSHOT=${SNAPSHOT/5.0/5}
 fi
 
 export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}}
@@ -115,7 +114,21 @@ DATAPATH=${TOOLCHAIN_DATAPATH:-${PREFIX}/share/gcc-data/${CTARGET}/${GCC_CONFIG_
 # We will handle /usr/include/g++-v3/ with gcc-config ...
 STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}}
 
-#---->> SLOT+IUSE logic <<----
+#---->> LICENSE+SLOT+IUSE logic <<----
+
+if tc_version_is_at_least 4.6 ; then
+	LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
+elif tc_version_is_at_least 4.4 ; then
+	LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+"
+elif tc_version_is_at_least 4.3 ; then
+	LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
+elif tc_version_is_at_least 4.2 ; then
+	LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
+elif tc_version_is_at_least 3.3 ; then
+	LICENSE="GPL-2+ LGPL-2.1+ FDL-1.2+"
+else
+	LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
+fi
 
 IUSE="multislot regression-test vanilla"
 IUSE_DEF=( nls nptl )
@@ -301,11 +314,14 @@ get_gcc_src_uri() {
 
 	# Set where to download gcc itself depending on whether we're using a
 	# prerelease, snapshot, or release tarball.
-	if [[ -n ${PRERELEASE} ]] ; then
+	if [[ ${PV} == *9999* ]] ; then
+		# Nothing to do w/git snapshots.
+		:
+	elif [[ -n ${PRERELEASE} ]] ; then
 		GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/prerelease-${PRERELEASE}/gcc-${PRERELEASE}.tar.bz2"
 	elif [[ -n ${SNAPSHOT} ]] ; then
 		GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2"
-	elif [[ ${PV} != *9999* ]] ; then
+	else
 		GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2"
 		# we want all branch updates to be against the main release
 		[[ -n ${BRANCH_UPDATE} ]] && \
@@ -1956,6 +1972,12 @@ toolchain_pkg_postinst() {
 		elog "Testsuite results have been installed into /usr/share/doc/${PF}/testsuite"
 		echo
 	fi
+
+	if [[ -n ${PRERELEASE}${SNAPSHOT} ]] ; then
+		einfo "This GCC ebuild is provided for your convenience, and the use"
+		einfo "of this compiler is not supported by the Gentoo Developers."
+		einfo "Please report bugs to upstream at http://gcc.gnu.org/bugzilla/"
+	fi
 }
 
 toolchain_pkg_postrm() {
diff --git a/media-gfx/assimp/assimp-3.1.1.ebuild b/media-gfx/assimp/assimp-3.1.1.ebuild
index 45cc732b0b88..0df4f11ca19c 100644
--- a/media-gfx/assimp/assimp-3.1.1.ebuild
+++ b/media-gfx/assimp/assimp-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/assimp/assimp-3.1.1.ebuild,v 1.2 2014/10/23 11:14:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/assimp/assimp-3.1.1.ebuild,v 1.3 2014/10/24 06:53:30 aballier Exp $
 
 EAPI=5
 
@@ -22,6 +22,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	sed -i -e 's/ASSIMP_LIB_INSTALL_DIR "lib"/ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_build samples ASSIMP_SAMPLES) \
@@ -31,4 +36,4 @@ src_configure() {
 	)
 
 	cmake-utils_src_configure
-}
\ No newline at end of file
+}
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index a858a597d1e2..5d6f11360242 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -1,8 +1,8 @@
 DIST dcraw-9.10.tar.gz 163860 SHA256 4ff3c0bb59593a29d5846e5e6f2fd979588382255fe38d11537c9e63143759ca SHA512 959210b08c45e91a2d5b89bcae9dfeaccfc9f22d8ed73efa1786546898c2ce1b81ef87917b2427bc16ac9fa8583657a7c1c1da22b36421fbb3170a1b74ec2f2a WHIRLPOOL 4709f87f191f92259b87adb23b70604c2956aeeb7d855e090e2623460e145d817190144146fe52339cbe9f5bd6e88d4556f261d81eaafc17c605bc98879eec31
 DIST dcraw-9.17.tar.gz 167138 SHA256 db73bf9f8e4574fcdc6cd8ed4e781a1d0f87d909bb0fe26fce8c87a467ee7a51 SHA512 a4b58e8c75e6c44180af056fe85b1602549a1722be4430b2fee8423d33b3ce48566bb770cbec3c14e2502ca600318c9a55781083a16339f9d1a7c5159f37202e WHIRLPOOL fd130a6048e64971948009cd3c553486f5dac0e6a7c2a8e96224f138887da5cc435f416e0a6adccc4887bd71dc3ef74a5fd600a165b650e491507336d169adbd
 DIST dcraw-9.19.tar.gz 170000 SHA256 bb01e58e02aec64ecb05806a12a7bb8f1f84962668b4247853fba4ebb6925874 SHA512 16597d92e53b16d0efa3da77a8a269dea5308028c1a4a7ef61f2c6e069ccab8aea7bfb95126c1fef63382df9d9e8e52a48f6d67b8aa826de947712c053c9961d WHIRLPOOL 99b0709ab1a35003cd157fd68c63285edfcfe27673043049120bdff93ed6a7809d6c1ae3d2cdfe9a9e1882495a088dd9c472d1d97400bc0358db412354511512
-DIST dcraw-9.20.tar.gz 171177 SHA256 bdfa98f75dfc996c4c63e75a03fe0579e15a918c39f99c19df461aaf8b160d90 SHA512 73ed22f7839a53c9747384a7aa95c6c6931a84cc21b5927f2e6b98ee1241baac85c9028271f3bf9b18e1f591d7d61539aaff3ea92d757d8d46de631f070ec019 WHIRLPOOL 3f9a4551515fba322ccd2aad8021cdb5bf1edbb1d2006660b362b165a362282524e6e575909df41f94e76cbd5e52fc04d2e69670f85435151e15275015f53249
-DIST dcraw-9.21.tar.gz 360512 SHA256 902a91b44e3e4f1b733fbd3e4f8560b53f2602231815466b91502ec4a0242a7f SHA512 3759dff0a2c8f5d056b043ae4b8dce0e4a17a2c2b665f6a46249841a3801b15ab4c60c21d2d3536648e0b663c757f2cab1a53aef6b122c3e3171efed470b2f34 WHIRLPOOL bb70f31bd014f39429617a62ac94978a9914500bb2ffc1be2893fe1dcc133c59424a848623b9cf2e5c6166a668607cd9e38cd13475c269f08e4299aef948d56d
-DIST dcraw-9.22.tar.gz 360759 SHA256 9a91b9ecfbbd67b279182b5979bc125384b49e316caf197128b1b7df3a485a72 SHA512 32fc352ff98974e5e07cdf45b3599b80b992a232d9d7f0d398ea5e7c08ce1b91a582b733bce79c8bb8f1075ea4b75a28e80b582c5c028eff10e8331fc0dc2ba3 WHIRLPOOL 036a10b7c946ec4752bf68e9102e4467f53a6d8912320b8300142967bf9db9bf4416810c41e5ab8b4144b27f982628a82a39abc8a4ed9267da9efbfb85e80777
+DIST dcraw-9.20.tar.gz 171270 SHA256 aedc39294031d5d777783af9a862eab70b5783cfddea7a2d937a86e6aabb3d94 SHA512 bac64480c0e4398b26d5651dad5348c0cb97eabd1ecb1ad17af48ba782934c7729286947a07584b5322f8d5a4ec3d666590123a81fd45ec700075bff8e7d150d WHIRLPOOL f11e7ac085ede501311c8df9375db1a21296578929e528db84eda2d81152e18d6f8addadaf3e228103f040dac15d2708afc936a00cc42269a55f943cf1af2776
+DIST dcraw-9.21.tar.gz 360575 SHA256 392a54229a24c235a249b42db92e06755cc369e58751c863868ad0434b22fbbd SHA512 28ca3befa9cbeabfa48ff7638159fc076b4cf4c67a5e9936d36ce93021554cbe79bfeed418d426bc101016e8247aee64b8f12fe59da47810d1b92911c5022078 WHIRLPOOL 11c061551e17867fbd9edd4493e26d743ace4560190cafcb06e3d3bbc35eed21e0690a5059972b6bd5f3893b84e9d0a59a1885988b6081922ebcb4fbdb1c3705
+DIST dcraw-9.22.tar.gz 344867 SHA256 0290aef2dc60fe434f8ecadf5f158c1c657c1d18b1adc6a91d33e5925d41bf01 SHA512 e4e332465b52eef1cf07e32a3962b24bcc6405614edd7d3d1fd375466fc5a253aaf212bf1b030d47e51f76d5c1bd7e0475813f302b67c7fba395d0cd922ee858 WHIRLPOOL a0996f632ab9b37d7965251147bb163449c8a3de9199da92683fdc6490a2b09d7aa49287bb1948105ecd96d788aa4730b7bff94483c94e576b0ba5cbebaba06e
 DIST parse-1.73.tar.bz2 8186 SHA256 51f75837b7fa7f6389f43c875ad8320c41a44c4213922dc767e16dc424462c3c SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c WHIRLPOOL 1abc642a60f3f5b54efa29722ff7674457b88811ef25e557b7823ff05f6ee55989e35c0b9dad04d74c769bcca1cb45f580985de92bb4e40cd63b6d0a35b3a0e2
 DIST rawphoto-1.32.tar.bz2 3841 SHA256 3348a83a44fa941924a4e743f88d993b71d28ba995f80e6765d6c19b6eeaea4c SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56 WHIRLPOOL af840eae74d74f83b7874a769e30ff0e613a5f1dba4d20fa315f6d9685fabffbe804ad878174f3ee274a6083105f1baa317f52b346afb493c34cea0e5c09c566
diff --git a/media-gfx/openmesh/openmesh-3.2.ebuild b/media-gfx/openmesh/openmesh-3.2.ebuild
index 80ed0731fab2..7bc5f2ac441f 100644
--- a/media-gfx/openmesh/openmesh-3.2.ebuild
+++ b/media-gfx/openmesh/openmesh-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-3.2.ebuild,v 1.1 2014/08/25 23:14:55 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-3.2.ebuild,v 1.2 2014/10/23 20:35:12 jsbronder Exp $
 
 EAPI="5"
 inherit eutils cmake-utils
@@ -16,11 +16,15 @@ SRC_URI="http://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.ta
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="qt4 static-libs"
+IUSE="qt4 qt5 static-libs"
 
-RDEPEND="qt4? ( dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	media-libs/freeglut )"
+RDEPEND="
+	qt4? ( dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+		media-libs/freeglut )
+	qt5? ( dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		media-libs/freeglut )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -42,7 +46,16 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs="$(cmake-utils_use_build "qt4" "APPS")"
+	mycmakeargs=""
+
+	if use qt4 || use qt5; then
+		mycmakeargs="${mycmakeargs} -DBUILD_APPS=ON"
+	fi
+
+	if use qt4 && ! use qt5; then
+		mycmakeargs="${mycmakeargs} -DFORCE_QT4"
+	fi
+
 	cmake-utils_src_configure
 }
 
diff --git a/media-libs/lcms/lcms-1.19-r3.ebuild b/media-libs/lcms/lcms-1.19-r3.ebuild
index 48cf6e8cf939..2429b1ebfa2a 100644
--- a/media-libs/lcms/lcms-1.19-r3.ebuild
+++ b/media-libs/lcms/lcms-1.19-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r3.ebuild,v 1.1 2014/10/23 19:30:38 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r3.ebuild,v 1.2 2014/10/23 20:52:58 jer Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.littlecms.com/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="jpeg python static-libs tiff zlib"
 
 RDEPEND="
diff --git a/media-libs/lcms/lcms-2.6.ebuild b/media-libs/lcms/lcms-2.6.ebuild
index a9c7633a93cf..dc988eeb5bba 100644
--- a/media-libs/lcms/lcms-2.6.ebuild
+++ b/media-libs/lcms/lcms-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.6.ebuild,v 1.3 2014/06/18 19:36:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.6.ebuild,v 1.4 2014/10/23 20:52:58 jer Exp $
 
 EAPI=5
 AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs +threads test tiff zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild b/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild
index af512d9e4a66..31a38d011433 100644
--- a/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild,v 1.5 2014/10/21 12:31:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild,v 1.6 2014/10/23 20:10:01 maekke Exp $
 
 EAPI=5
 inherit eutils multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index eff3b068891f..6d536b675c4b 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild,v 1.7 2014/10/21 21:38:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild,v 1.8 2014/10/23 20:12:10 maekke Exp $
 
 EAPI=5
 inherit eutils multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
index 5bae3c1f59fb..0918a54b3476 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r10.ebuild,v 1.5 2014/10/21 21:36:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r10.ebuild,v 1.6 2014/10/23 19:32:29 maekke Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs autotools flag-o-matic multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 IUSE="X debug mmx opengl static-libs"
 
 RDEPEND="
diff --git a/media-video/dvdstyler/dvdstyler-2.7.2.ebuild b/media-video/dvdstyler/dvdstyler-2.7.2.ebuild
index 064f34695f91..25aae324c5fb 100644
--- a/media-video/dvdstyler/dvdstyler-2.7.2.ebuild
+++ b/media-video/dvdstyler/dvdstyler-2.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-2.7.2.ebuild,v 1.1 2014/07/29 17:16:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-2.7.2.ebuild,v 1.2 2014/10/24 04:26:45 ssuominen Exp $
 
 EAPI=5
 
@@ -29,7 +29,8 @@ COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1
 	>=x11-libs/wxGTK-2.8.7:2.8=[gstreamer,X]
 	udev? ( >=virtual/libudev-215:= )"
 RDEPEND="${COMMON_DEPEND}
-	>=app-cdr/dvdisaster-0.72.4"
+	>=app-cdr/dvdisaster-0.72.4
+	media-video/mjpegtools"
 DEPEND="${COMMON_DEPEND}
 	app-arch/zip
 	app-text/xmlto
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 65af2d218025..09afc2095366 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Oct 2014 19:37:05 +0000
+Fri, 24 Oct 2014 11:37:01 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 65af2d218025..09afc2095366 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Oct 2014 19:37:05 +0000
+Fri, 24 Oct 2014 11:37:01 +0000
diff --git a/metadata/md5-cache/app-admin/puppet-3.7.2 b/metadata/md5-cache/app-admin/puppet-3.7.2
new file mode 100644
index 000000000000..3e56a002b2e3
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-3.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby19] =dev-ruby/rgen-0.6*[ruby_targets_ruby19] >=dev-ruby/facter-1.6.2[ruby_targets_ruby19] <dev-ruby/facter-3[ruby_targets_ruby19] dev-ruby/json[ruby_targets_ruby19] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby19] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby19] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby19] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby19] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby19] ) virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/hiera[ruby_targets_ruby20] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby20] =dev-ruby/rgen-0.6*[ruby_targets_ruby20] >=dev-ruby/facter-1.6.2[ruby_targets_ruby20] <dev-ruby/facter-3[ruby_targets_ruby20] dev-ruby/json[ruby_targets_ruby20] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby20] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby20] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby20] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby20] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby20] ) virtual/ruby-ssl[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DESCRIPTION=A system automation and configuration management software
+EAPI=5
+HOMEPAGE=http://puppetlabs.com/
+IUSE=augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+KEYWORDS=~amd64 ~hppa ~sparc ~x86
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby19] =dev-ruby/rgen-0.6*[ruby_targets_ruby19] >=dev-ruby/facter-1.6.2[ruby_targets_ruby19] <dev-ruby/facter-3[ruby_targets_ruby19] dev-ruby/json[ruby_targets_ruby19] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby19] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby19] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby19] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby19] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby19] ) virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/hiera[ruby_targets_ruby20] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby20] =dev-ruby/rgen-0.6*[ruby_targets_ruby20] >=dev-ruby/facter-1.6.2[ruby_targets_ruby20] <dev-ruby/facter-3[ruby_targets_ruby20] dev-ruby/json[ruby_targets_ruby20] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby20] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby20] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby20] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby20] ) sqlite3? ( dev-ruby/sqlite3[ruby_targets_ruby20] ) virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) 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_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+SLOT=0
+SRC_URI=http://www.puppetlabs.com/downloads/puppet/puppet-3.7.2.tar.gz
+_eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	32548a82e42dc26e3312581476d2f20c	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_md5_=3793f22b0a1e5ed25b15c0eff3dc18a5
diff --git a/metadata/md5-cache/app-admin/sysklogd-1.5.1 b/metadata/md5-cache/app-admin/sysklogd-1.5.1
index 3f70226f7fee..da2da9518d93 100644
--- a/metadata/md5-cache/app-admin/sysklogd-1.5.1
+++ b/metadata/md5-cache/app-admin/sysklogd-1.5.1
@@ -3,11 +3,11 @@ DESCRIPTION=Standard log daemons
 EAPI=4
 HOMEPAGE=http://www.infodrom.org/projects/sysklogd/
 IUSE=logrotate
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=dev-lang/perl sys-apps/debianutils
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz mirror://debian/pool/main/s/sysklogd/sysklogd_1.5-6.diff.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=ca370829e90f007967efe738605ac75b
+_md5_=acc86066d98f75d4f7583a8a49b70a2b
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.39 b/metadata/md5-cache/dev-db/mysql-5.5.39
deleted file mode 100644
index 90513d76ccfa..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.5.39
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1 ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
-EAPI=5
-HOMEPAGE=http://www.mysql.com/
-IUSE=bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.5
-RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1 ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
-REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
-SLOT=0
-SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.39.tar.gz https://downloads.skysql.com/files/mysql-5.5/mysql-5.5.39.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.39.tar.gz mirror://gentoo/mysql-extras-20140801-1950Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20140801-1950Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20140801-1950Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20140801-1950Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20140801-1950Z.tar.bz2
-_eclasses_=cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	mysql-cmake	1f6618e5b3ea74dec99af103829e6199	mysql-v2	99a4b41fb9b05d534873b1d68bc0816e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9b7414e581f934ede20e4b663db465a4
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406
index e5ac9b8656fe..60375a17ccdf 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.6.3_p20120406
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.3_p20120406/gcc-4.6.3.tar.bz2 mirror://gentoo/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.6.3_p20120406.patch.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=812f676b33d442d98af9c0ffa440d85c
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120911 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120911
index 53bc7f74bc4a..99dca8d8c332 100644
--- a/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120911
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120911
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.0_p20120911/gcc-4.7.0.tar.bz2 mirror://gentoo/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/dist/msp430-gcc-4.7.0_p20120911.patch.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=df1eeaed61e12996abc6fcb46df20146
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.3.0 b/metadata/md5-cache/dev-libs/appstream-glib-0.3.0
index 7bdfc71bc64b..b57de499616a 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.3.0
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Provides GObjects and helper methods to read and write AppStream met
 EAPI=5
 HOMEPAGE=https://github.com/hughsie/appstream-glib
 IUSE=+introspection nls
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64
 LICENSE=LGPL-2.1
 RDEPEND=app-arch/libarchive dev-db/sqlite:3 >=dev-libs/glib-2.16.1:2 media-libs/fontconfig >=media-libs/freetype-2.4:2 >=net-libs/libsoup-2.24:2.4 >=x11-libs/gdk-pixbuf-2.14:2 x11-libs/gtk+:3 x11-libs/pango dev-libs/libyaml introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
 SLOT=0/7
 SRC_URI=https://github.com/hughsie/appstream-glib/archive/appstream_glib_0_3_0.tar.gz -> appstream-glib-0.3.0.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=09e34604c166f13d41ac73c2bebeb826
+_md5_=da0477560d3a5356fe9c83e0cbd874ce
diff --git a/metadata/md5-cache/dev-libs/collada-dom-2.4.0 b/metadata/md5-cache/dev-libs/collada-dom-2.4.0
index e49f56c41dbd..35a41c631337 100644
--- a/metadata/md5-cache/dev-libs/collada-dom-2.4.0
+++ b/metadata/md5-cache/dev-libs/collada-dom-2.4.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2 dev-libs/libpc
 DESCRIPTION=COLLADA Document Object Model (DOM) C++ Library
 EAPI=5
 HOMEPAGE=http://collada-dom.sourceforge.net/
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2 dev-libs/libpcre[cxx]
 SLOT=0
 SRC_URI=mirror://sourceforge/collada-dom/collada-dom-2.4.0.tgz
 _eclasses_=cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=c6579764c0f650a846cd0df18d579ed4
+_md5_=2bdf5b8d78b68198e6a015699ad685d4
diff --git a/metadata/md5-cache/dev-ml/cppo-1.0.1 b/metadata/md5-cache/dev-ml/cppo-1.0.1
new file mode 100644
index 000000000000..a849153cb396
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/cppo-1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-lang/ocaml-3.12:= >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
+EAPI=5
+HOMEPAGE=http://mjambon.com/cppo.html
+IUSE=examples
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-lang/ocaml-3.12:=
+SLOT=0
+SRC_URI=http://mjambon.com/releases/cppo/cppo-1.0.1.tar.gz
+_eclasses_=findlib	9cf6020ee5481f39f1aa566a323f9868
+_md5_=16598fe3de2d1ee82edbae4e2bd0449b
diff --git a/metadata/md5-cache/dev-ml/cudf-0.7 b/metadata/md5-cache/dev-ml/cudf-0.7
new file mode 100644
index 000000000000..910602a6626c
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/cudf-0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-libs/glib:2 test? ( dev-ml/ounit ) dev-ml/findlib dev-lang/perl
+DESCRIPTION=Library to parse, pretty print, and evaluate CUDF documents
+EAPI=5
+HOMEPAGE=http://www.mancoosi.org/cudf/
+IUSE=+ocamlopt test
+KEYWORDS=~amd64
+LICENSE=LGPL-3
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-libs/glib:2
+SLOT=0/0.7
+SRC_URI=https://gforge.inria.fr/frs/download.php/file/33593/cudf-0.7.tar.gz
+_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=d1945bcd7aa0e58243fd7cdbe7bdcd1c
diff --git a/metadata/md5-cache/dev-ml/custom_printf-109.60.00 b/metadata/md5-cache/dev-ml/custom_printf-109.60.00
index 1b9a14dfa021..c290624625a0 100644
--- a/metadata/md5-cache/dev-ml/custom_printf-109.60.00
+++ b/metadata/md5-cache/dev-ml/custom_printf-109.60.00
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/type-conv-109.20.00:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DEPEND=>=dev-ml/type-conv-109.20.00:= dev-ml/sexplib:= dev-ml/pa_ounit:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
 DESCRIPTION=Syntax extension for printf format strings
 EAPI=5
 HOMEPAGE=http://bitbucket.org/yminsky/ocaml-core/wiki/Home
 IUSE=+ocamlopt debug
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/type-conv-109.20.00:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RDEPEND=>=dev-ml/type-conv-109.20.00:= dev-ml/sexplib:= dev-ml/pa_ounit:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/109.60.00
 SRC_URI=http://ocaml.janestreet.com/ocaml-core/109.60.00/individual/custom_printf-109.60.00.tar.gz http://dev.gentoo.org/~aballier/distfiles/custom_printf-109.60.00.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	32548a82e42dc26e3312581476d2f20c	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=ddd60ec0c2d9b2a4f6f207bd62f33310
+_md5_=bce248f7591c41432ed2d92eb47f8eaf
diff --git a/metadata/md5-cache/dev-ml/ocaml-re-1.2.2 b/metadata/md5-cache/dev-ml/ocaml-re-1.2.2
new file mode 100644
index 000000000000..acb1a90d8a98
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-re-1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Regular expression library for OCaml
+EAPI=5
+HOMEPAGE=http://github.com/ocaml/ocaml-re
+IUSE=+ocamlopt debug doc test
+KEYWORDS=~amd64
+LICENSE=LGPL-2-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/1.2.2
+SRC_URI=https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.2.tar.gz
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	32548a82e42dc26e3312581476d2f20c	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=c9c0341e42de89f12d112ca894dd38c0
diff --git a/metadata/md5-cache/dev-ml/utop-1.10 b/metadata/md5-cache/dev-ml/utop-1.10
deleted file mode 100644
index 4828da1cd770..000000000000
--- a/metadata/md5-cache/dev-ml/utop-1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-ml/lwt-2.4.0:=[react] >=dev-ml/lambda-term-1.2:= >=dev-ml/zed-1.2:= emacs? ( virtual/emacs ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
-DESCRIPTION=A new toplevel for OCaml with completion and colorization
-EAPI=5
-HOMEPAGE=http://github.com/diml/utop
-IUSE=emacs +ocamlopt debug doc
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-ml/lwt-2.4.0:=[react] >=dev-ml/lambda-term-1.2:= >=dev-ml/zed-1.2:= emacs? ( virtual/emacs ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.10
-SRC_URI=http://github.com/diml/utop/archive/1.10.tar.gz -> utop-1.10.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	32548a82e42dc26e3312581476d2f20c	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=6f1d4523c24c111feeb5239a98572eec
diff --git a/metadata/md5-cache/dev-ml/utop-1.5 b/metadata/md5-cache/dev-ml/utop-1.5
deleted file mode 100644
index fc4f7156442f..000000000000
--- a/metadata/md5-cache/dev-ml/utop-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-ml/lwt-2.4.0:=[react] >=dev-ml/lambda-term-1.2:= >=dev-ml/zed-1.2:= emacs? ( virtual/emacs ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
-DESCRIPTION=A new toplevel for OCaml with completion and colorization
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/utop/
-IUSE=emacs +ocamlopt debug doc
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-ml/lwt-2.4.0:=[react] >=dev-ml/lambda-term-1.2:= >=dev-ml/zed-1.2:= emacs? ( virtual/emacs ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.5
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1169/utop-1.5.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	32548a82e42dc26e3312581476d2f20c	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=88835a5b4bda85fae1b52d2c286ad6d9
diff --git a/metadata/md5-cache/dev-ml/utop-1.8 b/metadata/md5-cache/dev-ml/utop-1.8
deleted file mode 100644
index 8958e52a3866..000000000000
--- a/metadata/md5-cache/dev-ml/utop-1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-ml/lwt-2.4.0:=[react] >=dev-ml/lambda-term-1.2:= >=dev-ml/zed-1.2:= emacs? ( virtual/emacs ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
-DESCRIPTION=A new toplevel for OCaml with completion and colorization
-EAPI=5
-HOMEPAGE=http://github.com/diml/utop
-IUSE=emacs +ocamlopt debug doc
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-ml/lwt-2.4.0:=[react] >=dev-ml/lambda-term-1.2:= >=dev-ml/zed-1.2:= emacs? ( virtual/emacs ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.8
-SRC_URI=http://github.com/diml/utop/archive/1.8.tar.gz -> utop-1.8.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	32548a82e42dc26e3312581476d2f20c	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	oasis	d59efb9f3ae0e24a1932b2147425fb8d	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=7e11d8610da317a978fd7b0e4a4df711
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1 b/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1
index 27a5fd756b5b..9f84f9fcf524 100644
--- a/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Accessor-0.340.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Sub-Name dev-lang/perl:=[-build(-)]
 DESCRIPTION=Automated accessor generation
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Class-Accessor/
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-perl/Sub-Name dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	e22596c870f09911db9a237ca79ee872	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=4e031fb4f0deb89d94acd92bedb5fd0a
+_md5_=be0043d25d3c6be20ec4e13af5bb9e7f
diff --git a/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r1 b/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r1
index c81179499b59..0e2e8ec6f0be 100644
--- a/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Inheritable, overridable class data
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Class-Data-Inheritable/
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	e22596c870f09911db9a237ca79ee872	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=2cf8aa3d92faf1547e610f6e1ee226e3
+_md5_=ba54d50dbebdcbddff343b29d08b0c82
diff --git a/metadata/md5-cache/dev-perl/Devel-StackTrace-1.300.0-r1 b/metadata/md5-cache/dev-perl/Devel-StackTrace-1.300.0-r1
index a47aa7571b80..a326e6b8ac7e 100644
--- a/metadata/md5-cache/dev-perl/Devel-StackTrace-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Devel-StackTrace-1.300.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Devel-StackTrace module for perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Devel-StackTrace/
 IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.30.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	e22596c870f09911db9a237ca79ee872	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=d985a6e60cffea52afdbfe764f2cff45
+_md5_=4ff927ec6cf15d6846fe43b06f25454f
diff --git a/metadata/md5-cache/dev-perl/Exception-Class-1.370.0-r1 b/metadata/md5-cache/dev-perl/Exception-Class-1.370.0-r1
index f622304dfd57..ed82f1ecc6d9 100644
--- a/metadata/md5-cache/dev-perl/Exception-Class-1.370.0-r1
+++ b/metadata/md5-cache/dev-perl/Exception-Class-1.370.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Devel-StackTrace-1.20
 DESCRIPTION=A module that allows you to declare real exception classes in Perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Exception-Class/
-KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Devel-StackTrace-1.200.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.37.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	e22596c870f09911db9a237ca79ee872	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=d5070674548ffdeef1ca3d7d6e640ec4
+_md5_=39e8a118c945cb9e9cf055218598df9b
diff --git a/metadata/md5-cache/dev-perl/File-pushd-1.3.0-r1 b/metadata/md5-cache/dev-perl/File-pushd-1.3.0-r1
index 0ea8fc94dcdf..6c6b11d4c86c 100644
--- a/metadata/md5-cache/dev-perl/File-pushd-1.3.0-r1
+++ b/metadata/md5-cache/dev-perl/File-pushd-1.3.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Change directory temporarily for a limited scope
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/File-pushd/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.003.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	e22596c870f09911db9a237ca79ee872	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=98c33b0ce7bf08fc671203e77f3fd2c5
+_md5_=260e11f42a7411c71f2ff7a9aae0db05
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4 b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
index 0f41dd4262d7..9bd0075451e6 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
+++ b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
@@ -4,10 +4,10 @@ DESCRIPTION=Perl encapsulation of invoking the Latex programs
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/LaTeX-Driver/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=dev-perl/Class-Accessor dev-perl/Exception-Class dev-perl/File-Slurp virtual/perl-File-Spec dev-perl/File-pushd virtual/perl-Getopt-Long dev-perl/Readonly virtual/perl-parent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Driver-0.200.4.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	e22596c870f09911db9a237ca79ee872	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=3935273d8cf9385390f0a2963b759f1f
+_md5_=a9286498e4560b8eb078859cf2ecab56
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6 b/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6
index dcf6945e4d08..2b72ee0e5409 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6
+++ b/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6
@@ -4,10 +4,10 @@ DESCRIPTION=Encode characters for LaTeX formatting
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/LaTeX-Encode/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Getopt-Long dev-perl/HTML-Parser dev-perl/Pod-LaTeX dev-perl/Readonly dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Encode-0.091.6.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	e22596c870f09911db9a237ca79ee872	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=35d19532002d84f89334f2855cd9446c
+_md5_=9402085b7e39ce2d4228c84819abe5cc
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6 b/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
index 8b4bc938cdfe..b0308800ddbe 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
+++ b/metadata/md5-cache/dev-perl/LaTeX-Table-1.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for the automatic generation of LaTeX tables
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/LaTeX-Table/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Carp virtual/perl-Module-Pluggable dev-perl/Moose dev-perl/MooseX-FollowPBP virtual/perl-Scalar-List-Utils dev-perl/Template-Toolkit virtual/perl-version dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LI/LIMAONE/LaTeX-Table-v1.0.6.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	e22596c870f09911db9a237ca79ee872	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=c20403eeef919e95a38712ef37cf78ad
+_md5_=5094ad2afde4943a6e4eefb53d5f459f
diff --git a/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0 b/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0
index 767f2678506d..21fba88d500c 100644
--- a/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0
+++ b/metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Moose virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
 DESCRIPTION=Name your accessors get_foo() and set_foo(), whatever that may mean
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/MooseX-FollowPBP/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Artistic-2
 RDEPEND=dev-perl/Moose dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-FollowPBP-0.05.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	e22596c870f09911db9a237ca79ee872	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=e5ff0739e1750428119d26e1c4b03b73
+_md5_=4286996421b4fa8b6c0f8fac9e121fae
diff --git a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0 b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
index fb1a419b82d7..477e344442e8 100644
--- a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
+++ b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Pod-Parser virtual/perl-if virtual/perl-Module-Build dev-lan
 DESCRIPTION=Convert Pod data to formatted LaTeX
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Pod-LaTeX/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Pod-Parser virtual/perl-if dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	e22596c870f09911db9a237ca79ee872	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=51275c197442c60a2f617ee95002b428
+_md5_=0bdcb4bdbbecb6c7d177f3a4579cfaeb
diff --git a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0 b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
index deb10f3bf0dc..c13919d98a79 100644
--- a/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
+++ b/metadata/md5-cache/dev-perl/Template-Plugin-Latex-3.60.0
@@ -4,10 +4,10 @@ DESCRIPTION=LaTeX support for the Template Toolkit
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Template-Plugin-Latex/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-perl/LaTeX-Driver dev-perl/LaTeX-Encode dev-perl/LaTeX-Table >=dev-perl/Template-Toolkit-2.16 virtual/latex-base dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/Template-Plugin-Latex-3.06.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	e22596c870f09911db9a237ca79ee872	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=80cd5291ff6179bc0193d0b1dffb9254
+_md5_=a9d96502f324b5039df2922ae958521c
diff --git a/metadata/md5-cache/dev-python/pathtools-0.1.2 b/metadata/md5-cache/dev-python/pathtools-0.1.2
index 0ad8f609d03a..f21d7c0d630a 100644
--- a/metadata/md5-cache/dev-python/pathtools-0.1.2
+++ b/metadata/md5-cache/dev-python/pathtools-0.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Pattern matching and various utilities for file systems paths
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/pathtools/
-IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathtools/pathtools-0.1.2.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=03425dee786ade04f0b3b4ce9a83da86
+_md5_=72bc1b04dd0a651d3960c960cb148ee6
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.62 b/metadata/md5-cache/dev-python/pycups-1.9.62
index a11a3dd6016c..cd8bccc232ef 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.62
+++ b/metadata/md5-cache/dev-python/pycups-1.9.62
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=net-print/cups doc? ( dev-python/epydoc ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DEPEND=<net-print/cups-2.0.0 doc? ( dev-python/epydoc ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 DESCRIPTION=Python bindings for the CUPS API
 EAPI=3
 HOMEPAGE=http://cyberelk.net/tim/data/pycups/
 IUSE=doc examples
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86
 LICENSE=GPL-2
-RDEPEND=net-print/cups || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+RDEPEND=<net-print/cups-2.0.0 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://cyberelk.net/tim/data/pycups/pycups-1.9.62.tar.bz2
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=2d5526fe6f6fb1662c9fdd8f9babd4a7
+_md5_=1293047714b321c47a6073ebbb01a2bf
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.63 b/metadata/md5-cache/dev-python/pycups-1.9.63
index 357a3b83a634..7c9c921ce318 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.63
+++ b/metadata/md5-cache/dev-python/pycups-1.9.63
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-print/cups 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 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
+DEPEND=<net-print/cups-2.0.0 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 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 DESCRIPTION=Python bindings for the CUPS API
 EAPI=5
 HOMEPAGE=http://cyberelk.net/tim/data/pycups/
 IUSE=doc examples python_targets_python2_7 python_targets_pypy
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86
 LICENSE=GPL-2
-RDEPEND=net-print/cups python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
+RDEPEND=<net-print/cups-2.0.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycups/pycups-1.9.63.tar.bz2
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=4f4a1c353cc503614959ccbd5e60533b
+_md5_=c9cbca9a386dce78575249d2ef0ab5f6
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.66 b/metadata/md5-cache/dev-python/pycups-1.9.68
similarity index 95%
rename from metadata/md5-cache/dev-python/pycups-1.9.66
rename to metadata/md5-cache/dev-python/pycups-1.9.68
index 5423badc2485..1c8b715e8b9e 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.66
+++ b/metadata/md5-cache/dev-python/pycups-1.9.68
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=net-print/cups python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
 SLOT=0
-SRC_URI=mirror://pypi/p/pycups/pycups-1.9.66.tar.bz2
+SRC_URI=mirror://pypi/p/pycups/pycups-1.9.68.tar.bz2
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=7f3466d3e4377994c7b696c03538e7ff
+_md5_=bc1aabb2ffcd05ecdc213f7b700fc454
diff --git a/metadata/md5-cache/dev-python/scientificpython-2.9.1 b/metadata/md5-cache/dev-python/scientificpython-2.9.1
index b5e0e2b78e6d..716431c83983 100644
--- a/metadata/md5-cache/dev-python/scientificpython-2.9.1
+++ b/metadata/md5-cache/dev-python/scientificpython-2.9.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/numpy dev-python/pyro:3 sci-libs/netcdf mpi? ( virtual/mpi ) test? ( dev-python/nose ) dev-lang/python
+DEPEND=<dev-python/numpy-1.9 dev-python/pyro:3 sci-libs/netcdf mpi? ( virtual/mpi ) test? ( dev-python/nose ) dev-lang/python
 DESCRIPTION=Scientific Module for Python
 EAPI=3
 HOMEPAGE=http://sourcesup.cru.fr/projects/scientific-py/
 IUSE=doc mpi test
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-2
-RDEPEND=dev-python/numpy dev-python/pyro:3 sci-libs/netcdf mpi? ( virtual/mpi ) dev-lang/python
+RDEPEND=<dev-python/numpy-1.9 dev-python/pyro:3 sci-libs/netcdf mpi? ( virtual/mpi ) dev-lang/python
 SLOT=0
 SRC_URI=http://sourcesup.cru.fr/frs/download.php/3420/ScientificPython-2.9.1.tar.gz
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=bcb51779adf7a11c7d84e09940b95dfb
+_md5_=e0e064240e598f5943b03b5d25046307
diff --git a/metadata/md5-cache/dev-python/scientificpython-2.9.3 b/metadata/md5-cache/dev-python/scientificpython-2.9.3
index 92886717c3d9..fa9249a6495a 100644
--- a/metadata/md5-cache/dev-python/scientificpython-2.9.3
+++ b/metadata/md5-cache/dev-python/scientificpython-2.9.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyro:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/netcdf mpi? ( virtual/mpi ) test? ( dev-python/nose[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:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=<dev-python/numpy-1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyro:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/netcdf mpi? ( virtual/mpi ) test? ( dev-python/nose[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:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Scientific Module for Python
 EAPI=5
 HOMEPAGE=http://sourcesup.cru.fr/projects/scientific-py/
 IUSE=doc mpi test python_targets_python2_7
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-2
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyro:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/netcdf mpi? ( virtual/mpi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=<dev-python/numpy-1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyro:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/netcdf mpi? ( virtual/mpi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://sourcesup.cru.fr/frs/download.php/4425/ScientificPython-2.9.3.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=25200252f176aa3baedd2a9b0cfe7ddd
+_md5_=28dbd9824c7a5e8bf2d71c7442e0d0c6
diff --git a/metadata/md5-cache/dev-python/scientificpython-2.9.4 b/metadata/md5-cache/dev-python/scientificpython-2.9.4
new file mode 100644
index 000000000000..15f638c5c00c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scientificpython-2.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=<dev-python/numpy-1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyro:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/netcdf mpi? ( virtual/mpi ) test? ( dev-python/nose[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:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Scientific Module for Python
+EAPI=5
+HOMEPAGE=http://sourcesup.cru.fr/projects/scientific-py/
+IUSE=doc mpi test python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=CeCILL-2
+RDEPEND=<dev-python/numpy-1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyro:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/netcdf mpi? ( virtual/mpi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://sourcesup.cru.fr/frs/download.php/4570/ScientificPython-2.9.4.tar.gz
+_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=eea7fee3b75d5e04b09989a0febaf74f
diff --git a/metadata/md5-cache/dev-python/watchdog-0.8.1 b/metadata/md5-cache/dev-python/watchdog-0.8.1
index a5c89fe6ffd0..9bcb93a79c16 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.8.1
+++ b/metadata/md5-cache/dev-python/watchdog-0.8.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Python API and shell utilities to monitor file system events
 EAPI=5
 HOMEPAGE=http://github.com/gorakhargosh/watchdog
-IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/argh[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pathtools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/argh[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pathtools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/w/watchdog/watchdog-0.8.1.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=7d407e8f145e69442b80ba9c296fe118
+_md5_=9692c47c142d25ade2ac052c699a98b6
diff --git a/metadata/md5-cache/dev-util/appdata-tools-0.1.8 b/metadata/md5-cache/dev-util/appdata-tools-0.1.8
index e5e7cf2c10b7..67008968a8fe 100644
--- a/metadata/md5-cache/dev-util/appdata-tools-0.1.8
+++ b/metadata/md5-cache/dev-util/appdata-tools-0.1.8
@@ -4,10 +4,10 @@ DESCRIPTION=CLI designed to validate AppData descriptions for standards complian
 EAPI=5
 HOMEPAGE=https://github.com/hughsie/appdata-tools/
 IUSE=nls
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/appstream-glib-0.1.4 x11-libs/gdk-pixbuf:2
 SLOT=0
 SRC_URI=https://github.com/hughsie/appdata-tools/archive/appdata_tools_0_1_8.tar.gz -> appdata-tools-0.1.8.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=f56ec8015d863070423142b615599e70
+_md5_=9dcc884500c4e0c799c025cda0c5402b
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-1.584-r1 b/metadata/md5-cache/dev-util/jenkins-bin-1.584-r1
index d77ed538dc95..f3985cf19ad9 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-1.584-r1
+++ b/metadata/md5-cache/dev-util/jenkins-bin-1.584-r1
@@ -10,4 +10,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://mirrors.jenkins-ci.org/war/1.584/jenkins.war -> jenkins-bin-1.584.war
 _eclasses_=user	f54e098dd38ba1c0847a13e685b87747
-_md5_=0ceb5980120ea8cc3ac19d37ea532ff2
+_md5_=9e737b603dc3ccadb8621d540460eebd
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-1.585 b/metadata/md5-cache/dev-util/jenkins-bin-1.585
index 8bacec152be4..eb907e1307ef 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-1.585
+++ b/metadata/md5-cache/dev-util/jenkins-bin-1.585
@@ -10,4 +10,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://mirrors.jenkins-ci.org/war/1.585/jenkins.war -> jenkins-bin-1.585.war
 _eclasses_=user	f54e098dd38ba1c0847a13e685b87747
-_md5_=6474819354053712026cdc5c17685b38
+_md5_=bfe3f2d23732470ba7c6f7f05712eece
diff --git a/metadata/md5-cache/media-gfx/assimp-3.1.1 b/metadata/md5-cache/media-gfx/assimp-3.1.1
index d21edf7f3d3f..75d7810c6526 100644
--- a/metadata/md5-cache/media-gfx/assimp-3.1.1
+++ b/metadata/md5-cache/media-gfx/assimp-3.1.1
@@ -10,4 +10,4 @@ RDEPEND=boost? ( dev-libs/boost ) samples? ( x11-libs/libX11 virtual/opengl medi
 SLOT=0
 SRC_URI=mirror://sourceforge/assimp/assimp-3.1.1.zip
 _eclasses_=cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=74c88d5cf5714dc4250ec5df4be3510f
+_md5_=2b496a1fb09514d7192341223f3df37d
diff --git a/metadata/md5-cache/media-gfx/openmesh-3.2 b/metadata/md5-cache/media-gfx/openmesh-3.2
index def291b6e67c..052f579e66ff 100644
--- a/metadata/md5-cache/media-gfx/openmesh-3.2
+++ b/metadata/md5-cache/media-gfx/openmesh-3.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=qt4? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/freeglut ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=qt4? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/freeglut ) qt5? ( dev-qt/qtgui:5 dev-qt/qtopengl:5 media-libs/freeglut ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A generic and efficient data structure for representing and manipulating polygonal meshes
 EAPI=5
 HOMEPAGE=http://www.openmesh.org/
-IUSE=qt4 static-libs
+IUSE=qt4 qt5 static-libs
 KEYWORDS=~amd64 ~ia64 ~x86
 LICENSE=LGPL-3-with-linking-exception
-RDEPEND=qt4? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/freeglut )
+RDEPEND=qt4? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/freeglut ) qt5? ( dev-qt/qtgui:5 dev-qt/qtopengl:5 media-libs/freeglut )
 SLOT=0
 SRC_URI=http://openmesh.org/media/Releases/3.2/OpenMesh-3.2.tar.bz2
 _eclasses_=cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=cb8b631183b0126cee62820da635b280
+_md5_=5f42c1598d000188fb592de97de4aa93
diff --git a/metadata/md5-cache/media-libs/lcms-1.19-r3 b/metadata/md5-cache/media-libs/lcms-1.19-r3
index d0caff029298..4afc35e415da 100644
--- a/metadata/md5-cache/media-libs/lcms-1.19-r3
+++ b/metadata/md5-cache/media-libs/lcms-1.19-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight, speed optimized color management engine
 EAPI=5
 HOMEPAGE=http://www.littlecms.com/
 IUSE=jpeg python static-libs tiff 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 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=tiff? ( >=media-libs/tiff-4.0.3-r6: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(-)?] ) jpeg? ( >=virtual/jpeg-0-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(-)?] ) zlib? ( >=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(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.littlecms.com/lcms-1.19.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=2da3812b61d627cd106672d5f1cdc489
+_md5_=23b7f3cfefee4d0f5988c645d1fc80e0
diff --git a/metadata/md5-cache/media-libs/lcms-2.6 b/metadata/md5-cache/media-libs/lcms-2.6
index 750961cbeb88..c015f83eaa7d 100644
--- a/metadata/md5-cache/media-libs/lcms-2.6
+++ b/metadata/md5-cache/media-libs/lcms-2.6
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight, speed optimized color management engine
 EAPI=5
 HOMEPAGE=http://www.littlecms.com/
 IUSE=doc jpeg static-libs +threads test tiff 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=jpeg? ( >=virtual/jpeg-0-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(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6: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(-)?] ) zlib? ( >=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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r10 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://sourceforge/lcms/lcms2-2.6.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=b9ba75e8ffb158bd595b45dcb0151a5b
+_md5_=39603765bca77edfe03c1698e9763d7f
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.6-r1 b/metadata/md5-cache/media-libs/libmikmod-3.3.6-r1
index 3eef405384de..8e7236d8e570 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.6-r1
+++ b/metadata/md5-cache/media-libs/libmikmod-3.3.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A library to play a wide range of module formats
 EAPI=5
 HOMEPAGE=http://mikmod.sourceforge.net/
 IUSE=+alsa altivec coreaudio debug nas openal oss pulseaudio sse2 static-libs +threads abi_x86_32 abi_x86_64 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 hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2+ LGPL-2.1
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) nas? ( >=media-libs/nas-1.9.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(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.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/libmikmod:2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.6.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=39ae63af3be7ef2ed32ec229e0fb638d
+_md5_=5a34af3aa1f75bbaa1fb15e11e128e7d
diff --git a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4 b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4
index 2fc0fb943d58..ff7f920d6d8c 100644
--- a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4
+++ b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Direct Media Layer Mixer Library
 EAPI=5
 HOMEPAGE=http://www.libsdl.org/projects/SDL_mixer/
 IUSE=flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav abi_x86_32 abi_x86_64 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 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] flac? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) midi? ( fluidsynth? ( >=media-sound/fluidsynth-1.1.6-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(-)?] ) timidity? ( media-sound/timidity++ ) ) mp3? ( mad? ( >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) smpeg? ( >=media-libs/smpeg-0.4.4-r10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) mod? ( modplug? ( >=media-libs/libmodplug-0.8.8.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(-)?] ) mikmod? ( >=media-libs/libmikmod-3.3.6-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(-)?] ) ) vorbis? ( >=media-libs/libvorbis-1.3.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(-)?] >=media-libs/libogg-1.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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-sdl-20140406-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
 REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod )
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=82cff3463cc8acecddc18b9caf57e864
+_md5_=86fa046bf822ac557842e9f88c58625c
diff --git a/metadata/md5-cache/media-libs/smpeg-0.4.4-r10 b/metadata/md5-cache/media-libs/smpeg-0.4.4-r10
index 92d77698795f..c81f2b07aefd 100644
--- a/metadata/md5-cache/media-libs/smpeg-0.4.4-r10
+++ b/metadata/md5-cache/media-libs/smpeg-0.4.4-r10
@@ -4,10 +4,10 @@ DESCRIPTION=SDL MPEG Player Library
 EAPI=5
 HOMEPAGE=http://icculus.org/smpeg/
 IUSE=X debug mmx opengl 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 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-sdl-20140406 ) >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( >=virtual/glu-9.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(-)?] >=virtual/opengl-7.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(-)?] ) X? ( >=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/libXi-1.7.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/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(-)?] )
 SLOT=0
 SRC_URI=ftp://ftp.lokigames.com/pub/open-source/smpeg/smpeg-0.4.4.tar.gz mirror://gentoo/smpeg-0.4.4-gtkm4.patch.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=73762a10c8a7e6adf58f833af45d546d
+_md5_=267aa1844f5f61f25158504e6936b0e0
diff --git a/metadata/md5-cache/media-video/dvdstyler-2.7.2 b/metadata/md5-cache/media-video/dvdstyler-2.7.2
index cbdfa41244d3..7c0a5a64a251 100644
--- a/metadata/md5-cache/media-video/dvdstyler-2.7.2
+++ b/metadata/md5-cache/media-video/dvdstyler-2.7.2
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.dvdstyler.org/
 IUSE=debug +udev
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= >=media-libs/wxsvg-1.2:= >=media-video/dvdauthor-0.7.1 >=media-video/xine-ui-0.99.7 virtual/cdrtools >=virtual/ffmpeg-9-r1[encode] virtual/jpeg:0 >=x11-libs/wxGTK-2.8.7:2.8=[gstreamer,X] udev? ( >=virtual/libudev-215:= ) >=app-cdr/dvdisaster-0.72.4
+RDEPEND=>=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= >=media-libs/wxsvg-1.2:= >=media-video/dvdauthor-0.7.1 >=media-video/xine-ui-0.99.7 virtual/cdrtools >=virtual/ffmpeg-9-r1[encode] virtual/jpeg:0 >=x11-libs/wxGTK-2.8.7:2.8=[gstreamer,X] udev? ( >=virtual/libudev-215:= ) >=app-cdr/dvdisaster-0.72.4 media-video/mjpegtools
 SLOT=0
 SRC_URI=mirror://sourceforge/dvdstyler/DVDStyler-2.7.2.tar.bz2
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=1ba7158c2cda13d4d0dcd4a079d32cbc
+_md5_=077148cae05bdbe07de1d4d5d4d759d2
diff --git a/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.24 b/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.24
new file mode 100644
index 000000000000..a59f5fc824ed
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-lang/php[json,simplexml,zlib,xml,filter] >=dev-lang/php-5.3 >=net-analyzer/rrdtool-1.2[graph,perl] || ( net-analyzer/nagios-core net-analyzer/icinga net-analyzer/icinga2 ) apache2? ( =www-servers/apache-2* )
+DESCRIPTION=A performance data analyzer for nagios
+EAPI=5
+HOMEPAGE=http://www.pnp4nagios.org
+IUSE=apache2
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[json,simplexml,zlib,xml,filter] >=dev-lang/php-5.3 >=net-analyzer/rrdtool-1.2[graph,perl] || ( net-analyzer/nagios-core net-analyzer/icinga net-analyzer/icinga2 ) virtual/perl-Getopt-Long virtual/perl-Time-HiRes media-fonts/dejavu apache2? ( www-servers/apache[apache2_modules_rewrite] ) apache2? ( =www-servers/apache-2* )
+SLOT=0
+SRC_URI=mirror://sourceforge/pnp4nagios/PNP-0.6/pnp4nagios-0.6.24.tar.gz
+_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=9ad4fda0daa2a65b728ce6db7943e6c9
diff --git a/metadata/md5-cache/net-dns/libidn-1.29 b/metadata/md5-cache/net-dns/libidn-1.29
index 70d7af8fafbd..01af2f8f4ab8 100644
--- a/metadata/md5-cache/net-dns/libidn-1.29
+++ b/metadata/md5-cache/net-dns/libidn-1.29
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized Domain Names (IDN) implementation
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libidn/
 IUSE=doc emacs java mono nls static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-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(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.29.tar.gz
 _eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	32548a82e42dc26e3312581476d2f20c	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=40e3e04ae03cbfff600da79b3f891fb0
+_md5_=c8efc03f9cb26d52fba0705a9295e012
diff --git a/metadata/md5-cache/net-libs/libndp-1.4 b/metadata/md5-cache/net-libs/libndp-1.4
index e0d7fe7a5689..ec27d69ef607 100644
--- a/metadata/md5-cache/net-libs/libndp-1.4
+++ b/metadata/md5-cache/net-libs/libndp-1.4
@@ -4,9 +4,9 @@ DESCRIPTION=Library for Neighbor Discovery Protocol
 EAPI=5
 HOMEPAGE=http://libndp.org
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://libndp.org/files/libndp-1.4.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6df566c3fa3805833e31c1c5a5cae783
+_md5_=722e827787fc6d6d9d57994e6db3f77f
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.9-r3 b/metadata/md5-cache/net-libs/libvncserver-0.9.9-r3
index c0f01ef01a35..19caae80ab19 100644
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.9-r3
+++ b/metadata/md5-cache/net-libs/libvncserver-0.9.9-r3
@@ -4,11 +4,11 @@ DESCRIPTION=library for creating vnc servers
 EAPI=5
 HOMEPAGE=http://libvncserver.sourceforge.net/
 IUSE=+24bpp gcrypt gnutls ipv6 +jpeg +png ssl static-libs test threads +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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=gcrypt? ( >=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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] ) !gnutls? ( ssl? ( >=dev-libs/openssl-1.0.1h-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(-)?] ) ) jpeg? ( >=virtual/jpeg-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(-)?] ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) zlib? ( >=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(-)?] )
 REQUIRED_USE=png? ( zlib )
 SLOT=0
 SRC_URI=http://libvncserver.sourceforge.net/LibVNCServer-0.9.9.tar.gz mirror://sourceforge/libvncserver/LibVNCServer-0.9.9.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=70d79a1af3e5faa224f3e3b3b7d42c81
+_md5_=25a6b1685ff66aff6eaf1db802a2b2ca
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.3.26-r2 b/metadata/md5-cache/net-mail/fetchmail-6.3.26-r2
index 98d9e88d6a12..9113844dc50e 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.3.26-r2
+++ b/metadata/md5-cache/net-mail/fetchmail-6.3.26-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=hesiod? ( net-dns/hesiod ) ssl? ( >=dev-libs/openssl-0.9.6 ) kerberos? ( virtual/krb5 >=dev-libs/openssl-0.9.6 ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) sys-devel/flex nls? ( sys-devel/gettext ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
 EAPI=5
-HOMEPAGE=http://fetchmail.berlios.de
+HOMEPAGE=http://www.fetchmail.info/
 IUSE=ssl nls kerberos hesiod tk socks python_targets_python2_7 python_single_target_python2_7
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 public-domain
@@ -11,4 +11,4 @@ REQUIRED_USE=tk? ( python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://berlios/fetchmail/fetchmail-6.3.26.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=82b96178b7d91e305910df0e0c392554
+_md5_=cef48450dabd8e7d53126bbe6d0ed1e1
diff --git a/metadata/md5-cache/net-misc/networkmanager-0.9.10.0-r1 b/metadata/md5-cache/net-misc/networkmanager-0.9.10.0-r1
index f5b0bd9530f4..4ca9c906a3ba 100644
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.10.0-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.10.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Universal network configuration daemon for laptops, desktops, server
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=avahi connection-sharing consolekit +dhclient dhcpcd gnutls +introspection kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test vala +wext +wifi test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.26:2.4= >=net-misc/iputils-20121221-r1 sys-libs/readline >=virtual/libgudev-165:= avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) teamd? ( >=net-misc/libteam-1.9 ) || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) consolekit? ( sys-auth/consolekit ) wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.10.0.tar.xz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	32548a82e42dc26e3312581476d2f20c	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	d8f392783fdc2395fc64af046f2ca961	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=783d2df6ec4d4bebcfac58cb3736351b
+_md5_=e65183daa24f268447f31b493a544183
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2014.10.15 b/metadata/md5-cache/net-misc/youtube-dl-2014.10.23
similarity index 94%
rename from metadata/md5-cache/net-misc/youtube-dl-2014.10.15
rename to metadata/md5-cache/net-misc/youtube-dl-2014.10.23
index 7181c85f6df6..0d077ada5c9d 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2014.10.15
+++ b/metadata/md5-cache/net-misc/youtube-dl-2014.10.23
@@ -9,6 +9,6 @@ LICENSE=public-domain
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?]
 REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) ^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 )
 SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2014.10.15/youtube-dl-2014.10.15.tar.gz
+SRC_URI=http://youtube-dl.org/downloads/2014.10.23/youtube-dl-2014.10.23.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=c6a987e9460a2a0230bfe083751d6a5a
+_md5_=ffee4cf6f1f8176c3668a57ca6ea4fa5
diff --git a/metadata/md5-cache/net-print/ink-0.5.1 b/metadata/md5-cache/net-print/ink-0.5.1
index 260f7d3adab9..110e790824fe 100644
--- a/metadata/md5-cache/net-print/ink-0.5.1
+++ b/metadata/md5-cache/net-print/ink-0.5.1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=configure
 DEPEND=>net-print/libinklevel-0.8
 DESCRIPTION=A command line utility to display the ink level of your printer
-EAPI=4
+EAPI=5
 HOMEPAGE=http://ink.sourceforge.net/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>net-print/libinklevel-0.8
 SLOT=0
 SRC_URI=mirror://sourceforge/ink/ink-0.5.1.tar.gz
-_md5_=e33bba7e5b88dc6616b923b269247156
+_md5_=80abae0746a461ef75e52b9786801c7c
diff --git a/metadata/md5-cache/sci-biology/seqan-1.4.2 b/metadata/md5-cache/sci-biology/seqan-1.4.2
index ab0e53afaa7b..6059a0e8bc00 100644
--- a/metadata/md5-cache/sci-biology/seqan-1.4.2
+++ b/metadata/md5-cache/sci-biology/seqan-1.4.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] sci-biology/samtools sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=C++ Sequence Analysis Library
 EAPI=5
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( p
 SLOT=0
 SRC_URI=http://packages.seqan.de/seqan-src/seqan-src-1.4.2.tar.gz
 _eclasses_=cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=e57a75e7635efda5ad597daefa83ba55
+_md5_=0267686a5013a8e48b250764be4f51a1
diff --git a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.8.0 b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.8.0
new file mode 100644
index 000000000000..38284824fb49
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) pdb2pka? ( sci-chemistry/apbs[python,-mpi] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool virtual/fortran
+DESCRIPTION=An automated pipeline for performing Poisson-Boltzmann electrostatics calculations
+EAPI=5
+HOMEPAGE=http://www.poissonboltzmann.org/
+IUSE=doc examples opal +pdb2pka python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) pdb2pka? ( sci-chemistry/apbs[python,-mpi] ) virtual/fortran
+SLOT=0
+SRC_URI=mirror://sourceforge/pdb2pqr/pdb2pqr-1.8.tar.gz
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=63e8e8d6f9ca5ee4c536af69821f05a6
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-1.2.4 b/metadata/md5-cache/sci-chemistry/votca-csg-1.2.4-r1
similarity index 96%
rename from metadata/md5-cache/sci-chemistry/votca-csg-1.2.4
rename to metadata/md5-cache/sci-chemistry/votca-csg-1.2.4-r1
index 6d485408fd37..f0fec78ca5f6 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-1.2.4
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-1.2.4-r1
@@ -11,4 +11,4 @@ RDEPEND=~sci-libs/votca-tools-1.2.4 gromacs? ( sci-chemistry/gromacs:= ) dev-lan
 SLOT=0
 SRC_URI=http://downloads.votca.googlecode.com/hg/votca-csg-1.2.4.tar.gz doc? ( http://downloads.votca.googlecode.com/hg/votca-csg-manual-1.2.4.pdf ) examples? ( http://downloads.votca.googlecode.com/hg/votca-csg-tutorials-1.2.4.tar.gz )
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=e799702a0a8a2dfc89010e8100d50a0b
+_md5_=cecb37452e84e74f5a1acacc1bea53db
diff --git a/metadata/md5-cache/sci-libs/libccd-2.0 b/metadata/md5-cache/sci-libs/libccd-2.0
index 877803799dc0..1c74cf7e8a9f 100644
--- a/metadata/md5-cache/sci-libs/libccd-2.0
+++ b/metadata/md5-cache/sci-libs/libccd-2.0
@@ -4,9 +4,9 @@ DESCRIPTION=Library for collision detection between two convex shapes
 EAPI=5
 HOMEPAGE=http://libccd.danfis.cz/
 IUSE=double doc
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://libccd.danfis.cz/files/libccd-2.0.tar.gz
 _eclasses_=cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=c25bf83d187864be044419910b4e04bd
+_md5_=08cf9482f242b41f12e558a7b0213f3e
diff --git a/metadata/md5-cache/sci-libs/libccd-9999 b/metadata/md5-cache/sci-libs/libccd-9999
index e99a16dee306..1a22d37ec385 100644
--- a/metadata/md5-cache/sci-libs/libccd-9999
+++ b/metadata/md5-cache/sci-libs/libccd-9999
@@ -7,4 +7,4 @@ IUSE=double doc
 LICENSE=BSD
 SLOT=0
 _eclasses_=cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	git-r3	6ebae45064cb04482f3c702632dd9528	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=45afb0c37bc37ed990852705d199ed9e
+_md5_=e429cd939962817bd2a7e17049a55497
diff --git a/metadata/md5-cache/sci-libs/mmtk-2.7.3 b/metadata/md5-cache/sci-libs/mmtk-2.7.3
index 16cc9ffad146..a2d4b4f30c82 100644
--- a/metadata/md5-cache/sci-libs/mmtk-2.7.3
+++ b/metadata/md5-cache/sci-libs/mmtk-2.7.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/cython dev-python/numpy dev-python/scientificpython =dev-lang/python-2*
+DEPEND=dev-python/cython <dev-python/numpy-1.9 dev-python/scientificpython =dev-lang/python-2*
 DESCRIPTION=Molecular Modeling ToolKit for Python
 EAPI=5
 HOMEPAGE=http://dirac.cnrs-orleans.fr/MMTK/
 IUSE=examples
 KEYWORDS=~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux
 LICENSE=CeCILL-2
-RDEPEND=dev-python/cython dev-python/numpy dev-python/scientificpython =dev-lang/python-2*
+RDEPEND=dev-python/cython <dev-python/numpy-1.9 dev-python/scientificpython =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://sourcesup.cru.fr/frs/download.php/3421/MMTK-2.7.3.tar.gz
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=1a3c517455e0f20a513344f61e9f9183
+_md5_=c7bf5c41a8ff15128db43d06cfd3c749
diff --git a/metadata/md5-cache/sci-libs/mmtk-2.7.5 b/metadata/md5-cache/sci-libs/mmtk-2.7.5
index 02d274b88ccf..6031121b56c7 100644
--- a/metadata/md5-cache/sci-libs/mmtk-2.7.5
+++ b/metadata/md5-cache/sci-libs/mmtk-2.7.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/cython dev-python/numpy dev-python/scientificpython =dev-lang/python-2*
+DEPEND=dev-python/cython <dev-python/numpy-1.9 dev-python/scientificpython =dev-lang/python-2*
 DESCRIPTION=Molecular Modeling ToolKit for Python
 EAPI=5
 HOMEPAGE=http://dirac.cnrs-orleans.fr/MMTK/
 IUSE=examples
 KEYWORDS=~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux
 LICENSE=CeCILL-2
-RDEPEND=dev-python/cython dev-python/numpy dev-python/scientificpython =dev-lang/python-2*
+RDEPEND=dev-python/cython <dev-python/numpy-1.9 dev-python/scientificpython =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://sourcesup.cru.fr/frs/download.php/3794/MMTK-2.7.5.tar.gz
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=60ac05e120ab75f6ff2c4dd480c15dac
+_md5_=ef2fc858b1b88dd6e96fcd0abf29a2fc
diff --git a/metadata/md5-cache/sci-libs/mmtk-2.7.9 b/metadata/md5-cache/sci-libs/mmtk-2.7.9
index 6f1fa23173cd..0fb2aa6e8ba6 100644
--- a/metadata/md5-cache/sci-libs/mmtk-2.7.9
+++ b/metadata/md5-cache/sci-libs/mmtk-2.7.9
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/scientificpython[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:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/numpy-1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/scientificpython[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:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Molecular Modeling ToolKit for Python
 EAPI=5
 HOMEPAGE=http://dirac.cnrs-orleans.fr/MMTK/
 IUSE=examples python_targets_python2_7
 KEYWORDS=~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux
 LICENSE=CeCILL-2
-RDEPEND=dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/scientificpython[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:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/numpy-1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/scientificpython[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:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://sourcesup.cru.fr/frs/download.php/4324/MMTK-2.7.9.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=257a68e72d8b7824bc165d52cc68c097
+_md5_=95cf2b8f8bb53cffd618e64a7b46298c
diff --git a/metadata/md5-cache/sys-auth/nss-mdns-0.10-r2 b/metadata/md5-cache/sys-auth/nss-mdns-0.10-r2
index 8246a1c45691..d1325ce8b36e 100644
--- a/metadata/md5-cache/sys-auth/nss-mdns-0.10-r2
+++ b/metadata/md5-cache/sys-auth/nss-mdns-0.10-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Name Service Switch module for Multicast DNS
 EAPI=5
 HOMEPAGE=http://0pointer.de/lennart/projects/nss-mdns/
 IUSE=search-domains abi_x86_32 abi_x86_64 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=amd64 ~hppa ~mips ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=net-dns/avahi-0.6.31-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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=a9765b9f3bb0faea4e5b36ae76d8b9d6
+_md5_=fc0bf31054d5273c59d372c878c730d1
diff --git a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10 b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
index c95ae334b018..a95e403ccd79 100644
--- a/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
+++ b/metadata/md5-cache/sys-devel/gcc-2.95.3-r10
@@ -5,11 +5,11 @@ EAPI=2
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla altivec +nls +nptl +cxx +fortran
 KEYWORDS=~alpha ~ppc ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl )
 RESTRICT=strip
 SLOT=2.95
 SRC_URI=mirror://gnu/gcc/gcc-2.95.3/gcc-2.95.3.tar.bz2 mirror://gentoo/gcc-2.95.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-2.95.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-2.95.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-2.95.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-2.95.3-patches-1.4.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6db6836667917e3bed58cc988429d4a2
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=03fde3a98770ca9789e87d0bb044062c
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
index 4ee5fb41e96d..dafd19047fbb 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r1
@@ -5,11 +5,11 @@ EAPI=2
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla altivec boundschecking doc gcj awt hardened multilib objc +nls +nptl +cxx +fortran
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.3
 SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.3.6-patches-1.8.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.8.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~halcy0n/patches/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 http://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=16d813ec2e74ddd6736201a848a7cd40
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=89cea9a3a86990a9993ddf2a25dbbcec
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
index 17935815d3b0..36e04a49162d 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
@@ -5,11 +5,11 @@ EAPI=2
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=ip28 ip32r10k n32 n64 multislot regression-test vanilla altivec boundschecking d doc gcj awt hardened multilib objc +nls +nptl +cxx +fortran
 KEYWORDS=-* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.6-patches-1.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.7.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~halcy0n/patches/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 http://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9f2479947691daf00d62f2b18bb057dd
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=690b617e4db1b8103f50f23bbdfe0034
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4 b/metadata/md5-cache/sys-devel/gcc-4.0.4
index e00c08299756..d984f62d3e8c 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.0.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.0
 SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.0.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.0.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.2.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d971bdad38e9568ecf8438ddaa9bc567
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3d22ee8acb7e15fa666637396d248520
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2 b/metadata/md5-cache/sys-devel/gcc-4.1.2
index 12cd21cc5007..bb03ec9557a4 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.1
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.1.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.5.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d9a40a9e763c9ffe29a6a13bf95b6bea
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=0f01551f2c7ec89bda65c7abc926f4a5
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
index add6f6ea4753..0fa4e30ece9b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.2
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.2.4-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.3.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cee7c511a1f6c790191443ec7533e529
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=18f941aed62665213a3d27283a1a9e01
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
index c6445caae5e4..26ea7a66910e 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-piepatches-v10.1.5.tar.bz2 mirror://gentoo/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.6-specs-0.9.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-specs-0.9.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=01e99caced27f9b0b1a0a82a5a59a291
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a3bfec81ebfbc5c0e3df431483f227b1
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7 b/metadata/md5-cache/sys-devel/gcc-4.4.7
index 1348e4c1c5db..144d3d8519e1 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.7-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f7e762c58bcef4221420681a22f783a3
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=37938bee36b049c22a3cd0a990502f46
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.1-r1 b/metadata/md5-cache/sys-devel/gcc-4.5.1-r1
index 7d1c60f7874f..a3023a908935 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.1-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.1-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.1/gcc-4.5.1.tar.bz2 mirror://gentoo/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.1-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.1-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=944204b40c511906b8dada5ac3ec8f54
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a2b1af3ce0565a17259c39f642ddea33
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.2 b/metadata/md5-cache/sys-devel/gcc-4.5.2
index 3465487e202f..d42380245bcf 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.2/gcc-4.5.2.tar.bz2 mirror://gentoo/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.2-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=06033e7d282d2ff95f953447b06fcb35
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=856892c8ed46941f2b4ec7117c2d34b6
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.3-r2 b/metadata/md5-cache/sys-devel/gcc-4.5.3-r2
index 0830e46e0fcb..bcbf05b505c6 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.3-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.3-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.6.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.6.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.3-patches-1.6.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-patches-1.6.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.6.tar.bz2 mirror://gentoo/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-piepatches-v0.4.7.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4b0fc760c112f37e67bbf9c6ddf7e339
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=817bd28ab0f2c9bcf820bd4b5427e78a
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4 b/metadata/md5-cache/sys-devel/gcc-4.5.4
index 38d83b7c9327..aa30a9cff444 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-piepatches-v0.4.7.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=43987696cd35f3c8f423943b834a17a8
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=4551e60c984ef6a929510330aafa3f17
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.0 b/metadata/md5-cache/sys-devel/gcc-4.6.0
index 4955e1e6e8ce..91cc23cbe430 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.0/gcc-4.6.0.tar.bz2 mirror://gentoo/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.0-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.0-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cc534075b7dcb28b1c24eeb730bb8366
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3f114ea3706f575f349121f83d19df07
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.1-r1 b/metadata/md5-cache/sys-devel/gcc-4.6.1-r1
index 64a5ff81ba47..5500b05e713e 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.1-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.1-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.1/gcc-4.6.1.tar.bz2 mirror://gentoo/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.1-piepatches-v0.4.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=68d9ed84bbd4c7a5b67370b3226e2310
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=65f462b2191e80d9ca9c13c4279f078f
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.2 b/metadata/md5-cache/sys-devel/gcc-4.6.2
index b499f31dc464..f0277d70adf5 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.2/gcc-4.6.2.tar.bz2 mirror://gentoo/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.2-piepatches-v0.5.0.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e6013acd3842000e11278bd137f5aa04
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=98d271b11aa22b5751bb800fab008bb7
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.3 b/metadata/md5-cache/sys-devel/gcc-4.6.3
index 7d04e33cbfc0..ce0efd15cd3d 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.3
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2 mirror://gentoo/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.3-patches-1.13.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-patches-1.13.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.3-patches-1.13.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-patches-1.13.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-patches-1.13.tar.bz2 mirror://gentoo/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-piepatches-v0.5.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=92a0d0af6dc5983f452fda3c1fe83fc5
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=c656a590e5a41a5f84483eea0973afc8
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4 b/metadata/md5-cache/sys-devel/gcc-4.6.4
index c1bc7eab0aa0..1f8020e792c3 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-piepatches-v0.5.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=40b062115aaf408fa76771d264037b1b
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=cad528ed6f1c4d4dbbf289651ac33c79
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.0 b/metadata/md5-cache/sys-devel/gcc-4.7.0
index 7e99dfbc64d1..f09ce8d8dd4f 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2 mirror://gentoo/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-piepatches-v0.5.3.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ba144c857c75865e059724db5ef0481e
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=f3926e8b0b1d91d4a587f9cac459c557
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.1 b/metadata/md5-cache/sys-devel/gcc-4.7.1
index b907609f8255..c10db9bc46f7 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2 mirror://gentoo/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.1-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.1-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.1-piepatches-v0.5.3.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=19da0e2be9ecbbeeb047fb978034cf5e
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3129b9dc172edaff38f9d3700125e63c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.2-r1 b/metadata/md5-cache/sys-devel/gcc-4.7.2-r1
index 7d220eb8d06b..9175c39a756c 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.2-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.2-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2 mirror://gentoo/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.2-patches-1.6.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.2-patches-1.6.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.2-patches-1.6.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.2-patches-1.6.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.2-patches-1.6.tar.bz2 mirror://gentoo/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.2-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1bf1abd69f85539cb9369188a46a1734
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=7616fad3dde5186c689c0d878a7d00af
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.3-r1 b/metadata/md5-cache/sys-devel/gcc-4.7.3-r1
index 8e2aaf7259fb..c97375cca2c6 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.3-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.3-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.3/gcc-4.7.3.tar.bz2 mirror://gentoo/gcc-4.7.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.3-patches-1.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.3-patches-1.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.3-patches-1.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.3-patches-1.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.7.3-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.3-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.3-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.3-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b4bbb07be2d93015332e0782cc9a2d4e
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=cdf4a4f6085a8cd6f245fff9428d99d0
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4 b/metadata/md5-cache/sys-devel/gcc-4.7.4
index f9bc52d4cb62..eda5601efdc4 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f9b199fb00a3087af7f5eaf57d441d9e
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=bdc8442cdbd1a7d10ba21fba3b9119c6
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.0 b/metadata/md5-cache/sys-devel/gcc-4.8.0
index e288d005f6c4..a82dfa4ad25c 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8
 SRC_URI=mirror://gnu/gcc/gcc-4.8.0/gcc-4.8.0.tar.bz2 mirror://gentoo/gcc-4.8.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.0-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.0-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.8.0-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.0-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.0-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.0-piepatches-v0.5.5.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.0-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=937b046fa82bc6eba6ae0a16b2d38082
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=0d96eed45eb312abc80701237cd17607
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.1-r1 b/metadata/md5-cache/sys-devel/gcc-4.8.1-r1
index 0ad211a7adce..7ad72dd9b656 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.1-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.1-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8
 SRC_URI=mirror://gnu/gcc/gcc-4.8.1/gcc-4.8.1.tar.bz2 mirror://gentoo/gcc-4.8.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.1-patches-1.2.tar.bz2 mirror://gentoo/gcc-4.8.1-piepatches-v0.5.7.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.1-piepatches-v0.5.7.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.1-piepatches-v0.5.7.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.1-piepatches-v0.5.7.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.1-piepatches-v0.5.7.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=78aa0733b5cfd8c37a14198bde9699cb
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=47add0d64f730be0c5e842be36d7a66f
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.2 b/metadata/md5-cache/sys-devel/gcc-4.8.2
index e1e2248411af..aeaa0b65cf36 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8
 SRC_URI=mirror://gnu/gcc/gcc-4.8.2/gcc-4.8.2.tar.bz2 mirror://gentoo/gcc-4.8.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.2-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.2-patches-1.3r1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.2-patches-1.3r1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.2-patches-1.3r1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.2-patches-1.3r1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.2-patches-1.3r1.tar.bz2 mirror://gentoo/gcc-4.8.2-piepatches-v0.5.8r1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.2-piepatches-v0.5.8r1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.2-piepatches-v0.5.8r1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.2-piepatches-v0.5.8r1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.2-piepatches-v0.5.8r1.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c70d410d9b8be0119242aa064b417cc0
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=cd78b3d58ffb850720cf1f8622b3861e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.3 b/metadata/md5-cache/sys-devel/gcc-4.8.3
index 82eb175bf5ca..ade8dee13ec3 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.3
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8
 SRC_URI=mirror://gnu/gcc/gcc-4.8.3/gcc-4.8.3.tar.bz2 mirror://gentoo/gcc-4.8.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.3-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-patches-1.1.tar.bz2 mirror://gentoo/gcc-4.8.3-piepatches-v0.5.9.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.3-piepatches-v0.5.9.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.3-piepatches-v0.5.9.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.3-piepatches-v0.5.9.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-piepatches-v0.5.9.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=64e379860afe03ac6606ad351e8d0ed3
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=709395f09607c5e36f3b1d0ca603bc65
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.0 b/metadata/md5-cache/sys-devel/gcc-4.9.0
index dc23c72de185..7d12bf376f0d 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.0
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.9
 SRC_URI=mirror://gnu/gcc/gcc-4.9.0/gcc-4.9.0.tar.bz2 mirror://gentoo/gcc-4.9.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.9.0-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.9.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.0-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.0-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.0-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.0-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.9.0-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.0-piepatches-v0.6.0.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7de468d1ca74ac6c5a2554f713061ade
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=96c5b62f1f65d5b32a570e253d254ac0
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.1 b/metadata/md5-cache/sys-devel/gcc-4.9.1
index 2af094f8f672..3ed75cc94e4e 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.1
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.9
 SRC_URI=mirror://gnu/gcc/gcc-4.9.1/gcc-4.9.1.tar.bz2 mirror://gentoo/gcc-4.9.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.9.1-uclibc-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.1-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.1-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.1-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.1-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.1-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.9.1-piepatches-v0.6.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.1-piepatches-v0.6.0.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.3-specs-0.2.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=52a55ee2370ff888f1c22ebe76a002df
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=9976f904af5204b7eba3d4e80b205c2c
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493 b/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
index e3c6779b2157..e7ae79435c30 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.0.1_p5493
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=40
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5493.tar.gz
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=695373bab736b1a123a59a4884511fad
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
index 5ff9a3a2966e..0c13da389a29 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5664
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5664.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5e5182e1ebf95a532a8ea011fcf95fc
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
index 486ce94eab48..822b80bc1e64 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3ffe7d4840fa1a172ab518bfa0c67208
diff --git a/metadata/md5-cache/sys-devel/kgcc64-3.4.6 b/metadata/md5-cache/sys-devel/kgcc64-3.4.6
index c367e23b5f4e..0e28e4d09661 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-3.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-3.4.6
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=-* ~hppa ~mips ~ppc ~s390 sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-3.4.6-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.2.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=763423aac2a46bad5797bf21595efff1
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.1.2 b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
index 58f249db123a..9cdeec97af47 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.1.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=-* hppa ~mips ppc ~s390 sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.1
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.1.2-patches-1.0.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.0.1.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=539483eb32a8ea7ea0f16310cc0ca4cc
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.2.4 b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
index 3afb2eb1473f..811493b73ea0 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.2.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=-* hppa ~mips ppc ~s390 ~sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.2
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.2.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.0.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4fddea884410fa1693158010106a104d
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.5 b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
index b06284b42d1c..286a84365db0 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=-hppa ~mips ~sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 RESTRICT=strip
 SLOT=4.3
 SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.3.5-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef0ad9b40ac2c62a0192ff77c7344b0d
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.5 b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
index cd435be1df42..c9d525e8c997 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=hppa sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.5-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.2.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=57ab0b71d886c81b13bf7e82c61107b3
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.6 b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
index 39fc42daf853..3069e41eeb41 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=~hppa ~sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2
 RESTRICT=strip
 SLOT=4.4
 SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.4.6-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0158524737285e5b28380deed0178bb8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.3 b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
index 6488a1b8d5c9..f6fc46251b4f 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=hppa sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.3-patches-1.4.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.4.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bfef58f2c1d438af58ef6e2de0118e98
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.4 b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
index d7e8f89b62be..ea9c591e0d89 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=~hppa ~sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.5.4-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.2.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e8b96b6dc86e612b5a9d9b54e190768c
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.6.3 b/metadata/md5-cache/sys-devel/kgcc64-4.6.3
index da9073acd8a9..9e4eaf2bd494 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.6.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.6.3
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=hppa ~sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2 mirror://gentoo/gcc-4.6.3-patches-1.9.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.3-patches-1.9.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.3-patches-1.9.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.3-patches-1.9.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.3-patches-1.9.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=63670b0cc94d1a84ebb151d09ef90201
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.6.4 b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
index 481623fadcb1..a7e9d6e0b638 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.6.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=~hppa ~sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.6.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.0.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f78ace302f6be6eae0444b95961d9282
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.3 b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
index bd219af5c04c..04c081791e68 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=hppa sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.3/gcc-4.7.3.tar.bz2 mirror://gentoo/gcc-4.7.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.3-patches-1.3.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-patches-1.3.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e6fad764eadde5e581c3709a6101f40c
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.4 b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
index b3c2b7380dac..4d1457e9a0cb 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=~hppa ~sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.4-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.0.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fad7d12ac0b08f67fa8bdffc606aab80
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.1 b/metadata/md5-cache/sys-devel/kgcc64-4.8.1
index 5b2814c93341..7fce0406fcc0 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.1
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.1
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=~hppa ~sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.8
 SRC_URI=mirror://gnu/gcc/gcc-4.8.1/gcc-4.8.1.tar.bz2 mirror://gentoo/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.1-patches-1.2.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.1-patches-1.2.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7dabb5945bba9e391e216c9aa94c1f5e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.2 b/metadata/md5-cache/sys-devel/kgcc64-4.8.2
index 78b450b838a1..d46036875653 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.2
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=~hppa ~sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.8
 SRC_URI=mirror://gnu/gcc/gcc-4.8.2/gcc-4.8.2.tar.bz2 mirror://gentoo/gcc-4.8.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.2-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.2-patches-1.0.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e2e56f321ccf494a6a3b65863aafa9b9
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.3 b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
index 2685bae65366..09d820dfedbd 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=hppa ~sparc
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.8
 SRC_URI=mirror://gnu/gcc/gcc-4.8.3/gcc-4.8.3.tar.bz2 mirror://gentoo/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.8.3-patches-1.1.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-patches-1.1.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7d0a05fab4dcdf8b5abb908ce1497613
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.9.1 b/metadata/md5-cache/sys-devel/kgcc64-4.9.1
index a09dc33660e9..0e9bd773bccf 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.9.1
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.9.1
@@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://gcc.gnu.org/
 IUSE=multislot regression-test vanilla +nls +nptl
 KEYWORDS=~hppa
-LICENSE=GPL-2 LGPL-2.1
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-devel/gcc-config-1.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1
 RESTRICT=strip
 SLOT=4.9
 SRC_URI=mirror://gnu/gcc/gcc-4.9.1/gcc-4.9.1.tar.bz2 mirror://gentoo/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~rhill/dist/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.9.1-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.1-patches-1.0.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	89f4b2896b8297c49bfbb2a41630826b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain	a9e9bcd0a389dd5ec1778f114c3a6df0	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a3ec6fec8aba1eaaa53058c70138a8a
diff --git a/metadata/md5-cache/www-apache/mod_authn_sasl-1.2 b/metadata/md5-cache/www-apache/mod_authn_sasl-1.2
index 018173ddeba9..bbd25008ddaa 100644
--- a/metadata/md5-cache/www-apache/mod_authn_sasl-1.2
+++ b/metadata/md5-cache/www-apache/mod_authn_sasl-1.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst setup
 DEPEND=dev-libs/cyrus-sasl =www-servers/apache-2.2*
 DESCRIPTION=Cyrus SASL authentication module for Apache
 HOMEPAGE=http://mod-authn-sasl.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/cyrus-sasl =www-servers/apache-2.2*
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/project/mod-authn-sasl/mod-authn-sasl/1.2/mod_authn_sasl-1.2.tar.bz2
 _eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=179a038b63607bff03f89eff34aa9528
+_md5_=44515d027b87b62cf4b9a3c7eeb3260e
diff --git a/metadata/md5-cache/www-apps/wordpress-4.0 b/metadata/md5-cache/www-apps/wordpress-4.0
index ab52ca2879fd..3d33bd32edfb 100644
--- a/metadata/md5-cache/www-apps/wordpress-4.0
+++ b/metadata/md5-cache/www-apps/wordpress-4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Wordpress php and mysql based content management system (CMS)
 EAPI=5
 HOMEPAGE=http://wordpress.org/
 IUSE=vhosts
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) >=app-admin/webapp-config-1.50.15
 SLOT=4.0
 SRC_URI=http://wordpress.org/wordpress-4.0.tar.gz
 _eclasses_=webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=6a550113f474ff1bdab37d9a3fd979ac
+_md5_=296d3dbc4a67fe9f939059388dfc0318
diff --git a/metadata/md5-cache/www-client/chromium-39.0.2171.19 b/metadata/md5-cache/www-client/chromium-39.0.2171.36
similarity index 98%
rename from metadata/md5-cache/www-client/chromium-39.0.2171.19
rename to metadata/md5-cache/www-client/chromium-39.0.2171.36
index be55f1956f9f..96fa543380ca 100644
--- a/metadata/md5-cache/www-client/chromium-39.0.2171.19
+++ b/metadata/md5-cache/www-client/chromium-39.0.2171.36
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( dev-libs/libgcrypt:0= >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/protobuf-2.5.0-r1:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm 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/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-39.0.2171.19-lite.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-39.0.2171.36-lite.tar.xz
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	32548a82e42dc26e3312581476d2f20c	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	portability	a45c088f246ef5091e029f6285d7ce42	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=92d75893b0abba25be52f13ca3136a7d
+_md5_=df50178a6c1c323fe3f5d1afa5f8696b
diff --git a/metadata/md5-cache/www-client/lynx-2.8.8_p2 b/metadata/md5-cache/www-client/lynx-2.8.8_p2
index e5c5628c75f7..83b7b2a89dab 100644
--- a/metadata/md5-cache/www-client/lynx-2.8.8_p2
+++ b/metadata/md5-cache/www-client/lynx-2.8.8_p2
@@ -4,10 +4,10 @@ DESCRIPTION=An excellent console-based web browser with ssl support
 EAPI=5
 HOMEPAGE=http://lynx.isc.org/
 IUSE=bzip2 cjk gnutls idn ipv6 nls ssl unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-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 ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8 ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-2.6.4 ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn )
 SLOT=0
 SRC_URI=http://lynx.isc.org/current/lynx2.8.8rel.2.tar.bz2
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3db47bd1db9317c1bae76a85475fa53f
+_md5_=8c350919fad1b78a97ab301e5da10b2a
diff --git a/metadata/md5-cache/www-misc/fcgiwrap-1.1.0-r1 b/metadata/md5-cache/www-misc/fcgiwrap-1.1.0-r1
index 2e654cc4be32..7f62bca9561e 100644
--- a/metadata/md5-cache/www-misc/fcgiwrap-1.1.0-r1
+++ b/metadata/md5-cache/www-misc/fcgiwrap-1.1.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple FastCGI wrapper for CGI scripts (CGI support for nginx)
 EAPI=5
 HOMEPAGE=http://nginx.localdomain.pl/wiki/FcgiWrap
 IUSE=systemd
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=dev-libs/fcgi
 SLOT=0
 SRC_URI=https://github.com/gnosek/fcgiwrap/archive/1.1.0.tar.gz -> fcgiwrap-1.1.0.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=9487fc18830dc7ee2f849ffb3be3b00b
+_md5_=113654c42931660c873f7ffdca991a54
diff --git a/metadata/md5-cache/x11-libs/libva-1.0.15 b/metadata/md5-cache/x11-libs/libva-1.0.15
deleted file mode 100644
index 3c736cb91d11..000000000000
--- a/metadata/md5-cache/x11-libs/libva-1.0.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Video Acceleration (VA) API for Linux
-EAPI=3
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=opengl vdpau video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( x11-libs/libva-intel-driver )
-RDEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl )
-SLOT=0
-SRC_URI=http://cgit.freedesktop.org/vaapi/libva/snapshot/libva-1.0.15.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=fbd929fab7637f8f2783e6f7eeaff0c1
diff --git a/metadata/md5-cache/x11-libs/libva-1.0.16 b/metadata/md5-cache/x11-libs/libva-1.0.16
deleted file mode 100644
index 4a2d1ee740c6..000000000000
--- a/metadata/md5-cache/x11-libs/libva-1.0.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Video Acceleration (VA) API for Linux
-EAPI=3
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=opengl vdpau video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-RDEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl )
-SLOT=0
-SRC_URI=http://cgit.freedesktop.org/vaapi/libva/snapshot/libva-1.0.16.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=96db61624a2b915aa16fa1e9fa9675a5
diff --git a/metadata/md5-cache/x11-libs/libva-1.1.0 b/metadata/md5-cache/x11-libs/libva-1.1.0
deleted file mode 100644
index 052ac71f2ad2..000000000000
--- a/metadata/md5-cache/x11-libs/libva-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-0.95.0 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Video Acceleration (VA) API for Linux
-EAPI=4
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-RDEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-0.95.0 )
-REQUIRED_USE=opengl? ( X )
-SLOT=0
-SRC_URI=http://cgit.freedesktop.org/vaapi/libva/snapshot/libva-1.1.0.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=85892429ba68c57a80190b1a0aef57b4
diff --git a/metadata/md5-cache/x11-libs/libva-1.1.1 b/metadata/md5-cache/x11-libs/libva-1.1.1
deleted file mode 100644
index f8d09e3302e5..000000000000
--- a/metadata/md5-cache/x11-libs/libva-1.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Video Acceleration (VA) API for Linux
-EAPI=4
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-RDEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 )
-REQUIRED_USE=opengl? ( X )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.1.1.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=ba73f4f757228029a5c9519f98226e7e
diff --git a/metadata/md5-cache/x11-libs/libva-1.1.1-r1 b/metadata/md5-cache/x11-libs/libva-1.1.1-r1
deleted file mode 100644
index b632f2b67efe..000000000000
--- a/metadata/md5-cache/x11-libs/libva-1.1.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,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.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/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/libXfixes-5.0.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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.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(-)?] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Video Acceleration (VA) API for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx abi_x86_32 abi_x86_64 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=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.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(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.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(-)?] ) video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.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(-)?] ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.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(-)?] )
-RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,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.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/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/libXfixes-5.0.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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.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=opengl? ( X )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.1.1.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=56dc14936366a5b87a1cb3a5496a34e3
diff --git a/metadata/md5-cache/x11-libs/libva-1.2.0 b/metadata/md5-cache/x11-libs/libva-1.2.0
deleted file mode 100644
index 68abde13e1ff..000000000000
--- a/metadata/md5-cache/x11-libs/libva-1.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Video Acceleration (VA) API for Linux
-EAPI=4
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-RDEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 )
-REQUIRED_USE=opengl? ( X )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.2.0.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=b5771c15c2f3457dfae88a32deab3d9b
diff --git a/metadata/md5-cache/x11-libs/libva-1.2.0-r1 b/metadata/md5-cache/x11-libs/libva-1.2.0-r1
deleted file mode 100644
index 20f902aeacb8..000000000000
--- a/metadata/md5-cache/x11-libs/libva-1.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,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.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/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/libXfixes-5.0.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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.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(-)?] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Video Acceleration (VA) API for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx abi_x86_32 abi_x86_64 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=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.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(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.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(-)?] ) video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.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(-)?] ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.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(-)?] )
-RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,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.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/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/libXfixes-5.0.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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.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=opengl? ( X )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.2.0.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=88eaa85a0755bce1e24f08f9df45cf37
diff --git a/metadata/md5-cache/x11-libs/libva-1.2.1 b/metadata/md5-cache/x11-libs/libva-1.2.1
deleted file mode 100644
index 1eff3e34a836..000000000000
--- a/metadata/md5-cache/x11-libs/libva-1.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Video Acceleration (VA) API for Linux
-EAPI=4
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-RDEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 )
-REQUIRED_USE=opengl? ( X )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.2.1.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=d89517fc88b5b06d41168cb84f1f3212
diff --git a/metadata/md5-cache/x11-libs/libva-1.2.1-r1 b/metadata/md5-cache/x11-libs/libva-1.2.1-r1
deleted file mode 100644
index e577a60f7bc0..000000000000
--- a/metadata/md5-cache/x11-libs/libva-1.2.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,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.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/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/libXfixes-5.0.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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.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(-)?] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Video Acceleration (VA) API for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx abi_x86_32 abi_x86_64 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=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.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(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.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(-)?] ) video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.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(-)?] ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.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(-)?] )
-RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,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.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/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/libXfixes-5.0.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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.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=opengl? ( X )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.2.1.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=f8771021bc3a822504edab6db0b530e4
diff --git a/metadata/md5-cache/x11-libs/libva-1.3.0 b/metadata/md5-cache/x11-libs/libva-1.4.0
similarity index 98%
rename from metadata/md5-cache/x11-libs/libva-1.3.0
rename to metadata/md5-cache/x11-libs/libva-1.4.0
index 181b1285049a..a64d076c2b27 100644
--- a/metadata/md5-cache/x11-libs/libva-1.3.0
+++ b/metadata/md5-cache/x11-libs/libva-1.4.0
@@ -10,6 +10,6 @@ PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(
 RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,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.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/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/libXfixes-5.0.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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.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=opengl? ( X )
 SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.3.0.tar.bz2
+SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.4.0.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=6e308670bc68014123dd68e769ff1ec9
+_md5_=b03dc6533fe6018af41dc9fea52f1d0c
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.17 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.17
deleted file mode 100644
index 1cda9b449b9a..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/libva-1.0.14 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=HW video decode support for Intel integrated graphics
-EAPI=3
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.0.14 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel]
-SLOT=0
-SRC_URI=http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-1.0.17.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=cc73f4ceabdf88ed66b6ed6649bd864a
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.19 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.19
deleted file mode 100644
index 4ae85d93e515..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.19
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=HW video decode support for Intel integrated graphics
-EAPI=3
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=wayland X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.0.19.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=e54ec4267a4a9e177b6f9ca51f512b34
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20
deleted file mode 100644
index 97e083573799..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libva-1.1.0[X?,wayland?,drm?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=HW video decode support for Intel integrated graphics
-EAPI=3
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm wayland X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.1.0[X?,wayland?,drm?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.0.20.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=f8f659766cd40f71b98a68e37e584c59
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20-r1 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20-r1
deleted file mode 100644
index e69b9f49c3c7..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-1.2.1-r1[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,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/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,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-1.0.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(-)?] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=HW video decode support for Intel integrated graphics
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm wayland 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
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.2.1-r1[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,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/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,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-1.0.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(-)?] )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.0.20.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=cdc4a0cc62b2fb80405a067f1eaf083f
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.2.0 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.2.0
deleted file mode 100644
index 7cf2911a765f..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libva-1.2.0[X?,wayland?,drm?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.45[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=HW video decode support for Intel integrated graphics
-EAPI=3
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm wayland X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.2.0[X?,wayland?,drm?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.45[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.2.0.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=0e50400972784823a59f2b9b85f09e68
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.2.1 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.2.1
deleted file mode 100644
index 61e932ef999a..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libva-1.2.0[X?,wayland?,drm?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.45[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=HW video decode support for Intel integrated graphics
-EAPI=3
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm wayland X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.2.0[X?,wayland?,drm?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.45[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.2.1.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=586ed5feaf5594c83c645b7dabc38dc8
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.2.2 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.2.2
deleted file mode 100644
index 5411f242ca21..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/libva-1.2.0[X?,wayland?,drm?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.45[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=HW video decode support for Intel integrated graphics
-EAPI=3
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm wayland X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.2.0[X?,wayland?,drm?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.45[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.2.2.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=d33ad79e997d0f2049d6d7f1b88cdf10
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.2.2-r1 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.2.2-r1
deleted file mode 100644
index b3a6a1264016..000000000000
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.2.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-1.2.1-r1[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,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/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,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-1.0.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(-)?] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=HW video decode support for Intel integrated graphics
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm wayland 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
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.2.1-r1[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,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/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,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-1.0.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(-)?] )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.2.2.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=d86cb8152daed520c978ab22c071cf9c
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.4.0 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.4.0
new file mode 100644
index 000000000000..a19438b8bfd3
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-1.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=x11-libs/libva-1.4[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,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/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,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-1.0.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(-)?] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DESCRIPTION=HW video decode support for Intel integrated graphics
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
+IUSE=+drm wayland 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
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=x11-libs/libva-1.4[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,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/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,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-1.0.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(-)?] )
+SLOT=0
+SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.4.0.tar.bz2
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=f31d337e71e8710ce02cf3ce0e2faf11
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-9999 b/metadata/md5-cache/x11-libs/libva-intel-driver-9999
index eec749b55175..a402c7218d03 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-9999
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=x11-libs/libva-1.3.0[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,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/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,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-1.0.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(-)?] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool dev-vcs/git
+DEPEND=>=x11-libs/libva-1.4[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,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/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,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-1.0.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(-)?] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool dev-vcs/git
 DESCRIPTION=HW video decode support for Intel integrated graphics
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi
 IUSE=+drm wayland 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
 LICENSE=MIT
-RDEPEND=>=x11-libs/libva-1.3.0[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,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/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,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-1.0.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(-)?] )
+RDEPEND=>=x11-libs/libva-1.4[X?,wayland?,drm?,abi_x86_32(-)?,abi_x86_64(-)?,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/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=media-libs/mesa-9.1.6[egl,abi_x86_32(-)?,abi_x86_64(-)?,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-1.0.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(-)?] )
 SLOT=0
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=9d311ec08482eb2f7b30d2d6a0411881
+_md5_=ef8178e3315cace8a42858d2fc7e5a93
diff --git a/metadata/md5-cache/x11-libs/startup-notification-0.10 b/metadata/md5-cache/x11-libs/startup-notification-0.10
deleted file mode 100644
index 7ee4ef118156..000000000000
--- a/metadata/md5-cache/x11-libs/startup-notification-0.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libxcb <x11-libs/xcb-util-0.3.8 >=x11-libs/xcb-util-0.3 virtual/pkgconfig x11-proto/xproto x11-libs/libXt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Application startup notification and feedback library
-EAPI=4
-HOMEPAGE=http://www.freedesktop.org/software/startup-notification
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2 MIT
-RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libxcb <x11-libs/xcb-util-0.3.8 >=x11-libs/xcb-util-0.3
-SLOT=0
-SRC_URI=http://freedesktop.org/software/startup-notification/releases/startup-notification-0.10.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=e6c07df39d0c54443f9e938a8af95787
diff --git a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.1-r1 b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.1-r1
index 0065f66aef47..49e3601a8891 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.1-r1
+++ b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/xcb-util-0.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-proto/xcb-proto-1.8-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(-)?] >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,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-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,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/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libxcb-1.9.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/xcb-util-image-0.3.9-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/xcb-util-renderutil-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,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/xcb-proto-1.8-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(-)?] >=x11-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,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/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=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 static-libs doc
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
-RDEPEND=>=x11-libs/xcb-util-0.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-proto/xcb-proto-1.8-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(-)?] >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,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-xlibs[-abi_x86_32(-)] )
+RDEPEND=>=x11-libs/libxcb-1.9.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/xcb-util-image-0.3.9-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/xcb-util-renderutil-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,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/xcb-proto-1.8-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(-)?] >=x11-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-cursor-0.1.1.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=679672e62f079797130eaa5ee901f823
+_md5_=1d4b17ad64af437fd27e842d3193805c
diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0 b/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0
index 9040f79a2b00..3f0d98ba743b 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0
+++ b/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/xcb-util-0.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-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11:=[abi_x86_32(-)?,abi_x86_64(-)?,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/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libxcb-1.9.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/xcb-util-0.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-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,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/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=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 static-libs doc
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
-RDEPEND=>=x11-libs/xcb-util-0.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-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-xlibs[-abi_x86_32(-)] )
+RDEPEND=>=x11-libs/libxcb-1.9.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/xcb-util-0.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-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-image-0.4.0.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=77c5752e3ae5d155a13e87d98bb59f5e
+_md5_=2237ad47eee86ee49069480d4190b683
diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0
index b88889f93711..9cbc653e6d29 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0
+++ b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/xcb-util-0.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-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11:=[abi_x86_32(-)?,abi_x86_64(-)?,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/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,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/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,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/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=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 static-libs doc
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
-RDEPEND=>=x11-libs/xcb-util-0.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-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-xlibs[-abi_x86_32(-)] )
+RDEPEND=x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,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/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-keysyms-0.4.0.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=3ac5206a0fa7c648b18799562bc105ed
+_md5_=9b029e9b7422282b04b1fc2cb15937cd
diff --git a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1 b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1
index 0d56394760f0..d1192c595aec 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1
+++ b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/xcb-util-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,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/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,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-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,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/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libxcb-1.9.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-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,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/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=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 static-libs doc
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
-RDEPEND=>=x11-libs/xcb-util-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,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/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,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-xlibs[-abi_x86_32(-)] )
+RDEPEND=>=x11-libs/libxcb-1.9.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-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-renderutil-0.3.9.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=679831d8024ecbb07e979d6cdf0877d0
+_md5_=24445f40147bf8de0e7a8da3c678fb85
diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r1 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r1
index a023b8c658dd..15a81050c3a7 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r1
+++ b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/xcb-util-0.3.9-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/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,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-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,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/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEPEND=>=x11-libs/libxcb-1.9.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-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,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/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
 DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=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 static-libs doc
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
-RDEPEND=>=x11-libs/xcb-util-0.3.9-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/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,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-xlibs[-abi_x86_32(-)] )
+RDEPEND=>=x11-libs/libxcb-1.9.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-proto/xproto-7.0.24:=[abi_x86_32(-)?,abi_x86_64(-)?,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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-wm-0.4.1.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=e3bc04827e93c293e101e48cb79beff4
+_md5_=d899d2d07eb7f78a156b6d4325b3da56
diff --git a/metadata/md5-cache/x11-wm/pekwm-0.1.15 b/metadata/md5-cache/x11-wm/pekwm-0.1.15
deleted file mode 100644
index 2e40e3c8518d..000000000000
--- a/metadata/md5-cache/x11-wm/pekwm-0.1.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/jpeg media-libs/libpng x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig
-DESCRIPTION=A small window mananger based on aewm++
-EAPI=4
-HOMEPAGE=http://pekwm.org/
-IUSE=debug truetype xinerama
-KEYWORDS=amd64 ~mips ppc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=virtual/jpeg media-libs/libpng x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=http://pekwm.org/projects/pekwm/files/pekwm-0.1.15.tar.bz2 mirror://gentoo/pekwm-themes.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=2b54de2d96c4973023f82cd044f5ac3d
diff --git a/metadata/md5-cache/x11-wm/pekwm-0.1.16 b/metadata/md5-cache/x11-wm/pekwm-0.1.16
deleted file mode 100644
index 11d6b2378f6d..000000000000
--- a/metadata/md5-cache/x11-wm/pekwm-0.1.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/jpeg media-libs/libpng x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig
-DESCRIPTION=A small window mananger based on aewm++
-EAPI=5
-HOMEPAGE=http://pekwm.org/
-IUSE=debug truetype xinerama
-KEYWORDS=~amd64 ~mips ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=virtual/jpeg media-libs/libpng x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=http://pekwm.org/projects/pekwm/files/pekwm-0.1.16.tar.bz2 mirror://gentoo/pekwm-themes.tar.bz2
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=31064175b547a3b7ce69225dd41ed64e
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d1ecc6550b6d..340b9e44c221 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Oct 2014 19:37:08 +0000
+Fri, 24 Oct 2014 11:37:04 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 1350090eb829..ab530dfb4d23 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Oct 23 19:37:05 UTC 2014
+Fri Oct 24 11:37:01 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 84024a0d2bce..5bf2d58f437a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Oct 2014 20:00:01 +0000
+Fri, 24 Oct 2014 12:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f5194dac019c..0a2de473f36f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1414092901 Thu 23 Oct 2014 07:35:01 PM UTC UTC
+1414150501 Fri 24 Oct 2014 11:35:01 AM UTC UTC
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index 200e4cd89136..e13dc818e6db 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -1,2 +1,3 @@
 DIST pnp4nagios-0.6.19.tar.gz 3024558 SHA256 fe7a05c52fbcf4b62bd87dcb954995879e990d373118fff0e32bd99f8bd81dd4 SHA512 b3bf004905d4c317f071ea2ab662b859a0f2527137152da4b5473a72b721eadf7760a32c2c5a5e9f10cf8c9a705546f075617b0b30757718fd6050cc20519b3d WHIRLPOOL 0c9ad65dd84a15a83aff0aff359c856e2aca6ea5dddd62ad22e17a3c15746726462841f90f95844afdcc42d097c6760d72131eab66636295564261e187721647
 DIST pnp4nagios-0.6.21.tar.gz 2917588 SHA256 bb5d36a7cc49dcbcfcb424d437dc3739baa647816cffc610fb621216c4f5992a SHA512 8ab85e177342952f0fc15ddc9b14217e1e469ecf8e8316cec0d2cc09206b11dd2b211ccdfc10bc5e071fb3e7f8e1960d1d8bd920d7abe2ce195346384aac3337 WHIRLPOOL f588c1235b81c73c7082cfaef007e5cd51442efadf9c561f4f7361765b15cc8a4b4ef1a191e1b11d346238fbfe93249dd9d0720ee2cd327da7b8395a96ce2938
+DIST pnp4nagios-0.6.24.tar.gz 2919182 SHA256 87412ef01257c6096aa5c84fdb47db950b851c596e1306180be8ba45401793cf SHA512 7e8c32e0ac69ab747a57e8ab6cc59fddfb63e16598fda9c1e6270d6309ff0885cd1bd0876d05aa1d30bffa76b281d41dc8fbe59e430778bf4d3bdddc4a7bee9f WHIRLPOOL 4f48b406a7d82a4370701ede2625ed2c247bb933a9197d3417c4eb18f18b879465aeb4775e9a0f0300ac1140159df6c6130466b5434c0b33bccb7fff04de86f8
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild
new file mode 100644
index 000000000000..1a23a2b548da
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild,v 1.1 2014/10/24 06:38:28 jlec Exp $
+
+EAPI=5
+
+inherit depend.apache eutils
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org"
+SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	dev-lang/php[json,simplexml,zlib,xml,filter]
+	>=dev-lang/php-5.3
+	>=net-analyzer/rrdtool-1.2[graph,perl]
+	|| ( net-analyzer/nagios-core net-analyzer/icinga net-analyzer/icinga2 )"
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	media-fonts/dejavu
+	apache2? ( www-servers/apache[apache2_modules_rewrite] )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.6.14-makefile.patch
+}
+
+src_configure() {
+	local var_dir=
+	local user_group=
+
+	if has_version net-analyzer/nagios-core; then
+		var_dir=/var/nagios/
+		user_group=nagios
+	else
+		var_dir=/var/lib/icinga/
+		user_group=icinga
+	fi
+
+	econf \
+		--sysconfdir=/etc/pnp \
+		--datarootdir=/usr/share/pnp \
+		--mandir=/usr/share/man \
+		--with-perfdata-dir=${var_dir}/perfdata \
+		--with-nagios-user=${user_group} \
+		--with-nagios-group=${user_group} \
+		--with-perfdata-logfile=${var_dir}/perfdata.log \
+		--with-perfdata-spool-dir=/var/spool/pnp
+}
+
+src_compile() {
+	# The default target just shows a help
+	emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-config
+	newinitd "${FILESDIR}"/npcd.initd npcd
+	rm "${D}"/usr/share/pnp/install.php || die
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}"/98_pnp4nagios.conf
+	fi
+
+	# Bug 430358 - CVE-2012-3457
+	find "${D}/etc/pnp" -type f -exec chmod 0640 {} \; || die
+	find "${D}/etc/pnp" -type d -exec chmod 0750 {} \; || die
+}
+
+pkg_postinst() {
+	elog "Please make sure to enable URL rewriting in Apache or any other"
+	elog "webserver you're using, to get pnp4nagios running!"
+}
diff --git a/net-dns/libidn/libidn-1.29.ebuild b/net-dns/libidn/libidn-1.29.ebuild
index 4b4a0a5ecc9d..7f31575e7379 100644
--- a/net-dns/libidn/libidn-1.29.ebuild
+++ b/net-dns/libidn/libidn-1.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.29.ebuild,v 1.5 2014/10/23 11:24:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.29.ebuild,v 1.6 2014/10/23 19:31:40 maekke Exp $
 
 EAPI=5
 inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-libs/libndp/libndp-1.4.ebuild b/net-libs/libndp/libndp-1.4.ebuild
index b03335cb7f08..35748cf18693 100644
--- a/net-libs/libndp/libndp-1.4.ebuild
+++ b/net-libs/libndp/libndp-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libndp/libndp-1.4.ebuild,v 1.2 2014/09/23 11:52:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libndp/libndp-1.4.ebuild,v 1.3 2014/10/23 19:33:29 maekke Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/net-libs/libvncserver/libvncserver-0.9.9-r3.ebuild b/net-libs/libvncserver/libvncserver-0.9.9-r3.ebuild
index 0fd63abce5a6..154bfb32602d 100644
--- a/net-libs/libvncserver/libvncserver-0.9.9-r3.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.9-r3.ebuild,v 1.3 2014/10/23 14:25:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.9-r3.ebuild,v 1.4 2014/10/24 06:50:18 jer Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://libvncserver.sourceforge.net/LibVNCServer-${PV/_}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="+24bpp gcrypt gnutls ipv6 +jpeg +png ssl static-libs test threads +zlib"
 
 REQUIRED_USE="png? ( zlib )"
diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild b/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild
index 8d12f5dd4675..a0d48eaeecc2 100644
--- a/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild,v 1.8 2013/12/22 13:21:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild,v 1.9 2014/10/23 19:56:28 vapier Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="tk"
 inherit python-single-r1 user systemd toolchain-funcs autotools eutils
 
 DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://fetchmail.berlios.de"
+HOMEPAGE="http://www.fetchmail.info/"
 SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 public-domain"
diff --git a/net-misc/networkmanager/networkmanager-0.9.10.0-r1.ebuild b/net-misc/networkmanager/networkmanager-0.9.10.0-r1.ebuild
index f075b4baff9a..1a8ab67139be 100644
--- a/net-misc/networkmanager/networkmanager-0.9.10.0-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.10.0-r1.ebuild,v 1.3 2014/10/21 09:12:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.10.0-r1.ebuild,v 1.4 2014/10/23 19:37:59 maekke Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -21,7 +21,7 @@ IUSE="avahi connection-sharing consolekit +dhclient dhcpcd gnutls +introspection
 kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
 vala +wext +wifi" # wimax
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 REQUIRED_USE="
 	modemmanager? ( ppp )
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 4e587ce2d285..2fd859fe55bb 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
 DIST youtube-dl-2014.07.15.tar.gz 881673 SHA256 2274535bb4822af0c6a384d352b85d7c724fe9bd371d9bdd428bba4b1493bd02 SHA512 f1ec3b368559ed79c8b03621f6a27344069af9d4bb62023de5a30dfa571f863d0fc50cd874db63d9867e1c1b04a79a7e127cc13081c73705dcdc17b624fd986b WHIRLPOOL e1954e4a3217ad3a248eb7996169fec5e545fa56d60db7359a159df7a2c4da521a2e27f0eedf08ba90db1379f1248cb5be09f4daffaf58fb82ef143980cfaa3e
-DIST youtube-dl-2014.10.15.tar.gz 1097131 SHA256 f17e0a0ebae95120906c0c866caabb76ba5bf2abc8ae5cb939f8d584b1a511a8 SHA512 1bbe14d370738f0588b79e0478148fde22db8c86a46c10714f6abe3767a2189ad9e9b0dfe73fb8978e063b107bc4d9c597ca3262407a60b712162087209c7a56 WHIRLPOOL c7d22f2642c31bc5a1d42b98fbd78b60b7d45b9c1ce6f1206a710f9a723b74ff66b982fa803aa1b6d6e1f32c1f00900cdf1fe6768a10054e69489f61432e224b
 DIST youtube-dl-2014.10.18.tar.gz 1100264 SHA256 ef9c85ed1a0a375ce6d0367aff9163b409758b399cc9c6cb2042270ddbe5c0ad SHA512 40f8432033d7cb61795f66bbea15d2a06765b493bdd6366f623189038b0a17d45267314b1439614f6e28b829f9bd14920e01f09a2f8e0b08ca2af82780d69c22 WHIRLPOOL e349cfc86e9b638225142c54338b3bbc54b3cda05d0e75edcf7c8d464c9d63b9c0dceed0e33d3d242ac029afec199ce037e12df3713a912a3b9a8bee54bffd5d
+DIST youtube-dl-2014.10.23.tar.gz 1102295 SHA256 9f76c53be4744c9b73c3f148553617953db6539a9c57b2bdd33ae3232717508d SHA512 f20b98bcd8edf94a854c570fc0c7c6a52ed311dd6b244f55dfb8fac09dff8bcd30c06d763694834fb61f5a4d13ff1835ac514b14aa4a26a6edb0c735094e17c3 WHIRLPOOL 19a18d82d346de3d05186c0f3082ff86f619bc8d89aeda2a6bdf27f39e1739f52985f1a3c269a090324209d6c8f7a979e6c4b2666340f5feb735f3a0691eeb28
diff --git a/net-misc/youtube-dl/youtube-dl-2014.10.15.ebuild b/net-misc/youtube-dl/youtube-dl-2014.10.23.ebuild
similarity index 88%
rename from net-misc/youtube-dl/youtube-dl-2014.10.15.ebuild
rename to net-misc/youtube-dl/youtube-dl-2014.10.23.ebuild
index f6488f5d20a6..978bbb9c58b6 100644
--- a/net-misc/youtube-dl/youtube-dl-2014.10.15.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2014.10.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.10.15.ebuild,v 1.1 2014/10/15 12:28:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.10.23.ebuild,v 1.1 2014/10/23 20:27:46 jer Exp $
 
 EAPI=5
 
@@ -31,8 +31,8 @@ src_prepare() {
 		local xxx=(
 			anysex behindkink drtuber eporner extremetube fourtube goshgay
 			hentaistigma hornbunny mofosex pornhd pornhub pornotube pornoxo
-			redtube sunporno slutload spankwire thisav trutube tube8 vporn xbef
-			xhamster xnxx xtube xvideos youjizz youporn
+			redtube sexykarma sunporno slutload spankwire thisav trutube tube8
+			vporn xbef xhamster xnxx xtube xvideos youjizz youporn
 		)
 		sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
 		rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
diff --git a/net-print/ink/Manifest b/net-print/ink/Manifest
index df10765fdc24..8100d15d93c6 100644
--- a/net-print/ink/Manifest
+++ b/net-print/ink/Manifest
@@ -1 +1 @@
-DIST ink-0.5.1.tar.gz 105174 SHA256 d1985d40baae5cb8bf2c7ea554d24530b1cd95cd93cd143134f19ca7e1e90298
+DIST ink-0.5.1.tar.gz 105174 SHA256 d1985d40baae5cb8bf2c7ea554d24530b1cd95cd93cd143134f19ca7e1e90298 SHA512 12a21279ca4f390c5748b8ab1c62770c82decec1f9bfa3e6c13d7a269a7cb28fb96f92506c532f52fb4e3f1b72012e2c2a08e654a91edb1c73d1f7b778dc5848 WHIRLPOOL 9a5d4ad75ef0ad4fd6879aa1104d55cfdbe333d7411c9265fbf3dccd2cff5ebd4fde5f588f4e1e68abdb4eb9f62695b26e5a91b3ef532c7b441e27734bf86c40
diff --git a/net-print/ink/ink-0.5.1.ebuild b/net-print/ink/ink-0.5.1.ebuild
index 26b8340d1cdf..c932f5360f52 100644
--- a/net-print/ink/ink-0.5.1.ebuild
+++ b/net-print/ink/ink-0.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/ink/ink-0.5.1.ebuild,v 1.3 2012/02/24 14:15:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/ink/ink-0.5.1.ebuild,v 1.4 2014/10/23 23:04:24 tamiko Exp $
 
-EAPI="4"
+EAPI="5"
 
 DESCRIPTION="A command line utility to display the ink level of your printer"
 SRC_URI="mirror://sourceforge/ink/${P/_}.tar.gz"
@@ -15,3 +15,8 @@ IUSE=""
 
 DEPEND=">net-print/libinklevel-0.8"
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	# always use /bin/bash as configure shell, bug #526548
+	CONFIG_SHELL=/bin/bash default
+}
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index e5cd344e9229..4c04878e7702 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.220 2014/10/18 18:15:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.221 2014/10/23 19:38:40 maekke Exp $
+
+# Markus Meier <maekke@gentoo.org> (23 Oct 2014)
+# Unkeyworded deps, bug #523468
+net-misc/networkmanager teamd
 
 # Markus Meier <maekke@gentoo.org> (24 Sep 2014)
 # Unkeyworded deps, bug #519618
diff --git a/sci-biology/seqan/seqan-1.4.2.ebuild b/sci-biology/seqan/seqan-1.4.2.ebuild
index f1e36479061b..836b16dd9512 100644
--- a/sci-biology/seqan/seqan-1.4.2.ebuild
+++ b/sci-biology/seqan/seqan-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/seqan/seqan-1.4.2.ebuild,v 1.1 2014/10/17 13:51:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seqan/seqan-1.4.2.ebuild,v 1.2 2014/10/24 06:44:20 jlec Exp $
 
 EAPI=5
 
@@ -52,4 +52,10 @@ src_install() {
 	mkdir -p "${BUILD_DIR}"/docs/html || die
 	cmake-utils_src_install
 	chmod 755 "${ED}"/usr/bin/*sh || die
+
+	mv "${ED}"/usr/bin/{,seqan-}join || die
+}
+
+pkg_postinst() {
+	elog "Due to filecollision the 'join' binary has been renamed to seqan-join"
 }
diff --git a/sci-chemistry/pdb2pqr/Manifest b/sci-chemistry/pdb2pqr/Manifest
index 3034bd7a58b2..fef63c16e2c7 100644
--- a/sci-chemistry/pdb2pqr/Manifest
+++ b/sci-chemistry/pdb2pqr/Manifest
@@ -1,2 +1,3 @@
 DIST pdb2pqr-1.5.tar.gz 5747178 SHA256 2a83433b50a57aa0a05102c425cd7b4bb6750487327195ab719992f4186281c5
-DIST pdb2pqr-1.7.tar.gz 6906538 SHA256 8d27f2df430c40b99cde7952d0e96e72e433871a289d39c970b5eefe34345757
+DIST pdb2pqr-1.7.tar.gz 6906538 SHA256 8d27f2df430c40b99cde7952d0e96e72e433871a289d39c970b5eefe34345757 SHA512 64938ad08f2e86e0e1a121a2401aa599ffeecd313e5e69dd832e6b5afd698995aba3e96aec5e7c27c433d1429cbaa41d4bae1200e380fd2b954c08fbcd6a1484 WHIRLPOOL 5e937daa3a18c08988bc58167227c8143e7176ccb98cc041f7ec0138a0f991c94e38500bba5f196f4c1486085cb782017cdaa344ac5e8503a18087697ff2269d
+DIST pdb2pqr-1.8.tar.gz 6781507 SHA256 78470c21e5dc7afa12d782559b11d2cb04b755d93086bb80a43bd09fa0c3521f SHA512 3f640979d21511c4b08ab20c49f4662d959dddf67d9fedfb5e528d0869d897cd5770e77059b78a16c9778760593f410caf39eaaae2b664113af6875052873316 WHIRLPOOL bd582efba5544ec6450cf94e06f9449ba9d6a2861d64d0f88616302e3f93bf16332f210eecb01e268e2b1022bf6c5cbce3667b006b8e9345c9d18cebca373e74
diff --git a/sci-chemistry/pdb2pqr/files/pdb2pqr-1.8.0-automagic.patch b/sci-chemistry/pdb2pqr/files/pdb2pqr-1.8.0-automagic.patch
new file mode 100644
index 000000000000..c218fe6a816e
--- /dev/null
+++ b/sci-chemistry/pdb2pqr/files/pdb2pqr-1.8.0-automagic.patch
@@ -0,0 +1,75 @@
+diff -Naur pdb2pqr-1.4.0/configure.ac pdb2pqr-1.4.0.new/configure.ac
+--- pdb2pqr-1.4.0/configure.ac	2009-04-02 10:53:56.000000000 -0400
++++ pdb2pqr-1.4.0.new/configure.ac	2009-09-24 19:36:47.000000000 -0400
+@@ -255,38 +255,6 @@
+ 
+   # Test for Numeric install
+   AC_MSG_CHECKING([whether you defined Numeric or Numpy])
+-  if (test -n "${NUMERIC}") ; then
+-    AC_MSG_RESULT([yes])
+-    NUMERIC_INC=`find ${NUMERIC} -iname "arrayobject.h" | tail -n1`
+-    if test "$NUMERIC_INC" = ""; then
+-      AC_MSG_ERROR([Please check your NUMERIC path.  arrayobject.h cannot be found in ${NUMERIC}])
+-    fi
+-    NUMERIC_INC=`dirname ${NUMERIC_INC}`
+-    NUMERIC_LIB=`find ${NUMERIC} -iname "Numeric.pth" | tail -n1`
+-    if test "${NUMERIC_LIB}" = ""; then
+-      AC_MSG_ERROR([Please check your NUMERIC path.  Numeric.pth cannot be found in ${NUMERIC}])
+-    fi
+-    NUMERIC_NAME=`cat ${NUMERIC_LIB}`
+-    NUMERIC_LIB=`dirname ${NUMERIC_LIB}`
+-    NUMERIC_LIB=${NUMERIC_LIB}/${NUMERIC_NAME}
+-    if test "${PACKAGE_PATH}" = ""; then
+-      PACKAGE_PATH=${NUMERIC_LIB}
+-    else
+-      PACKAGE_PATH="${PACKAGE_PATH}:${NUMERIC_LIB}"
+-    fi
+-    PY_NUMERIC="-I${NUMERIC_INC} "
+-    PY_CFLAGS="$PY_CFLAGS $PY_NUMERIC"
+-  else
+-    AC_MSG_RESULT([no])	
+-    AC_MSG_CHECKING([for Numeric include files])
+-    if test -f $PY_PREFIX/include/python$PY_VERSION/Numeric/arrayobject.h; then
+-      PY_NUMERIC="-I$PY_PREFIX/include/python$PY_VERSION/Numeric"   
+-      AC_MSG_RESULT([$PY_NUMERIC])
+-      PY_CFLAGS="$PY_CFLAGS $PY_NUMERIC"
+-    else
+-      AC_MSG_RESULT([no])
+-    fi
+-  fi
+ 
+   # If failed, test for numpy
+   AC_MSG_CHECKING([whether you defined numpy])
+@@ -457,29 +425,14 @@
+   HAVE_PDB2PQR_OPAL=1
+ fi
+ 
+-if test "$PDB2PQR_OPAL_URL" != ""; then 
++if test "$PDB2PQR_OPAL_URL" != "no"; then 
+   HAVE_PDB2PQR_OPAL=1
+   if test -d $PY_PREFIX/lib/python$PY_VERSION/site-packages/ZSI ; then
+     echo ZSI is installed
+   else
+     #  need to install ZSI
+-    echo Installing ZSI.  This might take a while...
+-    cd contrib/ZSI-2.1-a1 
+-    if test `whoami` = "root"; then
+-      $py_path setup.py install
+-    else
+-      zsi_install="true"
+-      mkdir -p ${prefix}lib/python$PY_VERSION/site-packages
+-      export PYTHONPATH=${prefix}lib/python$PY_VERSION/site-packages
+-      $py_path setup.py install --prefix=${prefix}
+-      if test -d ${prefix}ZSI ; then
+-        echo ZSI is installed
+-      else
+-        cp -r ./build/lib/ZSI ${prefix}ZSI
+-      fi
+-      PYTHONPATH=""
+-    fi 
+-    cd ../..
++    echo Missing ZSI
++    exit 1
+   fi
+ fi  
+ 
diff --git a/sci-chemistry/pdb2pqr/files/pdb2pqr-1.8.0-ldflags.patch b/sci-chemistry/pdb2pqr/files/pdb2pqr-1.8.0-ldflags.patch
new file mode 100644
index 000000000000..5a7e04419ce6
--- /dev/null
+++ b/sci-chemistry/pdb2pqr/files/pdb2pqr-1.8.0-ldflags.patch
@@ -0,0 +1,30 @@
+ pdb2pka/Makefile.am           | 2 +-
+ pdb2pka/substruct/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pdb2pka/Makefile.am b/pdb2pka/Makefile.am
+index 75f6ffd..e40a2f6 100644
+--- a/pdb2pka/Makefile.am
++++ b/pdb2pka/Makefile.am
+@@ -16,7 +16,7 @@ SUBDIRS          = substruct
+ 
+ noinst_PROGRAMS         = _pMC_mult.so
+ _pMC_mult_so_SOURCES     = pMC_mult.cpp pMC_mult_wrap.cpp  
+-_pMC_mult_so_LINK        = $(CXX) -o $@ $(PY_SHARED)
++_pMC_mult_so_LINK        = $(CXX) $(LDFLAGS) -o $@ $(PY_SHARED)
+ _pMC_mult_so_LDADD       = $(PY_LDFLAGS)
+ 
+ #all:
+diff --git a/pdb2pka/substruct/Makefile.am b/pdb2pka/substruct/Makefile.am
+index b1638a0..ae95e94 100644
+--- a/pdb2pka/substruct/Makefile.am
++++ b/pdb2pka/substruct/Makefile.am
+@@ -15,7 +15,7 @@ CLEANFILES       = Algorithms.so
+ 
+ noinst_PROGRAMS          = Algorithms.so
+ Algorithms_so_SOURCES     = Algorithms.cpp  
+-Algorithms_so_LINK        = $(CXX) -o $@ $(PY_SHARED)
++Algorithms_so_LINK        = $(CXX) $(LDFLAGS) -o $@ $(PY_SHARED)
+ Algorithms_so_LDADD       = $(PY_LDFLAGS)
+ 
+ distclean-local: clean-local
diff --git a/sci-chemistry/pdb2pqr/metadata.xml b/sci-chemistry/pdb2pqr/metadata.xml
index 678d75f1cf5a..efc939161a8f 100644
--- a/sci-chemistry/pdb2pqr/metadata.xml
+++ b/sci-chemistry/pdb2pqr/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-chemistry</herd>
-	<use>
-		<flag name="opal">Add web interface via opal</flag>
-		<flag name="pdb2pka">Install experimental pdb2pka interface</flag>
-	</use>
+  <herd>sci-chemistry</herd>
+  <use>
+    <flag name="opal">Add web interface via opal</flag>
+    <flag name="pdb2pka">Install experimental pdb2pka interface</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.8.0.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.8.0.ebuild
new file mode 100644
index 000000000000..98d4a1e69b30
--- /dev/null
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.8.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.8.0.ebuild,v 1.2 2014/10/24 11:04:35 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils fortran-2 flag-o-matic python-r1 toolchain-funcs versionator
+
+MY_PV=$(get_version_component_range 1-2)
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An automated pipeline for performing Poisson-Boltzmann electrostatics calculations"
+LICENSE="BSD"
+HOMEPAGE="http://www.poissonboltzmann.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+IUSE="doc examples opal +pdb2pka"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/numpy
+	sci-chemistry/openbabel
+	opal? ( dev-python/zsi )
+	pdb2pka? ( sci-chemistry/apbs[python,-mpi] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if [[ -z ${MAXATOMS} ]]; then
+		einfo "If you like to have support for more then 10000 atoms,"
+		einfo "export MAXATOMS=\"your value\""
+	else
+		einfo "Allow usage of ${MAXATOMS} during calculations"
+	fi
+	fortran-2_pkg_setup
+	python_export_best
+}
+
+src_prepare() {
+	rm -rf contrib/* || die
+	epatch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${PN}-1.4.0-automagic.patch \
+		"${FILESDIR}"/1.7.0-install.patch
+	sed \
+		-e '50,200s:CWD:DESTDIR:g' \
+		-i Makefile.am || die
+
+	eautoreconf
+
+	tc-export CC
+}
+
+src_configure() {
+	# we need to compile the *.so as pic
+	append-flags -fPIC
+	FFLAGS="${FFLAGS} -fPIC"
+	econf \
+		--with-max-atoms=${MAXATOMS:-10000} \
+		$(usex pdb2pka "" --disable-pdb2pka) \
+		$(use_with opal) \
+		NUMPY="${EPREFIX}/$(python_get_sitedir)" \
+		F77="$(tc-getFC)"
+}
+
+src_compile() {
+	default
+	if use doc; then
+		pushd doc > /dev/null
+		sh genpydoc.sh || die "genpydoc failed"
+		popd > /dev/null
+	fi
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	local lib
+	dodir $(python_get_sitedir)/${PN}
+	emake -j1 \
+		DESTDIR="${ED}$(python_get_sitedir)/${PN}" \
+		PREFIX="" install
+		INPATH="$(python_get_sitedir)/${PN}"
+
+	python_newscript "${ED}"/$(python_get_sitedir)/${PN}/${PN}.py ${PN}
+	python_newscript "${ED}"/$(python_get_sitedir)/${PN}/pdb2pka/pka.py pdb2pka
+
+	for lib in _apbs.so apbslib.py{,c,o}; do
+		dosym ../../apbs/${lib} $(python_get_sitedir)/${PN}/pdb2pka/${lib}
+	done
+
+	if use doc; then
+		pushd doc > /dev/null
+		dohtml -r *.html images pydoc
+		popd > /dev/null
+	fi
+
+	use examples && \
+		insinto /usr/share/${PN}/ && \
+		doins -r examples
+
+	dodoc ChangeLog NEWS README AUTHORS
+
+	python_optimize
+}
diff --git a/sci-chemistry/votca-csg/votca-csg-1.2.4.ebuild b/sci-chemistry/votca-csg/votca-csg-1.2.4-r1.ebuild
similarity index 91%
rename from sci-chemistry/votca-csg/votca-csg-1.2.4.ebuild
rename to sci-chemistry/votca-csg/votca-csg-1.2.4-r1.ebuild
index 27693f48dc70..ce4007071d1d 100644
--- a/sci-chemistry/votca-csg/votca-csg-1.2.4.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-1.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/votca-csg-1.2.4.ebuild,v 1.1 2014/08/31 23:41:37 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/votca-csg/votca-csg-1.2.4-r1.ebuild,v 1.1 2014/10/24 03:33:23 ottxor Exp $
 
 EAPI=5
 
@@ -65,8 +65,12 @@ src_configure() {
 }
 
 src_install() {
-	newbashcomp scripts/csg-completion.bash ${PN}
 	cmake-utils_src_install
+	newbashcomp scripts/csg-completion.bash csg_call
+	for i in "${ED}"/usr/bin/csg_*; do
+		[[ ${i} = *csg_call ]] && continue
+		bashcomp_alias csg_call "${i##*/}"
+	done
 	if use doc; then
 		if [ -n "${PV##*9999}" ]; then
 			dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf"
diff --git a/sci-libs/libccd/libccd-2.0.ebuild b/sci-libs/libccd/libccd-2.0.ebuild
index 6afda46551d5..85efb91ce36a 100644
--- a/sci-libs/libccd/libccd-2.0.ebuild
+++ b/sci-libs/libccd/libccd-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libccd/libccd-2.0.ebuild,v 1.1 2014/10/23 16:03:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libccd/libccd-2.0.ebuild,v 1.2 2014/10/24 08:01:04 aballier Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	KEYWORDS=""
 	SRC_URI=""
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm"
 	SRC_URI="http://libccd.danfis.cz/files/${P}.tar.gz"
 fi
 
diff --git a/sci-libs/libccd/libccd-9999.ebuild b/sci-libs/libccd/libccd-9999.ebuild
index 79d725bcded4..c4046fa31dbe 100644
--- a/sci-libs/libccd/libccd-9999.ebuild
+++ b/sci-libs/libccd/libccd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libccd/libccd-9999.ebuild,v 1.1 2014/10/23 16:03:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libccd/libccd-9999.ebuild,v 1.2 2014/10/24 08:01:04 aballier Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	KEYWORDS=""
 	SRC_URI=""
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm"
 	SRC_URI="http://libccd.danfis.cz/files/${P}.tar.gz"
 fi
 
diff --git a/sci-libs/mmtk/mmtk-2.7.3.ebuild b/sci-libs/mmtk/mmtk-2.7.3.ebuild
index 1302c6f9e05d..c9819a89c6f1 100644
--- a/sci-libs/mmtk/mmtk-2.7.3.ebuild
+++ b/sci-libs/mmtk/mmtk-2.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mmtk/mmtk-2.7.3.ebuild,v 1.5 2012/11/04 10:00:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mmtk/mmtk-2.7.3.ebuild,v 1.6 2014/10/24 10:13:26 jlec Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ IUSE="examples"
 
 RDEPEND="
 	dev-python/cython
-	dev-python/numpy
+	<dev-python/numpy-1.9
 	dev-python/scientificpython"
 DEPEND="${RDEPEND}"
 
diff --git a/sci-libs/mmtk/mmtk-2.7.5.ebuild b/sci-libs/mmtk/mmtk-2.7.5.ebuild
index 992fd65f4e55..379cdd7791a8 100644
--- a/sci-libs/mmtk/mmtk-2.7.5.ebuild
+++ b/sci-libs/mmtk/mmtk-2.7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mmtk/mmtk-2.7.5.ebuild,v 1.1 2012/11/04 10:00:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mmtk/mmtk-2.7.5.ebuild,v 1.2 2014/10/24 10:13:26 jlec Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ IUSE="examples"
 
 RDEPEND="
 	dev-python/cython
-	dev-python/numpy
+	<dev-python/numpy-1.9
 	dev-python/scientificpython"
 DEPEND="${RDEPEND}"
 
diff --git a/sci-libs/mmtk/mmtk-2.7.9.ebuild b/sci-libs/mmtk/mmtk-2.7.9.ebuild
index 0d57b1d4dba8..ac1f125c98c2 100644
--- a/sci-libs/mmtk/mmtk-2.7.9.ebuild
+++ b/sci-libs/mmtk/mmtk-2.7.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mmtk/mmtk-2.7.9.ebuild,v 1.1 2013/06/16 15:39:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mmtk/mmtk-2.7.9.ebuild,v 1.2 2014/10/24 10:13:26 jlec Exp $
 
 EAPI=5
 
@@ -28,7 +28,7 @@ IUSE="examples"
 
 RDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	<dev-python/numpy-1.9[${PYTHON_USEDEP}]
 	dev-python/scientificpython[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
diff --git a/sys-auth/nss-mdns/nss-mdns-0.10-r2.ebuild b/sys-auth/nss-mdns/nss-mdns-0.10-r2.ebuild
index 3519f6e7590e..c58836c0d543 100644
--- a/sys-auth/nss-mdns/nss-mdns-0.10-r2.ebuild
+++ b/sys-auth/nss-mdns/nss-mdns-0.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-mdns/nss-mdns-0.10-r2.ebuild,v 1.4 2014/10/23 11:26:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-mdns/nss-mdns-0.10-r2.ebuild,v 1.5 2014/10/23 19:46:17 maekke Exp $
 
 EAPI="5"
 inherit autotools eutils multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/nss-mdns/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc x86"
 IUSE="search-domains"
 
 RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]"
diff --git a/sys-devel/gcc/gcc-2.95.3-r10.ebuild b/sys-devel/gcc/gcc-2.95.3-r10.ebuild
index 900b36bbd339..f72950a58db6 100644
--- a/sys-devel/gcc/gcc-2.95.3-r10.ebuild
+++ b/sys-devel/gcc/gcc-2.95.3-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r10.ebuild,v 1.11 2014/01/19 01:51:34 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r10.ebuild,v 1.12 2014/10/23 23:48:17 vapier Exp $
 
 EAPI="2"
 
@@ -8,8 +8,6 @@ PATCH_VER="1.4"
 
 inherit eutils flag-o-matic toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
 KEYWORDS="~alpha ~ppc ~sparc ~x86"
 
 gcc2-flags() {
diff --git a/sys-devel/gcc/gcc-3.3.6-r1.ebuild b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
index d61c21fab2f1..3adeae2cabd0 100644
--- a/sys-devel/gcc/gcc-3.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.26 2014/10/17 17:49:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.27 2014/10/23 23:48:17 vapier Exp $
 
 EAPI="2"
 
@@ -10,8 +10,6 @@ HTB_VER="1.00-r2"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
 # ia64 - broken static handling; USE=static emerge busybox
 KEYWORDS="~amd64 ~x86"
 
diff --git a/sys-devel/gcc/gcc-3.4.6-r2.ebuild b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
index c68a3b9ed5fa..238d27d282fd 100644
--- a/sys-devel/gcc/gcc-3.4.6-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.37 2014/10/17 17:49:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.38 2014/10/23 23:48:17 vapier Exp $
 
 EAPI="2"
 
@@ -13,8 +13,6 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
 KEYWORDS="-* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="ip28 ip32r10k n32 n64"
 
diff --git a/sys-devel/gcc/gcc-4.0.4.ebuild b/sys-devel/gcc/gcc-4.0.4.ebuild
index 00388e31c46b..5840076384e6 100644
--- a/sys-devel/gcc/gcc-4.0.4.ebuild
+++ b/sys-devel/gcc/gcc-4.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.18 2014/10/17 17:44:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.20 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -9,9 +9,6 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.2+"
 KEYWORDS=""
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.1.2.ebuild b/sys-devel/gcc/gcc-4.1.2.ebuild
index 75ea8e2c57f8..038ded183512 100644
--- a/sys-devel/gcc/gcc-4.1.2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.39 2014/10/17 17:49:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.41 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -10,9 +10,6 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.2+"
 KEYWORDS="-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.2.4-r1.ebuild b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
index 47cfa7f2574f..c53aed62bbb0 100644
--- a/sys-devel/gcc/gcc-4.2.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.4-r1.ebuild,v 1.18 2014/10/17 17:49:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.4-r1.ebuild,v 1.20 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -9,9 +9,6 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
 KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.3.6-r1.ebuild b/sys-devel/gcc/gcc-4.3.6-r1.ebuild
index 8b12abe1a251..394abc6ca2ca 100644
--- a/sys-devel/gcc/gcc-4.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.6-r1.ebuild,v 1.17 2014/10/17 17:49:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.6-r1.ebuild,v 1.19 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -19,9 +19,6 @@ PIE_UCLIBC_STABLE="x86 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
 KEYWORDS="alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.4.7.ebuild b/sys-devel/gcc/gcc-4.4.7.ebuild
index 4e00815f395e..c5534fe9443e 100644
--- a/sys-devel/gcc/gcc-4.4.7.ebuild
+++ b/sys-devel/gcc/gcc-4.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.7.ebuild,v 1.19 2014/10/17 17:47:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.7.ebuild,v 1.21 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -21,9 +21,6 @@ SSP_UCLIBC_STABLE=""
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.5.1-r1.ebuild b/sys-devel/gcc/gcc-4.5.1-r1.ebuild
index 66a082a06ad3..8759d79b5f98 100644
--- a/sys-devel/gcc/gcc-4.5.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.1-r1.ebuild,v 1.13 2014/10/17 17:47:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.1-r1.ebuild,v 1.15 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -21,9 +21,6 @@ SSP_UCLIBC_STABLE=""
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.5.2.ebuild b/sys-devel/gcc/gcc-4.5.2.ebuild
index e71a1d11cd99..858ec85038c7 100644
--- a/sys-devel/gcc/gcc-4.5.2.ebuild
+++ b/sys-devel/gcc/gcc-4.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.2.ebuild,v 1.13 2014/10/17 17:47:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.2.ebuild,v 1.15 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -21,9 +21,6 @@ SSP_UCLIBC_STABLE=""
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.5.3-r2.ebuild b/sys-devel/gcc/gcc-4.5.3-r2.ebuild
index c754f4c3e43d..42879e64b506 100644
--- a/sys-devel/gcc/gcc-4.5.3-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.5.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.3-r2.ebuild,v 1.20 2014/01/19 01:51:34 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.3-r2.ebuild,v 1.22 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -21,9 +21,6 @@ SSP_UCLIBC_STABLE=""
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.5.4.ebuild b/sys-devel/gcc/gcc-4.5.4.ebuild
index 450f25fe1d90..d2ab92125854 100644
--- a/sys-devel/gcc/gcc-4.5.4.ebuild
+++ b/sys-devel/gcc/gcc-4.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.4.ebuild,v 1.18 2014/01/19 01:51:34 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.4.ebuild,v 1.20 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -21,9 +21,6 @@ SSP_UCLIBC_STABLE=""
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.6.0.ebuild b/sys-devel/gcc/gcc-4.6.0.ebuild
index f6ae09b3d7bd..ddb877005926 100644
--- a/sys-devel/gcc/gcc-4.6.0.ebuild
+++ b/sys-devel/gcc/gcc-4.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.0.ebuild,v 1.16 2014/01/19 01:51:34 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.0.ebuild,v 1.18 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -21,9 +21,6 @@ SSP_UCLIBC_STABLE=""
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.6.1-r1.ebuild b/sys-devel/gcc/gcc-4.6.1-r1.ebuild
index 274520ac056c..e3bfd7423977 100644
--- a/sys-devel/gcc/gcc-4.6.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.1-r1.ebuild,v 1.13 2014/01/19 01:51:34 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.1-r1.ebuild,v 1.15 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -21,9 +21,6 @@ SSP_UCLIBC_STABLE=""
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.6.2.ebuild b/sys-devel/gcc/gcc-4.6.2.ebuild
index 22fbc87086e6..d9b7041b97ad 100644
--- a/sys-devel/gcc/gcc-4.6.2.ebuild
+++ b/sys-devel/gcc/gcc-4.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.2.ebuild,v 1.18 2014/01/19 01:51:34 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.2.ebuild,v 1.20 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -21,9 +21,6 @@ SSP_UCLIBC_STABLE=""
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.6.3.ebuild b/sys-devel/gcc/gcc-4.6.3.ebuild
index 949923d10847..fdb2d5b91231 100644
--- a/sys-devel/gcc/gcc-4.6.3.ebuild
+++ b/sys-devel/gcc/gcc-4.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.3.ebuild,v 1.40 2014/01/19 01:51:34 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.3.ebuild,v 1.42 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -22,9 +22,6 @@ SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.6.4.ebuild b/sys-devel/gcc/gcc-4.6.4.ebuild
index 5a40c8914534..af29a4ea0ed6 100644
--- a/sys-devel/gcc/gcc-4.6.4.ebuild
+++ b/sys-devel/gcc/gcc-4.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.4.ebuild,v 1.15 2014/09/15 08:23:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.6.4.ebuild,v 1.17 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -22,9 +22,6 @@ SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.7.0.ebuild b/sys-devel/gcc/gcc-4.7.0.ebuild
index 4a7a2b27d5ca..e54f65345425 100644
--- a/sys-devel/gcc/gcc-4.7.0.ebuild
+++ b/sys-devel/gcc/gcc-4.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.0.ebuild,v 1.12 2014/01/19 01:51:34 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.0.ebuild,v 1.14 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -22,9 +22,6 @@ SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.7.1.ebuild b/sys-devel/gcc/gcc-4.7.1.ebuild
index 7b2b87d4c5a5..b18fb086cd51 100644
--- a/sys-devel/gcc/gcc-4.7.1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.1.ebuild,v 1.13 2014/01/19 01:51:34 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.1.ebuild,v 1.15 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -22,9 +22,6 @@ SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.7.2-r1.ebuild b/sys-devel/gcc/gcc-4.7.2-r1.ebuild
index 05f7128dc6ef..61ad54dcb61d 100644
--- a/sys-devel/gcc/gcc-4.7.2-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.2-r1.ebuild,v 1.8 2014/01/19 01:51:34 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.2-r1.ebuild,v 1.10 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -22,10 +22,6 @@ SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.7.3-r1.ebuild b/sys-devel/gcc/gcc-4.7.3-r1.ebuild
index f0c841993546..aab186853571 100644
--- a/sys-devel/gcc/gcc-4.7.3-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.3-r1.ebuild,v 1.18 2014/10/02 00:10:29 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.3-r1.ebuild,v 1.20 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -22,10 +22,6 @@ SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -amd64-fbsd -x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.7.4.ebuild b/sys-devel/gcc/gcc-4.7.4.ebuild
index c673acdf4cff..80052f363710 100644
--- a/sys-devel/gcc/gcc-4.7.4.ebuild
+++ b/sys-devel/gcc/gcc-4.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.4.ebuild,v 1.3 2014/09/29 02:58:48 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.4.ebuild,v 1.5 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="4"
 
@@ -22,10 +22,6 @@ SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.8.0.ebuild b/sys-devel/gcc/gcc-4.8.0.ebuild
index 5f47d355c27f..2f30c4104053 100644
--- a/sys-devel/gcc/gcc-4.8.0.ebuild
+++ b/sys-devel/gcc/gcc-4.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.0.ebuild,v 1.14 2014/09/24 10:29:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.0.ebuild,v 1.16 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -22,10 +22,6 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.8.1-r1.ebuild b/sys-devel/gcc/gcc-4.8.1-r1.ebuild
index 877cf5216453..50c6d7e41d34 100644
--- a/sys-devel/gcc/gcc-4.8.1-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.1-r1.ebuild,v 1.12 2014/09/24 10:29:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.1-r1.ebuild,v 1.14 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -22,10 +22,6 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.8.2.ebuild b/sys-devel/gcc/gcc-4.8.2.ebuild
index 6c041b630343..a375301c54df 100644
--- a/sys-devel/gcc/gcc-4.8.2.ebuild
+++ b/sys-devel/gcc/gcc-4.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.2.ebuild,v 1.11 2014/09/24 10:29:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.2.ebuild,v 1.13 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="2"
 
@@ -22,10 +22,6 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-
 KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.8.3.ebuild b/sys-devel/gcc/gcc-4.8.3.ebuild
index d7c19f2b4ae0..36c0ea639afb 100644
--- a/sys-devel/gcc/gcc-4.8.3.ebuild
+++ b/sys-devel/gcc/gcc-4.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.3.ebuild,v 1.6 2014/10/22 20:48:33 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.3.ebuild,v 1.8 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="4"
 
@@ -22,10 +22,6 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-
 KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.9.0.ebuild b/sys-devel/gcc/gcc-4.9.0.ebuild
index 945840f73d77..3cf1ee3e0b48 100644
--- a/sys-devel/gcc/gcc-4.9.0.ebuild
+++ b/sys-devel/gcc/gcc-4.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.9.0.ebuild,v 1.1 2014/05/18 08:33:52 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.9.0.ebuild,v 1.3 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="4"
 
@@ -22,10 +22,6 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-
 KEYWORDS=""
 
 RDEPEND=""
diff --git a/sys-devel/gcc/gcc-4.9.1.ebuild b/sys-devel/gcc/gcc-4.9.1.ebuild
index fc14f670be38..1d4df0abae80 100644
--- a/sys-devel/gcc/gcc-4.9.1.ebuild
+++ b/sys-devel/gcc/gcc-4.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.9.1.ebuild,v 1.1 2014/08/07 00:40:11 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.9.1.ebuild,v 1.3 2014/10/24 00:23:04 vapier Exp $
 
 EAPI="4"
 
@@ -22,10 +22,6 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
-
-LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-
 KEYWORDS=""
 
 RDEPEND=""
diff --git a/www-apache/mod_authn_sasl/Manifest b/www-apache/mod_authn_sasl/Manifest
index ab8162d412a8..2da77b9db5a1 100644
--- a/www-apache/mod_authn_sasl/Manifest
+++ b/www-apache/mod_authn_sasl/Manifest
@@ -1 +1 @@
-DIST mod_authn_sasl-1.2.tar.bz2 274790 SHA256 4329e1f429560041cebe67b74a588330f382759bcbb91d3e4145b18e59734b57
+DIST mod_authn_sasl-1.2.tar.bz2 274790 SHA256 4329e1f429560041cebe67b74a588330f382759bcbb91d3e4145b18e59734b57 SHA512 cc967d350c7110f98b56fa94244473dd2cfc813e7992d7aa8a0ae2219264834b1e2218a1f0982bad661e335bfd713cfb9e8efa6ab69f07a309370e4b7d74ef02 WHIRLPOOL e906277df03d5027f9911d62f47d06ecff0bdb4a230b326c0d4361129bdf0358fd665c2e4c9b1ed54f79aa51fc02bae1edde4132369dee897c5ef86bd49e9fe8
diff --git a/www-apache/mod_authn_sasl/mod_authn_sasl-1.2.ebuild b/www-apache/mod_authn_sasl/mod_authn_sasl-1.2.ebuild
index c0545c0392af..7628038431c3 100644
--- a/www-apache/mod_authn_sasl/mod_authn_sasl-1.2.ebuild
+++ b/www-apache/mod_authn_sasl/mod_authn_sasl-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_authn_sasl/mod_authn_sasl-1.2.ebuild,v 1.2 2014/08/10 20:14:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_authn_sasl/mod_authn_sasl-1.2.ebuild,v 1.3 2014/10/23 19:45:46 maekke Exp $
 
 inherit eutils apache-module
 
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.sourceforge.net/project/mod-authn-sasl/mod-authn-sasl/
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="dev-libs/cyrus-sasl"
diff --git a/www-apps/wordpress/wordpress-4.0.ebuild b/www-apps/wordpress/wordpress-4.0.ebuild
index 9ee912352002..13e4987acdd4 100644
--- a/www-apps/wordpress/wordpress-4.0.ebuild
+++ b/www-apps/wordpress/wordpress-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-4.0.ebuild,v 1.1 2014/10/02 15:49:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-4.0.ebuild,v 1.2 2014/10/23 19:44:00 maekke Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://wordpress.org/"
 SRC_URI="http://wordpress.org/${P/_rc/-RC}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="virtual/httpd-php
 	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ea2256fa4134..a82b97e433f2 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,6 @@
 DIST chromium-38.0.2125.101.tar.xz 248192100 SHA256 d3303519ab471a3bc831e9b366e64dc2fe651894e52ae5d1e74de60ee2a1198a SHA512 fa26435709e278d6406af835fd2cf91c45d2fdc2ba9b93d18124e8eaca191cb205b98031b0e150f7b0b14e630343920d8d5eb23fa19f221e286ccf9e3dbcb47d WHIRLPOOL 0f4a5bdb90eb050a4bb2df1956c89f71a9eb88b359f8932803a8392e81f9b077b65f2d1dc8e5242a50e97e61894d00b8055bc3dcd46d3ec2be4a2c6f554e1aa3
 DIST chromium-38.0.2125.104.tar.xz 248193372 SHA256 fcd35aef570d3304798a44f00751aa5724eba775596a8795df1a10a6db83d454 SHA512 019793c2b4995b4bdf1eec295f13f9f8b6a1767c4ec1e1acf967c91e5911e7aea2a12266d08b85dc556abb70ff71d3ead4b247840f31cf00d08f5cd23fc8abb7 WHIRLPOOL 4f4007709e15355f0caf35848bed61c3ae69032321e994ed63e8f4dcd36c413a1713e8ad3baae3715941fab4b58e52826f9e29f128ad3e2577f8619431882754
-DIST chromium-39.0.2171.19-lite.tar.xz 194357312 SHA256 a42b7dab132f1a06326d7374c309bfb13537034c17ab6879c9dfa0ec4f723164 SHA512 1987c518b8bae374c2d914b716cc96f0656958077ce489811058a126091ef128b4b73068c50055baa23db5792f17cb638523fe4213b152d57ddc170d908169d4 WHIRLPOOL 7fe0da6970b15c8fd4aca9389e0d2410651df5be6ecf3bee9224dd0f67797e31c710ca63792859fdb400c106bec32a3b88d9fcfa8322619a431eaa3f336daafd
 DIST chromium-39.0.2171.27-lite.tar.xz 194373264 SHA256 cc952a7837806ff7cb29fef2cce6cd485f4b7b6f395ef832d962ae138974f05c SHA512 bde7da1de4139eb12ba47cf66bab807774f5541b473454c9f5d994c4ad967b857ae7b6a83765d3fe341a169f3122c8382618aa34197eef179bb51cc37b86ece5 WHIRLPOOL 7b843b962bf66833c055bec5f87368bd6854fb16e92e838c2edd92a1361d6fcf344164dc29577d32cdf0bbe4f7ea5e576173de0a45abe430aeeaaf0c268459fc
+DIST chromium-39.0.2171.36-lite.tar.xz 194393728 SHA256 74736666e3bfb29b27e695d4f711d33a4dcd54c77533f4daec5da8647b169682 SHA512 f1239e6f12a3ce1b8009a7b4e8fe1bd6ed6693471a79c393d51a9968b253ec9a19f947b4a5b066cf28dcd1b49b7ffc93d256f11692bc165e1182ee35c551445e WHIRLPOOL 627e6e8f559174aeed8c46662ede966e4f59e4f9ed9279038f8b523738f60c83f742db1ff4709cfb763e33aacecd4ec1c355679c8190091017b50ee4d4428149
 DIST chromium-40.0.2188.2-lite.tar.xz 194889236 SHA256 5aa50a7d67b41bb4f9127f519d7332c2f6e6cc7e40c61717d6c4b21d1745d957 SHA512 d6b2f5cdf8a346d75e300d38a01bdfd82cd961c06b89a67e8f66876fb1b7280c1f0b2c271059099e9385c05b6292a83f546ed7e84eeed514dd8a393f7879192d WHIRLPOOL 539c14806a6b5e6d5be069c69681adbc83fad3badf11106dabde22e1e61094a6c0cfac3a5c08fcf8c20c13f4d1bdaa65e4568ef8c9d18f249028d11003e4acec
 DIST chromium-40.0.2194.2-lite.tar.xz 195100696 SHA256 308f0005571ec2c8ad1981f59b9cacff3861eb36eda86a9c283fce84965afa84 SHA512 3da424a343a9bf0f65efd902070fbaa894f010f4fc2e6f10ce141eaca606e9ee52f5cf6e7c99da0078828cebc381e80a3c27597bc33a5d36f7fa29245142e16b WHIRLPOOL 530f0f3129aae6011ec5964b187f92bb5d958b719221b4c01dd446ac3bca9b01b7bf6c7184e3836946380d51ff4454d713b10a9d20df4f913db7ff63a7c849a9
diff --git a/www-client/chromium/chromium-39.0.2171.19.ebuild b/www-client/chromium/chromium-39.0.2171.36.ebuild
similarity index 99%
rename from www-client/chromium/chromium-39.0.2171.19.ebuild
rename to www-client/chromium/chromium-39.0.2171.36.ebuild
index 21b431c9889b..b5c7a3b82742 100644
--- a/www-client/chromium/chromium-39.0.2171.19.ebuild
+++ b/www-client/chromium/chromium-39.0.2171.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-39.0.2171.19.ebuild,v 1.2 2014/10/17 16:21:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-39.0.2171.36.ebuild,v 1.1 2014/10/24 00:47:17 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
diff --git a/www-client/lynx/lynx-2.8.8_p2.ebuild b/www-client/lynx/lynx-2.8.8_p2.ebuild
index 8867fad6442b..1760a0c855f4 100644
--- a/www-client/lynx/lynx-2.8.8_p2.ebuild
+++ b/www-client/lynx/lynx-2.8.8_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_p2.ebuild,v 1.1 2014/04/25 08:33:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_p2.ebuild,v 1.2 2014/10/23 20:38:49 jer Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SRC_URI="http://lynx.isc.org/current/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 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 ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-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 ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode"
 
 RDEPEND="sys-libs/ncurses[unicode?]
diff --git a/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild b/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild
index 38dd0682ff01..f1db70168166 100644
--- a/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild
+++ b/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild,v 1.4 2014/10/12 08:58:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild,v 1.5 2014/10/23 19:46:50 maekke Exp $
 
 EAPI="5"
 
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/gnosek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 RDEPEND="dev-libs/fcgi"
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 8819c61e2d61..70aee62c8055 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,8 +1,3 @@
-DIST intel-driver-1.0.17.tar.bz2 289359 SHA256 83bee4de6e156b3a95af3ac41bcb2dbfecbb547444e8ff8ef005dc5ad92e0b3f SHA512 33d2108596ed3562f2db7404b5cbab30a319ca88b905b658d5a619841dbada6a6e69f7f3f7205f3fd0b86afbec1aaa45e1baac2b8740e4cb5bbe81c6c6740447 WHIRLPOOL 79e1663b3dc238f51351d09bd570cfe662294813b645e1dae9a4fb554fa711536f4ef93fbf405080c15abf3cb31bad5df1bcbba32a3a56aaf9521a98a44ac802
-DIST libva-intel-driver-1.0.19.tar.bz2 448951 SHA256 2db68da9f4cea9b726ce2cd7c6246d902085310d83609082e453aa01559ea792 SHA512 a08bd474024869d0b6bd2eca6f039d571f199c1e4037938c2d6c6f7d01ab773bf61c5bf31e6af469280d9baf674f4f0827768b963999280cc1d9285a2ad44b57 WHIRLPOOL 124526b730c8836adaab31712715f531ba26ab8be1e6914a82b94e39d36e3a5f8c8dbd526f00ada44233023554a928f845940628fbcb03f9a0db0dc2c5bc9350
-DIST libva-intel-driver-1.0.20.tar.bz2 768811 SHA256 12fefb661372c053ff26530fae8342f9df63dbe8ab2c548d8d430d994042d4c9 SHA512 bd327ab2b99eba9255d2631f41888dbee0019125a512c47469692372cb11508898afcc38c646264cea51093bfb911b7ca7f35314e3e87b5c8baad9f6b0ffe755 WHIRLPOOL 3fe20f5040082c5a8393a0e7dd902423c8ba3f282ceac605844ae6f6c64295b9944f673b7773fd572ac646cc5bca24d6b3ef007e950e4dcada1880c002790a60
-DIST libva-intel-driver-1.2.0.tar.bz2 857789 SHA256 a6fceaa118fe5d1a6e7382ed30e6684b4059b3fedd79eb53121a80e8016c748c SHA512 f83f82bfbe76a27fd484d46cea36066801f8e09ca2695264c20d892cf81de2808de5648e0dbc407aa95740e500774bd9ca1a191886d8fd70010e828e899a91fd WHIRLPOOL c60d1eb8614458ce3272563b1457e9ca80dc296d4263b3f27be238305bed32268f89cc048654d65eba36b7f43e2a40735f8a8aa0f97a1c03f8e995c7c86fb8fd
-DIST libva-intel-driver-1.2.1.tar.bz2 868981 SHA256 5c6917c961b1de7f0d5ea3a6feac8eeec098d8aff6cdf2bca44e9b3083515186 SHA512 feb7faaf41b3044d342af57ea10e5be8b40e1a2fd1ca39fb4b2280cd0175f7d1fa9b9f06609693cf4e4cb2e2c68d86b2592512c71ef0f0461810554ca762e584 WHIRLPOOL 642893f619b439989940f4af24cafe510752ccda15a6a3d9c0bc56cb725e8fc260d711b577424f23e411227c7e3d973bf772702d684fedc0fd4d1fa228a3ad5c
-DIST libva-intel-driver-1.2.2.tar.bz2 863603 SHA256 19c474782877ec52d5a83e10d4770b65c57cfe9ebd98a7ea43ae5bead04b7044 SHA512 36bec331dc49cf533c61db03805fd2768409b13aa0f2af2427d0411189c9d7ad6e45446a842289cf2166cb019cd5e487bdca631d1b1d66f8f2e23a0b2bb8d2a5 WHIRLPOOL 6efdc24b45bf9e0934b71885e99e3ee2953f89642beb7de42d1d1c8a1f623436cfff5e6b1d46862f3a5a14e7d3edb2b0fd492fdb0a7f702df4d4e5d4bc137317
 DIST libva-intel-driver-1.3.0.tar.bz2 965030 SHA256 734c15e78495f53fecb9862a22579d05ca5994fac4d04e3cc804ca9cbaa7fb6c SHA512 09566199409f76b8a533857c6bef26c35cd21b1555d29b395e72649fa0337b86b4a65eb5adf4144649ae26d5d8c93f1462d19011c95de9256728cadf56975e5d WHIRLPOOL 727b1bd14a55baa60092a5f2f9bc0bfb2ca39328103f812ccb3be8391246c0b0c4e99b596527e7189e2700d91d15aceed1e5284808644d46e26b2d470d67194f
 DIST libva-intel-driver-1.3.2.tar.bz2 957834 SHA256 11d956ce11cb85bb009c8eb1ebb768403da2cb82675a6d66649f9c49ef4908d1 SHA512 94b09a64cbc2186b2c2cb863fbc8b390314e2b91bdf05b756d5d83a707db3847cca72072bb79bb09e69e335a711343f809552bc02b229679f8f5bb2b85602e1c WHIRLPOOL 8423b7b4de79032a0a5fcaa23ef7edbc303169ad85151a86859dd322c71f3af0a9d08c4d2e6385fcd874b0c1f4f6b3210b92a3b7d0460024069868f70aca5037
+DIST libva-intel-driver-1.4.0.tar.bz2 969607 SHA256 f487cee5ddbfb5f11d83a825f4ee72092c9e36018f282e6b2d76baa2ba1abfa2 SHA512 2ab3be0a4ff9d721a94c1096333d1c92483a8ccbbae42bedd3f83a6bf0f8bb836d44090d77187d3c963e4718a9a1b31620689f1eeb7268666150272f9283093b WHIRLPOOL 6114bf9bda40e2d21cfc2c178ff10a4ddff933b1982ab180fb7e535224558219fc8a036b2d0a4aa037351bdc265aca85ae23ddf81a65232b38c4e7cdfc9b681c
diff --git a/x11-libs/libva-intel-driver/files/libm.patch b/x11-libs/libva-intel-driver/files/libm.patch
deleted file mode 100644
index 0def10f585a8..000000000000
--- a/x11-libs/libva-intel-driver/files/libm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit eb39abb70886d9277cf7d5114125cb7b22e7c362
-Author: Joe Konno <joe.konno@intel.com>
-Date:   Tue Nov 20 07:42:27 2012 -0800
-
-    configure: add missing dependency to libm.
-    
-    Build broke when trying to compile with expressive debug CFLAGS (-g3).
-    This was root-caused to the lack of the "-lm" linker flag. By adding a
-    simple autoconf check we ensure that libm is linked.
-    
-    More specifically, recent VEBOX changes depend on cos() and sin() math
-    functions.
-    
-    Signed-off-by: Joe Konno <joe.konno@intel.com>
-
-diff --git a/configure.ac b/configure.ac
-index 4427839..2655d74 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,6 +64,7 @@ AM_PROG_CC_C_O
- AC_C_BIGENDIAN
- AC_HEADER_STDC
- AC_SYS_LARGEFILE
-+AC_CHECK_LIB([m], [sin])
- 
- LIBVA_PACKAGE_VERSION=libva_package_version
- AC_SUBST(LIBVA_PACKAGE_VERSION)
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.0.17.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.0.17.ebuild
deleted file mode 100644
index db033a00dea6..000000000000
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.0.17.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.0.17.ebuild,v 1.4 2012/11/18 11:11:41 ago Exp $
-
-EAPI="3"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	MY_P=${P#libva-}
-	SRC_URI="http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE=""
-
-RDEPEND=">=x11-libs/libva-1.0.14
-	!<x11-libs/libva-1.0.15[video_cards_intel]
-	>=x11-libs/libdrm-2.4.23[video_cards_intel]"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.0.19.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.0.19.ebuild
deleted file mode 100644
index cbc904ce960f..000000000000
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.0.19.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.0.19.ebuild,v 1.3 2012/12/08 15:26:41 aballier Exp $
-
-EAPI="3"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
-fi
-
-inherit autotools ${SCM} multilib eutils
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="wayland X"
-
-RDEPEND=">=x11-libs/libva-1.1.0[X?,wayland?]
-	!<x11-libs/libva-1.0.15[video_cards_intel]
-	>=x11-libs/libdrm-2.4.23[video_cards_intel]
-	wayland? ( media-libs/mesa[egl] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/libm.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable wayland) \
-		$(use_enable X x11)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20-r1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20-r1.ebuild
deleted file mode 100644
index 098f22717464..000000000000
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20-r1.ebuild,v 1.2 2014/06/18 21:02:16 mgorny Exp $
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM}
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm wayland X"
-
-RDEPEND=">=x11-libs/libva-1.2.1-r1[X?,wayland?,drm?,${MULTILIB_USEDEP}]
-	!<x11-libs/libva-1.0.15[video_cards_intel]
-	>=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
-	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README )
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable drm)
-		$(use_enable wayland)
-		$(use_enable X x11)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20.ebuild
deleted file mode 100644
index e73c47e7ca2f..000000000000
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20.ebuild,v 1.2 2013/06/19 19:44:17 aballier Exp $
-
-EAPI="3"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm wayland X"
-
-RDEPEND=">=x11-libs/libva-1.1.0[X?,wayland?,drm?]
-	!<x11-libs/libva-1.0.15[video_cards_intel]
-	>=x11-libs/libdrm-2.4.23[video_cards_intel]
-	wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable drm) \
-		$(use_enable wayland) \
-		$(use_enable X x11)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.2.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.2.0.ebuild
deleted file mode 100644
index bc0582cf9351..000000000000
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.2.0.ebuild,v 1.1 2013/06/26 19:06:32 aballier Exp $
-
-EAPI="3"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm wayland X"
-
-RDEPEND=">=x11-libs/libva-1.2.0[X?,wayland?,drm?]
-	!<x11-libs/libva-1.0.15[video_cards_intel]
-	>=x11-libs/libdrm-2.4.45[video_cards_intel]
-	wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable drm) \
-		$(use_enable wayland) \
-		$(use_enable X x11)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.2.1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.2.1.ebuild
deleted file mode 100644
index f48ff385e770..000000000000
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.2.1.ebuild,v 1.1 2013/10/12 07:52:25 aballier Exp $
-
-EAPI="3"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm wayland X"
-
-RDEPEND=">=x11-libs/libva-1.2.0[X?,wayland?,drm?]
-	!<x11-libs/libva-1.0.15[video_cards_intel]
-	>=x11-libs/libdrm-2.4.45[video_cards_intel]
-	wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable drm) \
-		$(use_enable wayland) \
-		$(use_enable X x11)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2.ebuild
deleted file mode 100644
index 2146a9a1154e..000000000000
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2.ebuild,v 1.2 2014/02/01 15:24:34 axs Exp $
-
-EAPI="3"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm wayland X"
-
-RDEPEND=">=x11-libs/libva-1.2.0[X?,wayland?,drm?]
-	!<x11-libs/libva-1.0.15[video_cards_intel]
-	>=x11-libs/libdrm-2.4.45[video_cards_intel]
-	wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable drm) \
-		$(use_enable wayland) \
-		$(use_enable X x11)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2-r1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.4.0.ebuild
similarity index 90%
rename from x11-libs/libva-intel-driver/libva-intel-driver-1.2.2-r1.ebuild
rename to x11-libs/libva-intel-driver/libva-intel-driver-1.4.0.ebuild
index 35618866b1ef..e168929b0f22 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2-r1.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2-r1.ebuild,v 1.2 2014/06/18 21:02:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.4.0.ebuild,v 1.1 2014/10/24 07:05:21 aballier Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ else
 fi
 IUSE="+drm wayland X"
 
-RDEPEND=">=x11-libs/libva-1.2.1-r1[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+RDEPEND=">=x11-libs/libva-1.4[X?,wayland?,drm?,${MULTILIB_USEDEP}]
 	!<x11-libs/libva-1.0.15[video_cards_intel]
 	>=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
 	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index 897cb185165e..02e2a99e930b 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild,v 1.12 2014/06/18 21:02:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild,v 1.13 2014/10/24 07:05:21 aballier Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ else
 fi
 IUSE="+drm wayland X"
 
-RDEPEND=">=x11-libs/libva-1.3.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+RDEPEND=">=x11-libs/libva-1.4[X?,wayland?,drm?,${MULTILIB_USEDEP}]
 	!<x11-libs/libva-1.0.15[video_cards_intel]
 	>=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
 	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 378e84be2628..f98cb68c37c6 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,8 +1,2 @@
-DIST libva-1.0.15.tar.bz2 488805 SHA256 7cc24ae9c947aa13904255244810d3637b03d41e2b6f4b643db3b97412cacd37 SHA512 e82d7c7126ff008500c3df47c93d0e5f8205f3cdaf92dc7be8fa6519a761f58961f908931aea9d4bea2ee4373e1ee02c146d4433fa00f50e6b83384f30fadc6e WHIRLPOOL 61c6ede021fc133e721caea73b0f4b95cba64b9ecddaca471a731207aaf44510e1c61553058b1a5cb5e8b5e4f56c49ace35c1bc7a55f5c715e0d939e39d9d189
-DIST libva-1.0.16.tar.bz2 496776 SHA256 a9a39a2b92eeab73c517de7e6b841c2840b040ea685f850866fe58242cc2f161 SHA512 5c7db891d418764db9cce34175c10a84abdb649aa14cdc10df4a294ef86af707937e13a783748b547294f72d9b11aa075d871198165243bb9870f7e7b92a0019 WHIRLPOOL b388beeef6f738110e6b947a9b59e6c246217372644c9c4488aef78d2d87cfdab52a3c4e6a6c016acf46fbb9ae17aff515e247ebee57ec2a0dbee150e6d0f55a
-DIST libva-1.1.0.tar.bz2 728879 SHA256 db6adc24a6f02f234a823dd8ced4a7e38084581f4ae02b6aac10716e523cefa8 SHA512 3ae73e789a26b6d2eee0a38a5e1dc7f06430dbca5ca73785295ca5a1bcc0bdc0ca2423e481e1304203471b55369faf62b2a234daa6370edc7ca8013affb6eaee WHIRLPOOL 27e6d4648aa2eddf2846f57a1300f97820dd013675bd173a019b9a8b1ccf343109a13df822f8581012020451a35cb485974f97be55bf8d2f131a8988e6807c1d
-DIST libva-1.1.1.tar.bz2 812302 SHA256 c0af7bf3e96e19fbd0513fbf461a010638907136b5ee0d68094fa0cc7e66cd4d SHA512 5ded27982e0bdb4f83bf3b183da73e5cdcb72752875a05658991f024e86973d6e11c941346fa015236d3d80ce7c515c323094782a9b48a34b881cae145bb6253 WHIRLPOOL 93712aec8321df6e2e1a2678d13281321eb7a91df582a9651a57e2421d00c9df368e3286e73389b7c43ef114565ab7066df7d5ccdbaa2f2be74a249c1ea4c79f
-DIST libva-1.2.0.tar.bz2 914646 SHA256 15c6d69ba52d4313e8c9f8bf8bbe2a7211ab03966f3beaafb4448e517418e1c4 SHA512 e45bc48a778515fea01461115802bea625999050d6e37c6bf4d5ae006c03763d577a8d4b812a912d416f0a7e321f67b94018c4a50994a68b5281f38c81108d9e WHIRLPOOL 2f16cd8830e8cd2cadc583edc8a2fd1268026354520eb73a23073d254e21b85b5404d679d540ef9f4a8ca9930ee749c709cf7c7cc167ae91296e4a6809d9918e
-DIST libva-1.2.1.tar.bz2 915262 SHA256 70080f8b260ca4316f7e100f2ce15ad3e2356a2b9eff951278085ff8d48ea83b SHA512 20a24e65169da97c03501abfd1dc59e92de5388b3d395e82cedfed0ff6d1ac888ec5c356e879c21a1f5ddf048c112a9a8cb61b6ffa155a62ae10aab909db15c9 WHIRLPOOL f7cc4d2f4dbf78a5fd7349440aeceb6e1e5f28f46fe651474f296bd97a1be91cf2fb96c3e53e552f63200e59d6fc9b2e2b3634a04626662742e7262cab5f5e69
-DIST libva-1.3.0.tar.bz2 765183 SHA256 36be87d0f26fb9010477350f7d05ef65e294fce9c21e17713c5ded582c18ce5d SHA512 dd33c6bbfd94665626368cbab96ee8be31ded7e6a0f1cd42c03507e5e2d6c591a6aadbbbb69b128de4792b16908dee12f81b8e3724f12383c56e1aa6ea45f585 WHIRLPOOL 6fbfc7d13a3027dcfc9b0c63380674e7714f7b4412321428e93703c0cb782981fabff84792b7a5cca1d34c1a4a1a438a31ea2f71440c6ca56b98b7487e16ac86
 DIST libva-1.3.1.tar.bz2 760656 SHA256 8789b1f1ca9cbc2c1ae477323ec8f5fb269b9360410d4d5e9ec96d679b3cc297 SHA512 12afa39b965c50beb4a3f356b0fea18123d885a3c24b452a59906db38369362b290b35eaebcbc3e6079aa5d63f8d9c263d236bde9744d4b3725497bc700e5661 WHIRLPOOL 71feddc30e44fa1e461dad93a2342a65b9fa3319a044561037e96879ce166b09d82b6ea9898735cfe54812f9964a3310d80e822c9abb7a0d4b9e9acabd8a2488
+DIST libva-1.4.0.tar.bz2 769099 SHA256 70c36e6bd1159658043d655372cecf7a45d90c168df8868c112ed2189a6b7651 SHA512 f49a3c4bcd3d9b7813daa3793bec0ccbd54859c4b116e7009e9877d580a506f94f272600bba74cc5b2ef2caead15d24104d92f501a5fc5d02d62d7fac4f3da3c WHIRLPOOL bc936bb97682cfb93b5d050439330942908e1f45c8159d9cde9c6299b5eaaf7909a2aea3950308ff37d3c0945b59692b9b7013e25119e8d07d47c16ce41c5939
diff --git a/x11-libs/libva/files/libva-1.1.0-wayland1.patch b/x11-libs/libva/files/libva-1.1.0-wayland1.patch
deleted file mode 100644
index 653bcb9caef0..000000000000
--- a/x11-libs/libva/files/libva-1.1.0-wayland1.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-commit b1cf861a087234eb797c402040403a538adbe0cc
-Author: Rob Bradford <rob@linux.intel.com>
-Date:   Fri Nov 2 10:57:47 2012 +0000
-
-    wayland: port to 1.0 protocol.
-    
-    With the change in protocol the hash of globals maintained by the client was
-    dropped. Instead we must setup a listener on the registry and get the globals
-    in a stream from that.
-    
-    Signed-off-by: Rob Bradford <rob@linux.intel.com>
-    Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-
-diff --git a/configure.ac b/configure.ac
-index de83e35..257964d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,7 +78,7 @@ m4_define([libva_lt_age],
- m4_define([libdrm_version], [2.4])
- 
- # Wayland minimum version number
--m4_define([wayland_api_version], [0.95.0])
-+m4_define([wayland_api_version], [1.0.0])
- 
- AC_PREREQ(2.57)
- AC_INIT([libva], [libva_version], [waldo.bastian@intel.com], libva)
-diff --git a/test/common/va_display_wayland.c b/test/common/va_display_wayland.c
-index 332d16d..abcb2b6 100644
---- a/test/common/va_display_wayland.c
-+++ b/test/common/va_display_wayland.c
-@@ -33,42 +33,39 @@
- 
- struct display {
-     struct wl_display          *display;
-+    struct wl_registry         *registry;
-     struct wl_compositor       *compositor;
-     struct wl_shell            *shell;
-     struct wl_shell_surface    *shell_surface;
-     struct wl_surface          *surface;
-     unsigned int                ref_count;
-     int                         event_fd;
--    unsigned int                event_mask;
- };
- 
- static struct display *g_display;
- 
- static void
--display_handle_global(
--    struct wl_display *display,
--    uint32_t           id,
--    const char        *interface,
--    uint32_t           version,
--    void              *data
-+registry_handle_global(
-+    void               *data,
-+    struct wl_registry *registry,
-+    uint32_t            id,
-+    const char         *interface,
-+    uint32_t            version
- )
- {
-     struct display * const d = data;
- 
-     if (strcmp(interface, "wl_compositor") == 0)
--        d->compositor = wl_display_bind(display, id, &wl_compositor_interface);
-+        d->compositor =
-+            wl_registry_bind(registry, id, &wl_compositor_interface, 1);
-     else if (strcmp(interface, "wl_shell") == 0)
--        d->shell = wl_display_bind(display, id, &wl_shell_interface);
-+        d->shell = wl_registry_bind(registry, id, &wl_shell_interface, 1);
- }
- 
--static int
--event_mask_update(uint32_t mask, void *data)
--{
--    struct display * const d = data;
--
--    d->event_mask = mask;
--    return 0;
--}
-+static const struct wl_registry_listener registry_listener = {
-+    registry_handle_global,
-+    NULL,
-+};
- 
- static VADisplay
- va_open_display_wayland(void)
-@@ -91,9 +88,10 @@ va_open_display_wayland(void)
-             return NULL;
-         }
-         wl_display_set_user_data(d->display, d);
--        wl_display_add_global_listener(d->display, display_handle_global, d);
--        d->event_fd = wl_display_get_fd(d->display, event_mask_update, d);
--        wl_display_iterate(d->display, d->event_mask);
-+        d->registry = wl_display_get_registry(d->display);
-+        wl_registry_add_listener(d->registry, &registry_listener, d);
-+        d->event_fd = wl_display_get_fd(d->display);
-+        wl_display_dispatch(d->display);
- 
-         d->ref_count = 1;
-         g_display = d;
-@@ -182,6 +180,7 @@ va_put_surface_wayland(
-          dst_rect->x, dst_rect->y, dst_rect->width, dst_rect->height
-      );
- 
-+    wl_surface_commit(d->surface);
-     wl_display_flush(d->display);
-     return VA_STATUS_SUCCESS;
- }
-diff --git a/test/putsurface/putsurface_wayland.c b/test/putsurface/putsurface_wayland.c
-index 3e1d495..b93334d 100644
---- a/test/putsurface/putsurface_wayland.c
-+++ b/test/putsurface/putsurface_wayland.c
-@@ -102,7 +102,7 @@ struct display {
-     struct wl_display  *display;
-     struct wl_compositor *compositor;
-     struct wl_shell    *shell;
--    uint32_t            mask;
-+    struct wl_registry *registry;
-     int                 event_fd;
- };
- 
-@@ -153,7 +153,7 @@ va_put_surface(
-     if (wl_drawable->redraw_pending) {
-         wl_display_flush(d->display);
-         while (wl_drawable->redraw_pending)
--            wl_display_iterate(wl_drawable->display, WL_DISPLAY_READABLE);
-+            wl_display_dispatch(wl_drawable->display);
-     }
- 
-     va_status = vaGetSurfaceBufferWl(va_dpy, va_surface, VA_FRAME_PICTURE, &buffer);
-@@ -169,35 +169,33 @@ va_put_surface(
-     wl_display_flush(d->display);
-     wl_drawable->redraw_pending = 1;
-     callback = wl_surface_frame(wl_drawable->surface);
-+    wl_surface_commit(wl_drawable->surface);
-     wl_callback_add_listener(callback, &frame_callback_listener, wl_drawable);
-     return VA_STATUS_SUCCESS;
- }
- 
- static void
--display_handle_global(
--    struct wl_display *display,
--    uint32_t           id,
--    const char        *interface,
--    uint32_t           version,
--    void              *data
-+registry_handle_global(
-+    void               *data,
-+    struct wl_registry *registry,
-+    uint32_t            id,
-+    const char         *interface,
-+    uint32_t            version
- )
- {
-     struct display * const d = data;
- 
-     if (strcmp(interface, "wl_compositor") == 0)
--        d->compositor = wl_display_bind(display, id, &wl_compositor_interface);
-+        d->compositor =
-+            wl_registry_bind(registry, id, &wl_compositor_interface, 1);
-     else if (strcmp(interface, "wl_shell") == 0)
--        d->shell = wl_display_bind(display, id, &wl_shell_interface);
-+        d->shell = wl_registry_bind(registry, id, &wl_shell_interface, 1);
- }
- 
--static int
--event_mask_update(uint32_t mask, void *data)
--{
--    struct display * const d = data;
--
--    d->mask = mask;
--    return 0;
--}
-+static const struct wl_registry_listener registry_listener = {
-+    registry_handle_global,
-+    NULL,
-+};
- 
- static void *
- open_display(void)
-@@ -213,9 +211,10 @@ open_display(void)
-         return NULL;
- 
-     wl_display_set_user_data(d->display, d);
--    wl_display_add_global_listener(d->display, display_handle_global, d);
--    d->event_fd = wl_display_get_fd(d->display, event_mask_update, d);
--    wl_display_iterate(d->display, d->mask);
-+    d->registry = wl_display_get_registry(d->display);
-+    wl_registry_add_listener(d->registry, &registry_listener, d);
-+    d->event_fd = wl_display_get_fd(d->display);
-+    wl_display_dispatch(d->display);
-     return d->display;
- }
- 
-@@ -298,9 +297,6 @@ check_window_event(
-     if (check_event == 0)
-         return 0;
- 
--    if (!(d->mask & WL_DISPLAY_READABLE))
--        return 0;
--
-     tv.tv_sec  = 0;
-     tv.tv_usec = 0;
-     do {
-@@ -313,7 +309,7 @@ check_window_event(
-             break;
-         }
-         if (retval == 1)
--            wl_display_iterate(d->display, WL_DISPLAY_READABLE);
-+            wl_display_dispatch(d->display);
-     } while (retval > 0);
- 
- #if 0
-diff --git a/va/wayland/va_wayland_drm.c b/va/wayland/va_wayland_drm.c
-index 30c3953..d292316 100644
---- a/va/wayland/va_wayland_drm.c
-+++ b/va/wayland/va_wayland_drm.c
-@@ -44,6 +44,7 @@ typedef struct va_wayland_drm_context {
-     struct va_wayland_context   base;
-     void                       *handle;
-     struct wl_drm              *drm;
-+    struct wl_registry         *registry;
-     void                       *drm_interface;
-     unsigned int                is_authenticated        : 1;
- } VADisplayContextWaylandDRM;
-@@ -142,6 +143,28 @@ va_wayland_drm_destroy(VADisplayContextP pDisplayContext)
-     }
- }
- 
-+static void
-+registry_handle_global(
-+    void               *data,
-+    struct wl_registry *registry,
-+    uint32_t            id,
-+    const char         *interface,
-+    uint32_t            version
-+)
-+{
-+    struct va_wayland_drm_context *wl_drm_ctx = data;
-+
-+    if (strcmp(interface, "wl_drm") == 0) {
-+        wl_drm_ctx->drm =
-+            wl_registry_bind(wl_drm_ctx->registry, id, wl_drm_ctx->drm_interface, 1);
-+    }
-+}
-+
-+static const struct wl_registry_listener registry_listener = {
-+    registry_handle_global,
-+    NULL,
-+};
-+
- bool
- va_wayland_drm_create(VADisplayContextP pDisplayContext)
- {
-@@ -168,14 +191,6 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
-     drm_state->auth_type = 0;
-     ctx->drm_state       = drm_state;
- 
--    id = wl_display_get_global(ctx->native_dpy, "wl_drm", 1);
--    if (!id) {
--        wl_display_roundtrip(ctx->native_dpy);
--        id = wl_display_get_global(ctx->native_dpy, "wl_drm", 1);
--        if (!id)
--            return false;
--    }
--
-     wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME, RTLD_LAZY|RTLD_LOCAL);
-     if (!wl_drm_ctx->handle)
-         return false;
-@@ -185,8 +200,14 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext)
-     if (!wl_drm_ctx->drm_interface)
-         return false;
- 
--    wl_drm_ctx->drm =
--        wl_display_bind(ctx->native_dpy, id, wl_drm_ctx->drm_interface);
-+    wl_drm_ctx->registry = wl_display_get_registry(ctx->native_dpy);
-+    wl_registry_add_listener(wl_drm_ctx->registry, &registry_listener, wl_drm_ctx);
-+    wl_display_roundtrip(ctx->native_dpy);
-+
-+    /* registry_handle_global should have been called by the
-+     * wl_display_roundtrip above
-+     */
-+
-     if (!wl_drm_ctx->drm)
-         return false;
- 
-diff --git a/va/wayland/va_wayland_emgd.c b/va/wayland/va_wayland_emgd.c
-index 73e6802..cb885d1 100644
---- a/va/wayland/va_wayland_emgd.c
-+++ b/va/wayland/va_wayland_emgd.c
-@@ -40,6 +40,7 @@ typedef struct va_wayland_emgd_context {
-     struct wl_emgd             *emgd;
-     void                       *emgd_interface;
-     unsigned int                is_created      : 1;
-+    struct wl_registry         *registry;
- } VADisplayContextWaylandEMGD;
- 
- static inline void
-@@ -86,6 +87,28 @@ va_wayland_emgd_destroy(VADisplayContextP pDisplayContext)
-     }
- }
- 
-+static void
-+registry_handle_global(
-+    void               *data,
-+    struct wl_registry *registry,
-+    uint32_t            id,
-+    const char         *interface,
-+    uint32_t            version
-+)
-+{
-+    VADisplayContextWaylandEMGD *wl_emgd_ctx = data;
-+
-+    if (strcmp(interface, "wl_emgd") == 0) {
-+        wl_emgd_ctx->emgd =
-+            wl_registry_bind(registry, id, wl_emgd_ctx->emgd_interface, 1);
-+    }
-+}
-+
-+static const struct wl_registry_listener registry_listener = {
-+    registry_handle_global,
-+    NULL,
-+};
-+
- bool
- va_wayland_emgd_create(VADisplayContextP pDisplayContext)
- {
-@@ -112,14 +135,6 @@ va_wayland_emgd_create(VADisplayContextP pDisplayContext)
-     drm_state->auth_type = 0;
-     ctx->drm_state       = drm_state;
- 
--    id = wl_display_get_global(ctx->native_dpy, "wl_emgd", 1);
--    if (!id) {
--        wl_display_roundtrip(ctx->native_dpy);
--        id = wl_display_get_global(ctx->native_dpy, "wl_emgd", 1);
--        if (!id)
--            return false;
--    }
--
-     wl_emgd_ctx->handle = dlopen(LIBWAYLAND_EMGD_NAME, RTLD_LAZY|RTLD_LOCAL);
-     if (!wl_emgd_ctx->handle)
-         return false;
-@@ -129,8 +144,13 @@ va_wayland_emgd_create(VADisplayContextP pDisplayContext)
-     if (!wl_emgd_ctx->emgd_interface)
-         return false;
- 
--    wl_emgd_ctx->emgd =
--        wl_display_bind(ctx->native_dpy, id, wl_emgd_ctx->emgd_interface);
-+    wl_emgd_ctx->registry = wl_display_get_registry(ctx->native_dpy);
-+    wl_registry_add_listener(wl_emgd_ctx->registry, &registry_listener, wl_emgd_ctx);
-+    wl_display_roundtrip(ctx->native_dpy);
-+
-+    /* registry_handle_global should have been called by the
-+     * wl_display_roundtrip above
-+     */
-     if (!wl_emgd_ctx->emgd)
-         return false;
-     return true;
diff --git a/x11-libs/libva/libva-1.0.15.ebuild b/x11-libs/libva/libva-1.0.15.ebuild
deleted file mode 100644
index c3a9530c1d72..000000000000
--- a/x11-libs/libva/libva-1.0.15.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.0.15.ebuild,v 1.7 2013/06/27 13:59:58 aballier Exp $
-
-EAPI="3"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://cgit.freedesktop.org/vaapi/libva/snapshot/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="opengl vdpau"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4
-	video_cards_dummy? ( virtual/udev )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	opengl? ( virtual/opengl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( x11-libs/libva-intel-driver )
-	"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable video_cards_dummy dummy-backend) \
-		$(use_enable opengl glx)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva/libva-1.0.16.ebuild b/x11-libs/libva/libva-1.0.16.ebuild
deleted file mode 100644
index 8381e4cd38f4..000000000000
--- a/x11-libs/libva/libva-1.0.16.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.0.16.ebuild,v 1.4 2013/06/27 13:59:58 aballier Exp $
-
-EAPI="3"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://cgit.freedesktop.org/vaapi/libva/snapshot/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="opengl vdpau"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4
-	video_cards_dummy? ( virtual/udev )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	opengl? ( virtual/opengl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-	"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable video_cards_dummy dummy-backend) \
-		$(use_enable opengl glx)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva/libva-1.1.0.ebuild b/x11-libs/libva/libva-1.1.0.ebuild
deleted file mode 100644
index f46f1ecd25aa..000000000000
--- a/x11-libs/libva/libva-1.1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.0.ebuild,v 1.8 2013/06/27 13:59:58 aballier Exp $
-
-EAPI=4
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-inherit autotools ${SCM} multilib eutils
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://cgit.freedesktop.org/vaapi/libva/snapshot/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="egl opengl vdpau wayland X"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-	)
-	egl? ( media-libs/mesa[egl] )
-	opengl? ( virtual/opengl )
-	wayland? ( >=dev-libs/wayland-0.95.0 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-src_prepare() {
-	has_version '>=dev-libs/wayland-1' && epatch "${FILESDIR}/${P}-wayland1.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable opengl glx) \
-		$(use_enable X x11) \
-		$(use_enable wayland) \
-		$(use_enable egl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva/libva-1.1.1-r1.ebuild b/x11-libs/libva/libva-1.1.1-r1.ebuild
deleted file mode 100644
index 6005bc63ba44..000000000000
--- a/x11-libs/libva/libva-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.1-r1.ebuild,v 1.2 2014/06/18 21:02:06 mgorny Exp $
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-DOCS=( NEWS )
-
-MULTILIB_WRAPPED_HEADERS=(
-/usr/include/va/va_backend_glx.h
-/usr/include/va/va_x11.h
-/usr/include/va/va_dri2.h
-/usr/include/va/va_dricommon.h
-/usr/include/va/va_glx.h
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva/libva-1.1.1.ebuild b/x11-libs/libva/libva-1.1.1.ebuild
deleted file mode 100644
index 53569828df84..000000000000
--- a/x11-libs/libva/libva-1.1.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.1.ebuild,v 1.3 2013/06/27 13:59:58 aballier Exp $
-
-EAPI=4
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-	)
-	egl? ( media-libs/mesa[egl] )
-	opengl? ( virtual/opengl )
-	wayland? ( >=dev-libs/wayland-1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable opengl glx) \
-		$(use_enable X x11) \
-		$(use_enable wayland) \
-		$(use_enable egl) \
-		$(use_enable drm)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva/libva-1.2.0-r1.ebuild b/x11-libs/libva/libva-1.2.0-r1.ebuild
deleted file mode 100644
index 4dca548e79bb..000000000000
--- a/x11-libs/libva/libva-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.0-r1.ebuild,v 1.2 2014/06/18 21:02:06 mgorny Exp $
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-PATCHES=( "${FILESDIR}/${P}-autotools-out-of-source-build.patch" )
-DOCS=( NEWS )
-
-MULTILIB_WRAPPED_HEADERS=(
-/usr/include/va/va_backend_glx.h
-/usr/include/va/va_x11.h
-/usr/include/va/va_dri2.h
-/usr/include/va/va_dricommon.h
-/usr/include/va/va_glx.h
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install
-	# collision with media-video/mjpegtools
-	mv "${ED}"/usr/bin/{mpeg2enc,mpeg2enc_libva} || die
-}
diff --git a/x11-libs/libva/libva-1.2.0.ebuild b/x11-libs/libva/libva-1.2.0.ebuild
deleted file mode 100644
index d882c4fba7f6..000000000000
--- a/x11-libs/libva/libva-1.2.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.0.ebuild,v 1.2 2013/06/27 13:59:58 aballier Exp $
-
-EAPI=4
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-	)
-	egl? ( media-libs/mesa[egl] )
-	opengl? ( virtual/opengl )
-	wayland? ( >=dev-libs/wayland-1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable opengl glx) \
-		$(use_enable X x11) \
-		$(use_enable wayland) \
-		$(use_enable egl) \
-		$(use_enable drm)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS || die
-	find "${D}" -name '*.la' -delete
-	# collision with media-video/mjpegtools
-	mv "${ED}"/usr/bin/{mpeg2enc,mpeg2enc_libva} || die
-}
diff --git a/x11-libs/libva/libva-1.2.1-r1.ebuild b/x11-libs/libva/libva-1.2.1-r1.ebuild
deleted file mode 100644
index 7bf8e4dde933..000000000000
--- a/x11-libs/libva/libva-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.1-r1.ebuild,v 1.3 2014/06/18 21:02:06 mgorny Exp $
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.0-autotools-out-of-source-build.patch" )
-DOCS=( NEWS )
-
-MULTILIB_WRAPPED_HEADERS=(
-/usr/include/va/va_backend_glx.h
-/usr/include/va/va_x11.h
-/usr/include/va/va_dri2.h
-/usr/include/va/va_dricommon.h
-/usr/include/va/va_glx.h
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva/libva-1.2.1.ebuild b/x11-libs/libva/libva-1.2.1.ebuild
deleted file mode 100644
index 3b97003ead1b..000000000000
--- a/x11-libs/libva/libva-1.2.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.1.ebuild,v 1.1 2013/06/29 03:43:38 aballier Exp $
-
-EAPI=4
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-inherit autotools ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-	)
-	egl? ( media-libs/mesa[egl] )
-	opengl? ( virtual/opengl )
-	wayland? ( >=dev-libs/wayland-1 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable opengl glx) \
-		$(use_enable X x11) \
-		$(use_enable wayland) \
-		$(use_enable egl) \
-		$(use_enable drm)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/x11-libs/libva/libva-1.3.0.ebuild b/x11-libs/libva/libva-1.4.0.ebuild
similarity index 95%
rename from x11-libs/libva/libva-1.3.0.ebuild
rename to x11-libs/libva/libva-1.4.0.ebuild
index e32e76f17747..f35041e982be 100644
--- a/x11-libs/libva/libva-1.3.0.ebuild
+++ b/x11-libs/libva/libva-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.3.0.ebuild,v 1.2 2014/06/18 21:02:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.4.0.ebuild,v 1.1 2014/10/24 07:00:48 aballier Exp $
 
 EAPI=5
 
diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
index ca090b94a230..45d1792a05ea 100644
--- a/x11-libs/startup-notification/Manifest
+++ b/x11-libs/startup-notification/Manifest
@@ -1,2 +1 @@
-DIST startup-notification-0.10.tar.gz 328787 SHA256 64bbeb5c28619721fc19d6920ad2b8bf6c0dc3a0e96a1b0bc26f480fbc525459
 DIST startup-notification-0.12.tar.gz 355285 SHA256 3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a SHA512 ea1246acdb50dafd9ced9914ec3c8f0d499c0ca3cfd447b43a444c768a6e9ea7135e5c42d9ca0089354698ac235bd86d42f12c70a3a17c9c79f998c07461f7ab WHIRLPOOL 3ce5fa69c618785443837df43261a5ed7edb9f0b3c13bf19638b1b7db90814957780099014bd61af51562874dd2c1fafea9134fe0af11521dfbc864d1abc9b88
diff --git a/x11-libs/startup-notification/files/startup-notification-0.10-tests.patch b/x11-libs/startup-notification/files/startup-notification-0.10-tests.patch
deleted file mode 100644
index 612d0b19d77a..000000000000
--- a/x11-libs/startup-notification/files/startup-notification-0.10-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Do not build tests unless required.
-
-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=226257
---- a/test/Makefile.am	2009-04-03 16:56:51.000000000 +0200
-+++ b/test/Makefile.am	2009-07-26 12:08:44.855802976 +0200
-@@ -16,7 +16,7 @@
- 	test-launcher-xcb			\
- 	test-watch-xmessages-xcb
- 
--noinst_PROGRAMS=$(XLIB_TEST) $(XCB_TEST)
-+check_PROGRAMS=$(XLIB_TEST) $(XCB_TEST)
- 
- test_launcher_SOURCES= test-launcher.c
- 
diff --git a/x11-libs/startup-notification/startup-notification-0.10.ebuild b/x11-libs/startup-notification/startup-notification-0.10.ebuild
deleted file mode 100644
index 37aedf486d8a..000000000000
--- a/x11-libs/startup-notification/startup-notification-0.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/startup-notification/startup-notification-0.10.ebuild,v 1.14 2012/05/05 03:52:26 jdhore Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Application startup notification and feedback library"
-HOMEPAGE="http://www.freedesktop.org/software/startup-notification"
-SRC_URI="http://freedesktop.org/software/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2 MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libxcb
-	<x11-libs/xcb-util-0.3.8
-	>=x11-libs/xcb-util-0.3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto
-	x11-libs/libXt"
-
-DOCS="AUTHORS ChangeLog doc/startup-notification.txt NEWS README"
-
-src_prepare() {
-	# Do not build tests unless required
-	epatch "${FILESDIR}"/${P}-tests.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/lib*/libstartup-notification-1.la
-}
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
index 78e6fe13528b..ad3a3e566a7e 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild,v 1.2 2014/06/18 21:15:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild,v 1.3 2014/10/23 19:39:58 mgorny Exp $
 
 EAPI=5
 
@@ -19,9 +19,11 @@ HOMEPAGE="http://xcb.freedesktop.org/"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
-RDEPEND=">=x11-libs/xcb-util-${PV}[${MULTILIB_USEDEP}]
-	>=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
+	>=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
 	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild
index dcd75aca1efd..453bc869a425 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild,v 1.1 2014/10/23 14:00:08 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild,v 1.2 2014/10/23 19:50:01 mgorny Exp $
 
 EAPI=5
 
@@ -18,11 +18,12 @@ HOMEPAGE="http://xcb.freedesktop.org/"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
-RDEPEND=">=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]
 	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11:=[${MULTILIB_USEDEP}] )"
+	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild
index 488df5e6fbdc..1fa2ecee0e1f 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild,v 1.1 2014/10/23 13:57:57 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild,v 1.2 2014/10/23 19:51:16 mgorny Exp $
 
 EAPI=5
 
@@ -18,11 +18,11 @@ HOMEPAGE="http://xcb.freedesktop.org/"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
-RDEPEND=">=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]
+RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]
 	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11:=[${MULTILIB_USEDEP}] )"
+	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild
index 2500aa726506..3c044f9a7da9 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild,v 1.2 2014/06/18 21:17:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild,v 1.3 2014/10/23 19:48:15 mgorny Exp $
 
 EAPI=5
 
@@ -19,8 +19,8 @@ HOMEPAGE="http://xcb.freedesktop.org/"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
-RDEPEND=">=x11-libs/xcb-util-${PV}[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
 	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild
index 3a287ba1864b..d3f1a96a5b6c 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild,v 1.2 2014/06/18 21:17:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild,v 1.3 2014/10/23 19:46:47 mgorny Exp $
 
 EAPI=5
 
@@ -19,8 +19,8 @@ HOMEPAGE="http://xcb.freedesktop.org/"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
-RDEPEND=">=x11-libs/xcb-util-0.3.9-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
 	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index e6e77dc92140..4994c2098f7a 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,4 +1,2 @@
-DIST pekwm-0.1.15.tar.bz2 395557 SHA256 56d405b87f3d858ebc53a227e4de23b9273067707251145c90af08d35bc7582f SHA512 d55e292f760cc704fbed3c6c7e7f9cc65ca1778f573ea368a6f28a2f588777df27c549499b8e92bdc7c9a30f6acbeddbfb77f36d06e7e5da75e34c1031f4b87f WHIRLPOOL a6f61e33ed7b491b714071edc10a65a4bd98c36707a9475bfc0549f3fdb2268a2ffc9a3930491c74e052822de5a4d567c08c1323bc7e2c0e11da31c23012d81c
-DIST pekwm-0.1.16.tar.bz2 401550 SHA256 899eef35d5d1f472dd65a08c180b9719935cb1f42eda7fada6f9b8b551c79c96 SHA512 28e45b9adfd9314d1614385c3e549fb5cb804d9e265fea7d905254e985f354d464d367040394456c70ae4e8e9da6b05c55fe029cea5893328f6f1ae503c25e34 WHIRLPOOL 404ef48f8632d8a48f11bbd5d52a8faf4c7b7e0452f15c959c58c7bd936c9ba735fcd157f8fbca8177a3dd4a33fb8dc42bb8d91892234b2e77f6a10a01edfa91
 DIST pekwm-0.1.17.tar.bz2 405742 SHA256 8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00 SHA512 fa4c95ddc7e17f737b4e90f32258a79bf2a0abe96a2ab1a4166b1aa6832ff7a978116d224c98c31a4b33444b3c59e9ecd6095ca062d8a65f0f6174803f5b0811 WHIRLPOOL e7371577e9cef2aade3679dbe50bc2124a55fdd443fada46cf3068e7cb9fc70c9f81f747c93a04a2b347c4b772c55b7520030fa0cbac50d4572a8e6599479327
 DIST pekwm-themes.tar.bz2 138599 SHA256 5a14f0c98381e0d5b36dcc2e56b30b0dd279e14b6dd61b199fedf807eccb4a13 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d WHIRLPOOL 1d55f89b2ca75fa169590e60d72c14c6049eceb100c1fb54ed736657a48a236eb2be6378852366254d2faf0da446eb570eecee3a3388064e7c45e54996dc6a0d
diff --git a/x11-wm/pekwm/files/pekwm-0.1.11-libpng14.patch b/x11-wm/pekwm/files/pekwm-0.1.11-libpng14.patch
deleted file mode 100644
index 98d394f825eb..000000000000
--- a/x11-wm/pekwm/files/pekwm-0.1.11-libpng14.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://repos.archlinux.org/wsvn/packages/pekwm/trunk/libpng-1.4.patch
-
---- src/PImageLoaderPng.cc
-+++ src/PImageLoaderPng.cc
-@@ -108,7 +108,7 @@
-     
-     // gray -> 8 bit gray
-     if (color_type == PNG_COLOR_TYPE_GRAY && (bpp < 8)) {
--        png_set_gray_1_2_4_to_8(png_ptr);
-+        png_set_expand_gray_1_2_4_to_8(png_ptr);
-     }
- 
-     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
-@@ -179,7 +179,7 @@
- 
-     status = fread(sig, 1, PImageLoaderPng::PNG_SIG_BYTES, fp);
-     if (status == PImageLoaderPng::PNG_SIG_BYTES) {
--        return (png_check_sig(sig, PImageLoaderPng::PNG_SIG_BYTES) != 0);
-+        return (png_sig_cmp(sig, 0, PImageLoaderPng::PNG_SIG_BYTES) == 0);
-     }
-     return false;
- }
diff --git a/x11-wm/pekwm/metadata.xml b/x11-wm/pekwm/metadata.xml
index 6d998c85b600..6746a3d39574 100644
--- a/x11-wm/pekwm/metadata.xml
+++ b/x11-wm/pekwm/metadata.xml
@@ -2,7 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
-	<maintainer><email>jer@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+	</maintainer>
 	<maintainer>
 		<email>linbug+gbz@posteo.org</email>
 		<name>Andreas Schlick</name>
diff --git a/x11-wm/pekwm/pekwm-0.1.15.ebuild b/x11-wm/pekwm/pekwm-0.1.15.ebuild
deleted file mode 100644
index b67fe2d563d1..000000000000
--- a/x11-wm/pekwm/pekwm-0.1.15.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.15.ebuild,v 1.6 2014/08/01 10:35:27 armin76 Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A small window mananger based on aewm++"
-HOMEPAGE="http://pekwm.org/"
-SRC_URI="http://pekwm.org/projects/pekwm/files/${P}.tar.bz2
-	mirror://gentoo/${PN}-themes.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=" amd64 ~mips ppc x86 ~x86-fbsd"
-IUSE="debug truetype xinerama"
-
-RDEPEND="virtual/jpeg
-	media-libs/libpng
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	truetype? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--enable-image-jpeg \
-		--enable-image-png \
-		--enable-image-xpm \
-		--enable-shape \
-		--enable-xrandr
-}
-
-src_install() {
-	default
-
-	rm "${WORKDIR}/themes/Ace/.theme.swp"
-	mv "${WORKDIR}/themes/"* "${D}/usr/share/${PN}/themes/"
-}
diff --git a/x11-wm/pekwm/pekwm-0.1.16.ebuild b/x11-wm/pekwm/pekwm-0.1.16.ebuild
deleted file mode 100644
index 76129773dbe7..000000000000
--- a/x11-wm/pekwm/pekwm-0.1.16.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.16.ebuild,v 1.2 2014/08/01 10:35:27 armin76 Exp $
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A small window mananger based on aewm++"
-HOMEPAGE="http://pekwm.org/"
-SRC_URI="http://pekwm.org/projects/pekwm/files/${P}.tar.bz2
-	mirror://gentoo/${PN}-themes.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=" ~amd64 ~mips ~ppc ~x86 ~x86-fbsd"
-IUSE="debug truetype xinerama"
-
-RDEPEND="virtual/jpeg
-	media-libs/libpng
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	truetype? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--enable-image-jpeg \
-		--enable-image-png \
-		--enable-image-xpm \
-		--enable-shape \
-		--enable-xrandr
-}
-
-src_install() {
-	default
-
-	rm "${WORKDIR}/themes/Ace/.theme.swp"
-	mv "${WORKDIR}/themes/"* "${D}/usr/share/${PN}/themes/"
-}