diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index ab0128e0a157..3b69658669a0 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,3 +1,3 @@
 DIST salt-2014.1.13.tar.gz 2846659 SHA256 0ab37478e18e6490eccef4deb9f77a20c99ffcc6f97b48e25eb546f8b73f3c22 SHA512 967f7759cbeb55dba0842c8f6efa281a28afa3e9ad7fd0771c587629e8e601cdaf440573e2453e1f21ec3dafa01f0b042ecbd1faa515c9d088cefb19f6ce6629 WHIRLPOOL d992900416f55f857f7685b2110fad6aa43e5859005259dc7db66853aa57c74a8ac06c1894d4c4bf26959c61ccacdff3273c1cbf18039ec005d36fffbc30fbbb
 DIST salt-2014.7.0.tar.gz 3518342 SHA256 d4a64436636a5e6839c1ae1d16052d2e965b9aed5c3c58735bd89fddb9a0ed5c SHA512 2954c9c3fa061823a315e26c5e5b34d8cf982a91b39f123dbeb85afa92451a5dd176394af9ae5667ffd5ab9463766ae08c5d5a00d5ef6d9107669b45b0c6778f WHIRLPOOL 348b49cdb852d3af40dd68592b1b6cd40f8088889a062f44767d23912eef61474571c35633cceee49fd0057df26662eb3e4b3d53b6f3f118c4c9e0b10f2df08f
-DIST salt-2014.7.1.tar.gz 3583585 SHA256 fbb292ec9bd77fce0965bfaf429021916edbee83f6544c0216738d8653fff10a SHA512 37c3e368bb2467409a1576cf0311de3b38d670b242694c0757f05cfc4062d4c358417d0d307fad6044ad239ebea79559f895a5bffe2e9715690b8ffa32151ad0 WHIRLPOOL 45ba016aa8d220e0004123ec849b32d1906366a56f182d70490c2fae456cac3b18d1aa278c9fcabcc8d6bc59df5aa4a451190e759378b36be4192233a03e2108
+DIST salt-2014.7.2.tar.gz 3570683 SHA256 92e6b9afe764c836cd24aa210d98050bc0fdb4d8ee9f813edc504ea19651e505 SHA512 baf9e856a84e208fe3906100e10b31ca06992a90d64aecb7a95315c5048a6a627fc0cc56276302afcd1f0a4230c7bd564e37d0c09ebcb8eedad9ee6c96830da1 WHIRLPOOL 72b3511ecb3de0a5a97f883b7329ae1a92735fde39942c8f70679f358c8ef7f0115de518c79158505b91b517d22a0188dbf97c4bfa79fcdeeefe79dd43e53ac4
diff --git a/app-admin/salt/salt-2014.7.0-r1.ebuild b/app-admin/salt/salt-2014.7.0-r1.ebuild
deleted file mode 100644
index 53faa1e6198a..000000000000
--- a/app-admin/salt/salt-2014.7.0-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.7.0-r1.ebuild,v 1.1 2014/12/03 22:10:14 chutzpah Exp $
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils distutils-r1 systemd
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
-IUSE+=" openssl redis timelib raet +zeromq test"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	raet? (
-		dev-python/libnacl[${PYTHON_USEDEP}]
-		dev-python/ioflo[${PYTHON_USEDEP}]
-		dev-python/raet[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-	api? (
-		|| (
-			dev-python/cherrypy[${PYTHON_USEDEP}]
-			www-servers/tornado[${PYTHON_USEDEP}]
-		)
-	)
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2014.4.24[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=(README.rst AUTHORS)
-
-REQUIRED_USE="|| ( raet zeromq )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-pydsl-includes-test.patch"
-)
-
-python_prepare() {
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py
-}
-
-python_install_all() {
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for s in minion master syndic $(use api && echo api); do
-		newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-		systemd_dounit "${FILESDIR}"/salt-${s}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-
-	# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
-	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
-		./tests/runtests.py --unit-tests --no-report --verbose || die "testing failed"
-}
diff --git a/app-admin/salt/salt-2014.7.1.ebuild b/app-admin/salt/salt-2014.7.2.ebuild
similarity index 85%
rename from app-admin/salt/salt-2014.7.1.ebuild
rename to app-admin/salt/salt-2014.7.2.ebuild
index 8916ac8ffbe6..56737010a7f0 100644
--- a/app-admin/salt/salt-2014.7.1.ebuild
+++ b/app-admin/salt/salt-2014.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.7.1.ebuild,v 1.1 2015/01/16 22:56:46 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.7.2.ebuild,v 1.1 2015/02/17 20:07:03 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_7)
@@ -45,7 +45,7 @@ RDEPEND="sys-apps/pciutils
 	)
 	zeromq? (
 		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
+		>=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
 		dev-python/pycrypto[${PYTHON_USEDEP}]
 	)
 	api? (
@@ -67,7 +67,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2014.8.5[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
 		${RDEPEND}
 	)"
 
@@ -76,16 +76,12 @@ DOCS=(README.rst AUTHORS)
 REQUIRED_USE="|| ( raet zeromq )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-remove-pydsl-includes-test.patch"
+	"${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch"
 )
 
 python_prepare() {
 	# this test fails because it trys to "pip install distribute"
 	rm tests/unit/{modules,states}/zcbuildout_test.py
-
-	# these tests fail because they depend on features that are only
-	# in git versions of SaltTesting
-	rm tests/unit/{templates/jinja,modules/hashutil}_test.py
 }
 
 python_install_all() {
@@ -107,5 +103,6 @@ python_test() {
 
 	# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
 	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
-		./tests/runtests.py --unit-tests --no-report --verbose || die "testing failed"
+		${EPYTHON} tests/runtests.py \
+		--unit-tests --no-report --verbose || die "testing failed"
 }
diff --git a/app-admin/salt/salt-9999.ebuild b/app-admin/salt/salt-9999.ebuild
index 1e20ea3c6d74..fbed190aedb6 100644
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.16 2015/01/16 22:56:46 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-9999.ebuild,v 1.17 2015/02/17 20:07:03 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_7)
@@ -45,7 +45,7 @@ RDEPEND="sys-apps/pciutils
 	)
 	zeromq? (
 		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
+		>=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
 		dev-python/pycrypto[${PYTHON_USEDEP}]
 	)
 	api? (
@@ -67,7 +67,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2014.8.5[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
 		${RDEPEND}
 	)"
 
@@ -99,5 +99,6 @@ python_test() {
 
 	# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
 	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
-		./tests/runtests.py --unit-tests --no-report --verbose || die "testing failed"
+		${EPYTHON} tests/runtests.py \
+		--unit-tests --no-report --verbose || die "testing failed"
 }
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 9ad6ad9740a8..6aeaf2fec08d 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,3 +1,4 @@
 DIST setools-3.3.8-01-fedora-patches.tar.gz 1128 SHA256 420b852d4209d07b73cec84586e000e7a6a719135ea677711abf97d420840bb6 SHA512 1aa2cc50c307929b522e029a552bfd545aef07656d1983289b0ea9be67aa94c07272a59c17630fc09fd79b06845ada318cdfa48d6cc243a24026e015c23b9634 WHIRLPOOL 25ae2b15fb15060fd0d34c55f4cc098b70a3a616f5334b092657a9c5df037b7fcf00fd185f33ba142e47d46c36b2fb7e9434021d6e987832fe833367a50d7449
 DIST setools-3.3.8-03-gentoo-patches.tar.gz 6584 SHA256 8eac460b7dc2ee5e2f23148cdbf187316edd78ce0ec7ebbb6b0f68d6ad33d86a SHA512 5458dab5775b558e287f946c299753be5cb5eb6c1c2b9df0e32c7cfa758bb5316d142aa6338d3019f5f1eeb72876e4d5ed4939b0dbfe7b7e01c08a19a086bacc WHIRLPOOL e1afa6bb28f3aee2f3acdc66efd8ca02548c4f8e5707052ea455f1db558126f069d63278251630ee68bf4987157279161006975cb14d44055492228fa476cd72
+DIST setools-3.3.8-04-gentoo-patches.tar.bz2 94986 SHA256 9a8a43ac97606fde9b2610ceed65f640638929853f871ce530982bedfd919b64 SHA512 39bf00b6aaf31821c6e2e2fb4c460dd1914fba4bf8385acebedf88f1533da990f1fb925dd49d75827aebef3f394a50a1edea46a07204193b58c65a066a064e6a WHIRLPOOL 4a92e4cf6930584de931c5d0805815aacd1c1af4434ca8e73414eda33588a55ef8d7bdfe4195be642889eee480128cbe12d1c5612e07ea304021b230e0b74816
 DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371
diff --git a/app-admin/setools/setools-3.3.8-r7.ebuild b/app-admin/setools/setools-3.3.8-r7.ebuild
new file mode 100644
index 000000000000..133cf8eb5a85
--- /dev/null
+++ b/app-admin/setools/setools-3.3.8-r7.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r7.ebuild,v 1.2 2015/02/18 03:35:21 perfinion Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit autotools java-pkg-opt-2 python-r1 eutils
+
+DESCRIPTION="SELinux policy tools"
+HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
+SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}/${P}.tar.bz2
+	http://dev.gentoo.org/~perfinion/patches/setools/${P}-04-gentoo-patches.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X debug java python"
+
+DEPEND=">=sys-devel/automake-1.12.1
+	>=sys-libs/libsepol-2.4
+	>=sys-libs/libselinux-2.4
+	sys-devel/bison
+	sys-devel/flex
+	>=dev-db/sqlite-3.2:3
+	dev-libs/libxml2:2
+	virtual/pkgconfig
+	java? (
+		>=virtual/jdk-1.4
+		dev-lang/swig
+	)
+	python? (
+		${PYTHON_DEPS}
+		dev-lang/swig
+	)
+	X? (
+		>=dev-lang/tk-8.4.9
+		>=gnome-base/libglade-2.0
+		>=x11-libs/gtk+-2.8:2
+	)"
+
+RDEPEND=">=sys-libs/libsepol-2.1.4
+	>=sys-libs/libselinux-2.3
+	>=dev-db/sqlite-3.2:3
+	dev-libs/libxml2:2
+	java? ( >=virtual/jre-1.4 )
+	X? (
+		>=dev-lang/tk-8.4.9
+		>=dev-tcltk/bwidget-1.8
+		>=gnome-base/libglade-2.0
+		>=x11-libs/gtk+-2.8:2
+	)"
+
+RESTRICT="test"
+# setools dirs that contain python code to build
+PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python"
+
+pkg_setup() {
+	local myld=$(tc-getLD)
+
+	if use java; then
+		java-pkg-opt-2_pkg_setup
+	fi
+
+	${myld} -v | grep -q "GNU gold" && \
+	ewarn "Bug #467136 shows us that the gold linker doesn't work with setools for now."
+}
+
+src_prepare() {
+	EPATCH_MULTI_MSG="Applying various (Gentoo) setool fixes... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	# Fix build failure due to double __init__.py installation
+	sed -e "s/^wrappedpy_DATA = qpol.py \$(pkgpython_PYTHON)/wrappedpy_DATA = qpol.py/" -i libqpol/swig/python/Makefile.am || die
+
+	local dir
+	for dir in ${PYTHON_DIRS}; do
+		# Python bindings are built/installed manually.
+		sed -e "s/MAYBE_PYSWIG = python/MAYBE_PYSWIG =/" -i ${dir%python}Makefile.am || die "sed failed"
+		# Make PYTHON_LDFLAGS replaceable during running `make`.
+		sed -e "/^AM_LDFLAGS =/s/@PYTHON_LDFLAGS@/\$(PYTHON_LDFLAGS)/" -i ${dir}/Makefile.am || die "sed failed"
+	done
+
+	epatch_user
+
+	eautoreconf
+
+	# Disable byte-compilation of Python modules.
+	echo '#!/bin/sh' > py-compile
+}
+
+src_configure() {
+	econf \
+		--with-java-prefix=${JAVA_HOME} \
+		--disable-selinux-check \
+		--disable-bwidget-check \
+		$(use_enable python swig-python) \
+		$(use_enable java swig-java) \
+		$(use_enable X swig-tcl) \
+		$(use_enable X gui) \
+		$(use_enable debug)
+
+	# work around swig c99 issues.  it does not require
+	# c99 anyway.
+	sed -i -e 's/-std=gnu99//' "${S}/libseaudit/swig/python/Makefile"
+}
+
+src_compile() {
+	emake LD="$(tc-getLD).bfd" || die "Failed to build setools"
+
+	if use python; then
+		building() {
+			python_export PYTHON_INCLUDEDIR
+			python_export PYTHON_SITEDIR
+			python_export PYTHON_LIBS
+			emake LD="$(tc-getLD).bfd" \
+				SWIG_PYTHON_CPPFLAGS="-I${PYTHON_INCLUDEDIR}" \
+				PYTHON_LDFLAGS="${PYTHON_LIBS}" \
+				pyexecdir="${PYTHON_SITEDIR}" \
+				pythondir="${PYTHON_SITEDIR}" \
+				-C ${1};
+		}
+		local dir
+		for dir in ${PYTHON_DIRS}; do
+			python_foreach_impl building ${dir};
+		done
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use python; then
+		installation() {
+			python_export PYTHON_SITEDIR
+			emake DESTDIR="${D}" \
+				pyexecdir="${PYTHON_SITEDIR}" \
+				pythondir="${PYTHON_SITEDIR}" \
+				-C ${1} install
+		}
+
+		local dir
+		for dir in ${PYTHON_DIRS}; do
+			python_foreach_impl installation ${dir};
+		done
+	fi
+}
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index da0346bfc7f2..f5e857b2a7ab 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,3 +1,4 @@
+DIST emacs-24.4.90.tar.xz 39752368 SHA256 cec2204ec0134dfac9987dde3aff95e4a02538d4ce63e8d7c55b6a409aa04b36 SHA512 c7fe2ab40b1a28a97342753afb7fd5c24751ad51a144c723c6c1be517b81006b4641f1f4e833b8424ac00107992934f4e4520dd7aa92074e44ab98a148a17eed WHIRLPOOL b20c133381617f15ee2babca36164a104f18da0f38ae310db4cbc539fa988832a4b7d78acc0e023e4b8c92a877decbce44d45028c8b8ecee708c092dfe27e39d
 DIST emacs-25.0.50_pre20141110.tar.xz 24564108 SHA256 ed5a3600a2434fa6c43fbbb711c9ad682f76bcaeba5632031a0053d1fa7c0020 SHA512 db2add52e31be1d696e3634c92f993db124eaa8f3a727d04603cf47ed4c581643594571177d812d6c86584dce357eec6c86a7c9df1b07b09cb6faac4c699daf2 WHIRLPOOL 91cdba50d7ad9f41859d3247b1b839d1a42cb8004e209b1afe8d86f3c27abdfd3f2b1cf767b480f2ea271871b79886c878a899918056c1abb100bfa0eab87668
 DIST emacs-25.0.50_pre20141231.tar.xz 24688612 SHA256 15bc6b8e1923bb6c1e18e3a8d89652c6594d72fbd1e3c15898ab9df03d19ad77 SHA512 b544f3530c707927c8ef4614b0804505e6cb32d8d6cef45f7aff56f67d632906d447d381a374ef37c6c46660cba1bb53dc7adead308bd902951abcc475593c75 WHIRLPOOL 0f373c4ef413a88e91e41b707686413a93661121453f3a80bff1cba75a17271dd30cd8dc64037487d2dcb2e3f4681af3bc989668c931b006a1bb2742eb5a9d5b
 DIST emacs-25.0.50_pre20150131.tar.xz 24719944 SHA256 fa21415c14d724c6cbd92ea8b76bfbc157757baf1446492b5f72062ff0017076 SHA512 85629851ba93d25050e0590b8c00ea9417e2c6839d306276ec3f02ce4d6bba14fe407f32eb07dcc2d42c79fade0678e9e5c098cf1562831a0a715373629a9d40 WHIRLPOOL e58589ac54577800e971232e814212b2954c93c42d701c137283590833420680968f71b46c6e087c4b3d900f96fb1c99edc6420ffbd336740e9b079e01e9ef4a
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.90.ebuild
new file mode 100644
index 000000000000..4864007bb88a
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.90.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.90.ebuild,v 1.1 2015/02/17 16:42:14 ulm Exp $
+
+EAPI=5
+
+inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
+	EGIT_BRANCH="emacs-24"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+else
+	SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
+		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="24"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
+	net-libs/liblockfile
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	gfile? ( >=dev-libs/glib-2.28.6 )
+	gnutls? ( net-libs/gnutls )
+	gpm? ( sys-libs/gpm )
+	hesiod? ( net-dns/hesiod )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	selinux? ( sys-libs/libselinux )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			gtk3? ( x11-libs/gtk+:3 )
+			!gtk3? ( x11-libs/gtk+:2 )
+		)
+		!gtk? (
+			motif? ( >=x11-libs/motif-2.3:0 )
+			!motif? (
+				Xaw3d? ( x11-libs/libXaw3d )
+				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? (
+		sys-apps/attr
+		sys-apps/paxctl
+	)"
+
+if [[ ${PV##*.} = 9999 ]]; then
+	DEPEND="${DEPEND}
+	sys-apps/texinfo"
+fi
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	epatch_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	#AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
+	if [[ ${PV##*.} = 9999 ]]; then
+		myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-gameuser="${GAMES_USER_DED:-games}" \
+		--without-compress-install \
+		--with-file-notification=$(usev gfile || usev inotify || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with gnutls) \
+		$(use_with gpm) \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with libxml2 xml2) \
+		$(use_with selinux) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
+}
+
+src_install () {
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+		|| die "moving emacs man page failed"
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{applications,icons}
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and info
+		pages. Therefore, several Emacs versions can be installed at the
+		same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+		strongly recommended that you use app-admin/emacs-updater to rebuild
+		all byte-compiled elisp files of the installed Emacs packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+
+	local pvr
+	for pvr in ${REPLACING_VERSIONS}; do
+		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
+	done
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-emulation/lxc/lxc-1.1.0-r1.ebuild b/app-emulation/lxc/lxc-1.1.0-r2.ebuild
similarity index 97%
rename from app-emulation/lxc/lxc-1.1.0-r1.ebuild
rename to app-emulation/lxc/lxc-1.1.0-r2.ebuild
index c1a55316a47b..b05d050387d7 100644
--- a/app-emulation/lxc/lxc-1.1.0-r1.ebuild
+++ b/app-emulation/lxc/lxc-1.1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.1.0-r1.ebuild,v 1.1 2015/02/15 15:38:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.1.0-r2.ebuild,v 1.1 2015/02/17 15:15:21 hwoarang Exp $
 
 EAPI="5"
 
@@ -173,7 +173,7 @@ src_install() {
 	doexe config/init/systemd/${PN}-devsetup
 	# Remember to compare our systemd unit file with the upstream one
 	# config/init/systemd/lxc.service.in
-	systemd_newunit "${FILESDIR}"/${PN}_at.service "lxc@.service"
+	systemd_newunit "${FILESDIR}"/${PN}_at.service.2 "lxc@.service"
 }
 
 pkg_postinst() {
diff --git a/app-emulation/lxc/lxc-1.1.0.ebuild b/app-emulation/lxc/lxc-1.1.0.ebuild
deleted file mode 100644
index d068911f9c7e..000000000000
--- a/app-emulation/lxc/lxc-1.1.0.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.1.0.ebuild,v 1.2 2015/02/08 10:06:47 hwoarang Exp $
-
-EAPI="5"
-
-MY_P="${P/_/-}"
-PYTHON_COMPAT=( python{3_2,3_3,3_4} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/"
-SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="cgmanager doc examples lua python seccomp"
-
-RDEPEND="net-libs/gnutls
-	sys-libs/libcap
-	cgmanager? ( app-admin/cgmanager )
-	lua? ( >=dev-lang/lua-5.1 )
-	python? ( ${PYTHON_DEPS} )
-	seccomp? ( sys-libs/libseccomp )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-sgml-utils )
-	>=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
-	sys-process/criu
-	sys-apps/util-linux
-	app-misc/pax-utils
-	virtual/awk"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-	~CPUSETS ~CGROUP_CPUACCT
-	~RESOURCE_COUNTERS
-	~CGROUP_SCHED
-
-	~NAMESPACES
-	~IPC_NS ~USER_NS ~PID_NS
-
-	~NETLINK_DIAG ~PACKET_DIAG
-	~INET_UDP_DIAG ~INET_TCP_DIAG
-	~UNIX_DIAG ~CHECKPOINT_RESTORE
-
-	~DEVPTS_MULTIPLE_INSTANCES
-	~CGROUP_FREEZER
-	~UTS_NS ~NET_NS
-	~VETH ~MACVLAN
-
-	~POSIX_MQUEUE
-	~!NETPRIO_CGROUP
-
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
-
-ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG:  needed for lxc-checkpoint"
-ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG:  needed for lxc-checkpoint"
-ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG:  needed for lxc-checkpoint"
-ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG:  needed for lxc-checkpoint"
-ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE:  needed for lxc-checkpoint"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
-
-ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC features make LXC unusable see postinst notes"
-
-DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	if [[ -n ${BACKPORTS} ]]; then
-		epatch "${WORKDIR}"/patches/*
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.0.6-bash-completion.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# I am not sure about the --with-rootfs-path
-	# /var/lib/lxc is probably more appropriate than
-	# /usr/lib/lxc.
-	econf \
-		--localstatedir=/var \
-		--bindir=/usr/sbin \
-		--docdir=/usr/share/doc/${PF} \
-		--with-config-path=/etc/lxc	\
-		--with-rootfs-path=/var/lib/lxc/rootfs \
-		--with-distro=gentoo \
-		--with-runtime-path=/run \
-		--disable-apparmor \
-		$(use_enable cgmanager) \
-		$(use_enable doc) \
-		$(use_enable examples) \
-		$(use_enable lua) \
-		--disable-python \
-		$(use_enable seccomp)
-}
-
-python_compile() {
-	distutils-r1_python_compile build_ext -I ../ -L ../${PN}
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		pushd "${S}/src/python-${PN}" > /dev/null
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
-	bashcomp_alias ${PN}-start \
-		${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
-
-	if use python; then
-		pushd "${S}/src/python-lxc" > /dev/null
-		# Unset DOCS. This has been handled by the default target
-		unset DOCS
-		distutils-r1_src_install
-		popd > /dev/null
-	fi
-
-	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
-
-	find "${D}" -name '*.la' -delete
-
-	# Gentoo-specific additions!
-	# Use initd.3 per #517144
-	newinitd "${FILESDIR}/${PN}.initd.3" ${PN}
-
-	# lxc-devsetup script
-	exeinto /usr/libexec/${PN}
-	doexe config/init/systemd/${PN}-devsetup
-	# Use that script with the systemd service (Similar to upstream
-	# Makefile.am
-	cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service || die
-	sed -i \
-		"/Restart=always/a ExecStartPre=/usr/libexec/${PN}/${PN}-devsetup" \
-		${PN}_at.service \
-		|| die "Failed to add ${PN}-devsetup to the systemd service file"
-	systemd_newunit ${PN}_at.service "lxc@.service"
-}
-
-pkg_postinst() {
-	elog "There is an init script provided with the package now; no documentation"
-	elog "is currently available though, so please check out /etc/init.d/lxc ."
-	elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
-	elog "to start the container defined into /etc/lxc/configname.conf ."
-	elog "For further information about LXC development see"
-	elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
-	elog ""
-}
diff --git a/app-misc/xmind/Manifest b/app-misc/xmind/Manifest
index 4997a57556ab..05f8474764e4 100644
--- a/app-misc/xmind/Manifest
+++ b/app-misc/xmind/Manifest
@@ -1,2 +1,3 @@
 DIST xmind-icons.tar.xz 5024 SHA256 6a5e087c5c66aa6f36b7822268b486922157e3b75a091b6fbdeec905607b8aa5 SHA512 3ee6b8e42b75305bec8f97f733575f10ca3d08e1c5a76a10700776cb7740ae6f8a0f3dfbc4112d60ab2499915ca4ea0e3d56fd49e55bec00fccdc8710d9f9f0d WHIRLPOOL 590571a8b950ff6200d92417ab7eede2a8856263bc07c00fb129d751d9a00ae9bab69d916aab2f04d8270eadb0466723e99570032eacabd7350afd3cca4b8f23
 DIST xmind-portable-3.4.1.201401221918.zip 138440913 SHA256 f70b8317ec0fe512e507bc26cc7fed70348af3c1d8c17603a78359175fc01261 SHA512 06d6473b26a0eef97d6651d14c13d7fd28fda19b33b2aea4f924d2e0f0d3131f19d5b64e081ba0d537c44eb09e27a83596aca91156bd32c5377903fbb7da9804 WHIRLPOOL 2601e8f293ef97d12576a461bb3b7a8e68bf6a4f807f780b9e6b7a12c20030bc979f61cf1f76f6deb617c57aa2c16e8d35621e66c5df825f8800ca38304d8ee0
+DIST xmind-portable-3.5.1.201411201906.zip 160601004 SHA256 920321dc254604d51d4b3b4718ba04271de0e47b63a836fc597467c4062a89e4 SHA512 24da7bf3bfbc0beddbf6f4bb4b9d465e28c652b6e80ba9e0bc2a52cc2ff8c175a83ea8cc0d5b3dc87961c5b6666b6294ca836e29795631db41455ef1b8b2b3f0 WHIRLPOOL 9dab13d6578fe7e817cfa43ce171e33ae5f6d0f939f307b8cf15d651a70800763776bf9ed318a7116716dc7aa20793455a771d46f38ca13780dc9272024f73fe
diff --git a/app-misc/xmind/xmind-3.5.1.201411201906.ebuild b/app-misc/xmind/xmind-3.5.1.201411201906.ebuild
new file mode 100644
index 000000000000..23842d1b2bbd
--- /dev/null
+++ b/app-misc/xmind/xmind-3.5.1.201411201906.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xmind/xmind-3.5.1.201411201906.ebuild,v 1.1 2015/02/17 22:45:13 creffett Exp $
+
+EAPI=5
+
+inherit eutils multilib gnome2-utils
+
+MY_PN="${PN}-portable"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A brainstorming and mind mapping software tool"
+HOMEPAGE="http://www.xmind.net"
+SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
+	http://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
+LICENSE="EPL-1.0 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5
+	x11-libs/gtk+:2
+"
+
+S=${WORKDIR}
+
+QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
+QA_FLAGS_IGNORED="
+	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.200.v20120522-1813/eclipse_1502.so
+	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20120522-1813/eclipse_1502.so
+	opt/xmind/XMind/libcairo-swt.so
+	opt/xmind/XMind/XMind
+"
+
+src_configure() {
+	if use amd64; then
+		XDIR="XMind_Linux_64bit"
+	else
+		XDIR="XMind_Linux"
+	fi
+	mv "$XDIR" XMind || die
+	mv XMind/.eclipseproduct Commons || die
+	cp "${FILESDIR}"/${PN}-3.4.0-config.ini Commons/configuration || die #Combined common+linux config.ini
+	# force data instance & config area to be at home/.xmind directory
+	sed -i -e '/-configuration/d' \
+		-e '/\.\/configuration/d' \
+		-e '/-data/d' \
+        -e '/\.\.\/Commons\/data\/workspace-cathy/d' \
+		-e 's/\.\.\/Commons/\/opt\/xmind\/Commons/g' XMind/XMind.ini || die
+	echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
+	echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /opt/xmind
+	doins -r Commons XMind || die
+	fperms a+rx  "/opt/xmind/XMind/XMind"
+
+	dodir /opt/bin
+	exeinto /opt/bin
+	newexe "${FILESDIR}/xmind-wrapper" xmind
+
+	# install icons
+	local res
+	for res in 16 32 48; do
+		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
+	done
+
+	# make desktop entry
+	make_desktop_entry "xmind %F" XMind xmind Office "MimeType=application/x-xmind;"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	elog "For audio notes support, install media-sound/lame"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-shells/mpibash/Manifest b/app-shells/mpibash/Manifest
index 9c71677baae4..101f3057151e 100644
--- a/app-shells/mpibash/Manifest
+++ b/app-shells/mpibash/Manifest
@@ -1 +1,2 @@
 DIST mpibash-1.1.tar.gz 346708 SHA256 bbcb4b93db7e58be11c4cebb369b52fe8ea9de1abd474f7834c9937002335877 SHA512 9729ed92025f0470dac110a2cc0a6ed971082ed98fa09493dc029dc32029474b8a51c55a571e01ee79a026f67829fc6011bcc074e318b5dfc327b3186f5d6f28 WHIRLPOOL e40b98e6762916aa30f9bdb851c8667a0d1afd11cfdf89c76125df822b41f3dccb351581168b5090bb2b890be720c4943222cbd8917d6a3065925d835da820e4
+DIST mpibash-1.2.tar.gz 347083 SHA256 5c2faaa74464111205dbae4799bd89c2425810ec3708d004237b42d620c8be57 SHA512 db755dd2c6212a8d7dfd6cbff17d5dffcbc3b6a0286abdad4d2e21790453d2356e88c566abe4648da138d6964098fad581b8fd5beae1335f5787de92f4659104 WHIRLPOOL 94fcf50d89250a6478a2ed56a0c1769dd678869884e1e80066ebdb479dd0c6d64048ade7829020fdad050b1e77a2315ab7e325a97aa472291d3e9a4888c915e3
diff --git a/app-shells/mpibash/mpibash-1.2.ebuild b/app-shells/mpibash/mpibash-1.2.ebuild
new file mode 100644
index 000000000000..daa43915d129
--- /dev/null
+++ b/app-shells/mpibash/mpibash-1.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mpibash/mpibash-1.2.ebuild,v 1.1 2015/02/17 23:21:14 ottxor Exp $
+
+EAPI=5
+
+inherit autotools multilib
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="git://github.com/losalamos/MPI-Bash.git http://github.com/losalamos/MPI-Bash.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/losalamos/MPI-Bash/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Parallel scripting right from the Bourne-Again Shell (Bash)"
+HOMEPAGE="https://github.com/losalamos/MPI-Bash"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="examples"
+
+DEPEND="virtual/mpi
+	>=app-shells/bash-4.2[plugins]
+	sys-cluster/libcircle"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	[[ "${PV}" = 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf --with-bashdir="${EPREFIX}"/usr/include/bash-plugins \
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash
+}
+
+src_install() {
+	default
+	sed -i '/^export LD_LIBRARY_PATH/d' "${ED}/usr/bin/${PN}" || die
+	use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die
+}
diff --git a/app-shells/mpibash/mpibash-9999.ebuild b/app-shells/mpibash/mpibash-9999.ebuild
new file mode 100644
index 000000000000..56644f654c2d
--- /dev/null
+++ b/app-shells/mpibash/mpibash-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mpibash/mpibash-9999.ebuild,v 1.1 2015/02/17 23:10:31 ottxor Exp $
+
+EAPI=5
+
+inherit autotools multilib
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="git://github.com/losalamos/MPI-Bash.git http://github.com/losalamos/MPI-Bash.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/losalamos/MPI-Bash/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Parallel scripting right from the Bourne-Again Shell (Bash)"
+HOMEPAGE="https://github.com/losalamos/MPI-Bash"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="examples"
+
+DEPEND="virtual/mpi
+	>=app-shells/bash-4.2[plugins]
+	sys-cluster/libcircle"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	[[ "${PV}" = 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf --with-bashdir="${EPREFIX}"/usr/include/bash-plugins \
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash
+}
+
+src_install() {
+	default
+	sed -i '/^export LD_LIBRARY_PATH/d' "${ED}/usr/bin/${PN}" || die
+	use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die
+}
diff --git a/app-shells/tcsh/files/tcsh-6.18.01-aix.patch b/app-shells/tcsh/files/tcsh-6.18.01-aix.patch
new file mode 100644
index 000000000000..669d20634731
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.18.01-aix.patch
@@ -0,0 +1,14 @@
+Upstream report, without better patch yet:
+http://bugs.gw.com/view.php?id=366
+
+--- tc.who.c.orig	2014-06-26 11:21:43 +0200
++++ tc.who.c	2014-06-26 11:21:58 +0200
+@@ -60,6 +60,8 @@
+ #  define TCSH_PATH_UTMP _PATH_UTMPX
+ # elif defined(UTMPX_FILE)
+ #  define TCSH_PATH_UTMP UTMPX_FILE
++# elif defined(UTMP_FILE)
++#  define TCSH_PATH_UTMP UTMP_FILE
+ # elif __FreeBSD_version >= 900000
+ #  /* Why isn't this defined somewhere? */
+ #  define TCSH_PATH_UTMP "/var/run/utx.active"
diff --git a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
index 6bf50e2cecd7..c86a1917dd80 100644
--- a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01-r2.ebuild,v 1.10 2014/01/26 12:11:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01-r2.ebuild,v 1.11 2015/02/17 15:03:26 haubi Exp $
 
 EAPI="3"
 
@@ -32,6 +32,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-6.14.00-debian-dircolors.patch # bug #120792
 	epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
 	epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
+	epatch "${FILESDIR}"/${PN}-6.18.01-aix.patch
 
 	# fix dependency on ncurses[tinfo], #459484
 	sed \
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 52aa25c2ee10..aa37b262db44 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,3 +1,2 @@
-DIST bibletime-2.10.0.tar.xz 3252312 SHA256 89763b17e91b6fe8a791c69d9357bcaf548abb7c1007a1c47efd834a2ec9f1fc SHA512 7c3e7a60d0d8bdcfab4f90eefd9b1dcff5b57c35e4a7224b2eec094a0bf9b9ca9757d9b37317689e4cf0283a132a274ec81a3ba5fea0feb6dd2735e2378c3098 WHIRLPOOL f342e21223cc911f8c80de9a8ecd521aa38a8aeee08238522a389f28a02d3c71580e2ebc9642a042607fbb8219344ddc9c29cacf6f9ef4df1dd78dc379224699
 DIST bibletime-2.10.1.tar.xz 3252680 SHA256 86d2d53913c08bce9f67c0d897639091d84e9d330527636cecd2b9008bf7ca91 SHA512 50f84eb1aefe911f1336ec7a23ea34ade1628383f35dca25330984787221214c0bc0cbc9f88f9540336949df02e76e769b7998d2eef3a15862e3038541564cc9 WHIRLPOOL 2ffc1b1b516d7fa94e842c957dc0be47be5e29ea015fcee2ff291093d0afc201af59d70b055193b420ff3acbc62386980b540eeb63ed92dbd1a741fb68b5be54
 DIST bibletime-2.9.1.tar.bz2 5968979 SHA256 308a86d4a1f63203e01438e75be8306377927498b5d0ae8769a4df3c828013b5 SHA512 6099e48fc3d54cb8362ec1a3965b372e60fd136d036dfd8d94b5e443ee5f27eb092162b653160bfc71d5366f79af35e22ee40d64ecd681f184bc4e90c1cd9e0a WHIRLPOOL 0677646ce099297321c4a519364b41254544f6d8660d72f9e76b6a8eafd08205915f40aef5bbc6463199ca0d272e28b926b13b0637ecdef1bc822256363cecf2
diff --git a/app-text/bibletime/bibletime-2.10.0.ebuild b/app-text/bibletime/bibletime-2.10.0.ebuild
deleted file mode 100644
index 337b98024b35..000000000000
--- a/app-text/bibletime/bibletime-2.10.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-2.10.0.ebuild,v 1.2 2014/08/06 07:09:31 patrick Exp $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Qt4 Bible study application using the SWORD library"
-HOMEPAGE="http://www.bibletime.info/"
-SRC_URI="mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-# bug 313657
-# RESTRICT="test"
-
-RDEPEND="
-	>=app-text/sword-1.6.0
-	>=dev-cpp/clucene-2.3.3.4
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qtwebkit:4
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost
-	dev-libs/icu:=
-	net-misc/curl
-	sys-libs/zlib
-	dev-qt/qttest:4
-"
-
-DOCS=( ChangeLog README )
-
-src_prepare() {
-	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt;:" \
-	    -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_WEBKIT=ON
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/app-text/bibletime/bibletime-2.10.1.ebuild b/app-text/bibletime/bibletime-2.10.1.ebuild
index 53cc2358c58b..9155cabe6d1d 100644
--- a/app-text/bibletime/bibletime-2.10.1.ebuild
+++ b/app-text/bibletime/bibletime-2.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-2.10.1.ebuild,v 1.1 2014/10/15 04:04:26 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-2.10.1.ebuild,v 1.2 2015/02/18 01:47:11 creffett Exp $
 
 EAPI=5
 inherit cmake-utils
diff --git a/dev-cpp/lucene++/Manifest b/dev-cpp/lucene++/Manifest
index be8f88d9c859..611bcb35f969 100644
--- a/dev-cpp/lucene++/Manifest
+++ b/dev-cpp/lucene++/Manifest
@@ -1 +1,2 @@
 DIST lucene++-3.0.6.tar.gz 1529066 SHA256 3e7092a4935e0d1ad5c6d7ac8f3c6ed2f53e51321237ce83744bbf02e0d61519 SHA512 c65aac4cdc92b4593a7d9996273047ff68cc097b755bacdd424266ffcf9143b491ef91123b8e78d9f1fba3d9ac39078a0c2c97c22a39f646f84a0fef0f2956ef WHIRLPOOL 7064b69214d62e05986c78fee2873222c85c2a7a4c892fcc29a5b47f0b1cb67e64789f3665dc3b8ca3628daf28e05c331a99cd0111062683e9323a6827e7ebf5
+DIST lucene++-3.0.7.tar.gz 2013570 SHA256 6c19f203311e4b44a0ccf7b1127db77436eb47159ea1c54f7531a0b1ca585e0c SHA512 92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220 WHIRLPOOL e5d18d6d0ac90f8b0ace161dc0457b2ca3546c211e96ac3c44dea4ba7d9bbd6bd9183016ceb2bccd8516261db0ca2dd4331701bb37e653e96df9453d6acbc878
diff --git a/dev-cpp/lucene++/lucene++-3.0.7.ebuild b/dev-cpp/lucene++/lucene++-3.0.7.ebuild
new file mode 100644
index 000000000000..c203cb392216
--- /dev/null
+++ b/dev-cpp/lucene++/lucene++-3.0.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/lucene++/lucene++-3.0.7.ebuild,v 1.1 2015/02/17 21:25:36 johu Exp $
+
+EAPI=5
+
+MY_P="LucenePlusPlus-rel_${PV}"
+inherit cmake-utils multilib
+
+DESCRIPTION="C++ port of Java Lucene library, a high-performance, full-featured text search engine"
+HOMEPAGE="https://github.com/luceneplusplus/LucenePlusPlus"
+SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS README.rst )
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEMO=OFF
+		-DENABLE_TEST=OFF
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/websocketpp/Manifest b/dev-cpp/websocketpp/Manifest
index 2449f63c3a25..bc9886073a17 100644
--- a/dev-cpp/websocketpp/Manifest
+++ b/dev-cpp/websocketpp/Manifest
@@ -1 +1,2 @@
 DIST websocketpp-0.4.0.tar.gz 628675 SHA256 8634b233c0c47afa6b76c4edcb9694de490b33950c549fd2531b312c18e8cfca SHA512 770560afca5f9c88454c1aec61e5c4dfd38b3835897a96c3815fe1232ba6ef7622d07530d644055e60089d5c6f8ab383691358abf2da5782515ad9f313f1d253 WHIRLPOOL 2fa0f3deabe6c7b5ae22ea5d4e2f90367a68b816cf4ffe81d61b7f9b85ef575c1cc1baadbf685e9c58ea3f442136c3d1128585e7244498b9def0484995015926
+DIST websocketpp-0.5.0.tar.gz 642592 SHA256 ab032d61f1d94fc4ebf3bb74297e520499d6fe56801084d3cc828455482e81d9 SHA512 8c254a3dc772fce31e4dff58e352d967d47d64cfb07dd93d1da7707f27c43760bf2c3d1e43b7669dad20b7986159185e5ba26d87e1716fb896be23173438c947 WHIRLPOOL 719921a8e804a382020d507ebe33bb5779191cc756b92cf9bd5a576370d4824100ddba556b96a3cbe88f9d701e28e6471727ad34f268805006f03ae3b99e39e0
diff --git a/dev-cpp/websocketpp/websocketpp-0.5.0.ebuild b/dev-cpp/websocketpp/websocketpp-0.5.0.ebuild
new file mode 100644
index 000000000000..7da8cb385573
--- /dev/null
+++ b/dev-cpp/websocketpp/websocketpp-0.5.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/websocketpp/websocketpp-0.5.0.ebuild,v 1.1 2015/02/17 20:09:11 johu Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="C++/Boost Asio based websocket client/server library"
+HOMEPAGE="http://www.zaphoyd.com/websocketpp"
+SRC_URI="https://github.com/zaphoyd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+SLOT="0"
+IUSE="boost test"
+
+DEPEMD=""
+RDEPEND="${DEPEND}
+	boost? ( dev-libs/boost )
+"
+
+# tests no-op
+RESTRICT="test"
+
+src_configure() {
+	# Disable EXAMPLES as compilation is broken upstream
+	local mycmakeargs=(
+		-DEXAMPLES=OFF
+		$(cmake-utils_use_enable !boost CPP11)
+		$(cmake-utils_use_enable test TESTS)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-db/mariadb/mariadb-10.0.16.ebuild b/dev-db/mariadb/mariadb-10.0.16.ebuild
index 81064275dde4..671da0efaaf4 100644
--- a/dev-db/mariadb/mariadb-10.0.16.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.16.ebuild,v 1.8 2015/02/16 10:27:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.16.ebuild,v 1.9 2015/02/17 21:07:48 maekke Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20141215-0144Z"
@@ -10,7 +10,7 @@ inherit toolchain-funcs mysql-multilib
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~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"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~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=''
diff --git a/dev-db/postgresql/postgresql-9.0.19.ebuild b/dev-db/postgresql/postgresql-9.0.19.ebuild
index a55db6a036ab..47f6e7b96f61 100644
--- a/dev-db/postgresql/postgresql-9.0.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.0.19.ebuild,v 1.5 2015/02/16 10:19:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.0.19.ebuild,v 1.6 2015/02/17 20:59:50 maekke Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.1.15.ebuild b/dev-db/postgresql/postgresql-9.1.15.ebuild
index 6322630eb170..a35b09d30d66 100644
--- a/dev-db/postgresql/postgresql-9.1.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.1.15.ebuild,v 1.5 2015/02/16 10:19:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.1.15.ebuild,v 1.6 2015/02/17 20:59:50 maekke Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.2.10.ebuild b/dev-db/postgresql/postgresql-9.2.10.ebuild
index 155331f7fa9b..a325e20a5e3c 100644
--- a/dev-db/postgresql/postgresql-9.2.10.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.2.10.ebuild,v 1.5 2015/02/16 10:19:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.2.10.ebuild,v 1.6 2015/02/17 20:59:50 maekke Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.3.6.ebuild b/dev-db/postgresql/postgresql-9.3.6.ebuild
index d5d92e8ff1cb..a857f3d0e49b 100644
--- a/dev-db/postgresql/postgresql-9.3.6.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.3.6.ebuild,v 1.5 2015/02/16 10:19:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.3.6.ebuild,v 1.6 2015/02/17 20:59:50 maekke Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.1.ebuild b/dev-db/postgresql/postgresql-9.4.1.ebuild
index 087414bf8ec4..4b5f88f14d51 100644
--- a/dev-db/postgresql/postgresql-9.4.1.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.4.1.ebuild,v 1.5 2015/02/16 10:19:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.4.1.ebuild,v 1.6 2015/02/17 20:59:50 maekke Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
new file mode 100644
index 000000000000..958338365cf0
--- /dev/null
+++ b/dev-java/oracle-javamail/Manifest
@@ -0,0 +1 @@
+DIST javamail-1.5.2-src.zip 1573447 SHA256 76efde22a38a021baa99087be1878787bf5e72ceb684b1bc33eb260a8ddcbdd5 SHA512 9d2ae8c38a8e7464023219dac13df95a34cab52a5ff9f19015ea0dde73a838f49ae006c9dc1538eeb978844af7ac962ce3b22d89f0f9ccda684141f7b52840bc WHIRLPOOL 6c438c6569cbd689eeaa8398301b5481956443ccb9f2112891bce5e97d1a792e0176e8fb395cbadd4175e87c253db833760aff96ea61654dad3d478d386fbf7b
diff --git a/dev-java/oracle-javamail/metadata.xml b/dev-java/oracle-javamail/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/oracle-javamail/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>java</herd>
+</pkgmetadata>
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
new file mode 100644
index 000000000000..f9ca12f288e1
--- /dev/null
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild,v 1.1 2015/02/17 22:25:19 fordfrog Exp $
+
+EAPI=4
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications"
+HOMEPAGE="https://java.net/projects/javamail/pages/Home"
+
+SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip"
+
+# either of these
+LICENSE="CDDL GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	default
+
+	# build.xml expects it here
+	mkdir -p legal/src/main/resources/META-INF || die
+	cp mail/src/main/resources/META-INF/LICENSE.txt \
+		legal/src/main/resources/META-INF || die
+}
+
+EANT_DOC_TARGET="docs"
+EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
+
+src_install() {
+	java-pkg_dojar target/release/mail.jar
+
+	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt || die
+	dohtml -r doc/release/{*.html,images} || die
+
+	use doc && java-pkg_dojavadoc target/release/docs/javadocs
+	use source && java-pkg_dosrc mail/src/main/java
+}
diff --git a/dev-lang/go/go-1.4.1.ebuild b/dev-lang/go/go-1.4.1.ebuild
index 5d83f62f1a8f..5c51626bf60d 100644
--- a/dev-lang/go/go-1.4.1.ebuild
+++ b/dev-lang/go/go-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.4.1.ebuild,v 1.3 2015/02/10 10:12:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.4.1.ebuild,v 1.4 2015/02/17 21:03:49 maekke Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
 	# Upstream only supports go on amd64, arm and x86 architectures.
-	KEYWORDS="-* amd64 ~arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos"
+	KEYWORDS="-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos"
 fi
 
 DESCRIPTION="A concurrent garbage collected and typesafe programming language"
diff --git a/dev-lang/perl/perl-5.20.1-r4.ebuild b/dev-lang/perl/perl-5.20.1-r4.ebuild
index c9c48416c625..fba6bf2189df 100644
--- a/dev-lang/perl/perl-5.20.1-r4.ebuild
+++ b/dev-lang/perl/perl-5.20.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.20.1-r4.ebuild,v 1.8 2015/02/17 08:11:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.20.1-r4.ebuild,v 1.9 2015/02/17 21:12:14 maekke Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc gdbm ithreads"
 
 RDEPEND="
diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
index 63b418025c89..6e5e7586e306 100644
--- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
+++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild,v 1.5 2015/02/16 10:19:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild,v 1.6 2015/02/17 21:06:24 maekke Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz"
 
 LICENSE="FastCGI"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="html"
 
 DEPEND=""
diff --git a/dev-libs/icu/icu-54.1-r1.ebuild b/dev-libs/icu/icu-54.1-r1.ebuild
index 2c2c116515ce..9bd67e8a775f 100644
--- a/dev-libs/icu/icu-54.1-r1.ebuild
+++ b/dev-libs/icu/icu-54.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-54.1-r1.ebuild,v 1.5 2015/02/16 10:20:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-54.1-r1.ebuild,v 1.6 2015/02/17 21:10:53 maekke Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/54a"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 6936c612957d..141120139497 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,2 +1,3 @@
 DIST libwacom-0.10.tar.bz2 416994 SHA256 8eb714496bd340861b4a55a59744bce041156998700ee6d4c87dd5036e7eba00 SHA512 777e8f57de9943769d6f484c5f290352799b30c78d2c74c0aaae7d7174e7dd394183358b9a89d667284cfa7cd19590a084821768d1b4dc1360ad1aa4e80fb4d0 WHIRLPOOL 738d26cebbb00a7eec3a679821b92baf06a289d1813d721ec432a70870885e531ffc2ae61e20adb26079686670fa2d22ef86a3bfb2cf40b1b119d452ed50953d
+DIST libwacom-0.11.tar.bz2 424554 SHA256 995f192e53f09444b79b66986227ebbac477520956363dededa19af3d8746284 SHA512 465f1ea9354bcba7d1c5d9fe146192b7ba1593973690718b2584b4786feb434f672556e7eed799761f96a37fe79bd14ae33ab7695d3ce9d5214cf9bc5b26eecc WHIRLPOOL 7f29b09a9bdee0d9cb2f5712414bdbcccf1b2a31a387020de2c1f911411934a3ae61a1d430b40e3402282fbc60e0d184b82c1cd524e43c8417d678f27063f607
 DIST libwacom-0.7.1.tar.bz2 402392 SHA256 9537111a6ac313fe9aaac947998eb8605bcbf5305c3f2c0625b796bd8252eda9 SHA512 b68ba3e4128c8dda1e68b6cdadafb7ad3411196b24b79ae18f1219b6f974028654a5286b4921c48bd00152c68bdd3533bb3df161aa6b178244b33cd80c6f1f6b WHIRLPOOL 3691b35a4e8364b28ac835b6d32c4e4aad26b16a5ec1dc8dc6c44c522a5c9cdb87c170b3e15a1a6404957771d51c18ca6a97ad01ab4b9852a0c87be25d695625
diff --git a/dev-libs/libwacom/libwacom-0.11.ebuild b/dev-libs/libwacom/libwacom-0.11.ebuild
new file mode 100644
index 000000000000..0b3811a716f2
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-0.11.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.11.ebuild,v 1.1 2015/02/17 22:52:04 tetromino Exp $
+
+EAPI=5
+inherit eutils udev
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/glib:2
+	virtual/libgudev:=
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	if ! use doc; then
+		sed -e 's:^\(SUBDIRS = .* \)doc:\1:' -i Makefile.in || die
+	fi
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	local udevdir="$(get_udevdir)"
+	dodir "${udevdir}/rules.d"
+	# generate-udev-rules must be run from inside tools directory
+	pushd tools > /dev/null
+	./generate-udev-rules > "${ED}/${udevdir}/rules.d/65-libwacom.rules" ||
+		die "generating udev rules failed"
+	popd > /dev/null
+	use doc && dohtml -r doc/html/*
+	prune_libtool_files
+}
diff --git a/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r2.ebuild b/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r2.ebuild
new file mode 100644
index 000000000000..a7eb0a8aaeed
--- /dev/null
+++ b/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-I18Nv2/PEAR-I18Nv2-0.11.4-r2.ebuild,v 1.1 2015/02/18 02:29:51 grknight Exp $
+
+EAPI=5
+
+inherit php-pear-r1
+
+DESCRIPTION="Internationalization - basic support to localize your application"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+DEPEND="dev-lang/php:*[iconv,pcre(+)]"
diff --git a/dev-php/doctrine/Manifest b/dev-php/doctrine/Manifest
index d9456657d949..c0e5b9661ff0 100644
--- a/dev-php/doctrine/Manifest
+++ b/dev-php/doctrine/Manifest
@@ -1 +1,2 @@
 DIST doctrine-1.2.5.tar.gz 659173 SHA256 382f7d91f2919cf9afcbf7ada8fc67265f7225caa8e6f5d98d20e4d2c3da9ec9 SHA512 c72f4e829a92b011af0bd96d2f8a780c3106afb57a9677a21aed683473ff00aebdf7143a276c7cc70f1b142196968b5e2e5e1f744dba5c8ae1267b867b4e0310 WHIRLPOOL dc2e6fccd3f6e88c44b80cf165a136941feafeea3bf5424c35be6bb926c49e95bb652e61b899e80ff86ed88c5e9c7514fdc959a189fe8cb4e1a4a228f46fe8d6
+DIST doctrine-2.4.6.tar.gz 456426 SHA256 7a660eebb0e6b2911057057df8a2f2c475cda8283a926725d06086f854c3538b SHA512 d7aeb58e8c76df384a472df08618a058b70f2b8499de6a3157c36bde125ab32c7bf4f80d1e6d880502ccfed2db704f3218a6f1f1ecbf603cc828e2a757c366b5 WHIRLPOOL 6376a6b15139cdde34ccdab2ef43dc3adc0ce5f82eb32473ed8cc49d049e94515d4c183b4793b6707df0aadcb414519612d6de8db092b2a229a68c4bfd54721d
diff --git a/dev-php/doctrine/doctrine-1.2.5.ebuild b/dev-php/doctrine/doctrine-1.2.5.ebuild
index b1eb9f290b8c..fa4ac4bd15b4 100644
--- a/dev-php/doctrine/doctrine-1.2.5.ebuild
+++ b/dev-php/doctrine/doctrine-1.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/doctrine/doctrine-1.2.5.ebuild,v 1.1 2014/10/30 04:27:21 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/doctrine/doctrine-1.2.5.ebuild,v 1.2 2015/02/18 02:11:25 grknight Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/php-5.2.3[cli,pdo]"
+DEPEND=">=dev-lang/php-5.2.3:*[cli,pdo]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-php/doctrine/doctrine-2.4.6.ebuild b/dev-php/doctrine/doctrine-2.4.6.ebuild
new file mode 100644
index 000000000000..11f1901d9066
--- /dev/null
+++ b/dev-php/doctrine/doctrine-2.4.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/doctrine/doctrine-2.4.6.ebuild,v 1.1 2015/02/18 02:11:25 grknight Exp $
+
+EAPI=5
+
+MY_P="${PN}2-${PV}"
+DESCRIPTION="An object relational mapper for PHP5"
+HOMEPAGE="http://www.doctrine-project.org/"
+SRC_URI="https://github.com/${PN}/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MIT BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/php-5.3.2:*[cli,pdo]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/php
+	doins -r lib/Doctrine
+}
diff --git a/dev-php/suhosin/suhosin-0.9.37.1.ebuild b/dev-php/suhosin/suhosin-0.9.37.1.ebuild
index 27a0e51c8bd6..057f9120a80c 100644
--- a/dev-php/suhosin/suhosin-0.9.37.1.ebuild
+++ b/dev-php/suhosin/suhosin-0.9.37.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.37.1.ebuild,v 1.1 2015/01/19 15:38:55 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.37.1.ebuild,v 1.2 2015/02/17 18:04:32 jer Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ USE_PHP="php5-6 php5-5 php5-4"
 
 inherit php-ext-source-r2
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 DESCRIPTION="Suhosin is an advanced protection system for PHP installations"
 HOMEPAGE="http://www.suhosin.org/"
diff --git a/dev-python/PyQt5/PyQt5-5.4.ebuild b/dev-python/PyQt5/PyQt5-5.4.ebuild
index f83b071ba2ec..70cb1c92eaee 100644
--- a/dev-python/PyQt5/PyQt5-5.4.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt5/PyQt5-5.4.ebuild,v 1.2 2015/02/03 07:49:55 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt5/PyQt5-5.4.ebuild,v 1.3 2015/02/18 05:21:11 yngwin Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -8,7 +8,8 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 inherit eutils multibuild multilib python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ https://pypi.python.org/pypi/PyQt5"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/
+	https://pypi.python.org/pypi/PyQt5"
 
 MY_PN="PyQt-gpl"
 if [[ ${PV} == *_pre* ]]; then
@@ -24,8 +25,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
 # TODO: bluetooth, webchannel, webengine
-IUSE="dbus debug declarative designer doc examples +gui help multimedia network opengl positioning
-	printsupport sensors serialport sql svg testlib webkit websockets widgets x11extras xmlpatterns"
+IUSE="dbus debug declarative designer doc examples gui help multimedia network
+	opengl positioning printsupport sensors serialport sql svg testlib webkit
+	websockets widgets x11extras xmlpatterns"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	positioning? ( gui )
diff --git a/dev-python/SaltTesting/Manifest b/dev-python/SaltTesting/Manifest
index 7fda2bf4ede2..fe45f2813bf4 100644
--- a/dev-python/SaltTesting/Manifest
+++ b/dev-python/SaltTesting/Manifest
@@ -1,4 +1,2 @@
-DIST SaltTesting-0.5.2.tar.gz 29488 SHA256 e4f748762c8154be6049a919b01a9d8e65b4ebd68b98db538a73f32305749c02 SHA512 b8667c50b1db3b780f531b4f08ef3d02f66a970ad861f51ae1021da9684ae3da110d0aa0d80b70df05a64bba9eae220fdfd63a8b2fa0d4be932525e8167fcce5 WHIRLPOOL f4af18bc717518e33acb02fe48af23cdb32f4fcfeaee027b118a08f218f3e531bd1d2775c65ce265676723d4cf03df6914dbdc6ecb049ead674cac3693d39219
-DIST SaltTesting-0.5.3.tar.gz 25956 SHA256 6b3a7d57e1ee64c4b6e38b01cab8cc0219a9d55f4d7f127480911a2593b0246e SHA512 7824432e6635d94267bcd20a304968c642e21ef9465c7528c02eb752a51b79290d8a7cbdbef0cc46a6dbc377399f894a6abb542d8e33f7bb6052bba7dd3e135c WHIRLPOOL 5d3cc9c7a81b8b3b02bed139d9bd31c01134e079e40a95675462868cb027cb171a19737323f286112e8a998d305b1435a9fc781230c3acf74358f80391ba2ae7
-DIST SaltTesting-2014.4.24.tar.gz 30456 SHA256 eb550323678f66bc957298f25c27eff37c5589d56ecd34da487707e9b4274e37 SHA512 82860a584301a5752a3a45044fbc7a1cd3b84fdd2f528b803e3c60c3fd971e4d8b7537f048506edc1572c2d648ddaf177a3fc8849a8e6bd2a1e254f880a7ff1e WHIRLPOOL bcf916c75c0cd0357a580cd14cfbc37418bea9ed01e1f8e35f773723c63b9a3c635d981c5cbd4b5639ff632140ed75df94aa9203fcaf4a2748d58de48c62ad05
 DIST SaltTesting-2014.8.5.tar.gz 32787 SHA256 ee1681e13f09646ce08f9e95e700eddb7d882f6a87051f2caee0e844aca69339 SHA512 f3a25d36c94e01d448c3a3ce1bbf831ab9d806847ccc44a4e3d2cc40ac8f967f570d6724fef3b61838e14f8624a092e83e9db46101509c22e817836b545c9f58 WHIRLPOOL bed7114ea75b496bf87efccb937e75d744b2f416a74f4df979ce151037cab13485b863d1ab757ff59810517df9c1a297b1f0e891e63ad64d7436081ddc5d281b
+DIST SaltTesting-2015.2.16.tar.gz 77908 SHA256 05ddb56d9775c404b2c8536bd5f8fce97cf35777b1077eed895175ae8db02d1d SHA512 170ff267be0edd24da1e90d70795fb2ff5193407e766a4d90cef550130b997ce4f4ecc0d327ca8555fbe14fd3587620b8e356e1060a91edac62cf114356ada48 WHIRLPOOL 736babf2df8922ce092fd0578fc2c45b3a9773975d63dbd12d04bb428e020ad4f8f798f9876fceb922154e5d8e55f105524a70b4514a582e84064f5fc332887a
diff --git a/dev-python/SaltTesting/SaltTesting-0.5.2.ebuild b/dev-python/SaltTesting/SaltTesting-0.5.2.ebuild
deleted file mode 100644
index 382019d34f4b..000000000000
--- a/dev-python/SaltTesting/SaltTesting-0.5.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/SaltTesting/SaltTesting-0.5.2.ebuild,v 1.2 2014/08/10 21:06:37 slyfox Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Required testing tools needed in the several Salt Stack projects"
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/saltstack/salt-testing.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-PATCHES=("${FILESDIR}/${P}-silence-DepricationWarning.patch")
diff --git a/dev-python/SaltTesting/SaltTesting-2014.4.24.ebuild b/dev-python/SaltTesting/SaltTesting-2014.4.24.ebuild
deleted file mode 100644
index 4dfbd7d37483..000000000000
--- a/dev-python/SaltTesting/SaltTesting-2014.4.24.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/SaltTesting/SaltTesting-2014.4.24.ebuild,v 1.2 2014/08/10 21:06:37 slyfox Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7})
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Required testing tools needed in the several Salt Stack projects"
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/saltstack/salt-testing.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
diff --git a/dev-python/SaltTesting/SaltTesting-0.5.3.ebuild b/dev-python/SaltTesting/SaltTesting-2015.2.16.ebuild
similarity index 74%
rename from dev-python/SaltTesting/SaltTesting-0.5.3.ebuild
rename to dev-python/SaltTesting/SaltTesting-2015.2.16.ebuild
index 80347e54ec46..e73b68802096 100644
--- a/dev-python/SaltTesting/SaltTesting-0.5.3.ebuild
+++ b/dev-python/SaltTesting/SaltTesting-2015.2.16.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/SaltTesting/SaltTesting-0.5.3.ebuild,v 1.2 2014/08/10 21:06:37 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/SaltTesting/SaltTesting-2015.2.16.ebuild,v 1.1 2015/02/17 19:05:50 chutzpah Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_6,2_7})
+PYTHON_COMPAT=(python2_7)
 
 inherit eutils distutils-r1
 
@@ -24,3 +24,6 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
+
+DEPEND=">=dev-python/requests-2.4.2"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 56dcbb9871d6..606cee0ec5d5 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1 +1,2 @@
 DIST chardet-2.2.1.tar.gz 180319 SHA256 f1964f73f5ee9b7e0309098b9512d587fbba6dd5d1f3797b1c95529e5241bf09 SHA512 87059b77b14c39fded7f1287f8eeab6a880e21f4b49a3aa103daf537bbb1e237069347e1953ebaa9a393bd4dee01993873c84aad3c00536ae34784686aecfe68 WHIRLPOOL 1cd6838823f8effd502c3049d13966ac0888bdb91b34489caea8666f9802967fe6f86565ed827e609cb614c920cc9f983bdecc27c30bb2abcf4420731a0a620e
+DIST chardet-2.3.0.tar.gz 164346 SHA256 e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa SHA512 d554c9b4564905a2b6c6971aaea2a812174d86b58137c6a2f9d54e2abd2395e6529968b2ce3ca2d97c717d2bd0bd80ab5b98cae9afac1a4add9ea305145030dd WHIRLPOOL af17bac2778a86d6fe9643a512a307cbcf92e4b43238b2d3d2bae53e646fccbdf40f31f41f9452e7d4f4c84d1ee637199af841a828d49f3452190749fee284c1
diff --git a/dev-python/chardet/chardet-2.3.0.ebuild b/dev-python/chardet/chardet-2.3.0.ebuild
new file mode 100644
index 000000000000..a30526859ba6
--- /dev/null
+++ b/dev-python/chardet/chardet-2.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chardet/chardet-2.3.0.ebuild,v 1.1 2015/02/17 17:56:49 djc Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal encoding detector"
+HOMEPAGE="https://github.com/chardet/chardet http://pypi.python.org/pypi/chardet"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pyifp/pyifp-0.2.2-r1.ebuild b/dev-python/pyifp/pyifp-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..1a2d588bb228
--- /dev/null
+++ b/dev-python/pyifp/pyifp-0.2.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyifp/pyifp-0.2.2-r1.ebuild,v 1.1 2015/02/18 01:46:57 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for libifp library for accessing iRiver iFP devices"
+HOMEPAGE="http://ifp-gnome.sourceforge.net"
+SRC_URI="mirror://sourceforge/ifp-gnome/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libifp-1.0.0.2"
+DEPEND="${RDEPEND}
+	dev-lang/swig"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+PATCHES=( "${FILESDIR}"/${P}-setup-fix.patch )
diff --git a/dev-python/pyifp/pyifp-0.2.2.ebuild b/dev-python/pyifp/pyifp-0.2.2.ebuild
deleted file mode 100644
index 774833a8f9f1..000000000000
--- a/dev-python/pyifp/pyifp-0.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyifp/pyifp-0.2.2.ebuild,v 1.6 2011/01/01 21:21:14 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit eutils distutils
-
-DESCRIPTION="Python bindings for libifp library for accessing iRiver iFP devices"
-HOMEPAGE="http://ifp-gnome.sourceforge.net"
-SRC_URI="mirror://sourceforge/ifp-gnome/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libifp-1.0.0.2"
-DEPEND="${RDEPEND}
-	dev-lang/swig"
-
-DOCS="README.txt"
-PYTHON_MODNAME="ifp.py ifp_core.py usb_core.py"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-setup-fix.patch
-	distutils_src_prepare
-}
diff --git a/dev-python/pyndex/pyndex-0.3.2a-r1.ebuild b/dev-python/pyndex/pyndex-0.3.2a-r1.ebuild
new file mode 100644
index 000000000000..2a7a54892066
--- /dev/null
+++ b/dev-python/pyndex/pyndex-0.3.2a-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyndex/pyndex-0.3.2a-r1.ebuild,v 1.1 2015/02/18 02:47:34 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+MY_PN="Pyndex"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple and fast Python full-text indexer (aka search engine) using Metakit as its back-end"
+HOMEPAGE="http://www.divmod.org/Pyndex/index.html"
+SRC_URI="mirror://sourceforge/pyndex/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-db/metakit-2.4.9.2[python]"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index df78a0c02612..048f5bd08993 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,2 +1 @@
-DIST ffi-git-1.9.3.tgz 881344 SHA256 f8cc0a05b682eac330fbd0c4f76c9fbf6338a7c32bd3cb5b1619506678ce5c7a SHA512 56c5d4ab13f8ce4038a614470a82a3c723d90e6cc9cb3423efdcd8b1a5f4f3f9f01a0fe335fe088e207818f541184256e20f81fea24c1fe449ed3382e45f9af3 WHIRLPOOL ba412d79cea3f0077048d388bcc94ae25552aada3b5261e44f1ff30245c4cc531be86272b1e3eaf59c215b429aeaab7ad72804de9d31016acec2c6099679096a
 DIST ffi-git-1.9.6.tgz 895468 SHA256 b27a59bf2eddcc17abaf7063a64e527fa892ba95cdb6320aba6fa945c769c9c7 SHA512 4b690b70db41642be679f13b33a67e27e1a4b14ca56d6ce355ea0a300c793a63e1081fb19d4c4bd395c1bea55a1669b96e3405932fffeebd328809a410fe3e8f WHIRLPOOL 7f5ad8d7766b037e24cff4721db02f05b39604c1be5e07ddad9de4a5155124d2a05ebd43209dfc2491cdc50ea08e5cda856f7502bf1c12666fa19b77516c81f7
diff --git a/dev-ruby/ffi/ffi-1.9.3.ebuild b/dev-ruby/ffi/ffi-1.9.3.ebuild
deleted file mode 100644
index b84b30dee479..000000000000
--- a/dev-ruby/ffi/ffi-1.9.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ffi-1.9.3.ebuild,v 1.19 2014/12/19 13:23:56 ago Exp $
-
-EAPI=5
-
-# jruby → unneeded, this is part of the standard JRuby distribution, and
-# would just install a dummy.
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_TEST="specs"
-
-RUBY_FAKEGEM_TASK_DOC="doc:yard"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="http://wiki.github.com/ffi/ffi"
-
-SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-
-RDEPEND+=" virtual/libffi"
-DEPEND+=" virtual/libffi"
-
-ruby_add_bdepend "dev-ruby/rake-compiler dev-ruby/yard
-	test? ( dev-ruby/rspec:2 )"
-
-ruby_add_rdepend "virtual/ruby-threads"
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' libtest/GNUmakefile || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake compile || die "compile failed"
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rake specs || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-util/ddd/ddd-3.3.12-r4.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild
index 163754181e22..7b827f29ed81 100644
--- a/dev-util/ddd/ddd-3.3.12-r4.ebuild
+++ b/dev-util/ddd/ddd-3.3.12-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.12-r4.ebuild,v 1.1 2014/04/08 00:48:03 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.12-r4.ebuild,v 1.2 2015/02/17 17:38:44 haubi Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/ddd"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3 FDL-1.1"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="+gnuplot readline"
 
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index 4aa8044426f2..464f488e4577 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,2 +1,3 @@
 DIST hedgewars-src-0.9.19.3.tar.bz2 191688324 SHA256 93adb39268e92b730d1014897bfcf55e0ee46e31b174f769b11408690a33ae90 SHA512 6aeb63e999ecba30af08db9c895b24527c3372558c50e5c58640fcdd0c7d4d800ae35de42f18945b870a4dc20b1f259e6748cc968fd0fdf6575ad6acc5c0aefe WHIRLPOOL dc4bd983ba6066368a8d0d3c14be5bb1aab10169f1fc7d607a4009714d085b8f0ed85670de76f64051a7f2b4cbecadde5cf1aad96254064f80ee48a636f9a582
 DIST hedgewars-src-0.9.20.5.tar.bz2 161550331 SHA256 a6d0896fe88d5746a4272c8f495c7457b17586e8d16ef429ce50dfa449c0adcc SHA512 f5e522008919c97f7826fe7fb9250ac0ae90041b3b672bb38593d3ed6dee424dad8daa2e7d176f392baa52bb5ade2c429957c52a1c092d565a10918d51fe3cb0 WHIRLPOOL 5102c676681b22e04248a67c51423a7564aa4a8b21d7fc24041b9eb920094208d2f849ba1b4a618d2b648996e820f03ae450bfc00817b9713c491d1bcb5c31f5
+DIST hedgewars-src-0.9.21.1.tar.bz2 160250791 SHA256 590a9458d2123c5550d5eb39edfed28d0663703d76e13c8987237c92ca41f3f8 SHA512 4b9a2ab79d9ddb064fddaa2a4dbc895a11c0cbc52ef9e5f56322a63821fdfa4a31d6e268510a9163bd57bd89dec20be30e0f5ef992b41dc473c4684bbb6a48be WHIRLPOOL 19242ff98d3994273c6b0c7e8cfbbb5f7338061c574b4bfe8a77ed085a44c618d1ce564b295e51b400ece6f51bcbc6e211c59278382fadb3f6a26e113c2dc4b4
diff --git a/games-strategy/hedgewars/hedgewars-0.9.21.1.ebuild b/games-strategy/hedgewars/hedgewars-0.9.21.1.ebuild
new file mode 100644
index 000000000000..f68b7c74ba06
--- /dev/null
+++ b/games-strategy/hedgewars/hedgewars-0.9.21.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/hedgewars-0.9.21.1.ebuild,v 1.1 2015/02/17 17:13:07 mr_bones_ Exp $
+
+# TODO: when physfs-2.1.0 hits the tree, set
+# -DPHYSFS_SYSTEM=ON
+
+EAPI=5
+CMAKE_BUILD_TYPE=Release
+inherit cmake-utils eutils games
+
+MY_P=${PN}-src-${PV}
+DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
+HOMEPAGE="http://hedgewars.org/"
+SRC_URI="http://download.gna.org/hedgewars/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 Apache-2.0 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+QA_FLAGS_IGNORED=${GAMES_BINDIR}/hwengine # pascal sucks
+QA_PRESTRIPPED=${GAMES_BINDIR}/hwengine # pascal sucks
+
+RDEPEND="
+	dev-lang/lua
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	media-libs/freeglut
+	media-libs/libpng:0
+	media-libs/libsdl[sound,opengl,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	sys-libs/zlib
+	virtual/ffmpeg"
+DEPEND="${RDEPEND}
+	>=dev-lang/fpc-2.4"
+RDEPEND="${RDEPEND}
+	media-fonts/wqy-zenhei
+	>=media-fonts/dejavu-2.28"
+
+S=${WORKDIR}/${PN}-src-${PV%.*}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMINIMAL_FLAGS=ON
+		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
+		-DDATA_INSTALL_DIR="${GAMES_DATADIR}/${PN}"
+		-Dtarget_binary_install_dir="${GAMES_BINDIR}"
+		-Dtarget_library_install_dir="$(games_get_libdir)"
+		-DNOSERVER=TRUE
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		-DPHYSFS_SYSTEM=OFF
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	DOCS="ChangeLog.txt README" cmake-utils_src_install
+	rm -f "${D}"/usr/share/games/hedgewars/Data/Fonts/{DejaVuSans-Bold.ttf,wqy-zenhei.ttc}
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \
+		"${GAMES_DATADIR}"/hedgewars/Data/Fonts/DejaVuSans-Bold.ttf
+	dosym /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc \
+		"${GAMES_DATADIR}"/hedgewars/Data/Fonts/wqy-zenhei.ttc
+	doicon misc/hedgewars.png
+	make_desktop_entry ${PN} Hedgewars
+	doman man/${PN}.6
+	prepgamesdirs
+}
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index d2eb15de5b10..961432978ede 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,2 +1 @@
-DIST pyfa-1.2.0-kronos-1.0-src.zip 6346771 SHA256 bfead7da7449e873b7d85190db61198b66d6f09c8d45ee5eb7021509adf6ea32 SHA512 2d0a41107b9463a2ff14e30ff73d390953653e409ea41b92f8339ceb68d12d044b635a82f70ed2a5f64c3ddc2a1e9981f8f3e73a6b51619d514cd57d686af196 WHIRLPOOL fc1aec38c2e4857a5e3cd52d128cf5804b9df48bf59d842ea5a1c9be085c48b6a946c73ab6647037b2bc31817cd283d777bf8114030e7ead2d79ea7f1c755f64
-DIST pyfa-1.2.1-kronos-1.0-src.zip 6566198 SHA256 f6640942f0189c535992ce85e082f883a8eea156d24572c3364b70a46f3e1fe5 SHA512 44d0b0036ea36514786349352a4937d71377d43a036fa61b8bfcedd4b215fcac7e8ebcafc7b05dcf5b2a31fae949f3a31eee14f1d1f713c85c8e00fb3f96b3d0 WHIRLPOOL 751c5633b042f923175436b4282b33281f9052859514f83daefb724676ab6f4165ac04bd4a98538766d57250005218ed0bb9cbf05c145dcb588929c50cc701d0
+DIST pyfa-1.8.1.tar.gz 5928926 SHA256 7c888f033483fde96be55466cfd5c275bd5e0aedf60779bdb43c77714930a942 SHA512 f692bb4fe8772a9ff9fae068e6964a9cfae47d38627553117e8b6e50b7ce2c2c3187c48a9f32be093130d1be5e328ef3044e08b288e04f442d1abdf41784a972 WHIRLPOOL e9360483ee6f490912694c63508af8458c9242f3f2e4a4d6f17e7c5aecefbf09faf2f1fb0298de307812a3713c11469ceb243c6d75ff0e354fe34c1c24b27c1c
diff --git a/games-util/pyfa/pyfa-1.2.0.ebuild b/games-util/pyfa/pyfa-1.2.0.ebuild
deleted file mode 100644
index 2220eb8c76e0..000000000000
--- a/games-util/pyfa/pyfa-1.2.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.2.0.ebuild,v 1.1 2014/06/04 13:56:31 tetromino Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit eutils gnome2-utils python-r1
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/DarkFenX/Pyfa"
-
-LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/DarkFenX/Pyfa.git"
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-kronos-1.0-src.zip"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-IUSE="+graph"
-
-RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-	graph? (
-		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py service/settings.py
-
-	# make staticPath settable from configforced again
-	epatch "${FILESDIR}/${PN}-1.1.20-staticPath.patch"
-
-	# do not try to save exported html to python sitedir
-	epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch"
-
-	# fix import path in the main script for systemwide installation
-	epatch "${FILESDIR}/${PN}-1.1.11-import-pyfa.patch"
-	touch __init__.py
-
-	pyfa_make_configforced() {
-		mkdir -p "${BUILD_DIR}" || die
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			-e "s:%%EPREFIX%%:${EPREFIX}:" \
-			"${FILESDIR}/configforced.py" > "${BUILD_DIR}/configforced.py"
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			pyfa.py > "${BUILD_DIR}/pyfa"
-	}
-	python_foreach_impl pyfa_make_configforced
-}
-
-src_install() {
-	pyfa_py_install() {
-		local packagedir=$(python_get_sitedir)/${PN}
-		insinto "${packagedir}"
-		doins -r eos gui icons service config*.py __init__.py gpl.txt
-		[[ -e info.py ]] && doins info.py # only in zip releases
-		doins "${BUILD_DIR}/configforced.py"
-		python_doscript "${BUILD_DIR}/pyfa"
-		python_optimize
-	}
-	python_foreach_impl pyfa_py_install
-
-	insinto /usr/share/${PN}
-	doins -r staticdata
-	dodoc readme.txt
-	insinto /usr/share/icons/hicolor/32x32/apps
-	doins icons/pyfa.png
-	insinto /usr/share/icons/hicolor/64x64/apps
-	newins icons/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/pyfa/pyfa-1.2.1.ebuild b/games-util/pyfa/pyfa-1.8.1.ebuild
similarity index 85%
rename from games-util/pyfa/pyfa-1.2.1.ebuild
rename to games-util/pyfa/pyfa-1.8.1.ebuild
index 95a5a58561a2..6989e502acf3 100644
--- a/games-util/pyfa/pyfa-1.2.1.ebuild
+++ b/games-util/pyfa/pyfa-1.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.2.1.ebuild,v 1.1 2014/06/29 00:16:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.8.1.ebuild,v 1.1 2015/02/17 22:37:12 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -18,12 +18,13 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-2
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-kronos-1.0-src.zip"
+	SRC_URI="https://github.com/DarkFenX/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 IUSE="+graph"
 
-RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
 	dev-python/wxpython:2.8[${PYTHON_USEDEP}]
 	graph? (
 		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
@@ -31,7 +32,7 @@ RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]
 	${PYTHON_DEPS}"
 DEPEND="app-arch/unzip"
 
-S=${WORKDIR}/${PN}
+S=${WORKDIR}/Pyfa-${PV}
 
 src_prepare() {
 	# get rid of CRLF line endings introduced in 1.1.10 so patches work
@@ -72,7 +73,7 @@ src_install() {
 
 	insinto /usr/share/${PN}
 	doins -r staticdata
-	dodoc readme.txt
+	dodoc README.md
 	insinto /usr/share/icons/hicolor/32x32/apps
 	doins icons/pyfa.png
 	insinto /usr/share/icons/hicolor/64x64/apps
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
index 1b8e66b2e090..7a78006213d0 100644
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-9999.ebuild,v 1.3 2014/06/04 13:56:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-9999.ebuild,v 1.4 2015/02/17 22:37:12 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -18,12 +18,13 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-2
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/DarkFenX/Pyfa/releases/download/v${PV}/${P}-kronos-1.0-src.zip"
+	SRC_URI="https://github.com/DarkFenX/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 IUSE="+graph"
 
-RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
 	dev-python/wxpython:2.8[${PYTHON_USEDEP}]
 	graph? (
 		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
@@ -31,7 +32,7 @@ RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]
 	${PYTHON_DEPS}"
 DEPEND="app-arch/unzip"
 
-S=${WORKDIR}/${PN}
+S=${WORKDIR}/Pyfa-${PV}
 
 src_prepare() {
 	# get rid of CRLF line endings introduced in 1.1.10 so patches work
@@ -72,7 +73,7 @@ src_install() {
 
 	insinto /usr/share/${PN}
 	doins -r staticdata
-	dodoc readme.txt
+	dodoc README.md
 	insinto /usr/share/icons/hicolor/32x32/apps
 	doins icons/pyfa.png
 	insinto /usr/share/icons/hicolor/64x64/apps
diff --git a/java-virtuals/javamail/javamail-1.0-r3.ebuild b/java-virtuals/javamail/javamail-1.0-r3.ebuild
new file mode 100644
index 000000000000..a57526c0d926
--- /dev/null
+++ b/java-virtuals/javamail/javamail-1.0-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/javamail/javamail-1.0-r3.ebuild,v 1.1 2015/02/17 22:26:49 fordfrog Exp $
+
+EAPI=4
+
+inherit java-virtuals-2
+
+DESCRIPTION="Virtual for javamail implementations"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="|| (
+	dev-java/oracle-javamail:0
+	dev-java/sun-javamail:0
+	dev-java/gnu-javamail:1
+)"
+
+JAVA_VIRTUAL_PROVIDES="oracle-javamail sun-javamail gnu-javamail-1"
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index a977523bab6c..95faafe1cca4 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,2 +1 @@
-DIST pykde4-4.12.5.tar.xz 2005104 SHA256 f03649015070ad9a2c6b0015af0c9972503012b3fe7f3d9b0c6d06fd3f479554 SHA512 b26ef3cac39e03141dc739bba03d8be4a095f74b31de0296fc1991e9cf60013a43bb03a4fb5a8673fc98d4824a5a10ed6fd18261d1b23bcf74059d28c780b834 WHIRLPOOL f176ccb420abee5768836bdab650152a335f06cc72b21bb559192c04a08f0ebc04c3d08c2150291ab2d93b931846cf4a0fcbb0bad7af8b39994aa011b216774c
 DIST pykde4-4.14.3.tar.xz 2006504 SHA256 7fb9d7b5ed03d531243ebd67939baf30933452dafbdfca866e6653e9a77d80fc SHA512 42430f83bf41dc5d7511369250ff480fd7b90954b4ace8dbda2d6151ee3f3c979fe3d9b0163cda76df52107e982d4ac518fa1c28bc1d711d97f2d8739eaff1f3 WHIRLPOOL 5df847617a220ef9e1330f3c970bb6f785e713ebbed8a04ef4a3c9d1470d1b4a2032177f59df4d4baf89a0975b8c02f63f133747588cb65a3fa5d849e51b4d4d
diff --git a/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch b/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch
deleted file mode 100644
index 73cee86b6c57..000000000000
--- a/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-See Gentoo bug #322351.
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -101,6 +101,8 @@
-     ${KDEPIMLIBS_INCLUDE_DIRS}
- )
- 
-+# Pull in ARM configuration options if needed
-+STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
- set(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
- set(SIP_CONCAT_PARTS 8)
- if (WIN32)
-@@ -108,7 +110,7 @@
- else ()
-     set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
- endif ()
--set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
-+set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
- 
- # Use an extra option when compiling on Python 3.
- if (PYTHON_VERSION_MAJOR GREATER 2)
diff --git a/kde-base/pykde4/metadata.xml b/kde-base/pykde4/metadata.xml
index 7bceb5a68841..7ceb431b93bb 100644
--- a/kde-base/pykde4/metadata.xml
+++ b/kde-base/pykde4/metadata.xml
@@ -5,6 +5,5 @@
 	<use>
 		<flag name="akonadi">Compile bindings for Akonadi</flag>
 		<flag name="nepomuk">Compile bindings for Nepomuk</flag>
-		<flag name="semantic-desktop">Enables Nepomuk and Soprano python language bindings</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-base/pykde4/pykde4-4.12.5.ebuild b/kde-base/pykde4/pykde4-4.12.5.ebuild
deleted file mode 100644
index a1a6f57c5677..000000000000
--- a/kde-base/pykde4/pykde4-4.12.5.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.12.5.ebuild,v 1.6 2014/07/17 10:59:25 kensington Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_REQ_USE="threads"
-OPENGL_REQUIRED="always"
-
-inherit python-r1 portability kde4-base multilib eutils
-
-DESCRIPTION="Python bindings for KDE4"
-KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples semantic-desktop test"
-HOMEPAGE="http://techbase.kde.org/Development/Languages/Python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( semantic-desktop )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt4-4.9.5[${PYTHON_USEDEP},dbus,declarative,script(+),sql,svg,webkit,X]
-	<dev-python/PyQt4-4.11
-	>=dev-python/sip-4.14:=[${PYTHON_USEDEP}]
-	<dev-python/sip-4.16
-	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
-	semantic-desktop? (
-		$(add_kdebase_dep kdepimlibs)
-		>=dev-libs/soprano-2.9.0
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/python-exec:0[${PYTHON_USEDEP}]
-	sys-devel/libtool
-"
-
-pkg_setup() {
-	kde4-base_pkg_setup
-
-	have_python2=false
-
-	scan_python_versions() {
-		if [[ ${EPYTHON} == python2.* ]]; then
-			have_python2=true
-		fi
-	}
-	python_foreach_impl scan_python_versions
-
-	if ! ${have_python2}; then
-		ewarn "You do not have a Python 2 version selected."
-		ewarn "kpythonpluginfactory will not be built"
-	fi
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	if ! use examples; then
-		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i CMakeLists.txt \
-			|| die "Failed to disable examples"
-	fi
-
-	# See bug 322351
-	use arm && epatch "${FILESDIR}/${PN}-4.10.1-arm-sip.patch"
-
-	sed -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' \
-		-i kpythonpluginfactory/CMakeLists.txt || die
-
-	if ${have_python2}; then
-		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
-		cp "${FILESDIR}/kpythonpluginfactorywrapper.c-r1" "${WORKDIR}/wrapper/kpythonpluginfactorywrapper.c" || die "failed to copy wrapper"
-	fi
-	python_copy_sources
-
-}
-
-src_configure() {
-	configuration() {
-		local mycmakeargs=(
-			-DWITH_PolkitQt=OFF
-			-DWITH_QScintilla=OFF
-			$(cmake-utils_use_with semantic-desktop Soprano)
-			$(cmake-utils_use_with semantic-desktop Nepomuk)
-			$(cmake-utils_use_with semantic-desktop KdepimLibs)
-			-DPYTHON_EXECUTABLE=${PYTHON}
-			-DPYKDEUIC4_ALTINSTALL=TRUE
-		)
-		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
-		kde4-base_src_configure
-	}
-
-	python_foreach_impl run_in_build_dir configuration
-}
-
-echo_and_run() {
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	compilation() {
-		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
-		kde4-base_src_compile
-	}
-	python_foreach_impl run_in_build_dir compilation
-
-	if ${have_python2}; then
-		pushd "${WORKDIR}/wrapper" > /dev/null
-		echo_and_run libtool --tag=CC --mode=compile $(tc-getCC) \
-			-shared \
-			${CFLAGS} ${CPPFLAGS} \
-			-DEPREFIX="\"${EPREFIX}\"" \
-			-DPLUGIN_DIR="\"/usr/$(get_libdir)/kde4\"" -c \
-			-o kpythonpluginfactorywrapper.lo \
-			kpythonpluginfactorywrapper.c
-		echo_and_run libtool --tag=CC --mode=link $(tc-getCC) \
-			-shared -module -avoid-version \
-			${CFLAGS} ${LDFLAGS} \
-			-o kpythonpluginfactory.la \
-			-rpath "${EPREFIX}/usr/$(get_libdir)/kde4" \
-			kpythonpluginfactorywrapper.lo \
-			$(dlopen_lib)
-		popd > /dev/null
-	fi
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir kde4-base_src_test
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-
-		mv "${ED}"/usr/bin/pykdeuic4-{${EPYTHON/python/},${EPYTHON}} || die
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	dosym python-exec /usr/bin/pykdeuic4
-
-	# As we don't call the eclass's src_install, we have to install the docs manually
-	DOCS=("${S}"/{AUTHORS,NEWS,README})
-	use doc && HTML_DOCS=("${S}/docs/html/")
-	einstalldocs
-
-	if ${have_python2}; then
-		pushd "${WORKDIR}/wrapper" > /dev/null
-		echo_and_run libtool --mode=install install kpythonpluginfactory.la "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
-		rm "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
-		popd > /dev/null
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use examples; then
-		echo
-		elog "PyKDE4 examples have been installed to"
-		elog "${EPREFIX}/usr/share/apps/${PN}/examples"
-		echo
-	fi
-}
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
index 7f2655fdd333..5d9be24a68aa 100644
--- a/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
+++ b/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild,v 1.3 2014/05/31 22:20:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild,v 1.4 2015/02/17 21:00:56 maekke Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://lxde.sf.net/"
 SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~ppc ~x86 ~arm-linux ~x86-linux"
 SLOT="0"
 # upower USE flag is enabled by default in the desktop profile
 IUSE="nls upower"
diff --git a/media-fonts/font-util/font-util-1.3.0.ebuild b/media-fonts/font-util/font-util-1.3.0.ebuild
index 4ef7357fc132..338b8c8a4e72 100644
--- a/media-fonts/font-util/font-util-1.3.0.ebuild
+++ b/media-fonts/font-util/font-util-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-util/font-util-1.3.0.ebuild,v 1.12 2014/01/18 12:20:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/font-util/font-util-1.3.0.ebuild,v 1.13 2015/02/17 17:41:33 haubi Exp $
 
 EAPI=4
 inherit xorg-2
@@ -8,7 +8,7 @@ inherit xorg-2
 EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/font/util"
 DESCRIPTION="X.Org font utilities"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-libs/freetype/freetype-2.5.5.ebuild b/media-libs/freetype/freetype-2.5.5.ebuild
index cf69a4fb3d15..4d9df1e093ce 100644
--- a/media-libs/freetype/freetype-2.5.5.ebuild
+++ b/media-libs/freetype/freetype-2.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.5.ebuild,v 1.5 2015/02/16 10:19:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.5.ebuild,v 1.6 2015/02/17 21:08:12 maekke Exp $
 
 EAPI=5
 inherit autotools-multilib flag-o-matic multilib toolchain-funcs
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
 
 LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
-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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="X +adobe-cff auto-hinter bindist bzip2 debug doc fontforge harfbuzz
 	infinality png static-libs utils"
 REQUIRED_USE="harfbuzz? ( auto-hinter )"
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index b00039236030..361a4356dd5a 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,3 +1,4 @@
 DIST harfbuzz-0.9.28.tar.bz2 1063769 SHA256 a567f7c58018af0a9751e18641fd8434bfcef8307122dabe47dd652ce8bde048 SHA512 6b475cc05fc7707d60138573bfcf97f2415c3b8a17ddf844dcf919c215eee882f220a54792ceb9a15b009a5f574f965a06ed1d8b2cbcc990b758fcca3503f021 WHIRLPOOL cbb3a9ae0d3e00c8cd28b145982f396d75a7e56f659657e21f2ed9767c756b0a72e43c3b5b233667dcd29102a8307a791f5ef48e64d9abd1a45a495066264048
 DIST harfbuzz-0.9.35.tar.bz2 1165359 SHA256 0aa1a8aba6f502321cf6fef3c9d2c73dde48389c5ed1d3615a7691944c2a06ed SHA512 843555b33a5cfb96a909f14a558818a10fa59b70e5284e749c96ec0273fc17b59d535fba314992e8b6713fddfcf3cb96826e5420e88a251e5d39802fd07aadc1 WHIRLPOOL de15ac4fa6680b10121c50b0dcb0412aa04d98729955ea8bd58d83ef629098eb2eeccab36d0e8b9a224b2d4ff19201b294ca27e5552ea4cefdb1abe73eb3c780
 DIST harfbuzz-0.9.37.tar.bz2 1172911 SHA256 255f3b3842dead16863d1d0c216643d97b80bfa087aaa8fc5926da24ac120207 SHA512 0884b0b672e8c99070f488dc7b1054d633c66dd1cd5f298dacb5246d280d1e8aace243dd38958b5c42d7b43fc832ac6031cacaf36e1fc6b58a82c12235eddd5a WHIRLPOOL 725bc9dbf63d4885df8fb11936f0208ee9cddf4082ded5a69c1daf814a314833bd4913cef557a3329f02914053cba886f25825a00fd0714482d06c5a3d117577
+DIST harfbuzz-0.9.38.tar.bz2 1177106 SHA256 6736f383b4edfcaaeb6f3292302ca382d617d8c79948bb2dd2e8f86cdccfd514 SHA512 7638853a33bafa139d3a87b2733e89d19239c2ef13afcd1bb0dac3a0f95f786caaaf327560c1714d502ee0adcc2bb068ee6095e81b501a66f8c7559394f1458e WHIRLPOOL 79278d7db00a401af036f35bb90d7dd058b99bc13095f5ba4dac97e68372b51b8192dc0538667ff67b13e39c97318df8351c9c5f5482cc1af7c3bc6764cd534e
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild
new file mode 100644
index 000000000000..44f0181948c5
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.38.ebuild,v 1.1 2015/02/17 17:19:34 tetromino Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils libtool multilib-minimal python-any-r1
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="+cairo +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34 )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+	dev-util/ragel
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	econf \
+		--without-coretext \
+		--without-uniscribe \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with cairo) \
+		$(use_with glib) \
+		$(use_with introspection gobject) \
+		$(use_with graphite graphite2) \
+		$(use_with icu) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with truetype freetype)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/html docs/reference/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 43bc2733d53d..167c40beaf20 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.31 2014/12/27 20:47:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.32 2015/02/17 17:19:34 tetromino Exp $
 
 EAPI=5
 
@@ -64,17 +64,21 @@ src_prepare() {
 
 	[[ ${PV} == 9999 ]] && eautoreconf
 	elibtoolize # for Solaris
+
+	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
 }
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
+	# harfbuzz-gobject only used for instrospection, bug #535852
 	econf \
 		--without-coretext \
 		--without-uniscribe \
 		$(use_enable static-libs static) \
 		$(multilib_native_use_with cairo) \
 		$(use_with glib) \
-		$(use_with glib gobject) \
+		$(use_with introspection gobject) \
 		$(use_with graphite graphite2) \
 		$(use_with icu) \
 		$(multilib_native_use_enable introspection) \
diff --git a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-0.10.23-r1.ebuild b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-0.10.23-r1.ebuild
index 422d73f1536e..71b93cc96768 100644
--- a/media-plugins/gst-plugins-mimic/gst-plugins-mimic-0.10.23-r1.ebuild
+++ b/media-plugins/gst-plugins-mimic/gst-plugins-mimic-0.10.23-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-mimic/gst-plugins-mimic-0.10.23-r1.ebuild,v 1.10 2014/09/15 08:22:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-mimic/gst-plugins-mimic-0.10.23-r1.ebuild,v 1.11 2015/02/17 21:02:32 maekke Exp $
 
 EAPI="5"
 
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for the MIMIC codec"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libmimic-1.0.4-r2[${MULTILIB_USEDEP}]"
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index c2e5842c0bc3..d1db6ce2cf7c 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -1,3 +1,4 @@
 DIST gentoo-vdr-scripts-2.0.0.tar.bz2 37438 SHA256 6c2025714546a25632c5b8103b3fa4b7ca6adf963189800c91e99cb23f7b2a79 SHA512 0214b390e1e4fe4f65ceb940a1d092f88fe5263eda3c97ebfa7d2925a772165af3a3c62bfc964e577e374ce723aefccb29082f8219fda918ad17f966ad8ad392 WHIRLPOOL a3de83d95a51622de997d8231b973d6899a2fa21324492e11eb4001ad3c15dee5c6e65f20ee44fd43ebe2974b2b1acf623956d2d44b955bfee799d1a696ace65
 DIST gentoo-vdr-scripts-2.5.tar.bz2 39893 SHA256 39a3c5d1cf30f1b07a6218b2154835994bbf9d65358e916260bad970a6ca6432 SHA512 bed3db4e3c4f8195d5715d274a32485d067fa2e539ace417c2d73bac1294d46736754be589d5e18b77e0baa1b4d9cd7df5ff8a13db2850d92d2eb992f9b131a6 WHIRLPOOL 5a7626484784ad49624df92daab0997368f885d4d5f6ad732082c2a77c840f6e23f345cf35816890d43493c57fa70c90eb9a4ab785a8d4ead81f6779714138b9
 DIST gentoo-vdr-scripts-2.6.tar.bz2 40483 SHA256 797e7bd055d648d7eeda085aa0be2783e3292369823558f0313a99e96d539a3c SHA512 001c2519e9937b5d34af5a50662186a7914d1c9413e6a37d04df0fb943a920418dfbcd7e721c96e00fb4e236fc484780974d5e46bd1aa104b493a6962c871690 WHIRLPOOL 08a5149049c557fea68fdeca9e6b93e62fe83087e6261b521e7e39fe4151d38a58aa8f7cfd7046e801889770353c85cec299f89ddf9a3517a795188d1d7d376a
+DIST gentoo-vdr-scripts-2.7.tar.bz2 46618 SHA256 40f6e50e684b4dde9c026887119e80c9680212bfe41854c6526cc1346c0ae2a2 SHA512 95db4d2632d07cc86394fbc2898050d47175f01cc60b61230ba5363c770ba6ad5c5935987ac6a1131bc575887633ed6c8f6242f7de225fc875d0871123665bc5 WHIRLPOOL 889e2379fa9df6ae9992f6569779d4f485488e84c9c1065c43717ae07d15c601ce9a731e612e6bfaaf7df55d5eb4c7901f16bbf0eff680bc5b4ea25662885790
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild
new file mode 100644
index 000000000000..118a4f4cc49d
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.ebuild,v 1.1 2015/02/18 00:06:13 hd_brummy Exp $
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="nvram"
+
+RDEPEND="nvram? ( sys-power/nvram-wakeup )
+	app-admin/sudo
+	sys-process/wait_on_pid"
+
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+
+	# Add user vdr to these groups:
+	#   video - accessing dvb-devices
+	#   audio - playing sound when using software-devices
+	#   cdrom - playing dvds/audio-cds ...
+	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
+}
+
+src_prepare() {
+	# moved into own package
+	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
+	sed -e '/all:/s#compile##' -i Makefile
+}
+
+src_install() {
+	default
+	nonfatal dodoc README* TODO ChangeLog
+
+	# create necessary directories
+	diropts -ovdr -gvdr
+	keepdir "${VDR_HOME}"
+
+	local kd
+	for kd in shutdown-data merged-config-files dvd-images; do
+		keepdir "${VDR_HOME}/${kd}"
+	done
+}
+
+pkg_preinst() {
+	local PLUGINS_NEW=0
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
+		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
+	fi
+	if [[ ${PLUGINS_NEW} > 0 ]]; then
+		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
+	else
+		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
+		local PLUGIN
+		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
+			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
+		done
+	fi
+
+	has_version "<${CATEGORY}/${PN}-0.5.4"
+	previous_less_than_0_5_4=$?
+
+	has_version "<${CATEGORY}/${PN}-2.6"
+	previous_less_than_2_6=$?
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
+		elog "\nVDR use now default the --cachedir parameter to store the epg.file"
+		elog "Please do not override this with the EPGFILE variable\n"
+
+		elog "svdrp port 2001 support removed\n"
+
+		elog "--rcu support removed, use media-plugin/vdr-rcu\n"
+	fi
+
+	if [[ $previous_less_than_2_6 = 0 ]]; then
+		elog "${CATEGORY}/${PN} supports now a init script"
+		elog "to start a X server"
+		elog "Please refer for detailed info to"
+		elog "${CATGORY}/${PN} README.x11-setup\n"
+	fi
+
+	if use nvram; then
+		elog "nvram wakeup is optional."
+		elog "To make use of it emerge sys-power/nvram-wakeup.\n"
+	fi
+
+	elog "Plugins which should be used are now set via its"
+	elog "own config-file called /etc/conf.d/vdr.plugins"
+	elog "or enabled via the frontend eselect vdr-plugin.\n"
+
+	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
+		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
+	then
+		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
+		ewarn "This no longer has any effect, please use"
+		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
+	fi
+
+	elog "systemd is supported by ${CATEGORY}/${PN}"
+	elog "Please read for detailed info on this"
+	elog "${CATEGORY}/${PN} README.systemd"
+}
+
+pkg_config() {
+	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
+
+		einfo "Removing depricated entry from /etc/sudoers:"
+		einfo "-  ${VDRSUDOENTRY}"
+
+		cd "${T}"
+		cat >sudoedit-vdr.sh <<-SUDOEDITOR
+			#!/bin/bash
+			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
+
+		SUDOEDITOR
+		chmod a+x sudoedit-vdr.sh
+
+		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
+
+		einfo "Edited /etc/sudoers"
+	fi
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 2086d9ee05ed..e2f60dd223d5 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 17 Feb 2015 15:06:55 +0000
+Wed, 18 Feb 2015 05:36:51 +0000
diff --git a/metadata/glsa/glsa-201502-13.xml b/metadata/glsa/glsa-201502-13.xml
new file mode 100644
index 000000000000..a28becf6c976
--- /dev/null
+++ b/metadata/glsa/glsa-201502-13.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201502-13">
+  <title>Chromium: Multiple vulnerabilities </title>
+  <synopsis>Multiple vulnerabilities have been found in Chromium, the worst of
+    which can allow remote attackers to cause Denial of Service or gain
+    escalated privileges. 
+  </synopsis>
+  <product type="ebuild">chromium</product>
+  <announced>February 17, 2015</announced>
+  <revised>February 17, 2015: 1</revised>
+  <bug>537366</bug>
+  <bug>539094</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-client/chromium" auto="yes" arch="*">
+      <unaffected range="ge">40.0.2214.111</unaffected>
+      <vulnerable range="lt">40.0.2214.111</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Chromium is an open-source web browser project.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Chromium. Please review
+      the CVE identifiers referenced below for details. 
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker may be able to cause a Denial of Service condition,
+      gain privileges via a filesystem: URI, or have other unspecified impact.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Chromium users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/chromium-40.0.2214.111"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7923">CVE-2014-7923</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7924">CVE-2014-7924</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7925">CVE-2014-7925</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7926">CVE-2014-7926</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7927">CVE-2014-7927</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7928">CVE-2014-7928</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7929">CVE-2014-7929</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7930">CVE-2014-7930</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7931">CVE-2014-7931</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7932">CVE-2014-7932</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7933">CVE-2014-7933</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7934">CVE-2014-7934</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7935">CVE-2014-7935</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7936">CVE-2014-7936</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7937">CVE-2014-7937</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7938">CVE-2014-7938</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7939">CVE-2014-7939</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7940">CVE-2014-7940</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7941">CVE-2014-7941</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7942">CVE-2014-7942</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7943">CVE-2014-7943</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7944">CVE-2014-7944</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7945">CVE-2014-7945</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7946">CVE-2014-7946</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7947">CVE-2014-7947</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-7948">CVE-2014-7948</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-9646">CVE-2014-9646</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-9647">CVE-2014-9647</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-9648">CVE-2014-9648</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-1205">CVE-2015-1205</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-1209">CVE-2015-1209</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-1210">CVE-2015-1210</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-1211">CVE-2015-1211</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-1212">CVE-2015-1212</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-1346">CVE-2015-1346</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-1359">CVE-2015-1359</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-1360">CVE-2015-1360</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-1361">CVE-2015-1361</uri>
+  </references>
+  <metadata tag="requester" timestamp="Fri, 23 Jan 2015 22:37:02 +0000">
+    BlueKnight
+  </metadata>
+  <metadata tag="submitter" timestamp="Tue, 17 Feb 2015 22:01:01 +0000">K_F</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 2086d9ee05ed..e2f60dd223d5 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 17 Feb 2015 15:06:55 +0000
+Wed, 18 Feb 2015 05:36:51 +0000
diff --git a/metadata/md5-cache/app-admin/salt-2014.7.1 b/metadata/md5-cache/app-admin/salt-2014.7.1
deleted file mode 100644
index d0ef678c6daa..000000000000
--- a/metadata/md5-cache/app-admin/salt-2014.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2014.8.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( dev-python/libnacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ioflo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/raet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) api? ( || ( dev-python/cherrypy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[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(-)] virtual/pkgconfig
-DESCRIPTION=Salt is a remote execution and configuration manager
-EAPI=5
-HOMEPAGE=http://saltstack.org/
-IUSE=api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova openssl redis selinux timelib raet +zeromq test python_targets_python2_7
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( dev-python/libnacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ioflo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/raet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) api? ( || ( dev-python/cherrypy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[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=|| ( raet zeromq ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-2014.7.1.tar.gz
-_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ebadbeaa228ef6027623cf61836c04ea
diff --git a/metadata/md5-cache/app-admin/salt-2014.7.0-r1 b/metadata/md5-cache/app-admin/salt-2014.7.2
similarity index 56%
rename from metadata/md5-cache/app-admin/salt-2014.7.0-r1
rename to metadata/md5-cache/app-admin/salt-2014.7.2
index 061736c50907..f129aebca546 100644
--- a/metadata/md5-cache/app-admin/salt-2014.7.0-r1
+++ b/metadata/md5-cache/app-admin/salt-2014.7.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2014.4.24[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( dev-python/libnacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ioflo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/raet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) api? ( || ( dev-python/cherrypy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[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(-)] virtual/pkgconfig
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2015.2.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( dev-python/libnacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ioflo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/raet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/m2crypto-0.22.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) api? ( || ( dev-python/cherrypy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[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(-)] virtual/pkgconfig
 DESCRIPTION=Salt is a remote execution and configuration manager
 EAPI=5
 HOMEPAGE=http://saltstack.org/
-IUSE=api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova openssl redis timelib raet +zeromq test python_targets_python2_7
+IUSE=api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova openssl redis selinux timelib raet +zeromq test python_targets_python2_7
 KEYWORDS=~x86 ~amd64
 LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( dev-python/libnacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ioflo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/raet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) api? ( || ( dev-python/cherrypy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[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=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( dev-python/libnacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ioflo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/raet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/m2crypto-0.22.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) api? ( || ( dev-python/cherrypy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[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=|| ( raet zeromq ) || ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-2014.7.0.tar.gz
+SRC_URI=mirror://pypi/s/salt/salt-2014.7.2.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=06719972902c919b5bef2d627f6ecafd
+_md5_=4f08db5c2b48b7004013d17c5958bc8d
diff --git a/metadata/md5-cache/app-admin/salt-9999 b/metadata/md5-cache/app-admin/salt-9999
index 91fcd54d9924..b6d093d49d68 100644
--- a/metadata/md5-cache/app-admin/salt-9999
+++ b/metadata/md5-cache/app-admin/salt-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2014.8.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( dev-python/libnacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ioflo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/raet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) api? ( || ( dev-python/cherrypy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[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(-)] virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2015.2.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( dev-python/libnacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ioflo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/raet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/m2crypto-0.22.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) api? ( || ( dev-python/cherrypy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[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(-)] virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Salt is a remote execution and configuration manager
 EAPI=5
 HOMEPAGE=http://saltstack.org/
 IUSE=api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova openssl redis selinux timelib raet +zeromq test python_targets_python2_7
 LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( dev-python/libnacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ioflo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/raet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) api? ( || ( dev-python/cherrypy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[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=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( dev-python/libnacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ioflo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/raet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/m2crypto-0.22.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) api? ( || ( dev-python/cherrypy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[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=|| ( raet zeromq ) || ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	git-r3	3a2bd0ae504c33a50061885480f3def3	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5b49cdb970de3ad4bcf454c2f7c7ae60
+_md5_=bcf49a3fa748d49ed30dbc1e2118830d
diff --git a/metadata/md5-cache/app-admin/setools-3.3.8-r7 b/metadata/md5-cache/app-admin/setools-3.3.8-r7
new file mode 100644
index 000000000000..0f6b3f358a23
--- /dev/null
+++ b/metadata/md5-cache/app-admin/setools-3.3.8-r7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=sys-devel/automake-1.12.1 >=sys-libs/libsepol-2.4 >=sys-libs/libselinux-2.4 sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 virtual/pkgconfig java? ( >=virtual/jdk-1.4 dev-lang/swig ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/swig ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.1.9-r1 )
+DESCRIPTION=SELinux policy tools
+EAPI=5
+HOMEPAGE=http://www.tresys.com/selinux/selinux_policy_tools.shtml
+IUSE=X debug java python elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/libsepol-2.1.4 >=sys-libs/libselinux-2.3 >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 java? ( >=virtual/jre-1.4 ) X? ( >=dev-lang/tk-8.4.9 >=dev-tcltk/bwidget-1.8 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.8/setools-3.3.8.tar.bz2 http://dev.gentoo.org/~perfinion/patches/setools/setools-3.3.8-04-gentoo-patches.tar.bz2
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=1a5798eea87b68c4e91a60ad969ba78d
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-24.4.90 b/metadata/md5-cache/app-editors/emacs-vcs-24.4.90
new file mode 100644
index 000000000000..da57e3edc444
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-vcs-24.4.90
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gfile? ( >=dev-libs/glib-2.28.6 ) gnutls? ( net-libs/gnutls ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr sys-apps/paxctl ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=5
+HOMEPAGE=http://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gfile? ( >=dev-libs/glib-2.28.6 ) gnutls? ( net-libs/gnutls ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) )
+REQUIRED_USE=?? ( aqua X )
+SLOT=24
+SRC_URI=http://dev.gentoo.org/~ulm/distfiles/emacs-24.4.90.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-24.4.90.tar.xz
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=556db17d85598f92b0a6a7985e62b5e5
diff --git a/metadata/md5-cache/app-emulation/lxc-1.1.0 b/metadata/md5-cache/app-emulation/lxc-1.1.0
deleted file mode 100644
index e7fe004b1f43..000000000000
--- a/metadata/md5-cache/app-emulation/lxc-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua? ( >=dev-lang/lua-5.1 ) python? ( 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_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) seccomp? ( sys-libs/libseccomp ) doc? ( app-text/docbook-sgml-utils ) >=sys-kernel/linux-headers-3.2 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=LinuX Containers userspace utilities
-EAPI=5
-HOMEPAGE=https://linuxcontainers.org/
-IUSE=cgmanager doc examples lua python seccomp python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64
-LICENSE=LGPL-3
-RDEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua? ( >=dev-lang/lua-5.1 ) python? ( 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_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) seccomp? ( sys-libs/libseccomp ) sys-process/criu sys-apps/util-linux app-misc/pax-utils virtual/awk
-REQUIRED_USE=python? ( || ( python_targets_python3_3 python_targets_python3_4 ) )
-SLOT=0
-SRC_URI=https://github.com/lxc/lxc/archive/lxc-1.1.0.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0d3c8d768f71dfe1d58063dfcf6d1bbc
diff --git a/metadata/md5-cache/app-emulation/lxc-1.1.0-r1 b/metadata/md5-cache/app-emulation/lxc-1.1.0-r2
similarity index 98%
rename from metadata/md5-cache/app-emulation/lxc-1.1.0-r1
rename to metadata/md5-cache/app-emulation/lxc-1.1.0-r2
index e5bb75c5bfe9..52dd6da144f4 100644
--- a/metadata/md5-cache/app-emulation/lxc-1.1.0-r1
+++ b/metadata/md5-cache/app-emulation/lxc-1.1.0-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/lxc/lxc/archive/lxc-1.1.0.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=450b110e198b69160f199957f8831d1d
+_md5_=f0f25f6e218f83fd1072cfa29ee1790a
diff --git a/metadata/md5-cache/app-misc/xmind-3.5.1.201411201906 b/metadata/md5-cache/app-misc/xmind-3.5.1.201411201906
new file mode 100644
index 000000000000..25c5b379bc36
--- /dev/null
+++ b/metadata/md5-cache/app-misc/xmind-3.5.1.201411201906
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A brainstorming and mind mapping software tool
+EAPI=5
+HOMEPAGE=http://www.xmind.net
+KEYWORDS=~amd64 ~x86
+LICENSE=EPL-1.0 LGPL-3
+RDEPEND=>=virtual/jre-1.5 x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-portable-3.5.1.201411201906.zip http://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=e438ae650c7e5d6b805c0bbaf7bed33b
diff --git a/metadata/md5-cache/app-shells/mpibash-1.2 b/metadata/md5-cache/app-shells/mpibash-1.2
new file mode 100644
index 000000000000..60fba8fe0d10
--- /dev/null
+++ b/metadata/md5-cache/app-shells/mpibash-1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/mpi >=app-shells/bash-4.2[plugins] sys-cluster/libcircle !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Parallel scripting right from the Bourne-Again Shell (Bash)
+EAPI=5
+HOMEPAGE=https://github.com/losalamos/MPI-Bash
+IUSE=examples
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=virtual/mpi >=app-shells/bash-4.2[plugins] sys-cluster/libcircle
+SLOT=0
+SRC_URI=https://github.com/losalamos/MPI-Bash/releases/download/v1.2/mpibash-1.2.tar.gz
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=4c89c34a2476ecbb76074c794e0f6cde
diff --git a/metadata/md5-cache/app-shells/mpibash-9999 b/metadata/md5-cache/app-shells/mpibash-9999
new file mode 100644
index 000000000000..10bb52e7a8dd
--- /dev/null
+++ b/metadata/md5-cache/app-shells/mpibash-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=virtual/mpi >=app-shells/bash-4.2[plugins] sys-cluster/libcircle !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Parallel scripting right from the Bourne-Again Shell (Bash)
+EAPI=5
+HOMEPAGE=https://github.com/losalamos/MPI-Bash
+IUSE=examples
+LICENSE=GPL-3
+RDEPEND=virtual/mpi >=app-shells/bash-4.2[plugins] sys-cluster/libcircle
+SLOT=0
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	git-r3	3a2bd0ae504c33a50061885480f3def3	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=5a34309c46c4eaf060dc0e0ac7452b84
diff --git a/metadata/md5-cache/app-shells/tcsh-6.18.01-r2 b/metadata/md5-cache/app-shells/tcsh-6.18.01-r2
index 94eb4a0641d4..ae5ba3ee44bc 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.18.01-r2
+++ b/metadata/md5-cache/app-shells/tcsh-6.18.01-r2
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/tcsh/tcsh-6.18.01.tar.gz http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.9.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5b11455f7130c51daa5ad39f99f7ddcf
+_md5_=d6cc8e12b788a8238fc34a0581a055bf
diff --git a/metadata/md5-cache/app-text/bibletime-2.10.0 b/metadata/md5-cache/app-text/bibletime-2.10.0
deleted file mode 100644
index 1939a9e78c93..000000000000
--- a/metadata/md5-cache/app-text/bibletime-2.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-text/sword-1.6.0 >=dev-cpp/clucene-2.3.3.4 dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 dev-libs/boost dev-libs/icu:= net-misc/curl sys-libs/zlib dev-qt/qttest:4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Qt4 Bible study application using the SWORD library
-EAPI=5
-HOMEPAGE=http://www.bibletime.info/
-IUSE=debug
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/sword-1.6.0 >=dev-cpp/clucene-2.3.3.4 dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4
-SLOT=0
-SRC_URI=mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/bibletime-2.10.0.tar.xz
-_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=875c983fae6fbaf2d01e3475ee775039
diff --git a/metadata/md5-cache/app-text/bibletime-2.10.1 b/metadata/md5-cache/app-text/bibletime-2.10.1
index 31143454af9c..11ce4f703ccc 100644
--- a/metadata/md5-cache/app-text/bibletime-2.10.1
+++ b/metadata/md5-cache/app-text/bibletime-2.10.1
@@ -10,4 +10,4 @@ RDEPEND=>=app-text/sword-1.6.0 >=dev-cpp/clucene-2.3.3.4 qt5? ( dev-qt/linguist-
 SLOT=0
 SRC_URI=mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/bibletime-2.10.1.tar.xz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=156a0ee04e3e1b7c555ec5db27471b93
+_md5_=1079987cd7b159d2b3fc7b8bc00f4fe7
diff --git a/metadata/md5-cache/dev-cpp/lucene++-3.0.7 b/metadata/md5-cache/dev-cpp/lucene++-3.0.7
new file mode 100644
index 000000000000..bc818631d60f
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/lucene++-3.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=C++ port of Java Lucene library, a high-performance, full-featured text search engine
+EAPI=5
+HOMEPAGE=https://github.com/luceneplusplus/LucenePlusPlus
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( LGPL-3 Apache-2.0 )
+RDEPEND=dev-libs/boost:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_3.0.7.tar.gz -> lucene++-3.0.7.tar.gz
+_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=0b85b1f6312026e3aa6ad4483bc6dedf
diff --git a/metadata/md5-cache/dev-cpp/websocketpp-0.5.0 b/metadata/md5-cache/dev-cpp/websocketpp-0.5.0
new file mode 100644
index 000000000000..34035168c60b
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/websocketpp-0.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=C++/Boost Asio based websocket client/server library
+EAPI=5
+HOMEPAGE=http://www.zaphoyd.com/websocketpp
+IUSE=boost test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=boost? ( dev-libs/boost )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zaphoyd/websocketpp/archive/0.5.0.tar.gz -> websocketpp-0.5.0.tar.gz
+_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=b6b3cd301447d92bcf44712bda631953
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.16 b/metadata/md5-cache/dev-db/mariadb-10.0.16
index 52509a743589..e98ad66e05e5 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.0.16
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.16
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=5
 HOMEPAGE=http://mariadb.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 bindist +community cluster debug embedded extraengine jemalloc latin1 minimal +perl profiling selinux ssl systemtap static static-libs tcmalloc test oqgraph pam sphinx tokudb odbc xml
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ~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
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~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.6
 RDEPEND=ssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) sys-libs/ncurses >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.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(-)?,static-libs?] !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc: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(-)?] ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !bindist? ( >=sys-libs/readline-4.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= ) !minimal? ( pam? ( virtual/pam:0= ) ) perl? ( !dev-db/mytop ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) oqgraph? ( dev-libs/judy:0= ) >=dev-libs/libpcre-8.35:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes )
@@ -12,4 +12,4 @@ REQUIRED_USE=minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc ) tcmalloc? ( !jem
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-10.0.16/kvm-tarbake-jaunty-x86/mariadb-10.0.16.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-10.0.16/source/mariadb-10.0.16.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-10.0.16/kvm-tarbake-jaunty-x86/mariadb-10.0.16.tar.gz http://mirrors.coreix.net/mariadb/mariadb-10.0.16/kvm-tarbake-jaunty-x86/mariadb-10.0.16.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-10.0.16/kvm-tarbake-jaunty-x86/mariadb-10.0.16.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-10.0.16/kvm-tarbake-jaunty-x86/mariadb-10.0.16.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-10.0.16/kvm-tarbake-jaunty-x86/mariadb-10.0.16.tar.gz mirror://gentoo/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20141215-0144Z.tar.bz2
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	b6536cf1c75b238b0368fffe1c67e05e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d0159c86a1d4e752d147e2ae6f3a43b5
+_md5_=a6f0357fd498c5a7472ae909f648b511
diff --git a/metadata/md5-cache/dev-db/postgresql-9.0.19 b/metadata/md5-cache/dev-db/postgresql-9.0.19
index 1163db021d99..26b9d642dc2c 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.0.19
+++ b/metadata/md5-cache/dev-db/postgresql-9.0.19
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-admin/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline ) ssl? ( >=dev-libs/openssl-0.9.6-r1 ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.0 !dev-db/postgresql-base:9.0 !dev-db/postgresql-server:9.0 selinux? ( sec-policy/selinux-postgresql )
 RESTRICT=test
 SLOT=9.0
 SRC_URI=mirror://postgresql/source/v9.0.19/postgresql-9.0.19.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	prefix	21058c21ca48453d771df15500873ede	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b04e6eb5c2b210d55a021d1cd9ec9a01
+_md5_=8e23005667d6b2257e9ec78243bfc31d
diff --git a/metadata/md5-cache/dev-db/postgresql-9.1.15 b/metadata/md5-cache/dev-db/postgresql-9.1.15
index aac65f948397..90276930c994 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.1.15
+++ b/metadata/md5-cache/dev-db/postgresql-9.1.15
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-admin/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline ) ssl? ( >=dev-libs/openssl-0.9.6-r1 ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.1 !dev-db/postgresql-base:9.1 !dev-db/postgresql-server:9.1 selinux? ( sec-policy/selinux-postgresql )
 RESTRICT=test
 SLOT=9.1
 SRC_URI=mirror://postgresql/source/v9.1.15/postgresql-9.1.15.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	prefix	21058c21ca48453d771df15500873ede	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=97bccbbeed9ea002ff863298a8da6132
+_md5_=896add5048c8dac53e8d3ca0ced9cdcf
diff --git a/metadata/md5-cache/dev-db/postgresql-9.2.10 b/metadata/md5-cache/dev-db/postgresql-9.2.10
index 3351f1242839..1152e2e8ddce 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.2.10
+++ b/metadata/md5-cache/dev-db/postgresql-9.2.10
@@ -4,10 +4,10 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-admin/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline ) ssl? ( >=dev-libs/openssl-0.9.6-r1 ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.2 !dev-db/postgresql-base:9.2 !dev-db/postgresql-server:9.2 selinux? ( sec-policy/selinux-postgresql )
 SLOT=9.2
 SRC_URI=mirror://postgresql/source/v9.2.10/postgresql-9.2.10.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	prefix	21058c21ca48453d771df15500873ede	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=35944c64b869aa22c183130255b9c4fa
+_md5_=54f2da09dbc0f4e6af54ecaca7d1e0ef
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.6 b/metadata/md5-cache/dev-db/postgresql-9.3.6
index 5f5236b6b0ef..3139582a4fcd 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.6
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.6
@@ -4,10 +4,10 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-admin/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline ) ssl? ( >=dev-libs/openssl-0.9.6-r1 ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 selinux? ( sec-policy/selinux-postgresql )
 SLOT=9.3
 SRC_URI=mirror://postgresql/source/v9.3.6/postgresql-9.3.6.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	prefix	21058c21ca48453d771df15500873ede	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d1b2302afb6f178f89fb4133e37b3b78
+_md5_=662ca612fadd83292cc103542f578dd9
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.1 b/metadata/md5-cache/dev-db/postgresql-9.4.1
index 0f5fe36f16f7..1c99085e0885 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.1
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-admin/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline ) ssl? ( >=dev-libs/openssl-0.9.6-r1 ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.1/postgresql-9.4.1.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	prefix	21058c21ca48453d771df15500873ede	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0355f2e9bd61c335d29a8d665232b69b
+_md5_=8659bc86b8ccc3d5583856ae9e6c18ca
diff --git a/metadata/md5-cache/dev-java/oracle-javamail-1.5.2 b/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
new file mode 100644
index 000000000000..88dbd5787b88
--- /dev/null
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A Java-based framework to build multiplatform mail and messaging applications
+EAPI=4
+HOMEPAGE=https://java.net/projects/javamail/pages/Home
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=CDDL GPL-2 BSD
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.2-src.zip
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3049413d24d315c8eef1029ceb4f967b
diff --git a/metadata/md5-cache/dev-lang/go-1.4.1 b/metadata/md5-cache/dev-lang/go-1.4.1
index bceb3f1d0351..7a60dc1a30b7 100644
--- a/metadata/md5-cache/dev-lang/go-1.4.1
+++ b/metadata/md5-cache/dev-lang/go-1.4.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst preinst prepare test
 DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=5
 HOMEPAGE=http://www.golang.org
-KEYWORDS=-* amd64 ~arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos
+KEYWORDS=-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://storage.googleapis.com/golang/go1.4.1.src.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=09202c42c5af56bd94ee34758b0a0d28
+_md5_=ca005c036b424f4ae165fdfdf34c34b4
diff --git a/metadata/md5-cache/dev-lang/perl-5.20.1-r4 b/metadata/md5-cache/dev-lang/perl-5.20.1-r4
index 93047995c137..c9d8cd5a5364 100644
--- a/metadata/md5-cache/dev-lang/perl-5.20.1-r4
+++ b/metadata/md5-cache/dev-lang/perl-5.20.1-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Larry Wall's Practical Extraction and Report Language
 EAPI=5
 HOMEPAGE=http://www.perl.org/
 IUSE=berkdb debug doc gdbm ithreads
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.20
 SRC_URI=mirror://cpan/src/5.0/perl-5.20.1.tar.bz2 mirror://cpan/authors/id/R/RJ/RJBS/perl-5.20.1.tar.bz2 mirror://gentoo/perl-5.20.1-patches-2.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/perl-5.20.1-patches-2.tar.xz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=65e06ca20559bd6e98398a4ea759e48d
+_md5_=cfc55d6ab9afcec7389864d8f60cb116
diff --git a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2 b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
index 85fa107be333..c8d4f4eefbe8 100644
--- a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
+++ b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
@@ -4,9 +4,9 @@ DESCRIPTION=FastCGI Developer's Kit
 EAPI=4
 HOMEPAGE=http://www.fastcgi.com/
 IUSE=html
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=FastCGI
 SLOT=0
 SRC_URI=http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ef8bcfb1e1eb67d933340a8015ea4b3f
+_md5_=d23b4e966d50bae549bd034b73fd0eb2
diff --git a/metadata/md5-cache/dev-libs/icu-54.1-r1 b/metadata/md5-cache/dev-libs/icu-54.1-r1
index 9c9afdd53485..95749477fbcb 100644
--- a/metadata/md5-cache/dev-libs/icu-54.1-r1
+++ b/metadata/md5-cache/dev-libs/icu-54.1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=International Components for Unicode
 EAPI=5
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 SLOT=0/54a
 SRC_URI=http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.tgz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5c77432c8848d8bf23c616113047af9c
+_md5_=3ac8d19c386ddb32866bed34adca83b8
diff --git a/metadata/md5-cache/dev-libs/libwacom-0.11 b/metadata/md5-cache/dev-libs/libwacom-0.11
new file mode 100644
index 000000000000..c93deb4b9547
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libwacom-0.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 virtual/libgudev:= virtual/pkgconfig doc? ( app-doc/doxygen ) virtual/pkgconfig
+DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
+EAPI=5
+HOMEPAGE=http://linuxwacom.sourceforge.net/
+IUSE=doc static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 virtual/libgudev:=
+SLOT=0
+SRC_URI=mirror://sourceforge/linuxwacom/libwacom/libwacom-0.11.tar.bz2
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438
+_md5_=c4d8a3d46835ff869ba998acf5b0a89c
diff --git a/metadata/md5-cache/dev-php/PEAR-I18Nv2-0.11.4-r2 b/metadata/md5-cache/dev-php/PEAR-I18Nv2-0.11.4-r2
new file mode 100644
index 000000000000..dafb63305630
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-I18Nv2-0.11.4-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install setup
+DEPEND=dev-lang/php:*[iconv,pcre(+)] dev-lang/php:* >=dev-php/pear-1.8.1
+DESCRIPTION=Internationalization - basic support to localize your application
+EAPI=5
+HOMEPAGE=http://pear.php.net/I18Nv2
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=PHP-3
+RDEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=http://pear.php.net/get/I18Nv2-0.11.4.tgz
+_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-pear-r1	6199074ba0005674c2291a5a8d0274e2	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=29ffd821257a9b6e08f24a88004420c3
diff --git a/metadata/md5-cache/dev-php/doctrine-1.2.5 b/metadata/md5-cache/dev-php/doctrine-1.2.5
index 3f9c1b3523a0..7b6ea90addc1 100644
--- a/metadata/md5-cache/dev-php/doctrine-1.2.5
+++ b/metadata/md5-cache/dev-php/doctrine-1.2.5
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
-DEPEND=>=dev-lang/php-5.2.3[cli,pdo]
+DEPEND=>=dev-lang/php-5.2.3:*[cli,pdo]
 DESCRIPTION=An object relational mapper for PHP5
 EAPI=5
 HOMEPAGE=http://www.doctrine-project.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 MIT BSD
-RDEPEND=>=dev-lang/php-5.2.3[cli,pdo]
+RDEPEND=>=dev-lang/php-5.2.3:*[cli,pdo]
 SLOT=0
 SRC_URI=https://github.com/doctrine/doctrine1/archive/v1.2.5.tar.gz -> doctrine-1.2.5.tar.gz
-_md5_=b9a1f99d8305f02649593c77a3bb1452
+_md5_=82bb5cbad6ad5e9a1a206ff59c299931
diff --git a/metadata/md5-cache/dev-php/doctrine-2.4.6 b/metadata/md5-cache/dev-php/doctrine-2.4.6
new file mode 100644
index 000000000000..6c4bc37d9f0c
--- /dev/null
+++ b/metadata/md5-cache/dev-php/doctrine-2.4.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-lang/php-5.3.2:*[cli,pdo]
+DESCRIPTION=An object relational mapper for PHP5
+EAPI=5
+HOMEPAGE=http://www.doctrine-project.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 MIT BSD
+RDEPEND=>=dev-lang/php-5.3.2:*[cli,pdo]
+SLOT=2
+SRC_URI=https://github.com/doctrine/doctrine2/archive/v2.4.6.tar.gz -> doctrine-2.4.6.tar.gz
+_md5_=2190a209b1777c14b6b9a522b20e5407
diff --git a/metadata/md5-cache/dev-php/suhosin-0.9.37.1 b/metadata/md5-cache/dev-php/suhosin-0.9.37.1
index 3252a43fe05c..dd017513cf8c 100644
--- a/metadata/md5-cache/dev-php/suhosin-0.9.37.1
+++ b/metadata/md5-cache/dev-php/suhosin-0.9.37.1
@@ -4,11 +4,11 @@ DESCRIPTION=Suhosin is an advanced protection system for PHP installations
 EAPI=5
 HOMEPAGE=http://www.suhosin.org/
 IUSE=php_targets_php5-6 php_targets_php5-5 php_targets_php5-4
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=PHP-3.01
 RDEPEND=dev-lang/php[unicode] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php5-5 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://download.suhosin.org/suhosin-0.9.37.1.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-ext-source-r2	39437168059a2166e012420b3ba12815	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a8d579cea03e4775a8051d107f072d8d
+_md5_=cce36de8d51f6fa8f2aa9aacb80e0297
diff --git a/metadata/md5-cache/dev-python/PyQt5-5.4 b/metadata/md5-cache/dev-python/PyQt5-5.4
index f76f3e4f383c..7b2bc1c03811 100644
--- a/metadata/md5-cache/dev-python/PyQt5-5.4
+++ b/metadata/md5-cache/dev-python/PyQt5-5.4
@@ -3,7 +3,7 @@ DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targe
 DESCRIPTION=Python bindings for the Qt framework
 EAPI=5
 HOMEPAGE=http://www.riverbankcomputing.co.uk/software/pyqt/intro/ https://pypi.python.org/pypi/PyQt5
-IUSE=dbus debug declarative designer doc examples +gui help multimedia network opengl positioning printsupport sensors serialport sql svg testlib webkit websockets widgets x11extras xmlpatterns python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+IUSE=dbus debug declarative designer doc examples gui help multimedia network opengl positioning printsupport sensors serialport sql svg testlib webkit websockets widgets x11extras xmlpatterns python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.16.4:=[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(-)] >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtxml-5.3.2:5 dbus? ( dev-python/dbus-python[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(-)] >=dev-qt/qtdbus-5.3.2:5 ) declarative? ( >=dev-qt/qtdeclarative-5.3.2:5[widgets?] ) designer? ( >=dev-qt/designer-5.3.2:5 ) gui? ( >=dev-qt/qtgui-5.3.2:5 ) help? ( >=dev-qt/qthelp-5.3.2:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.3.2:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.3.2:5 ) opengl? ( >=dev-qt/qtopengl-5.3.2:5 ) positioning? ( >=dev-qt/qtpositioning-5.3.2:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.3.2:5 ) sensors? ( >=dev-qt/qtsensors-5.3.2:5 ) serialport? ( >=dev-qt/qtserialport-5.3.2:5 ) sql? ( >=dev-qt/qtsql-5.3.2:5 ) svg? ( >=dev-qt/qtsvg-5.3.2:5 ) testlib? ( >=dev-qt/qttest-5.3.2:5 ) webkit? ( >=dev-qt/qtwebkit-5.3.2:5[printsupport] ) websockets? ( >=dev-qt/qtwebsockets-5.3.2:5 ) widgets? ( >=dev-qt/qtwidgets-5.3.2:5 ) x11extras? ( >=dev-qt/qtx11extras-5.3.2:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.3.2:5 )
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/PyQt-gpl-5.4.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=fb6ff67188e16138d29d14de6d97879d
+_md5_=4e57154994fed1106555650b1c7a04b8
diff --git a/metadata/md5-cache/dev-python/SaltTesting-0.5.2 b/metadata/md5-cache/dev-python/SaltTesting-0.5.2
deleted file mode 100644
index 6ed9904f6a94..000000000000
--- a/metadata/md5-cache/dev-python/SaltTesting-0.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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=Required testing tools needed in the several Salt Stack projects
-EAPI=5
-HOMEPAGE=http://saltstack.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=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=mirror://pypi/S/SaltTesting/SaltTesting-0.5.2.tar.gz
-_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=92a24b260e98afc2b60a684db3d9f7b8
diff --git a/metadata/md5-cache/dev-python/SaltTesting-0.5.3 b/metadata/md5-cache/dev-python/SaltTesting-0.5.3
deleted file mode 100644
index 8d9d4cbea47e..000000000000
--- a/metadata/md5-cache/dev-python/SaltTesting-0.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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=Required testing tools needed in the several Salt Stack projects
-EAPI=5
-HOMEPAGE=http://saltstack.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~x86 ~amd64
-LICENSE=Apache-2.0
-RDEPEND=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=mirror://pypi/S/SaltTesting/SaltTesting-0.5.3.tar.gz
-_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1667414029f44bbc7b9194c48e8a2a81
diff --git a/metadata/md5-cache/dev-python/SaltTesting-2014.4.24 b/metadata/md5-cache/dev-python/SaltTesting-2015.2.16
similarity index 58%
rename from metadata/md5-cache/dev-python/SaltTesting-2014.4.24
rename to metadata/md5-cache/dev-python/SaltTesting-2015.2.16
index 051be6a12271..e27fdce99eb0 100644
--- a/metadata/md5-cache/dev-python/SaltTesting-2014.4.24
+++ b/metadata/md5-cache/dev-python/SaltTesting-2015.2.16
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-python/requests-2.4.2 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=Required testing tools needed in the several Salt Stack projects
 EAPI=5
 HOMEPAGE=http://saltstack.org/
 IUSE=python_targets_python2_7
 KEYWORDS=~x86 ~amd64
 LICENSE=Apache-2.0
-RDEPEND=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/requests-2.4.2 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=mirror://pypi/S/SaltTesting/SaltTesting-2014.4.24.tar.gz
+SRC_URI=mirror://pypi/S/SaltTesting/SaltTesting-2015.2.16.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=472f244a2019eb630a5292251a9a68dc
+_md5_=3530307d0125304603fa9cc74bd2e1b9
diff --git a/metadata/md5-cache/dev-python/chardet-2.3.0 b/metadata/md5-cache/dev-python/chardet-2.3.0
new file mode 100644
index 000000000000..33e3381e219f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/chardet-2.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DESCRIPTION=Universal encoding detector
+EAPI=5
+HOMEPAGE=https://github.com/chardet/chardet http://pypi.python.org/pypi/chardet
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
+SLOT=0
+SRC_URI=mirror://pypi/c/chardet/chardet-2.3.0.tar.gz
+_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=5b6e49cbe3654aaebdad9c8fe96e4c07
diff --git a/metadata/md5-cache/dev-python/pyifp-0.2.2 b/metadata/md5-cache/dev-python/pyifp-0.2.2
deleted file mode 100644
index e03d875320ab..000000000000
--- a/metadata/md5-cache/dev-python/pyifp-0.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=>=media-libs/libifp-1.0.0.2 dev-lang/swig =dev-lang/python-2*
-DESCRIPTION=Python bindings for libifp library for accessing iRiver iFP devices
-EAPI=3
-HOMEPAGE=http://ifp-gnome.sourceforge.net
-KEYWORDS=~amd64 ~ia64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=media-libs/libifp-1.0.0.2 =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/ifp-gnome/pyifp-0.2.2.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f961ff188f44e0005f4fb474322eec63
diff --git a/metadata/md5-cache/dev-python/pyifp-0.2.2-r1 b/metadata/md5-cache/dev-python/pyifp-0.2.2-r1
new file mode 100644
index 000000000000..6c3cdd597c44
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyifp-0.2.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=media-libs/libifp-1.0.0.2 dev-lang/swig >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
+DESCRIPTION=Python bindings for libifp library for accessing iRiver iFP devices
+EAPI=5
+HOMEPAGE=http://ifp-gnome.sourceforge.net
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=media-libs/libifp-1.0.0.2 >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/ifp-gnome/pyifp-0.2.2.tar.gz
+_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=d5b6b9ea8382c35aadc5660003bfd92f
diff --git a/metadata/md5-cache/dev-python/pyndex-0.3.2a-r1 b/metadata/md5-cache/dev-python/pyndex-0.3.2a-r1
new file mode 100644
index 000000000000..be75bed739a4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyndex-0.3.2a-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
+DESCRIPTION=Simple and fast Python full-text indexer (aka search engine) using Metakit as its back-end
+EAPI=5
+HOMEPAGE=http://www.divmod.org/Pyndex/index.html
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-db/metakit-2.4.9.2[python] >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/pyndex/Pyndex-0.3.2a.tar.gz
+_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=fbc3e7946c4f144cd3f94818edf2edf5
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.3 b/metadata/md5-cache/dev-ruby/ffi-1.9.3
deleted file mode 100644
index c4f413a23ed2..000000000000
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libffi ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] dev-ruby/yard[ruby_targets_ruby19] test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/rake-compiler[ruby_targets_ruby20] dev-ruby/yard[ruby_targets_ruby20] test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) test? ( ruby_targets_ruby19? ( virtual/ruby-threads[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-threads[ruby_targets_ruby20] ) ) 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/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[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=Ruby extension for programmatically loading dynamic libraries
-EAPI=5
-HOMEPAGE=http://wiki.github.com/ffi/ffi
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=virtual/libffi ruby_targets_ruby19? ( virtual/ruby-threads[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-threads[ruby_targets_ruby20] ) 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://github.com/ffi/ffi/archive/1.9.3.tar.gz -> ffi-git-1.9.3.tgz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8df0bab56a370579fd6f5844bf74c28b
diff --git a/metadata/md5-cache/dev-util/ddd-3.3.12-r4 b/metadata/md5-cache/dev-util/ddd-3.3.12-r4
index d4bcedffb098..27024278f8e7 100644
--- a/metadata/md5-cache/dev-util/ddd-3.3.12-r4
+++ b/metadata/md5-cache/dev-util/ddd-3.3.12-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical front-end for command-line debuggers
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/ddd
 IUSE=+gnuplot readline
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux
 LICENSE=GPL-3 LGPL-3 FDL-1.1
 RDEPEND=sys-devel/gdb sys-libs/ncurses x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt >=x11-libs/motif-2.3:0 ppc? ( dev-libs/elfutils ) ppc64? ( dev-libs/elfutils ) readline? ( sys-libs/readline ) x11-apps/xfontsel gnuplot? ( sci-visualization/gnuplot )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/ddd/ddd-3.3.12.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=39c03f5a0820cddb72d6001c641b373f
+_md5_=d0cbc2b3c3b93d48b482fafbc2efb539
diff --git a/metadata/md5-cache/games-strategy/hedgewars-0.9.21.1 b/metadata/md5-cache/games-strategy/hedgewars-0.9.21.1
new file mode 100644
index 000000000000..793c3a102111
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/hedgewars-0.9.21.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-lang/lua dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/freeglut media-libs/libpng:0 media-libs/libsdl[sound,opengl,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf sys-libs/zlib virtual/ffmpeg >=dev-lang/fpc-2.4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A turn-based strategy, artillery, action and comedy game
+EAPI=5
+HOMEPAGE=http://hedgewars.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 Apache-2.0 FDL-1.3
+RDEPEND=dev-lang/lua dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/freeglut media-libs/libpng:0 media-libs/libsdl[sound,opengl,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf sys-libs/zlib virtual/ffmpeg media-fonts/wqy-zenhei >=media-fonts/dejavu-2.28 games-misc/games-envd
+SLOT=0
+SRC_URI=http://download.gna.org/hedgewars/hedgewars-src-0.9.21.1.tar.bz2
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=bc7771bbcdd5a379fc5b21d26faf83cb
diff --git a/metadata/md5-cache/games-util/pyfa-1.2.0 b/metadata/md5-cache/games-util/pyfa-1.2.0
deleted file mode 100644
index 71a63f289d45..000000000000
--- a/metadata/md5-cache/games-util/pyfa-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=5
-HOMEPAGE=https://github.com/DarkFenX/Pyfa
-IUSE=+graph python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm
-RDEPEND=dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/DarkFenX/Pyfa/releases/download/v1.2.0/pyfa-1.2.0-kronos-1.0-src.zip
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9737a26717e73248e375fc014240a36e
diff --git a/metadata/md5-cache/games-util/pyfa-1.2.1 b/metadata/md5-cache/games-util/pyfa-1.2.1
deleted file mode 100644
index a142b75bda82..000000000000
--- a/metadata/md5-cache/games-util/pyfa-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=5
-HOMEPAGE=https://github.com/DarkFenX/Pyfa
-IUSE=+graph python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm
-RDEPEND=dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/DarkFenX/Pyfa/releases/download/v1.2.1/pyfa-1.2.1-kronos-1.0-src.zip
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=95f40216a2c2b3699159b36dc2cc1d05
diff --git a/metadata/md5-cache/games-util/pyfa-1.8.1 b/metadata/md5-cache/games-util/pyfa-1.8.1
new file mode 100644
index 000000000000..78eaca1687b5
--- /dev/null
+++ b/metadata/md5-cache/games-util/pyfa-1.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
+EAPI=5
+HOMEPAGE=https://github.com/DarkFenX/Pyfa
+IUSE=+graph python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm
+RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=https://github.com/DarkFenX/Pyfa/archive/v1.8.1.tar.gz -> pyfa-1.8.1.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=697a4b54e7c3102e37aa12e40a81bbfb
diff --git a/metadata/md5-cache/games-util/pyfa-9999 b/metadata/md5-cache/games-util/pyfa-9999
index d08da80cb571..d4127d344620 100644
--- a/metadata/md5-cache/games-util/pyfa-9999
+++ b/metadata/md5-cache/games-util/pyfa-9999
@@ -5,7 +5,7 @@ EAPI=5
 HOMEPAGE=https://github.com/DarkFenX/Pyfa
 IUSE=+graph python_targets_python2_7
 LICENSE=GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm
-RDEPEND=dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	git-2	e28f0d8a9b321431b1e699782851b827	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=12c55f7f39aa5070679545665abf6c12
+_md5_=e6af8a34a72495addfaace309d3c5958
diff --git a/metadata/md5-cache/java-virtuals/javamail-1.0-r3 b/metadata/md5-cache/java-virtuals/javamail-1.0-r3
new file mode 100644
index 000000000000..e812fe3a45b0
--- /dev/null
+++ b/metadata/md5-cache/java-virtuals/javamail-1.0-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.1.6
+DESCRIPTION=Virtual for javamail implementations
+EAPI=4
+HOMEPAGE=http://www.gentoo.org
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=|| ( dev-java/oracle-javamail:0 dev-java/sun-javamail:0 dev-java/gnu-javamail:1 ) >=dev-java/java-config-2.1.6
+SLOT=0
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b26111806e683a4c8d24354f54610f8d
diff --git a/metadata/md5-cache/kde-base/pykde4-4.12.5 b/metadata/md5-cache/kde-base/pykde4-4.12.5
deleted file mode 100644
index a5b3fb7d65c4..000000000000
--- a/metadata/md5-cache/kde-base/pykde4-4.12.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/PyQt4-4.9.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),dbus,declarative,script(+),sql,svg,webkit,X] <dev-python/PyQt4-4.11 >=dev-python/sip-4.14:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/sip-4.16 >=kde-base/kdelibs-4.12.5:4[aqua=,opengl,semantic-desktop?] semantic-desktop? ( >=kde-base/kdepimlibs-4.12.5:4[aqua=] >=dev-libs/soprano-2.9.0 ) dev-lang/python-exec:0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] sys-devel/libtool >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.12.5:4[aqua=]
-DESCRIPTION=Python bindings for KDE4
-EAPI=5
-HOMEPAGE=http://techbase.kde.org/Development/Languages/Python
-IUSE=debug doc examples semantic-desktop test python_targets_python2_7 python_targets_python3_3 aqua
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/PyQt4-4.9.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),dbus,declarative,script(+),sql,svg,webkit,X] <dev-python/PyQt4-4.11 >=dev-python/sip-4.14:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] <dev-python/sip-4.16 >=kde-base/kdelibs-4.12.5:4[aqua=,opengl,semantic-desktop?] semantic-desktop? ( >=kde-base/kdepimlibs-4.12.5:4[aqua=] >=dev-libs/soprano-2.9.0 ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.12.5:4[aqua=] ) >=dev-qt/qtopengl-4.8.5:4 dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.12.5:4[aqua=]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 ) test? ( semantic-desktop )
-SLOT=4/4.12
-SRC_URI=mirror://kde/stable/4.12.5/src/pykde4-4.12.5.tar.xz
-_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	0fefdf727b8cb916a1b974021316f911	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	portability	a45c088f246ef5091e029f6285d7ce42	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1e66110fd48978f38e0c3bb4ba23f981
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r3 b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r3
index 9d965f9b16e5..d5ce5504cc0f 100644
--- a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r3
+++ b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r3
@@ -4,10 +4,10 @@ DESCRIPTION=LXDE session manager (lite version)
 EAPI=5
 HOMEPAGE=http://lxde.sf.net/
 IUSE=nls upower
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~x86 ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm ~ppc ~x86 ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus !lxde-base/lxsession-edit sys-apps/lsb-release upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxsession-0.4.9.2.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	a41415fe361172827ed11b6a32ee38fb
-_md5_=29b95a82cc5b87f140d6a91cb373486a
+_md5_=e2a9c5e3c4e43d2d365ccbe2b1460989
diff --git a/metadata/md5-cache/media-fonts/font-util-1.3.0 b/metadata/md5-cache/media-fonts/font-util-1.3.0
index 2742afa4e2fe..d79437c44920 100644
--- a/metadata/md5-cache/media-fonts/font-util-1.3.0
+++ b/metadata/md5-cache/media-fonts/font-util-1.3.0
@@ -3,9 +3,9 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys
 DESCRIPTION=X.Org font utilities
 EAPI=4
 HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/font/font-util-1.3.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	xorg-2	69479ff7a35a30e863a475568d29b9be
-_md5_=e8c9aff8ca0fd83fe59b0285eb5943a0
+_md5_=18a99320848a4a88e7b32bfd9108349b
diff --git a/metadata/md5-cache/media-libs/freetype-2.5.5 b/metadata/md5-cache/media-libs/freetype-2.5.5
index 0fb337aaeb3a..f32f4d188e9d 100644
--- a/metadata/md5-cache/media-libs/freetype-2.5.5
+++ b/metadata/md5-cache/media-libs/freetype-2.5.5
@@ -4,7 +4,7 @@ DESCRIPTION=A high-quality and portable font engine
 EAPI=5
 HOMEPAGE=http://www.freetype.org/
 IUSE=X +adobe-cff auto-hinter bindist bzip2 debug doc fontforge harfbuzz infinality png static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=|| ( FTL GPL-2+ )
 PDEPEND=infinality? ( media-libs/fontconfig-infinality )
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( 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/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
@@ -12,4 +12,4 @@ REQUIRED_USE=harfbuzz? ( auto-hinter )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.5.5.tar.bz2 mirror://nongnu/freetype/freetype-2.5.5.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.5.5.tar.bz2 mirror://nongnu/freetype/ft2demos-2.5.5.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.5.5.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.5.5.tar.bz2 ) infinality? ( http://dev.gentoo.org/~polynomial-c/freetype-2.5.5-infinality-patches.tar.xz )
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2fdf2168d70071bb8b402c723c2dc94e
+_md5_=0235fb358bff0b963e5f4b4151672232
diff --git a/metadata/md5-cache/media-libs/harfbuzz-0.9.38 b/metadata/md5-cache/media-libs/harfbuzz-0.9.38
new file mode 100644
index 000000000000..005ad51e2d07
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-0.9.38
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.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(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34 ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/gtk-doc-am virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=An OpenType text shaping engine
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.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(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34 ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+SLOT=0/0.9.18
+SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.38.tar.bz2
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=de2a32bcccb87734c062dba887b51e47
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index 11298c913cbf..c952cc6e3bb6 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -9,4 +9,4 @@ RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	git-r3	3a2bd0ae504c33a50061885480f3def3	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7f318f0574b1eb5304f477d506f26884
+_md5_=2c9813ddaba35d783dde1f404fc42fd4
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mimic-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mimic-0.10.23-r1
index a88c80e05864..6a60ebf72e74 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mimic-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mimic-0.10.23-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for the MIMIC codec
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 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 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmimic-1.0.4-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(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)?,abi_x86_64(-)?,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/gst-plugins-bad-0.10.23:0.10[abi_x86_32(-)?,abi_x86_64(-)?,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-gstplugins[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=844dcc431878d978972e56754d058660
+_md5_=0d34894696cd2514b57f0cdce733b1fc
diff --git a/metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.7 b/metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.7
new file mode 100644
index 000000000000..99fc3082e64e
--- /dev/null
+++ b/metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=config install postinst preinst prepare setup
+DESCRIPTION=Scripts necessary for use of vdr as a set-top-box
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/
+IUSE=nvram
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=nvram? ( sys-power/nvram-wakeup ) app-admin/sudo sys-process/wait_on_pid
+SLOT=0
+SRC_URI=mirror://gentoo/gentoo-vdr-scripts-2.7.tar.bz2 http://dev.gentoo.org/~hd_brummy/distfiles/gentoo-vdr-scripts-2.7.tar.bz2
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=acfcbbf3b54629359ebe5c8f5b6bb5bc
diff --git a/metadata/md5-cache/net-misc/dhcpcd-6.6.7 b/metadata/md5-cache/net-misc/dhcpcd-6.6.7
index 21650c6dd432..5e3dbc758ed6 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-6.6.7
+++ b/metadata/md5-cache/net-misc/dhcpcd-6.6.7
@@ -4,10 +4,10 @@ DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=5
 HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
 IUSE=elibc_glibc ipv6 kernel_linux +udev
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
 SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-6.6.7.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=eb1136d9667afc5521dc62e9f2f9492b
+_md5_=15594e5e06f39b76318712003f50b060
diff --git a/metadata/md5-cache/net-misc/openvpn-2.3.6-r2 b/metadata/md5-cache/net-misc/openvpn-2.3.6-r2
new file mode 100644
index 000000000000..363ec194c2c4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openvpn-2.3.6-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) ssl? ( !polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.2.10 ) ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Robust and highly flexible tunneling application compatible with many OSes
+EAPI=4
+HOMEPAGE=http://openvpn.net/
+IUSE=examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl selinux +ssl systemd +lzo static userland_BSD
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) ssl? ( !polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.2.10 ) ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) selinux? ( sec-policy/selinux-openvpn )
+REQUIRED_USE=static? ( !plugins !pkcs11 ) polarssl? ( ssl ) pkcs11? ( ssl ) !plugins? ( !pam !down-root )
+SLOT=0
+SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.3.6.tar.gz
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=7b1ff67098f48a4b3a44cbaf4c0063ce
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-9999 b/metadata/md5-cache/net-p2p/qbittorrent-9999
index 0c3d095bb88a..ba598d264d9a 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-9999
+++ b/metadata/md5-cache/net-p2p/qbittorrent-9999
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/boost:= dev-qt/qtcore:4 >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?] >=net-libs/rb_libtorrent-0.16.17 dbus? ( dev-qt/qtdbus:4 ) X? ( dev-qt/qtgui:4 ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=configure install unpack
+DEPEND=dev-libs/boost:= >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?,qt4?,qt5?] >=net-libs/rb_libtorrent-0.16.17 sys-libs/zlib qt4? ( dev-qt/qtcore:4 dbus? ( dev-qt/qtdbus:4 ) X? ( dev-qt/qtgui:4 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) X? ( dev-qt/qtgui:4 dev-qt/qtwidgets:5 ) ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=BitTorrent client in C++ and Qt
 EAPI=5
 HOMEPAGE=http://www.qbittorrent.org/
-IUSE=dbus debug geoip +X python_targets_python2_7
+IUSE=+dbus debug geoip +qt4 qt5 webui +X python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= dev-qt/qtcore:4 >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?] >=net-libs/rb_libtorrent-0.16.17 dbus? ( dev-qt/qtdbus:4 ) X? ( dev-qt/qtgui:4 ) 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(-)] geoip? ( dev-libs/geoip )
+RDEPEND=dev-libs/boost:= >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?,qt4?,qt5?] >=net-libs/rb_libtorrent-0.16.17 sys-libs/zlib qt4? ( dev-qt/qtcore:4 dbus? ( dev-qt/qtdbus:4 ) X? ( dev-qt/qtgui:4 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) X? ( dev-qt/qtgui:4 dev-qt/qtwidgets:5 ) ) 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(-)] geoip? ( dev-libs/geoip )
+REQUIRED_USE=^^ ( qt4 qt5 ) dbus? ( X ) geoip? ( X )
 SLOT=0
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	git-r3	3a2bd0ae504c33a50061885480f3def3	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=62eba7f3ff929abb4c017b8e05b72345
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	git-r3	3a2bd0ae504c33a50061885480f3def3	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=20ff3115f8b78c47c90435e234cf54f4
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.5.2 b/metadata/md5-cache/net-wireless/gnuradio-3.7.5.2
deleted file mode 100644
index 7a197c2d4ddb..000000000000
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-util/cppunit-1.9.14 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ctrlport? ( dev-libs/Ice[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-qt/qtcore-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 net-libs/cppzmq ) dev-lang/swig dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
-EAPI=5
-HOMEPAGE=http://gnuradio.org/
-IUSE=+audio +alsa atsc +analog +digital channels +ctrlport doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-util/cppunit-1.9.14 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ctrlport? ( dev-libs/Ice[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-qt/qtcore-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 net-libs/cppzmq )
-REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) pager? ( filter analog ) qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
-SLOT=0/3.7.5.2
-SRC_URI=http://s3-dist.gnuradio.org/gnuradio-3.7.5.2.tar.gz
-_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0c1a7b6f02093bea25469d4194257e52
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.6 b/metadata/md5-cache/net-wireless/gnuradio-3.7.6.1
similarity index 99%
rename from metadata/md5-cache/net-wireless/gnuradio-3.7.6
rename to metadata/md5-cache/net-wireless/gnuradio-3.7.6.1
index 64f06a9c0cef..dd5f9530d7e1 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.6
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.6.1
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-util/cppunit-1.9.14 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ctrlport? ( dev-libs/Ice[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) fcd? ( virtual/libusb:1 ) filter? ( sci-libs/scipy ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) jack? ( media-sound/jack-audio-connection-kit ) log? ( dev-libs/log4cpp ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( >=dev-python/PyQt4-4.4[X,opengl,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pyqwt-5.2:5[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-qt/qtcore-4.4:4 >=dev-qt/qtgui-4.4:4 x11-libs/qwt:6 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) utils? ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) vocoder? ( media-sound/gsm ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) zeromq? ( >=net-libs/zeromq-2.1.11 net-libs/cppzmq )
 REQUIRED_USE=python_targets_python2_7 audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) oss? ( audio ) jack? ( audio ) portaudio? ( audio ) analog? ( filter ) digital? ( filter analog ) pager? ( filter analog ) qt4? ( filter ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog ) wxwidgets? ( filter analog )
-SLOT=0/3.7.6
-SRC_URI=http://s3-dist.gnuradio.org/gnuradio-3.7.6.tar.gz
+SLOT=0/3.7.6.1
+SRC_URI=http://s3-dist.gnuradio.org/gnuradio-3.7.6.1.tar.gz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=cd4ccb262d21baaf347912c6071301e3
+_md5_=139a7fef4bde0fca24ce13eebe653ad9
diff --git a/metadata/md5-cache/perl-core/CGI-3.650.0 b/metadata/md5-cache/perl-core/CGI-3.650.0
index 3ed05eda9620..502d5ecc29c9 100644
--- a/metadata/md5-cache/perl-core/CGI-3.650.0
+++ b/metadata/md5-cache/perl-core/CGI-3.650.0
@@ -4,10 +4,10 @@ DESCRIPTION=Simple Common Gateway Interface Class
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/CGI.pm/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/CGI.pm-3.65.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=388fdbac6670f11cd4b3a6c6e4028f8e
+_md5_=2fef047b57b051d671eb4c8884f38905
diff --git a/metadata/md5-cache/perl-core/File-Temp-0.230.400-r1 b/metadata/md5-cache/perl-core/File-Temp-0.230.400-r1
index 6439ffa74181..252d89af914d 100644
--- a/metadata/md5-cache/perl-core/File-Temp-0.230.400-r1
+++ b/metadata/md5-cache/perl-core/File-Temp-0.230.400-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=File::Temp can be used to create and open temporary files in a safe way
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/File-Temp/
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-Temp-0.2304.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=8c1b2e28c11afd5ee29a0d81b51d1fa8
+_md5_=80f397d66ed69e837776ad7c118ba3e5
diff --git a/metadata/md5-cache/perl-core/Module-Build-0.420.500 b/metadata/md5-cache/perl-core/Module-Build-0.420.500
index 5ef73c7a32a1..823db8c62f5d 100644
--- a/metadata/md5-cache/perl-core/Module-Build-0.420.500
+++ b/metadata/md5-cache/perl-core/Module-Build-0.420.500
@@ -4,10 +4,10 @@ DESCRIPTION=Build and install Perl modules
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Module-Build/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Archive-Tar-1.09 >=virtual/perl-CPAN-Meta-2.110.420 >=virtual/perl-CPAN-Meta-YAML-0.3.0 virtual/perl-Data-Dumper >=virtual/perl-ExtUtils-CBuilder-0.270.0 virtual/perl-ExtUtils-Install virtual/perl-ExtUtils-Manifest >=virtual/perl-ExtUtils-ParseXS-2.210.0 >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-File-Temp-0.150.0 virtual/perl-Getopt-Long >=virtual/perl-Module-Metadata-1.0.2 >=virtual/perl-Parse-CPAN-Meta-1.440.100 >=virtual/perl-Perl-OSType-1 virtual/perl-Test-Harness >=virtual/perl-Test-Simple-0.490.0 virtual/perl-Text-ParseWords >=virtual/perl-version-0.870.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4205.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=58d0b8be7b3a0f9d9bb63a913fced85e
+_md5_=c8378647f07ee6ac6e813c4e6ac921fd
diff --git a/metadata/md5-cache/perl-core/libnet-1.270.0 b/metadata/md5-cache/perl-core/libnet-1.270.0
index 0a4d781761ad..1d6738913c73 100644
--- a/metadata/md5-cache/perl-core/libnet-1.270.0
+++ b/metadata/md5-cache/perl-core/libnet-1.270.0
@@ -4,10 +4,10 @@ DESCRIPTION=A URI Perl Module
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/libnet/
 IUSE=sasl
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sasl? ( dev-perl/Authen-SASL ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/libnet-1.27.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	6b84915e66050718c89bcbc76c144e80	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=030c273acf33f81df3f9d6b8813a2886
+_md5_=a3cd2dcc8f8530ccefd0e0110d879617
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.4 b/metadata/md5-cache/sci-libs/fftw-3.3.4
index d1cf7473b2aa..5d220e9ffda6 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.4
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.4
@@ -4,10 +4,10 @@ DESCRIPTION=Fast C library for the Discrete Fourier Transform
 EAPI=5
 HOMEPAGE=http://www.fftw.org/
 IUSE=altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus abi_x86_32 abi_x86_64 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) fortran? ( virtual/fortran )
 SLOT=3.0/3
 SRC_URI=http://www.fftw.org/fftw-3.3.4.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d7fe7c5292faf958cb270c2560fe1556
+_md5_=784e48013d7a76933f3f56aa58c59c79
diff --git a/metadata/md5-cache/sci-physics/lammps-20150210 b/metadata/md5-cache/sci-physics/lammps-20150210
new file mode 100644
index 000000000000..7d2d14406eb0
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/lammps-20150210
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
+DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
+EAPI=5
+HOMEPAGE=http://lammps.sandia.gov/
+IUSE=doc examples gzip lammps-memalign mpi static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
+SLOT=0
+SRC_URI=http://lammps.sandia.gov/tars/lammps-10Feb15.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=e628bc1c4623925a3df66b40b53a3a67
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-4.6.6 b/metadata/md5-cache/sci-visualization/gnuplot-4.6.6
index 3ac433f4b2a9..7a076f6bb6a5 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-4.6.6
+++ b/metadata/md5-cache/sci-visualization/gnuplot-4.6.6
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line driven interactive plotting program
 EAPI=5
 HOMEPAGE=http://www.gnuplot.info/
 IUSE=aqua bitmap cairo doc examples +gd ggi latex lua qt4 readline svga wxwidgets X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gnuplot bitmap? ( free-noncomm )
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) lua? ( dev-lang/lua ) qt4? ( >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtsvg-4.5:4 ) readline? ( sys-libs/readline ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-4.6.6.tar.gz mirror://gentoo/gnuplot.info-4.6.2.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=6c6534f087c4122af443a27a376dd6b0
+_md5_=7047409f5d91c87c94b930a8f668436b
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.0.0 b/metadata/md5-cache/sci-visualization/gnuplot-5.0.0
index 81b1f21e9865..037d8814431d 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.0.0
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line driven interactive plotting program
 EAPI=5
 HOMEPAGE=http://www.gnuplot.info/
 IUSE=aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gnuplot bitmap? ( free-noncomm )
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua ) qt4? ( >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtsvg-4.5:4 ) readline? ( sys-libs/readline ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.0.0.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=c3b1124fed9910a36853e50a6435e238
+_md5_=f6e676de6a2d2bdf98f085f2790e748f
diff --git a/metadata/md5-cache/sys-apps/dbus-1.8.16 b/metadata/md5-cache/sys-apps/dbus-1.8.16
index 54ac74c2449a..c78c21f8492e 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.8.16
+++ b/metadata/md5-cache/sys-apps/dbus-1.8.16
@@ -4,10 +4,10 @@ DESCRIPTION=A message bus system, a simple way for applications to talk to each
 EAPI=5
 HOMEPAGE=http://dbus.freedesktop.org/
 IUSE=debug doc selinux static-libs systemd test 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 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( AFL-2.1 GPL-2 )
 RDEPEND=>=dev-libs/expat-2 selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-dbus )
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.8.16.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=72fa8c76a6fa83d187f491766baf1bde
+_md5_=9637f37950a534fa9a619f769503dba9
diff --git a/metadata/md5-cache/sys-apps/systemd-218-r3 b/metadata/md5-cache/sys-apps/systemd-218-r3
index 49f5c6c1142b..f2265a82c0a8 100644
--- a/metadata/md5-cache/sys-apps/systemd-218-r3
+++ b/metadata/md5-cache/sys-apps/systemd-218-r3
@@ -3,7 +3,7 @@ DEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= )
 DESCRIPTION=System and service manager for Linux
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb abi_x86_32 abi_x86_64 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_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
+IUSE=acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http idn introspection kdbus +kmod +lz4 lzma pam policykit python qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb abi_x86_32 abi_x86_64 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_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.6.8-r1:0[systemd] >=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
@@ -11,4 +11,4 @@ RDEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0=
 SLOT=0/2
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-218.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f3749381114414d60ed6bf5497f1d09d
+_md5_=ad240fa7ef488f307e9e674592545c8a
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 52392d091aff..07494aa65ff6 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -3,11 +3,11 @@ DEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= )
 DESCRIPTION=System and service manager for Linux
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http idn importd introspection kdbus +kmod lz4 lzma nat pam policykit python qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb abi_x86_32 abi_x86_64 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_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
+IUSE=acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http idn importd introspection kdbus +kmod +lz4 lzma nat pam policykit python qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb abi_x86_32 abi_x86_64 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_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.6.8-r1:0[systemd] >=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 !sys-auth/nss-myhostname !<sys-libs/glibc-2.14 !sys-fs/eudev !sys-fs/udev
 REQUIRED_USE=importd? ( curl gcrypt lzma )
 SLOT=0/2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7adc1e4e0e8569f9d6e8fd23bb54cacf
+_md5_=5a8bd0f40d9f397689acb28d93712433
diff --git a/metadata/md5-cache/virtual/perl-Archive-Tar-1.960.0 b/metadata/md5-cache/virtual/perl-Archive-Tar-1.960.0
index fad4917660e9..621389f2c17a 100644
--- a/metadata/md5-cache/virtual/perl-Archive-Tar-1.960.0
+++ b/metadata/md5-cache/virtual/perl-Archive-Tar-1.960.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Archive-Tar
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Archive-Tar-1.960.0 ) !<perl-core/Archive-Tar-1.960.0 !>perl-core/Archive-Tar-1.960.0-r999
 SLOT=0
-_md5_=a5fece60028dc94a81ac1783371ecf45
+_md5_=f9d425ef24628fd35a031344987450d5
diff --git a/metadata/md5-cache/virtual/perl-Attribute-Handlers-0.960.0 b/metadata/md5-cache/virtual/perl-Attribute-Handlers-0.960.0
index bfacefbc8903..741bc15938ec 100644
--- a/metadata/md5-cache/virtual/perl-Attribute-Handlers-0.960.0
+++ b/metadata/md5-cache/virtual/perl-Attribute-Handlers-0.960.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Attribute-Handlers
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Attribute-Handlers-0.960.0 ) !<perl-core/Attribute-Handlers-0.960.0 !>perl-core/Attribute-Handlers-0.960.0-r999
 SLOT=0
-_md5_=da6781526faaf5f8614a766743b0aac6
+_md5_=826ac649ac66c464e583aaaa7c56483d
diff --git a/metadata/md5-cache/virtual/perl-B-Debug-1.190.0 b/metadata/md5-cache/virtual/perl-B-Debug-1.190.0
index 617800447b5f..5b94d4d27cda 100644
--- a/metadata/md5-cache/virtual/perl-B-Debug-1.190.0
+++ b/metadata/md5-cache/virtual/perl-B-Debug-1.190.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for B-Debug
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/B-Debug-1.190.0 ) !<perl-core/B-Debug-1.190.0 !>perl-core/B-Debug-1.190.0-r999
 SLOT=0
-_md5_=c494dcff18c661f9e72c81f37999d158
+_md5_=86941ec9c88a9bd83a49f454fb7d4fc3
diff --git a/metadata/md5-cache/virtual/perl-CGI-3.650.0-r1 b/metadata/md5-cache/virtual/perl-CGI-3.650.0-r1
index bb222fd26319..773b10a63176 100644
--- a/metadata/md5-cache/virtual/perl-CGI-3.650.0-r1
+++ b/metadata/md5-cache/virtual/perl-CGI-3.650.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CGI
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos
 RDEPEND=~perl-core/CGI-3.650.0
 SLOT=0
-_md5_=1359da8ca9a8d1bb855333ab50a86cfc
+_md5_=59fec8b4d514d57e99447c8ac3dde690
diff --git a/metadata/md5-cache/virtual/perl-CPAN-2.0.5 b/metadata/md5-cache/virtual/perl-CPAN-2.0.5
index 3ce52855912a..8f20b19f21f6 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-2.0.5
+++ b/metadata/md5-cache/virtual/perl-CPAN-2.0.5
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
 RDEPEND=|| ( =dev-lang/perl-5.20.1* =dev-lang/perl-5.20.0* ~perl-core/CPAN-2.0.5 ) !<perl-core/CPAN-2.0.5 !>perl-core/CPAN-2.0.5-r999
 SLOT=0
-_md5_=23d183af4dcc21f49072c695b0b32e9a
+_md5_=e0eb49a307aa95e45a757b4a6c1e8829
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.140.640 b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.140.640
index 84e157e6ddf1..31693cde6dfc 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.140.640
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.140.640
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-Meta-2.140.640 ) !<perl-core/CPAN-Meta-2.140.640 !>perl-core/CPAN-Meta-2.140.640-r999 >=virtual/perl-CPAN-Meta-YAML-0.11.0 >=virtual/perl-JSON-PP-2.271.30
 SLOT=0
-_md5_=08f134e75981113ca63f16be77946e35
+_md5_=ca6670ea4efa49ed225e157dfca031e9
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0-r1 b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0-r1
index 4034c13705e1..3c374bbe6f1c 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0-r1
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-Requirements-2.125.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta-Requirements
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-Meta-Requirements-2.125.0 ) !<perl-core/CPAN-Meta-Requirements-2.125.0 !>perl-core/CPAN-Meta-Requirements-2.125.0-r999
 SLOT=0
-_md5_=6ef60d5f3904861f360aa695b1552397
+_md5_=014d9ef281d3f66ce5181fbe3cb99d22
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.12.0 b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.12.0
index ec2d5a4ad4fd..9626a633cc6e 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.12.0
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-YAML-0.12.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta-YAML
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/CPAN-Meta-YAML-0.12.0 ) !<perl-core/CPAN-Meta-YAML-0.12.0 !>perl-core/CPAN-Meta-YAML-0.12.0-r999
 SLOT=0
-_md5_=d0ee682a6b220dcc3e64046192a60c7b
+_md5_=8067193ca80695e2de904db98dc3d3b0
diff --git a/metadata/md5-cache/virtual/perl-Carp-1.330.100 b/metadata/md5-cache/virtual/perl-Carp-1.330.100
index 47314d60a2b8..033d6486e062 100644
--- a/metadata/md5-cache/virtual/perl-Carp-1.330.100
+++ b/metadata/md5-cache/virtual/perl-Carp-1.330.100
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Carp
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Carp-1.330.100 ) !<perl-core/Carp-1.330.100 !>perl-core/Carp-1.330.100-r999
 SLOT=0
-_md5_=7e8f2ab5880479b2a81ae10bc7944766
+_md5_=7dea6b57272484b23308914615a497d8
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.64.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.64.0
index b0cf488c5780..f311080722a1 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.64.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.64.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Bzip2
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Compress-Raw-Bzip2-2.64.0 ) !<perl-core/Compress-Raw-Bzip2-2.64.0 !>perl-core/Compress-Raw-Bzip2-2.64.0-r999
 SLOT=0
-_md5_=c332cbfd49f2c2c90f28e4e75fa54c33
+_md5_=02fafb213d7b5db3c99876a46dca979c
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.65.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.65.0
index 9c884d8b2aa1..da2dd5cb4314 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.65.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.65.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Zlib
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Compress-Raw-Zlib-2.65.0 ) !<perl-core/Compress-Raw-Zlib-2.65.0 !>perl-core/Compress-Raw-Zlib-2.65.0-r999
 SLOT=0
-_md5_=a0cfac322f35487bf2ab503fa560a5e2
+_md5_=bfad2f3c2b83022a89553f5e6777f4b5
diff --git a/metadata/md5-cache/virtual/perl-DB_File-1.831.0 b/metadata/md5-cache/virtual/perl-DB_File-1.831.0
index 0e989e376494..a5b00bd0cfd1 100644
--- a/metadata/md5-cache/virtual/perl-DB_File-1.831.0
+++ b/metadata/md5-cache/virtual/perl-DB_File-1.831.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for DB_File
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 RDEPEND=|| ( =dev-lang/perl-5.20*[berkdb] ~perl-core/DB_File-1.831.0 ) !<perl-core/DB_File-1.831.0 !>perl-core/DB_File-1.831.0-r999
 SLOT=0
-_md5_=e8c73092a165cf463b62f94599ff5d90
+_md5_=36b2b0a27b0054132a7c0e709ca13e9a
diff --git a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.210.0 b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.210.0
index d9ef410c1ed9..dee450646da6 100644
--- a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.210.0
+++ b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.210.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Devel-PPPort
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Devel-PPPort-3.210.0 ) !<perl-core/Devel-PPPort-3.210.0 !>perl-core/Devel-PPPort-3.210.0-r999
 SLOT=0
-_md5_=e8fc5bc51bf7590a35a98bc1a434c73f
+_md5_=7b8d2e67f3fbe005819220814d2d2ec3
diff --git a/metadata/md5-cache/virtual/perl-Digest-MD5-2.530.0-r2 b/metadata/md5-cache/virtual/perl-Digest-MD5-2.530.0-r2
index 6472b1bf726f..bacf7a7f2215 100644
--- a/metadata/md5-cache/virtual/perl-Digest-MD5-2.530.0-r2
+++ b/metadata/md5-cache/virtual/perl-Digest-MD5-2.530.0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Digest-MD5
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Digest-MD5-2.530.0 ) !<perl-core/Digest-MD5-2.530.0 !>perl-core/Digest-MD5-2.530.0-r999
 SLOT=0
-_md5_=aba60c4a8ee1d3649899c9a4b1bd21db
+_md5_=23e129824d6bc8964f4da3d88c616281
diff --git a/metadata/md5-cache/virtual/perl-Digest-SHA-5.880.0 b/metadata/md5-cache/virtual/perl-Digest-SHA-5.880.0
index 0746fbbb7bd7..695a1bfbd07a 100644
--- a/metadata/md5-cache/virtual/perl-Digest-SHA-5.880.0
+++ b/metadata/md5-cache/virtual/perl-Digest-SHA-5.880.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Digest-SHA
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Digest-SHA-5.880.0 ) !<perl-core/Digest-SHA-5.880.0 !>perl-core/Digest-SHA-5.880.0-r999
 SLOT=0
-_md5_=30c889d3ab466d0b84dc0e1d7c0d2f63
+_md5_=f35bbf82e5f932235f7a79a16868ebcc
diff --git a/metadata/md5-cache/virtual/perl-Encode-2.600.0 b/metadata/md5-cache/virtual/perl-Encode-2.600.0
index 7408e67427c3..d66c6c58c7bb 100644
--- a/metadata/md5-cache/virtual/perl-Encode-2.600.0
+++ b/metadata/md5-cache/virtual/perl-Encode-2.600.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Encode
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Encode-2.600.0 ) !<perl-core/Encode-2.600.0 !>perl-core/Encode-2.600.0-r999
 SLOT=0
-_md5_=7f64a4a830faeefe485c93be1b902aa0
+_md5_=b7fb60cbd5260f5b4713a08aa4f0e2ec
diff --git a/metadata/md5-cache/virtual/perl-Exporter-5.710.0 b/metadata/md5-cache/virtual/perl-Exporter-5.710.0
index 4387ae01b082..81944a0e7919 100644
--- a/metadata/md5-cache/virtual/perl-Exporter-5.710.0
+++ b/metadata/md5-cache/virtual/perl-Exporter-5.710.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Exporter
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20.2* =dev-lang/perl-5.20.1* ~perl-core/Exporter-5.710.0 ) !<perl-core/Exporter-5.710.0 !>perl-core/Exporter-5.710.0-r999
 SLOT=0
-_md5_=087c2f256ca9677c92d7a32a082abcb3
+_md5_=ee4c41f49555e7e6e72365551fdffe1c
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.217 b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.217
index c69d6e04942d..fdeb4455ffe4 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.217
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.217
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-CBuilder
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20.2* =dev-lang/perl-5.20.1* ~perl-core/ExtUtils-CBuilder-0.280.217 ) !<perl-core/ExtUtils-CBuilder-0.280.217 !>perl-core/ExtUtils-CBuilder-0.280.217-r999
 SLOT=0
-_md5_=09ecc4a5adfab9188a7dbd5994878030
+_md5_=20230e5da8a5b254ee124f7b347503fa
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r2 b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r2
index 19867673202f..81ac2206ab42 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r2
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.180.0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Command
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-Command-1.180.0 ) !<perl-core/ExtUtils-Command-1.180.0 !>perl-core/ExtUtils-Command-1.180.0-r999
 SLOT=0
-_md5_=3c8baab6543726281540a860fd956b3d
+_md5_=3dd5fd90567af9affdedc09bc216e878
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Install-1.670.0 b/metadata/md5-cache/virtual/perl-ExtUtils-Install-1.670.0
index ea3c5a6e9337..42b907392be1 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Install-1.670.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Install-1.670.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Install
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-Install-1.670.0 ) !<perl-core/ExtUtils-Install-1.670.0 !>perl-core/ExtUtils-Install-1.670.0-r999
 SLOT=0
-_md5_=89a60d3411d2b8db8e5873939ee9b9b7
+_md5_=b9918dd81ad73d65356e0a7633eb4ee0
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.980.0 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.980.0
index b301248037dd..255bd496ebbf 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.980.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-6.980.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-MakeMaker
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-MakeMaker-6.980.0 ) !<perl-core/ExtUtils-MakeMaker-6.980.0 !>perl-core/ExtUtils-MakeMaker-6.980.0-r999
 SLOT=0
-_md5_=fd4fd28e04a967e8c5d756f35e3d6032
+_md5_=1bfb43a884e53f0b06fa0685e5ed1833
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.240.0 b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.240.0
index fcc2984ec700..14cf46a487d4 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.240.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.240.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-ParseXS
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/ExtUtils-ParseXS-3.240.0 ) !<perl-core/ExtUtils-ParseXS-3.240.0 !>perl-core/ExtUtils-ParseXS-3.240.0-r999
 SLOT=0
-_md5_=8ae6af53b9ec642b3e86e069267334a8
+_md5_=721d3164158d351b6c7e4ae35f11007a
diff --git a/metadata/md5-cache/virtual/perl-File-Spec-3.480.0 b/metadata/md5-cache/virtual/perl-File-Spec-3.480.0
index c8514129622f..d624115aabaf 100644
--- a/metadata/md5-cache/virtual/perl-File-Spec-3.480.0
+++ b/metadata/md5-cache/virtual/perl-File-Spec-3.480.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Spec
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20.1* ~perl-core/File-Spec-3.480.0 ) !<perl-core/File-Spec-3.480.0 !>perl-core/File-Spec-3.480.0-r999
 SLOT=0
-_md5_=8e19ea243578577ab36d60a8a39d403d
+_md5_=c34b37df11698ac56eb87798c163504f
diff --git a/metadata/md5-cache/virtual/perl-File-Temp-0.230.400-r2 b/metadata/md5-cache/virtual/perl-File-Temp-0.230.400-r2
index 887056a2dedc..7210f9664744 100644
--- a/metadata/md5-cache/virtual/perl-File-Temp-0.230.400-r2
+++ b/metadata/md5-cache/virtual/perl-File-Temp-0.230.400-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Temp
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/File-Temp-0.230.400 !=perl-core/File-Temp-0.230.400
 SLOT=0
-_md5_=ff1d5b7f09849b4de2ac365ad952d572
+_md5_=9681222ee206ce18641689fc83cb8694
diff --git a/metadata/md5-cache/virtual/perl-Getopt-Long-2.420.0-r1 b/metadata/md5-cache/virtual/perl-Getopt-Long-2.420.0-r1
index 33fd655979d5..0207c2ade1f5 100644
--- a/metadata/md5-cache/virtual/perl-Getopt-Long-2.420.0-r1
+++ b/metadata/md5-cache/virtual/perl-Getopt-Long-2.420.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Getopt-Long
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Getopt-Long-2.420.0 ) !<perl-core/Getopt-Long-2.420.0 !>perl-core/Getopt-Long-2.420.0-r999
 SLOT=0
-_md5_=5e13ddd55447164ada94490a162405c8
+_md5_=406d98bb6b34735834f89ae333d63b0a
diff --git a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.400.0 b/metadata/md5-cache/virtual/perl-I18N-LangTags-0.400.0
index 8561be5a6208..110aba119bc6 100644
--- a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.400.0
+++ b/metadata/md5-cache/virtual/perl-I18N-LangTags-0.400.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for I18N-LangTags
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/I18N-LangTags-0.400.0 ) !<perl-core/I18N-LangTags-0.400.0 !>perl-core/I18N-LangTags-0.400.0-r999
 SLOT=0
-_md5_=9bdb76797948ef8f89853d6deb390f23
+_md5_=961d4026fe15c20623a3f255c647bfd8
diff --git a/metadata/md5-cache/virtual/perl-IO-1.310.0 b/metadata/md5-cache/virtual/perl-IO-1.310.0
index ecf683a520fa..036b10d65675 100644
--- a/metadata/md5-cache/virtual/perl-IO-1.310.0
+++ b/metadata/md5-cache/virtual/perl-IO-1.310.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/IO-1.310.0 ) !<perl-core/IO-1.310.0 !>perl-core/IO-1.310.0-r999
 SLOT=0
-_md5_=2f13d52997c53ba5b2faa382dc2b013b
+_md5_=f33de1ca158553bfd4eb143188511995
diff --git a/metadata/md5-cache/virtual/perl-IO-Compress-2.64.0 b/metadata/md5-cache/virtual/perl-IO-Compress-2.64.0
index a7f85077097f..dc8e290c65a8 100644
--- a/metadata/md5-cache/virtual/perl-IO-Compress-2.64.0
+++ b/metadata/md5-cache/virtual/perl-IO-Compress-2.64.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Compress
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/IO-Compress-2.64.0 ) !<perl-core/IO-Compress-2.64.0 !>perl-core/IO-Compress-2.64.0-r999
 SLOT=0
-_md5_=1b58b845aa4cac6d011b791e8fdb9cfa
+_md5_=ee3a55083cbbdc71ea5f5d515f5eb428
diff --git a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.290.0 b/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.290.0
index 64e16f65ac0e..3abb8b2edde8 100644
--- a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.290.0
+++ b/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.290.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Socket-IP
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/IO-Socket-IP-0.290.0 ) !<perl-core/IO-Socket-IP-0.290.0 !>perl-core/IO-Socket-IP-0.290.0-r999
 SLOT=0
-_md5_=7c012525821d43cb3e7428f5c6eb8164
+_md5_=a31c04765f104914298f0316b0aa2f17
diff --git a/metadata/md5-cache/virtual/perl-IPC-Cmd-0.920.0 b/metadata/md5-cache/virtual/perl-IPC-Cmd-0.920.0
index 9e69e5b0a74f..88ed96731686 100644
--- a/metadata/md5-cache/virtual/perl-IPC-Cmd-0.920.0
+++ b/metadata/md5-cache/virtual/perl-IPC-Cmd-0.920.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IPC-Cmd
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/IPC-Cmd-0.920.0 ) !<perl-core/IPC-Cmd-0.920.0 !>perl-core/IPC-Cmd-0.920.0-r999
 SLOT=0
-_md5_=918401b7806d860ca5581a7037aba6ef
+_md5_=6f3fb3a86bce0f25e773bad27dae65f5
diff --git a/metadata/md5-cache/virtual/perl-JSON-PP-2.272.30 b/metadata/md5-cache/virtual/perl-JSON-PP-2.272.30
index adf86b71a2cc..716cc2f4c459 100644
--- a/metadata/md5-cache/virtual/perl-JSON-PP-2.272.30
+++ b/metadata/md5-cache/virtual/perl-JSON-PP-2.272.30
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for JSON-PP
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/JSON-PP-2.272.30 ) !<perl-core/JSON-PP-2.272.30 !>perl-core/JSON-PP-2.272.30-r999
 SLOT=0
-_md5_=a43c191dc95215a294afd5bf318a7b35
+_md5_=ccbf99a6f11f7d4ace580b7a8322bdb1
diff --git a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.250.0 b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.250.0
index 35a302a542a8..4c2ba301f18a 100644
--- a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.250.0
+++ b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.250.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Locale-Maketext
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Locale-Maketext-1.250.0 ) !<perl-core/Locale-Maketext-1.250.0 !>perl-core/Locale-Maketext-1.250.0-r999
 SLOT=0
-_md5_=62359bcd6059f4182fa578e45e2eaa80
+_md5_=785e81e62fe0a2e95f260198743d480d
diff --git a/metadata/md5-cache/virtual/perl-MIME-Base64-3.140.0-r1 b/metadata/md5-cache/virtual/perl-MIME-Base64-3.140.0-r1
index 55fcef902dd7..de32d9c2c72c 100644
--- a/metadata/md5-cache/virtual/perl-MIME-Base64-3.140.0-r1
+++ b/metadata/md5-cache/virtual/perl-MIME-Base64-3.140.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for MIME-Base64
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/MIME-Base64-3.140.0 ) !<perl-core/MIME-Base64-3.140.0 !>perl-core/MIME-Base64-3.140.0-r999
 SLOT=0
-_md5_=c88c2d470e3a249fc81e3d2614166b37
+_md5_=378928a000ed032a48d43340c9ee4d58
diff --git a/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.310.0 b/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.310.0
index 27830ec3acae..1c5d18c6c515 100644
--- a/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.310.0
+++ b/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.310.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-BigInt-FastCalc
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Math-BigInt-FastCalc-0.310.0 ) !<perl-core/Math-BigInt-FastCalc-0.310.0 !>perl-core/Math-BigInt-FastCalc-0.310.0-r999
 SLOT=0
-_md5_=ca5f18f82022326170b4ea636e6f3eb8
+_md5_=a7bd22f05d7d5445bba4bd39f785896a
diff --git a/metadata/md5-cache/virtual/perl-Math-BigRat-0.260.600 b/metadata/md5-cache/virtual/perl-Math-BigRat-0.260.600
index cb5454702a82..950d1e7d0ea7 100644
--- a/metadata/md5-cache/virtual/perl-Math-BigRat-0.260.600
+++ b/metadata/md5-cache/virtual/perl-Math-BigRat-0.260.600
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-BigRat
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Math-BigRat-0.260.600 ) !<perl-core/Math-BigRat-0.260.600 !>perl-core/Math-BigRat-0.260.600-r999
 SLOT=0
-_md5_=6b377cfd16e10eb05ee298af6c11cac4
+_md5_=88ba16b0a96f44ce128a3d0b2e0110b6
diff --git a/metadata/md5-cache/virtual/perl-Module-Build-0.420.500-r1 b/metadata/md5-cache/virtual/perl-Module-Build-0.420.500-r1
index a918c3b9bbe8..6c4d4d65fa60 100644
--- a/metadata/md5-cache/virtual/perl-Module-Build-0.420.500-r1
+++ b/metadata/md5-cache/virtual/perl-Module-Build-0.420.500-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-Build
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/Module-Build-0.420.500
 SLOT=0
-_md5_=7a4269ecf8df9c28b2651fdf317726c2
+_md5_=e0052851a91467e08da0ff5fc4eee5ad
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.20.1 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.20.1
index 4de79a6fc547..f9003c928c71 100644
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.20.1
+++ b/metadata/md5-cache/virtual/perl-Module-CoreList-5.20.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-CoreList
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20.1* ~perl-core/Module-CoreList-5.20.1 ) !<perl-core/Module-CoreList-5.20.1 !>perl-core/Module-CoreList-5.20.1-r999
 SLOT=0
-_md5_=c1481d8f26467fc9beac08349cf808d8
+_md5_=d50828b18d506db6704ea55da8e5faf2
diff --git a/metadata/md5-cache/virtual/perl-Module-Load-0.320.0 b/metadata/md5-cache/virtual/perl-Module-Load-0.320.0
index fdf1f0592c35..f041817baada 100644
--- a/metadata/md5-cache/virtual/perl-Module-Load-0.320.0
+++ b/metadata/md5-cache/virtual/perl-Module-Load-0.320.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-Load
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Module-Load-0.320.0 ) !<perl-core/Module-Load-0.320.0 !>perl-core/Module-Load-0.320.0-r999
 SLOT=0
-_md5_=e5b3aeb6536668602fc5397e97ba1f30
+_md5_=ad8ae2d96e52082b57fb557c9a90db0d
diff --git a/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.620.0 b/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.620.0
index 37e96790dc1b..2f33340fb051 100644
--- a/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.620.0
+++ b/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.620.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-Load-Conditional
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Module-Load-Conditional-0.620.0 ) !<perl-core/Module-Load-Conditional-0.620.0 !>perl-core/Module-Load-Conditional-0.620.0-r999
 SLOT=0
-_md5_=ac0973974ef9325a9c99e71c5d28e6ea
+_md5_=d2d78605cf034fc0f6849bd01d680091
diff --git a/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.19 b/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.19
index e3b6536329de..e37c9f08e04f 100644
--- a/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.19
+++ b/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.19
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-Metadata
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Module-Metadata-1.0.19 ) !<perl-core/Module-Metadata-1.0.19 !>perl-core/Module-Metadata-1.0.19-r999
 SLOT=0
-_md5_=0c0d141875b64c289d956e8537402166
+_md5_=f10f219720b6ec0f4f761831682cd909
diff --git a/metadata/md5-cache/virtual/perl-Package-Constants-0.40.0 b/metadata/md5-cache/virtual/perl-Package-Constants-0.40.0
index f34750a31ad5..1de93995a99f 100644
--- a/metadata/md5-cache/virtual/perl-Package-Constants-0.40.0
+++ b/metadata/md5-cache/virtual/perl-Package-Constants-0.40.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Package-Constants
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Package-Constants-0.40.0 ) !<perl-core/Package-Constants-0.40.0 !>perl-core/Package-Constants-0.40.0-r999
 SLOT=0
-_md5_=ecca91d0b1214077a16ac3b4c85ee1e0
+_md5_=691aabab8646688f158aa582f33b50b3
diff --git a/metadata/md5-cache/virtual/perl-Params-Check-0.380.0-r1 b/metadata/md5-cache/virtual/perl-Params-Check-0.380.0-r1
index 651db461f8b2..2fa24e36276c 100644
--- a/metadata/md5-cache/virtual/perl-Params-Check-0.380.0-r1
+++ b/metadata/md5-cache/virtual/perl-Params-Check-0.380.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Params-Check
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Params-Check-0.380.0 ) !<perl-core/Params-Check-0.380.0 !>perl-core/Params-Check-0.380.0-r999
 SLOT=0
-_md5_=2d9f3da55308089eb1bab7126ebaee7a
+_md5_=c1d9064cccde8b4a93165585724ecd67
diff --git a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400 b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400
index b8254657a963..a49739bf8c4f 100644
--- a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400
+++ b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-1.441.400
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Parse-CPAN-Meta
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Parse-CPAN-Meta-1.441.400 ) !<perl-core/Parse-CPAN-Meta-1.441.400 !>perl-core/Parse-CPAN-Meta-1.441.400-r999
 SLOT=0
-_md5_=d608c8c23a939e814a2b9f91440c4d1c
+_md5_=bfad6d7cc5e4649eb605d1e7724a69af
diff --git a/metadata/md5-cache/virtual/perl-Perl-OSType-1.7.0 b/metadata/md5-cache/virtual/perl-Perl-OSType-1.7.0
index 32762d9bfd95..237c14d045ac 100644
--- a/metadata/md5-cache/virtual/perl-Perl-OSType-1.7.0
+++ b/metadata/md5-cache/virtual/perl-Perl-OSType-1.7.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Perl-OSType
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Perl-OSType-1.7.0 ) !<perl-core/Perl-OSType-1.7.0 !>perl-core/Perl-OSType-1.7.0-r999
 SLOT=0
-_md5_=f49efd126a264d552350bf12476f94ec
+_md5_=e5b03c439c9ec2fd248ae3278292f30a
diff --git a/metadata/md5-cache/virtual/perl-Pod-Escapes-1.60.0 b/metadata/md5-cache/virtual/perl-Pod-Escapes-1.60.0
index f0f53248e48c..6a77ad748b14 100644
--- a/metadata/md5-cache/virtual/perl-Pod-Escapes-1.60.0
+++ b/metadata/md5-cache/virtual/perl-Pod-Escapes-1.60.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Pod-Escapes
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Pod-Escapes-1.60.0 ) !<perl-core/Pod-Escapes-1.60.0 !>perl-core/Pod-Escapes-1.60.0-r999
 SLOT=0
-_md5_=fd08a1c4f6ffc523b3e61f3934a7d306
+_md5_=62a38f5d4cd439e5e201959d1bd238b0
diff --git a/metadata/md5-cache/virtual/perl-Pod-Parser-1.620.0 b/metadata/md5-cache/virtual/perl-Pod-Parser-1.620.0
index 4d70816c06c3..b872d42c3222 100644
--- a/metadata/md5-cache/virtual/perl-Pod-Parser-1.620.0
+++ b/metadata/md5-cache/virtual/perl-Pod-Parser-1.620.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Pod-Parser
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Pod-Parser-1.620.0 ) !<perl-core/Pod-Parser-1.620.0 !>perl-core/Pod-Parser-1.620.0-r999
 SLOT=0
-_md5_=701d63977a7492cfc236b4eac9ea0608
+_md5_=7601838bd3a589939aff2c65a29cec00
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.380.0 b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.380.0
index 877e83423696..eaf2c93ec5c6 100644
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.380.0
+++ b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.380.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Scalar-List-Utils-1.380.0 ) !<perl-core/Scalar-List-Utils-1.380.0 !>perl-core/Scalar-List-Utils-1.380.0-r999
 SLOT=0
-_md5_=301285011d939d6526cf5b92753d34f0
+_md5_=e3506ce303b3902dd0ada1b030e34577
diff --git a/metadata/md5-cache/virtual/perl-Storable-2.490.0 b/metadata/md5-cache/virtual/perl-Storable-2.490.0
index e174eeb0e705..f0c5b7c429e4 100644
--- a/metadata/md5-cache/virtual/perl-Storable-2.490.0
+++ b/metadata/md5-cache/virtual/perl-Storable-2.490.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Storable
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20.1* =dev-lang/perl-5.20.0* ~perl-core/Storable-2.490.0 ) !<perl-core/Storable-2.490.0 !>perl-core/Storable-2.490.0-r999
 SLOT=0
-_md5_=0b06d9bad58d73c81ad264ca6b1e3d62
+_md5_=e04d8e2e117593e6338f439b15db769d
diff --git a/metadata/md5-cache/virtual/perl-Sys-Syslog-0.330.0-r1 b/metadata/md5-cache/virtual/perl-Sys-Syslog-0.330.0-r1
index 1dbb666f2d75..27966f0cd846 100644
--- a/metadata/md5-cache/virtual/perl-Sys-Syslog-0.330.0-r1
+++ b/metadata/md5-cache/virtual/perl-Sys-Syslog-0.330.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Sys-Syslog
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Sys-Syslog-0.330.0 ) !<perl-core/Sys-Syslog-0.330.0 !>perl-core/Sys-Syslog-0.330.0-r999
 SLOT=0
-_md5_=07d31365a5d94c40dbca25edbe01c9f0
+_md5_=9c7517b81238b9dcced7a6efcec1c80d
diff --git a/metadata/md5-cache/virtual/perl-Term-ReadLine-1.140.0 b/metadata/md5-cache/virtual/perl-Term-ReadLine-1.140.0
index b46b3bbe217c..3674d45d442c 100644
--- a/metadata/md5-cache/virtual/perl-Term-ReadLine-1.140.0
+++ b/metadata/md5-cache/virtual/perl-Term-ReadLine-1.140.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Term-ReadLine
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Term-ReadLine-1.140.0 ) !<perl-core/Term-ReadLine-1.140.0 !>perl-core/Term-ReadLine-1.140.0-r999
 SLOT=0
-_md5_=eb7919d8e5fb5838ac55de18f85e35de
+_md5_=b0414701305b070754c7f93826e97f61
diff --git a/metadata/md5-cache/virtual/perl-Test-Harness-3.330.0 b/metadata/md5-cache/virtual/perl-Test-Harness-3.330.0
index b93d51a6a0b1..4be53f1ea6fb 100644
--- a/metadata/md5-cache/virtual/perl-Test-Harness-3.330.0
+++ b/metadata/md5-cache/virtual/perl-Test-Harness-3.330.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Harness
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Test-Harness-3.330.0 ) !<perl-core/Test-Harness-3.330.0 !>perl-core/Test-Harness-3.330.0-r999
 SLOT=0
-_md5_=38255766dff2a83229a8956a056efb25
+_md5_=1a903e8e66ead6c28533b94cfdfabf40
diff --git a/metadata/md5-cache/virtual/perl-Test-Simple-1.1.2 b/metadata/md5-cache/virtual/perl-Test-Simple-1.1.2
index 0c9ab694befc..281cb3675a26 100644
--- a/metadata/md5-cache/virtual/perl-Test-Simple-1.1.2
+++ b/metadata/md5-cache/virtual/perl-Test-Simple-1.1.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Simple
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Test-Simple-1.1.2 ) !<perl-core/Test-Simple-1.1.2 !>perl-core/Test-Simple-1.1.2-r999
 SLOT=0
-_md5_=1974f5220a5727014aeec482f4ce9e24
+_md5_=73904dc9f13b17b48a62bb1b96ac08ea
diff --git a/metadata/md5-cache/virtual/perl-Text-ParseWords-3.290.0-r1 b/metadata/md5-cache/virtual/perl-Text-ParseWords-3.290.0-r1
index 5fe7064633e2..7c42345adc6e 100644
--- a/metadata/md5-cache/virtual/perl-Text-ParseWords-3.290.0-r1
+++ b/metadata/md5-cache/virtual/perl-Text-ParseWords-3.290.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Text-ParseWords
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Text-ParseWords-3.290.0 ) !<perl-core/Text-ParseWords-3.290.0 !>perl-core/Text-ParseWords-3.290.0-r999
 SLOT=0
-_md5_=8931dbe00d3a950b49eba72b04c42dae
+_md5_=87b32e9b41795203fa22e02624edbccf
diff --git a/metadata/md5-cache/virtual/perl-Time-HiRes-1.972.600-r1 b/metadata/md5-cache/virtual/perl-Time-HiRes-1.972.600-r1
index 2fb251652535..cbffcb4c8643 100644
--- a/metadata/md5-cache/virtual/perl-Time-HiRes-1.972.600-r1
+++ b/metadata/md5-cache/virtual/perl-Time-HiRes-1.972.600-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Time-HiRes
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/Time-HiRes-1.972.600 ) !<perl-core/Time-HiRes-1.972.600 !>perl-core/Time-HiRes-1.972.600-r999
 SLOT=0
-_md5_=ef37f97d85fa19de760809f9ec7597d9
+_md5_=253b414bf3ee8618cbfb2f70a373a7f4
diff --git a/metadata/md5-cache/virtual/perl-XSLoader-0.170.0 b/metadata/md5-cache/virtual/perl-XSLoader-0.170.0
index 6084a200ba74..1b956d8b6b72 100644
--- a/metadata/md5-cache/virtual/perl-XSLoader-0.170.0
+++ b/metadata/md5-cache/virtual/perl-XSLoader-0.170.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for XSLoader
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/XSLoader-0.170.0 ) !<perl-core/XSLoader-0.170.0 !>perl-core/XSLoader-0.170.0-r999
 SLOT=0
-_md5_=074d8f7c263d9b5989ccef5241881f06
+_md5_=942a2af081603e46e3ae95cefd5ba431
diff --git a/metadata/md5-cache/virtual/perl-bignum-0.370.0 b/metadata/md5-cache/virtual/perl-bignum-0.370.0
index ef7a09de1b7d..b1c3e488cb1c 100644
--- a/metadata/md5-cache/virtual/perl-bignum-0.370.0
+++ b/metadata/md5-cache/virtual/perl-bignum-0.370.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for bignum
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/bignum-0.370.0 ) !<perl-core/bignum-0.370.0 !>perl-core/bignum-0.370.0-r999
 SLOT=0
-_md5_=620c3650eaf89ab33d1018fc704c9242
+_md5_=e67b54b8fa23bdd5b9a72febc1f91a17
diff --git a/metadata/md5-cache/virtual/perl-if-0.60.300 b/metadata/md5-cache/virtual/perl-if-0.60.300
index d4caf0c553b8..4e5b0047f42e 100644
--- a/metadata/md5-cache/virtual/perl-if-0.60.300
+++ b/metadata/md5-cache/virtual/perl-if-0.60.300
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for if
 EAPI=5
-KEYWORDS=amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/if-0.60.300 ) !<perl-core/if-0.60.300 !>perl-core/if-0.60.300-r999
 SLOT=0
-_md5_=e1825d737dfc3feb708d4cc95dabf2c0
+_md5_=b3332f0d291654fee16c17b5ff518cc6
diff --git a/metadata/md5-cache/virtual/perl-libnet-1.270.0 b/metadata/md5-cache/virtual/perl-libnet-1.270.0
index 68691a3d6f43..dcd5e5ae8fc2 100644
--- a/metadata/md5-cache/virtual/perl-libnet-1.270.0
+++ b/metadata/md5-cache/virtual/perl-libnet-1.270.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for libnet
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/libnet-1.270.0
 SLOT=0
-_md5_=63e48832d7ac6fbbf34abf3e34c693cb
+_md5_=e791bf628ae62421af0dec3681a0c2d9
diff --git a/metadata/md5-cache/virtual/perl-parent-0.228-r1 b/metadata/md5-cache/virtual/perl-parent-0.228-r1
index 8bae58c78944..d42e3c6c7fc0 100644
--- a/metadata/md5-cache/virtual/perl-parent-0.228-r1
+++ b/metadata/md5-cache/virtual/perl-parent-0.228-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for parent
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/parent-0.228 ) !<perl-core/parent-0.228 !>perl-core/parent-0.228-r999
 SLOT=0
-_md5_=af55e4307212759a9242f2df87985b77
+_md5_=5e34fbf669bfbeaba748c5ccef225aaf
diff --git a/metadata/md5-cache/virtual/perl-podlators-2.5.3 b/metadata/md5-cache/virtual/perl-podlators-2.5.3
index 7a87def2c4b9..727beff80501 100644
--- a/metadata/md5-cache/virtual/perl-podlators-2.5.3
+++ b/metadata/md5-cache/virtual/perl-podlators-2.5.3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for podlators
 EAPI=5
-KEYWORDS=amd64 ~arm ia64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ia64 ppc ppc64 sparc x86
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/podlators-2.5.3 ) !<perl-core/podlators-2.5.3 !>perl-core/podlators-2.5.3-r999
 SLOT=0
-_md5_=cf5f45af9daaaf04abdfc325f448d3a3
+_md5_=28283a876621319241d32b0b804cf03f
diff --git a/metadata/md5-cache/virtual/perl-version-0.990.900 b/metadata/md5-cache/virtual/perl-version-0.990.900
index 41d66212b297..f95418dc1b9c 100644
--- a/metadata/md5-cache/virtual/perl-version-0.990.900
+++ b/metadata/md5-cache/virtual/perl-version-0.990.900
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for version
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.20.2* =dev-lang/perl-5.20.1* ~perl-core/version-0.990.900 ) !<perl-core/version-0.990.900 !>perl-core/version-0.990.900-r999
 SLOT=0
-_md5_=021bb0ea9629850ef62129c2d9ac8c72
+_md5_=0e9f751136325bc5e52e17894234cf49
diff --git a/metadata/md5-cache/www-client/opera-developer-29.0.1770.1 b/metadata/md5-cache/www-client/opera-developer-29.0.1778.0
similarity index 95%
rename from metadata/md5-cache/www-client/opera-developer-29.0.1770.1
rename to metadata/md5-cache/www-client/opera-developer-29.0.1778.0
index 393d127d1d21..bbe5e774e1ef 100644
--- a/metadata/md5-cache/www-client/opera-developer-29.0.1770.1
+++ b/metadata/md5-cache/www-client/opera-developer-29.0.1778.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 SLOT=0
-SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-developer/29.0.1770.1/linux/opera-developer_29.0.1770.1_amd64.deb )
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-developer/29.0.1778.0/linux/opera-developer_29.0.1778.0_amd64.deb )
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=dd6fe0c29ae3c4a41fa645f04713351f
+_md5_=240114d1ab349df32734d2c03f91e73f
diff --git a/metadata/md5-cache/x11-misc/py3status-1.6 b/metadata/md5-cache/x11-misc/py3status-1.6
deleted file mode 100644
index b385677e61fd..000000000000
--- a/metadata/md5-cache/x11-misc/py3status-1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-misc/i3status dev-python/setuptools[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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=py3status is an extensible i3status wrapper written in python
-EAPI=5
-HOMEPAGE=https://github.com/ultrabug/py3status
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=x11-misc/i3status python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://github.com/ultrabug/py3status/archive/1.6.tar.gz -> py3status-1.6.tar.gz
-_eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a65a02f05aad2cc9d2e8cafeee3d3b75
diff --git a/metadata/md5-cache/x11-misc/py3status-2.2 b/metadata/md5-cache/x11-misc/py3status-2.3
similarity index 93%
rename from metadata/md5-cache/x11-misc/py3status-2.2
rename to metadata/md5-cache/x11-misc/py3status-2.3
index cbb40719a6ec..7427731f511a 100644
--- a/metadata/md5-cache/x11-misc/py3status-2.2
+++ b/metadata/md5-cache/x11-misc/py3status-2.3
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=x11-misc/i3status python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
-SRC_URI=https://github.com/ultrabug/py3status/archive/2.2.tar.gz -> py3status-2.2.tar.gz
+SRC_URI=https://github.com/ultrabug/py3status/archive/2.3.tar.gz -> py3status-2.3.tar.gz
 _eclasses_=distutils-r1	f810ae4ac7e5c3db4ff72db46e3c40d1	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9ec341cbc9b09af42f19e4ca887f59a6
+_md5_=24941b47867424c59c41a1c334d00825
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3bdd4db85dcf..d6b9fd1b2b91 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 17 Feb 2015 15:06:58 +0000
+Wed, 18 Feb 2015 05:36:54 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index fc1d14ca0bb9..26921bb7ad0d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Feb 17 15:06:55 UTC 2015
+Wed Feb 18 05:36:51 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6a00c49f8750..3e7e67294b62 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 17 Feb 2015 15:30:01 +0000
+Wed, 18 Feb 2015 06:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6e75b528b1d3..067a616282b1 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1424185501 Tue 17 Feb 2015 03:05:01 PM UTC UTC
+1424237701 Wed 18 Feb 2015 05:35:01 AM UTC UTC
diff --git a/net-misc/dhcpcd/dhcpcd-6.6.7.ebuild b/net-misc/dhcpcd/dhcpcd-6.6.7.ebuild
index c5820d22d1f0..1b2d9293787b 100644
--- a/net-misc/dhcpcd/dhcpcd-6.6.7.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-6.6.7.ebuild,v 1.3 2015/02/02 16:41:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-6.6.7.ebuild,v 1.4 2015/02/17 21:01:44 maekke Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/openvpn/files/2.3.6-disable-compression.patch b/net-misc/openvpn/files/2.3.6-disable-compression.patch
new file mode 100644
index 000000000000..d9d1c764e908
--- /dev/null
+++ b/net-misc/openvpn/files/2.3.6-disable-compression.patch
@@ -0,0 +1,18 @@
+https://community.openvpn.net/openvpn/changeset/5d5233778868ddd568140c394adfcfc8e3453245/
+
+--- openvpn-2.3.6/src/openvpn/ssl_openssl.c.orig	2014-11-29 23:00:35.000000000 +0800
++++ openvpn-2.3.6/src/openvpn/ssl_openssl.c	2015-01-12 21:14:30.186993686 +0800
+@@ -238,6 +238,13 @@
+     if (tls_ver_min > TLS_VER_1_2 || tls_ver_max < TLS_VER_1_2)
+       sslopt |= SSL_OP_NO_TLSv1_2;
+ #endif
++
++#ifdef SSL_OP_NO_COMPRESSION
++    msg (M_WARN, "[Workaround] disable SSL compression");
++    sslopt |= SSL_OP_NO_COMPRESSION;
++#endif
++
++
+     SSL_CTX_set_options (ctx->ctx, sslopt);
+   }
+ 
diff --git a/net-misc/openvpn/openvpn-2.3.6-r2.ebuild b/net-misc/openvpn/openvpn-2.3.6-r2.ebuild
new file mode 100644
index 000000000000..c27b7e26588b
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.3.6-r2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.6-r2.ebuild,v 1.1 2015/02/17 18:46:07 djc Exp $
+
+EAPI=4
+
+inherit multilib autotools flag-o-matic user systemd
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
+HOMEPAGE="http://openvpn.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl selinux +ssl systemd +lzo static userland_BSD"
+
+REQUIRED_USE="static? ( !plugins !pkcs11 )
+			polarssl? ( ssl )
+			pkcs11? ( ssl )
+			!plugins? ( !pam !down-root )"
+
+DEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
+	)
+	pam? ( virtual/pam )
+	ssl? (
+		!polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.2.10 )
+	)
+	lzo? ( >=dev-libs/lzo-1.07 )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+src_prepare() {
+	# Set correct pass to systemd-ask-password binary
+	sed -i "s:\(/bin/systemd-ask-password\):/usr\1:" ./src/openvpn/console.c || die
+	epatch "${FILESDIR}/2.3.6-null-cipher.patch" || die
+	epatch "${FILESDIR}/2.3.6-disable-compression.patch" || die
+	eautoreconf
+}
+
+src_configure() {
+	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
+	local myconf
+	echo "DROPPY"
+	use polarssl && echo "FLOZZY"
+	use polarssl && myconf="--with-crypto-library=polarssl"
+	econf \
+		${myconf} \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
+		$(use_enable passwordsave password-save) \
+		$(use_enable ssl) \
+		$(use_enable ssl crypto) \
+		$(use_enable lzo) \
+		$(use_enable pkcs11) \
+		$(use_enable plugins) \
+		$(use_enable iproute2) \
+		$(use_enable pam plugin-auth-pam) \
+		$(use_enable down-root plugin-down-root) \
+		$(use_enable systemd)
+}
+
+src_install() {
+	default
+	find "${ED}/usr" -name '*.la' -delete
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README README.IPv6
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# dodoc does not supportly support directory traversal, #15193
+		insinto /usr/share/doc/${PF}/examples
+		doins -r sample contrib
+	fi
+
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service 'openvpn@.service'
+}
+
+pkg_postinst() {
+	# Add openvpn user so openvpn servers can drop privs
+	# Clients should run as root so they can change ip addresses,
+	# dns information and other such things.
+	enewgroup openvpn
+	enewuser openvpn "" "" "" openvpn
+
+	if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
+		ewarn "WARNING: The openvpn init script has changed"
+		ewarn ""
+	fi
+
+	elog "The openvpn init script expects to find the configuration file"
+	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+	elog ""
+	elog "To create more VPNs, simply create a new .conf file for it and"
+	elog "then create a symlink to the openvpn init script from a link called"
+	elog "openvpn.newconfname - like so"
+	elog "   cd /etc/openvpn"
+	elog "   ${EDITOR##*/} foo.conf"
+	elog "   cd /etc/init.d"
+	elog "   ln -s openvpn openvpn.foo"
+	elog ""
+	elog "You can then treat openvpn.foo as any other service, so you can"
+	elog "stop one vpn and start another if you need to."
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
+	fi
+
+	einfo ""
+	einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
+	einfo "They can now be emerged via app-crypt/easy-rsa."
+}
diff --git a/net-p2p/qbittorrent/metadata.xml b/net-p2p/qbittorrent/metadata.xml
index 9eec7fece0f5..0c56b695e958 100644
--- a/net-p2p/qbittorrent/metadata.xml
+++ b/net-p2p/qbittorrent/metadata.xml
@@ -7,4 +7,7 @@
     <email>hwoarang@gentoo.org</email>
     <name>Markos Chandras</name>
   </maintainer>
+  <use>
+    <flag name='webui'>Enable the Web UI</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 998208764009..892e8ba5aa18 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -1,30 +1,48 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.18 2014/10/19 00:23:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.19 2015/02/17 19:15:20 yngwin Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
-inherit python-r1 qt4-r2 git-r3
+inherit python-r1 qmake-utils
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="http://www.qbittorrent.org/"
-EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+MY_P=${P/_}
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-
-IUSE="dbus debug geoip +X"
+IUSE="+dbus debug geoip +qt4 qt5 webui +X"
+REQUIRED_USE="^^ ( qt4 qt5 )
+	dbus? ( X )
+	geoip? ( X )"
 
 # geoip and python are runtime deps only (see INSTALL file)
 CDEPEND="
 	dev-libs/boost:=
-	dev-qt/qtcore:4
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?]
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?,qt4?,qt5?]
 	>=net-libs/rb_libtorrent-0.16.17
-	dbus? ( dev-qt/qtdbus:4 )
-	X? ( dev-qt/qtgui:4 )
+	sys-libs/zlib
+	qt4? ( dev-qt/qtcore:4
+		dbus? ( dev-qt/qtdbus:4 )
+		X? ( dev-qt/qtgui:4 )
+		)
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtxml:5
+		dbus? ( dev-qt/qtdbus:5 )
+		X? ( dev-qt/qtgui:4
+			dev-qt/qtwidgets:5 )
+		)
 "
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
@@ -34,6 +52,7 @@ RDEPEND="${CDEPEND}
 	geoip? ( dev-libs/geoip )
 "
 
+S=${WORKDIR}/${MY_P}
 DOCS=(AUTHORS Changelog README.md TODO)
 
 src_configure() {
@@ -41,15 +60,21 @@ src_configure() {
 	local myconf=(
 		./configure
 		--prefix="${EPREFIX}/usr"
-		--with-libboost-inc="${EPREFIX}/usr/include/boost"
 		--with-qtsingleapplication=system
 		$(use dbus  || echo --disable-qt-dbus)
 		$(use debug && echo --enable-debug)
 		$(use geoip || echo --disable-geoip-database)
+		$(use qt5   && echo --with-qt5)
+		$(use webui || echo --disable-webui)
 		$(use X     || echo --disable-gui)
 	)
 
 	echo "${myconf[@]}"
 	"${myconf[@]}" || die "configure failed"
-	eqmake4
+	use qt4 && eqmake4
+	use qt5 && eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
 }
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index d5589adaeb8e..37958be4c719 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,3 +1,2 @@
 DIST gnuradio-3.6.5.1.tar.gz 3150283 SHA256 0875d2f0a7da0f3bcc1771b528b0f98f79d9ab69aa1ef953651bbbe1f57b4621 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8 WHIRLPOOL 7cf55be5fac7891a737d228d83718bbc43f9069c6275c5ac465ae11088559dca5e7fa31239e281271b529aa8b9ae1a0efe3850a16a40e53c0f1fe57e351ff2a8
-DIST gnuradio-3.7.5.2.tar.gz 3550717 SHA256 e91bea1e4354358fc55d8fce0868fdc5f22db5852ada23dbcec7ca6f265f7c10 SHA512 da632793a4591d5ab2a9499c63c28e41e708379e7ff2504351d99823164b6593b0ea1bbb198612a1d8fa5574c7023360256e86a8a0c6f3db3b3a7dbc3a045f96 WHIRLPOOL e23de5a996d58d4315338f61e42abc46ab21c6833f8a42cb0e3a39eb3c28f03a04a8cb895446e573e83b077f9850ebb5e8bfe7dad541008a232d2974f134ae2d
-DIST gnuradio-3.7.6.tar.gz 3579734 SHA256 07390ec36b1718c2e73b2933b3b6d3b0af8251d61ce06a37231700e65fac14a2 SHA512 7f005e3dbdfe8f67aea04f7a055b1a354c92c5cb138a7228908602b334cf5b3b3c690b31eb171064918e9878a241a6402763cf6a65291ba0a4a86e1cae420e86 WHIRLPOOL 922734733c1239eec6a19cb9d2b8b5259ded811369ace0241a6f107cf3d9128ffa724fee7213997f57fe32cf7b5e64cdfa9efe6885af548699ea39a6dc757cd8
+DIST gnuradio-3.7.6.1.tar.gz 3588833 SHA256 39dede70eec36f430c4895900bbd7ed266aa9e846d0a362987e806b7197c4c0b SHA512 88ec30b2bd93ca032c29f4606856a8e70b0123474fd84115657804429f381dea78f97a7523c9684acad6a27b357ddf876632e957de5c6e0170045dc38d121939 WHIRLPOOL 97d70e403fe46b0afbd1e6f0812f8d9de4ea506dcb2190a23d9a0f0499662f9e2bbaa86d1b624f7c621ae1675094f92cd295bc273db0759b2647e2dfb2a49b43
diff --git a/net-wireless/gnuradio/gnuradio-3.7.5.2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.5.2.ebuild
deleted file mode 100644
index 83cbb1f74848..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.5.2.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.5.2.ebuild,v 1.1 2015/01/08 14:37:41 zerochaos Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime python-single-r1
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="http://gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="http://s3-dist.gnuradio.org/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="+audio +alsa atsc +analog +digital channels +ctrlport doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		audio? ( || ( alsa oss jack portaudio ) )
-		alsa? ( audio )
-		oss? ( audio )
-		jack? ( audio )
-		portaudio? ( audio )
-		analog? ( filter )
-		digital? ( filter analog )
-		pager? ( filter analog )
-		qt4? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-util/cppunit-1.9.14
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_USEDEP}]
-	)
-	ctrlport? ( dev-libs/Ice[python,${PYTHON_USEDEP}] )
-	fcd? ( virtual/libusb:1 )
-	filter? ( sci-libs/scipy )
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	qt4? (
-		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
-		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
-		>=dev-qt/qtcore-4.4:4
-		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
-	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	vocoder? ( media-sound/gsm )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	wxwidgets? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11
-		net-libs/cppzmq )
-	"
-
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	grc? (
-		x11-misc/xdg-utils
-	)
-	oss? (
-		virtual/os-headers
-	)
-"
-
-src_prepare() {
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	#epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
-	#epatch "${FILESDIR}/${P}-build-type-nonfatal.patch"
-}
-
-src_configure() {
-	# TODO: docs are installed to /usr/share/doc/${PN} not /usr/share/doc/${PF}
-	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
-	#audio provider is still automagic
-	#zeromq missing deps isn't fatal
-	mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_VOLK=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_AUDIO=ON
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable ctrlport GR_CTRLPORT) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(cmake-utils_use_enable filter GR_FILTER) \
-		$(cmake-utils_use_enable grc GRC) \
-		$(cmake-utils_use_enable jack GR_AUDIO_JACK) \
-		$(cmake-utils_use_enable log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(cmake-utils_use_enable oss GR_AUDIO_OSS) \
-		$(cmake-utils_use_enable pager GR_PAGER) \
-		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
-		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
-		$(cmake-utils_use_enable test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.6.ebuild b/net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild
similarity index 99%
rename from net-wireless/gnuradio/gnuradio-3.7.6.ebuild
rename to net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild
index 6b79e76cef63..69a5c5206153 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.6.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.6.ebuild,v 1.2 2015/01/21 12:32:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.6.1.ebuild,v 1.1 2015/02/17 16:07:10 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
diff --git a/perl-core/CGI/CGI-3.650.0.ebuild b/perl-core/CGI/CGI-3.650.0.ebuild
index c6da69a223bb..554489a7c9b8 100644
--- a/perl-core/CGI/CGI-3.650.0.ebuild
+++ b/perl-core/CGI/CGI-3.650.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/CGI/CGI-3.650.0.ebuild,v 1.8 2015/02/17 08:14:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CGI/CGI-3.650.0.ebuild,v 1.9 2015/02/17 21:18:03 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Simple Common Gateway Interface Class"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/perl-core/File-Temp/File-Temp-0.230.400-r1.ebuild b/perl-core/File-Temp/File-Temp-0.230.400-r1.ebuild
index d8b5974b8bec..f77d5b1a029d 100644
--- a/perl-core/File-Temp/File-Temp-0.230.400-r1.ebuild
+++ b/perl-core/File-Temp/File-Temp-0.230.400-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.230.400-r1.ebuild,v 1.8 2015/02/17 08:14:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.230.400-r1.ebuild,v 1.9 2015/02/17 21:08:32 maekke Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # bug 390719
diff --git a/perl-core/Module-Build/Module-Build-0.420.500.ebuild b/perl-core/Module-Build/Module-Build-0.420.500.ebuild
index 336fb9f1f2e1..122c9550c062 100644
--- a/perl-core/Module-Build/Module-Build-0.420.500.ebuild
+++ b/perl-core/Module-Build/Module-Build-0.420.500.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Build/Module-Build-0.420.500.ebuild,v 1.9 2015/02/17 08:14:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Module-Build/Module-Build-0.420.500.ebuild,v 1.10 2015/02/17 21:35:29 maekke Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Build and install Perl modules"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/perl-core/libnet/libnet-1.270.0.ebuild b/perl-core/libnet/libnet-1.270.0.ebuild
index 48bc344956c5..5a437421de26 100644
--- a/perl-core/libnet/libnet-1.270.0.ebuild
+++ b/perl-core/libnet/libnet-1.270.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/libnet/libnet-1.270.0.ebuild,v 1.8 2015/02/17 08:14:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/libnet/libnet-1.270.0.ebuild,v 1.9 2015/02/17 21:46:11 maekke Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit eutils perl-module
 DESCRIPTION="A URI Perl Module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="sasl"
 
 RDEPEND="sasl? ( dev-perl/Authen-SASL )"
diff --git a/profiles/package.mask b/profiles/package.mask
index 9fb1036b62d5..dce7f62d05fb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16367 2015/02/16 18:03:23 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16368 2015/02/17 18:42:01 graaff Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -30,6 +30,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (17 Feb 2015)
+
+# Mask virtual/ruby-threads for removal in 30 days, bug 537074. This
+# virtual is no longer used in the tree and serves no purpose since
+# the removal of ruby 1.8.
+virtual/ruby-threads
+
 # Michael Sterrett <mr_bones_@gentoo.org> (16 Feb 2015)
 # No upstream anymore; misc issues
 # masked for removal on 20150318
diff --git a/profiles/prefix/aix/package.mask b/profiles/prefix/aix/package.mask
index 1ba08f791628..e4a5ea13e31b 100644
--- a/profiles/prefix/aix/package.mask
+++ b/profiles/prefix/aix/package.mask
@@ -1,10 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/package.mask,v 1.11 2015/02/17 13:22:47 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/package.mask,v 1.13 2015/02/17 17:59:50 haubi Exp $
+
+# Michael Haubenwallner <haubi@gentoo.org> (17 Feb 2015)
+# Fails to include "config.h" first in some sources.
+=sci-visualization/gnuplot-5.0.0
 
 # Michael Haubenwallner <haubi@gentoo.org> (17 Feb 2015)
 # Ships without gnulib module faccessat, necessary for AIX.
-~sys-devel/patch-2.7.4
+=sys-devel/patch-2.7.4
 
 # Michael Haubenwallner <haubi@gentoo.org> (17 Feb 2015)
 # Breaks (openssh, ...) because of PR target/65058
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask
index 894d6068d219..a848b653d329 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -1,8 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/package.mask,v 1.39 2014/01/14 20:03:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/package.mask,v 1.40 2015/02/17 18:00:53 haubi Exp $
 
 
+# Michael Haubenwallner <haubi@gentoo.org> (17 Feb 2015)
+# Ships without gnulib module faccessat.
+=sys-devel/patch-2.7.4
+
 # Fabian Groffen <grobian@gentoo.org> (14 Jan 2014)
 # util-linux has no business on Solaris systems
 sys-apps/util-linux
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 4b2264918b13..b2047fe1013b 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.41 2014/09/17 22:21:23 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.42 2015/02/18 05:17:33 yngwin Exp $
+
+# Ben de Groot <yngwin@gentoo.org> (18 Feb 2015)
+# Enable sensible defaults for desktop users (bug #540046)
+dev-python/PyQt5 declarative gui network printsupport sql widgets xmlpatterns
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (17 Sep 2014)
 # Disable glamor for xf86-video-intel since it also needs uxa, which is
@@ -14,7 +18,7 @@ net-libs/libpcap -bluetooth
 
 # Rick Farina <zerochaos@gentoo.org> (31 May 2014)
 # wireshark 1.10.x has a mostly non-functional qt4 interface so keep
-# gtk3 the default until 1.11.x or higher is stabilized 
+# gtk3 the default until 1.11.x or higher is stabilized
 <net-analyzer/wireshark-1.11.0 -qt4
 
 # Michał Górny <mgorny@gentoo.org> (27 May 2014)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index fdf606c931cd..af9d8619cae5 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3185,7 +3185,6 @@ kde-base/powerdevil:pm-utils - Adds support for suspend/resume the system throug
 kde-base/poxml:extras - Build po2xml and swappo tools
 kde-base/pykde4:akonadi - Compile bindings for Akonadi
 kde-base/pykde4:nepomuk - Compile bindings for Nepomuk
-kde-base/pykde4:semantic-desktop - Enables Nepomuk and Soprano python language bindings
 kde-base/qtruby:declarative - Compile bindings for dev-qt/qtdeclarative.
 kde-base/qtruby:phonon - Compile bindings for Phonon.
 kde-base/qtruby:qscintilla - Compile bindings for x11-libs/qscintilla.
@@ -5990,6 +5989,7 @@ net-p2p/ppcoin-qt:qrcode - Enable generation of QR Codes for receiving payments
 net-p2p/ppcoind:logrotate - Use app-admin/logrotate for rotating logs
 net-p2p/primecoin-qt:qrcode - Enable generation of QR Codes for receiving payments
 net-p2p/primecoind:logrotate - Use app-admin/logrotate for rotating logs
+net-p2p/qbittorrent:webui - Enable the Web UI
 net-p2p/retroshare:cli - Enables the CLI version of RetroShare
 net-p2p/retroshare:feedreader - Enables the Feedreader plugin
 net-p2p/retroshare:links-cloud - Enables LinkClouds plugin
diff --git a/sci-libs/fftw/fftw-3.3.4.ebuild b/sci-libs/fftw/fftw-3.3.4.ebuild
index 41a0c6d5ff35..d7b0033c347f 100644
--- a/sci-libs/fftw/fftw-3.3.4.ebuild
+++ b/sci-libs/fftw/fftw-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.7 2015/02/08 06:33:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.8 2015/02/17 21:05:34 maekke Exp $
 
 EAPI=5
 
@@ -14,11 +14,11 @@ HOMEPAGE="http://www.fftw.org/"
 if [[ ${PV} = *9999 ]]; then
 	inherit git-2
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-	KEYWORDS="hppa"
+	KEYWORDS="arm hppa"
 	AUTOTOOLS_AUTORECONF=1
 else
 	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 5e8e52665e3f..3bca00c1f586 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -1,3 +1,4 @@
+DIST lammps-10Feb15.tar.gz 62912048 SHA256 59373e9b5592f7b697a144bbce1fb742726e03536b7bb355dac7a9e013ddf9b8 SHA512 a7804377a23f03f338bdaf443439dffcdc52293b4c45e6369b340a1107510fed0b8a198e3b5afcff2e04e109985b52ee62e7b28276697bae37ac6f783d1ab9f2 WHIRLPOOL 09f29cadf8b072d388abe45ec219341d2a14a6c9cc9e4010a0f7945e930e9984738f7837748d117ab95ca76ce0c8d9160fe88dcec17e8d21b81f385dec8f7005
 DIST lammps-10Jan15.tar.gz 62757375 SHA256 b3cbc1e2efb64b5431744940a8d78a0737824c46bfa18c2f0cc6565d67394421 SHA512 40d273049c9c22cb9828d4f51c29dd1044efad24a78e989f4c0da443ebd8f84d15dc18197ecc41cfc3a3f70ce5b59aeb82bb84dafa014a62b991b6d9b674f4fe WHIRLPOOL 946ab5f4d0701abbaadee94ad5493d6c39bad6ed866ae29176ffa8f16b3508a7cb0a8deefddd987aaf95ae2f74b768cadeddc54b4c053eb12dfde2b9fa597fb8
 DIST lammps-11Jul14.tar.gz 64634749 SHA256 05a9af6fae3f27e41ee776fb3c306a07c2f80b953770fa1ccbd36bbbb6991283 SHA512 6951d9af5d1f77f3160ba13ed70bb1ff71d1f8da0716b784b3e3cf010eb8b9ee68ac49befe4602771bbb4a473fd531f07568d922e0bbff97d4193f9e8c0ea793 WHIRLPOOL f1b814171e81898f7138b6116d4bddedfdccc0a956d11184fb64c82722905a28a97420c19b65edef488915ce956479b0ba255767b45f2f70c53e5674ee6e3744
 DIST lammps-14Jun14.tar.gz 64597109 SHA256 cf7d492862c7bbb1865631b8abce34ea8b5edac17a573c8924c4f9b885fccac3 SHA512 fb0d5d58c1abd402d0aa311156f023af9579793b6606f5c449f5bf0b298dc77a0c68198dc2898d9d8f0f84b24bd84fec3d60b1549d60446152b9e18d5f217608 WHIRLPOOL 7336cb8f57aa856ae7b8ca77bbdfb78df9c2a4fd229f58884c302e88dd75aa53c567c22fbdc8c87af032df264dbdd222d23143b23ba5a84dd8e94f5a7a260838
diff --git a/sci-physics/lammps/lammps-20150210.ebuild b/sci-physics/lammps/lammps-20150210.ebuild
new file mode 100644
index 000000000000..f4b912831418
--- /dev/null
+++ b/sci-physics/lammps/lammps-20150210.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20150210.ebuild,v 1.1 2015/02/17 16:53:27 nicolasbock Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic fortran-2 multilib
+
+convert_month() {
+	case $1 in
+		01) echo Jan
+			;;
+		02) echo Feb
+			;;
+		03) echo Mar
+			;;
+		04) echo Apr
+			;;
+		05) echo May
+			;;
+		06) echo Jun
+			;;
+		07) echo Jul
+			;;
+		08) echo Aug
+			;;
+		09) echo Sep
+			;;
+		10) echo Oct
+			;;
+		11) echo Nov
+			;;
+		12) echo Dec
+			;;
+		*)  echo unknown
+			;;
+	esac
+}
+
+MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="http://lammps.sandia.gov/"
+SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples gzip lammps-memalign mpi static-libs"
+
+DEPEND="
+	mpi? (
+		virtual/blas
+		virtual/lapack
+		virtual/mpi
+	)
+	sci-libs/voro++
+	"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+lmp_emake() {
+	local LAMMPS_INCLUDEFLAGS
+	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
+	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"
+
+	# The lammps makefile uses CC to indicate the C++ compiler.
+	emake \
+		ARCHIVE=$(tc-getAR) \
+		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
+		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
+		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
+		CCFLAGS="${CXXFLAGS}" \
+		F90FLAGS="${FCFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
+		MPI_INC=$(usex mpi '' "-I../STUBS") \
+		MPI_PATH=$(usex mpi '' '-L../STUBS') \
+		MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
+		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
+		"$@"
+}
+
+src_prepare() {
+	# Fix inconsistent use of SHFLAGS.
+	sed -i \
+		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
+		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
+		lib/voronoi/Makefile.lammps || die
+
+	# Fix missing .so name.
+	sed -i \
+		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
+		src/MAKE/Makefile.serial || die
+
+	# Fix makefile in tools.
+	sed -i \
+		-e 's:g++:$(CXX) $(CXXFLAGS):' \
+		-e 's:gcc:$(CC) $(CCFLAGS):' \
+		-e 's:ifort:$(FC) $(FCFLAGS):' \
+		tools/Makefile || die
+}
+
+src_compile() {
+	# Prepare compiler flags.
+	append-cxxflags -fPIC -I../../src
+	append-fflags -fPIC
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src stubs
+
+	# Build packages
+	emake -C src yes-asphere
+	emake -C src yes-body
+	emake -C src yes-class2
+	emake -C src yes-colloid
+	emake -C src yes-dipole
+	emake -C src yes-fld
+	#emake -C src yes-gpu
+	emake -C src yes-granular
+	# Need OpenKIM external dependency.
+	#emake -C src yes-kim
+	# Need Kokkos external dependency.
+	#emake -C src yes-kokkos
+	emake -C src yes-kspace
+	emake -C src yes-manybody
+	emake -C src yes-mc
+	lmp_emake -C src yes-meam
+	lmp_emake -j1 -C lib/meam -f Makefile.gfortran
+	emake -C src yes-misc
+	emake -C src yes-molecule
+	#emake -C src yes-mpiio
+	emake -C src yes-opt
+	emake -C src yes-peri
+	emake -C src yes-poems
+	lmp_emake -C lib/poems -f Makefile.g++
+	emake -C src yes-reax
+	lmp_emake -j1 -C lib/reax -f Makefile.gfortran
+	emake -C src yes-replica
+	emake -C src yes-rigid
+	emake -C src yes-shock
+	emake -C src yes-snap
+	emake -C src yes-srd
+	emake -C src yes-voronoi
+	emake -C src yes-xtc
+
+	emake -C src yes-user-eff
+	emake -C src yes-user-fep
+	use mpi && emake -C src yes-user-lb
+	emake -C src yes-user-phonon
+	emake -C src yes-user-sph
+
+	if use mpi; then
+		emake -C src yes-user-atc
+		lmp_emake -C lib/atc -f Makefile.g++
+	fi
+
+	if use static-libs; then
+		# Build static library.
+		lmp_emake -C src makelib
+		lmp_emake -C src -f Makefile.lib serial
+	fi
+
+	# Build shared library.
+	lmp_emake -C src makeshlib
+	lmp_emake -C src -f Makefile.shlib serial
+
+	# Compile main executable.
+	lmp_emake -C src serial
+
+	# Compile tools.
+	emake -C tools binary2txt chain micelle2d data2xmovie
+}
+
+src_install() {
+	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
+	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
+	newbin src/lmp_serial lmp
+	dobin tools/binary2txt
+	# Don't forget to add header files of optional packages as they are added
+	# to this ebuild. There may also be .mod files from Fortran based
+	# packages.
+	insinto "/usr/include/${PN}"
+	doins -r src/*.h lib/meam/*.mod
+
+	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
+	insinto "/${LAMMPS_POTENTIALS}"
+	doins potentials/*
+	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
+	doenvd 99lammps
+
+	if use examples; then
+		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
+		insinto "${LAMMPS_EXAMPLES}"
+		doins -r examples/*
+	fi
+
+	dodoc README
+	if use doc; then
+		dodoc doc/Manual.pdf
+		dohtml -r doc/*
+	fi
+}
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.6.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.6.ebuild
index 43551b5b2737..1cd11b0a8f2b 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6.6.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.6.ebuild,v 1.1 2014/11/08 20:38:11 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.6.ebuild,v 1.2 2015/02/17 17:35:51 haubi Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="aqua bitmap cairo doc examples +gd ggi latex lua qt4 readline svga wxwidgets X"
 
 RDEPEND="
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.0.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.0.ebuild
index 05c17d54347a..b5ae4e49c66d 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.0.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-5.0.0.ebuild,v 1.2 2015/02/17 12:07:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-5.0.0.ebuild,v 1.3 2015/02/17 17:35:51 haubi Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 	inherit autotools
 fi
 
diff --git a/sys-apps/dbus/dbus-1.8.16.ebuild b/sys-apps/dbus/dbus-1.8.16.ebuild
index ab5e6b31c7c0..ca233c7e15d9 100644
--- a/sys-apps/dbus/dbus-1.8.16.ebuild
+++ b/sys-apps/dbus/dbus-1.8.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.16.ebuild,v 1.5 2015/02/16 10:20:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.16.ebuild,v 1.6 2015/02/17 21:24:25 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc selinux static-libs systemd test X"
 
 CDEPEND=">=dev-libs/expat-2
diff --git a/sys-apps/systemd/systemd-218-r3.ebuild b/sys-apps/systemd/systemd-218-r3.ebuild
index 24831c1dded0..085b48ead1dd 100644
--- a/sys-apps/systemd/systemd-218-r3.ebuild
+++ b/sys-apps/systemd/systemd-218-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218-r3.ebuild,v 1.1 2015/02/08 17:21:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218-r3.ebuild,v 1.2 2015/02/17 20:15:02 pacho Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
-	idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
+	idn introspection kdbus +kmod +lz4 lzma pam policykit python qrcode +seccomp
 	selinux ssl sysv-utils terminal test vanilla xkb"
 
 MINKV="3.8"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 516e81916b7d..e48227692f36 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.158 2015/02/17 01:46:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.159 2015/02/17 20:15:02 pacho Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
-	idn importd introspection kdbus +kmod lz4 lzma nat pam policykit python
+	idn importd introspection kdbus +kmod +lz4 lzma nat pam policykit python
 	qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb"
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-1.960.0.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-1.960.0.ebuild
index 17fb9596ca82..9955a28fed57 100644
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-1.960.0.ebuild
+++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-1.960.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Archive-Tar/perl-Archive-Tar-1.960.0.ebuild,v 1.9 2015/02/17 08:11:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Archive-Tar/perl-Archive-Tar-1.960.0.ebuild,v 1.10 2015/02/17 21:12:40 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-0.960.0.ebuild b/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-0.960.0.ebuild
index e2928b8ff695..9f6e1db0d6d5 100644
--- a/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-0.960.0.ebuild
+++ b/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-0.960.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-0.960.0.ebuild,v 1.9 2015/02/17 08:11:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-0.960.0.ebuild,v 1.10 2015/02/17 21:13:06 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-B-Debug/perl-B-Debug-1.190.0.ebuild b/virtual/perl-B-Debug/perl-B-Debug-1.190.0.ebuild
index 77e7d57c0413..afd8dcc5474f 100644
--- a/virtual/perl-B-Debug/perl-B-Debug-1.190.0.ebuild
+++ b/virtual/perl-B-Debug/perl-B-Debug-1.190.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-B-Debug/perl-B-Debug-1.190.0.ebuild,v 1.9 2015/02/17 08:11:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-B-Debug/perl-B-Debug-1.190.0.ebuild,v 1.10 2015/02/17 21:13:33 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-CGI/perl-CGI-3.650.0-r1.ebuild b/virtual/perl-CGI/perl-CGI-3.650.0-r1.ebuild
index eea2ecda346e..6702c675001d 100644
--- a/virtual/perl-CGI/perl-CGI-3.650.0-r1.ebuild
+++ b/virtual/perl-CGI/perl-CGI-3.650.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CGI/perl-CGI-3.650.0-r1.ebuild,v 1.8 2015/02/17 08:11:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CGI/perl-CGI-3.650.0-r1.ebuild,v 1.9 2015/02/17 21:18:30 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild
index 2ba105ed0c63..8a69920c3148 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild,v 1.9 2015/02/17 08:12:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.125.0-r1.ebuild,v 1.10 2015/02/17 21:21:03 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild
index cd300265edcf..76303c541230 100644
--- a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild
+++ b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild,v 1.9 2015/02/17 08:12:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.12.0.ebuild,v 1.10 2015/02/17 21:20:09 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild
index 50796ae814b7..0a599b80cf6e 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild,v 1.11 2015/02/17 08:12:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.140.640.ebuild,v 1.12 2015/02/17 21:20:36 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild b/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild
index db26484b4db5..56fed8cfc2d5 100644
--- a/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild
+++ b/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild,v 1.10 2015/02/17 08:11:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-CPAN/perl-CPAN-2.0.5.ebuild,v 1.11 2015/02/17 21:18:56 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-Carp/perl-Carp-1.330.100.ebuild b/virtual/perl-Carp/perl-Carp-1.330.100.ebuild
index 31bc3aed7ab4..7836dc5c2251 100644
--- a/virtual/perl-Carp/perl-Carp-1.330.100.ebuild
+++ b/virtual/perl-Carp/perl-Carp-1.330.100.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Carp/perl-Carp-1.330.100.ebuild,v 1.10 2015/02/17 08:12:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Carp/perl-Carp-1.330.100.ebuild,v 1.11 2015/02/17 21:21:29 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.64.0.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.64.0.ebuild
index fb886177fff3..f96c3ed59076 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.64.0.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.64.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.64.0.ebuild,v 1.9 2015/02/17 08:12:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.64.0.ebuild,v 1.10 2015/02/17 21:21:55 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.65.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.65.0.ebuild
index 214943e4fa59..827fc513fe13 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.65.0.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.65.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.65.0.ebuild,v 1.9 2015/02/17 08:12:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.65.0.ebuild,v 1.10 2015/02/17 21:22:21 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-DB_File/perl-DB_File-1.831.0.ebuild b/virtual/perl-DB_File/perl-DB_File-1.831.0.ebuild
index ee9d4d9c98bc..e5cb1a1b99cd 100644
--- a/virtual/perl-DB_File/perl-DB_File-1.831.0.ebuild
+++ b/virtual/perl-DB_File/perl-DB_File-1.831.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-DB_File/perl-DB_File-1.831.0.ebuild,v 1.9 2015/02/17 08:12:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-DB_File/perl-DB_File-1.831.0.ebuild,v 1.10 2015/02/17 21:22:48 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.210.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.210.0.ebuild
index 5af524e75051..6892d5774953 100644
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.210.0.ebuild
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.210.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.210.0.ebuild,v 1.9 2015/02/17 08:12:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.210.0.ebuild,v 1.10 2015/02/17 21:23:14 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.0-r2.ebuild b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.0-r2.ebuild
index c74ac7d1ca93..772312a15795 100644
--- a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.0-r2.ebuild
+++ b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.0-r2.ebuild,v 1.8 2015/02/17 08:12:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Digest-MD5/perl-Digest-MD5-2.530.0-r2.ebuild,v 1.9 2015/02/17 21:23:45 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Digest-SHA/perl-Digest-SHA-5.880.0.ebuild b/virtual/perl-Digest-SHA/perl-Digest-SHA-5.880.0.ebuild
index d8244fe5c16e..804619b7c015 100644
--- a/virtual/perl-Digest-SHA/perl-Digest-SHA-5.880.0.ebuild
+++ b/virtual/perl-Digest-SHA/perl-Digest-SHA-5.880.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Digest-SHA/perl-Digest-SHA-5.880.0.ebuild,v 1.9 2015/02/17 08:12:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Digest-SHA/perl-Digest-SHA-5.880.0.ebuild,v 1.10 2015/02/17 21:24:12 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Encode/perl-Encode-2.600.0.ebuild b/virtual/perl-Encode/perl-Encode-2.600.0.ebuild
index 1acf69853f6d..ea421b371c05 100644
--- a/virtual/perl-Encode/perl-Encode-2.600.0.ebuild
+++ b/virtual/perl-Encode/perl-Encode-2.600.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Encode/perl-Encode-2.600.0.ebuild,v 1.9 2015/02/17 08:12:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Encode/perl-Encode-2.600.0.ebuild,v 1.10 2015/02/17 21:24:44 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Exporter/perl-Exporter-5.710.0.ebuild b/virtual/perl-Exporter/perl-Exporter-5.710.0.ebuild
index 12a35dcc4409..9cd6af4cf66f 100644
--- a/virtual/perl-Exporter/perl-Exporter-5.710.0.ebuild
+++ b/virtual/perl-Exporter/perl-Exporter-5.710.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Exporter/perl-Exporter-5.710.0.ebuild,v 1.10 2015/02/17 08:12:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Exporter/perl-Exporter-5.710.0.ebuild,v 1.11 2015/02/17 21:25:10 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.217.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.217.ebuild
index 09ad17073cbf..fa40bd114f42 100644
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.217.ebuild
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.217.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.217.ebuild,v 1.9 2015/02/17 08:12:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.217.ebuild,v 1.10 2015/02/17 21:25:37 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild
index 1a8193b26fba..c32ef35ae2ae 100644
--- a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild
+++ b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild,v 1.9 2015/02/17 08:12:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.180.0-r2.ebuild,v 1.10 2015/02/17 21:26:04 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.670.0.ebuild b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.670.0.ebuild
index 9bf14945fcc3..e4fa60d3ca0a 100644
--- a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.670.0.ebuild
+++ b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.670.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.670.0.ebuild,v 1.10 2015/02/17 08:12:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-1.670.0.ebuild,v 1.11 2015/02/17 21:26:30 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.980.0.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.980.0.ebuild
index 86e516978cdc..44fe0982f6a2 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.980.0.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.980.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.980.0.ebuild,v 1.10 2015/02/17 08:12:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-6.980.0.ebuild,v 1.11 2015/02/17 21:26:56 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild
index f6361b663328..08fec9efd486 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild,v 1.9 2015/02/17 08:12:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.240.0.ebuild,v 1.10 2015/02/17 21:27:28 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.480.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.480.0.ebuild
index 670e1bd6ff00..641b36b01846 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.480.0.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.480.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Spec/perl-File-Spec-3.480.0.ebuild,v 1.8 2015/02/17 08:12:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Spec/perl-File-Spec-3.480.0.ebuild,v 1.9 2015/02/17 21:27:58 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-File-Temp/perl-File-Temp-0.230.400-r2.ebuild b/virtual/perl-File-Temp/perl-File-Temp-0.230.400-r2.ebuild
index 789d792a2881..d4db87bd5333 100644
--- a/virtual/perl-File-Temp/perl-File-Temp-0.230.400-r2.ebuild
+++ b/virtual/perl-File-Temp/perl-File-Temp-0.230.400-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Temp/perl-File-Temp-0.230.400-r2.ebuild,v 1.8 2015/02/17 08:12:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Temp/perl-File-Temp-0.230.400-r2.ebuild,v 1.9 2015/02/17 21:11:46 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 RDEPEND="
diff --git a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.420.0-r1.ebuild b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.420.0-r1.ebuild
index 383cbcdd63cb..313ae2617f74 100644
--- a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.420.0-r1.ebuild
+++ b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.420.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Getopt-Long/perl-Getopt-Long-2.420.0-r1.ebuild,v 1.9 2015/02/17 08:12:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Getopt-Long/perl-Getopt-Long-2.420.0-r1.ebuild,v 1.10 2015/02/17 21:28:24 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.400.0.ebuild b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.400.0.ebuild
index c6af13839087..3a1a351277dd 100644
--- a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.400.0.ebuild
+++ b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.400.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.400.0.ebuild,v 1.8 2015/02/17 08:12:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.400.0.ebuild,v 1.9 2015/02/17 21:28:51 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.64.0.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.64.0.ebuild
index 7844de5a04ef..0d1d95fea259 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.64.0.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.64.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IO-Compress/perl-IO-Compress-2.64.0.ebuild,v 1.8 2015/02/17 08:12:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IO-Compress/perl-IO-Compress-2.64.0.ebuild,v 1.9 2015/02/17 21:29:43 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.290.0.ebuild b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.290.0.ebuild
index 1f6f66a96b06..ce2f6f6eb8db 100644
--- a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.290.0.ebuild
+++ b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.290.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.290.0.ebuild,v 1.8 2015/02/17 08:12:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.290.0.ebuild,v 1.9 2015/02/17 21:30:10 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-IO/perl-IO-1.310.0.ebuild b/virtual/perl-IO/perl-IO-1.310.0.ebuild
index bdd1720cd656..be473c2e22cf 100644
--- a/virtual/perl-IO/perl-IO-1.310.0.ebuild
+++ b/virtual/perl-IO/perl-IO-1.310.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IO/perl-IO-1.310.0.ebuild,v 1.8 2015/02/17 08:12:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IO/perl-IO-1.310.0.ebuild,v 1.9 2015/02/17 21:29:17 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.0.ebuild b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.0.ebuild
index 4766a1b9ab55..0b6d97d270b9 100644
--- a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.0.ebuild
+++ b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.0.ebuild,v 1.8 2015/02/17 08:12:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.920.0.ebuild,v 1.9 2015/02/17 21:30:42 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-JSON-PP/perl-JSON-PP-2.272.30.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-2.272.30.ebuild
index a6cf363b9306..1ff71cc7405f 100644
--- a/virtual/perl-JSON-PP/perl-JSON-PP-2.272.30.ebuild
+++ b/virtual/perl-JSON-PP/perl-JSON-PP-2.272.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-JSON-PP/perl-JSON-PP-2.272.30.ebuild,v 1.9 2015/02/17 08:12:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-JSON-PP/perl-JSON-PP-2.272.30.ebuild,v 1.10 2015/02/17 21:31:07 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.250.0.ebuild b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.250.0.ebuild
index cbc7d08497fe..1ec05ba462aa 100644
--- a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.250.0.ebuild
+++ b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.250.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.250.0.ebuild,v 1.9 2015/02/17 08:12:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.250.0.ebuild,v 1.10 2015/02/17 21:31:33 maekke Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ HOMEPAGE=""
 SRC_URI=""
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.140.0-r1.ebuild b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.140.0-r1.ebuild
index 27f2aaed1789..5d8c0f374070 100644
--- a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.140.0-r1.ebuild
+++ b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.140.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-MIME-Base64/perl-MIME-Base64-3.140.0-r1.ebuild,v 1.8 2015/02/17 08:12:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-MIME-Base64/perl-MIME-Base64-3.140.0-r1.ebuild,v 1.9 2015/02/17 21:32:04 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.310.0.ebuild b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.310.0.ebuild
index be4af517452f..ef61c68b1cfe 100644
--- a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.310.0.ebuild
+++ b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.310.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.310.0.ebuild,v 1.8 2015/02/17 08:13:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.310.0.ebuild,v 1.9 2015/02/17 21:32:35 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Math-BigRat/perl-Math-BigRat-0.260.600.ebuild b/virtual/perl-Math-BigRat/perl-Math-BigRat-0.260.600.ebuild
index c20504e1dd98..dbf3f2adc1e4 100644
--- a/virtual/perl-Math-BigRat/perl-Math-BigRat-0.260.600.ebuild
+++ b/virtual/perl-Math-BigRat/perl-Math-BigRat-0.260.600.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Math-BigRat/perl-Math-BigRat-0.260.600.ebuild,v 1.8 2015/02/17 08:13:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Math-BigRat/perl-Math-BigRat-0.260.600.ebuild,v 1.9 2015/02/17 21:33:01 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
 
 IUSE=""
 RDEPEND="
diff --git a/virtual/perl-Module-Build/perl-Module-Build-0.420.500-r1.ebuild b/virtual/perl-Module-Build/perl-Module-Build-0.420.500-r1.ebuild
index 16bbafff06e5..9d5ad01f82c5 100644
--- a/virtual/perl-Module-Build/perl-Module-Build-0.420.500-r1.ebuild
+++ b/virtual/perl-Module-Build/perl-Module-Build-0.420.500-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Build/perl-Module-Build-0.420.500-r1.ebuild,v 1.8 2015/02/17 08:13:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Build/perl-Module-Build-0.420.500-r1.ebuild,v 1.9 2015/02/17 21:35:56 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.20.1.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.20.1.ebuild
index 44d8a93869cd..42a59e95e12f 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.20.1.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.20.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-CoreList/perl-Module-CoreList-5.20.1.ebuild,v 1.8 2015/02/17 08:13:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-CoreList/perl-Module-CoreList-5.20.1.ebuild,v 1.9 2015/02/17 21:36:24 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.620.0.ebuild b/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.620.0.ebuild
index 853c73966275..c88d2d537b4e 100644
--- a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.620.0.ebuild
+++ b/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.620.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.620.0.ebuild,v 1.8 2015/02/17 08:13:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.620.0.ebuild,v 1.9 2015/02/17 21:37:17 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Module-Load/perl-Module-Load-0.320.0.ebuild b/virtual/perl-Module-Load/perl-Module-Load-0.320.0.ebuild
index 54c66166d6dc..9a1725e6eab9 100644
--- a/virtual/perl-Module-Load/perl-Module-Load-0.320.0.ebuild
+++ b/virtual/perl-Module-Load/perl-Module-Load-0.320.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Load/perl-Module-Load-0.320.0.ebuild,v 1.8 2015/02/17 08:13:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Load/perl-Module-Load-0.320.0.ebuild,v 1.9 2015/02/17 21:36:50 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.19.ebuild b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.19.ebuild
index f3d11eae5f6c..0025da848620 100644
--- a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.19.ebuild
+++ b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.19.ebuild,v 1.8 2015/02/17 08:13:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.19.ebuild,v 1.9 2015/02/17 21:37:49 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Package-Constants/perl-Package-Constants-0.40.0.ebuild b/virtual/perl-Package-Constants/perl-Package-Constants-0.40.0.ebuild
index 5142c2cc02f8..e9ec787244bd 100644
--- a/virtual/perl-Package-Constants/perl-Package-Constants-0.40.0.ebuild
+++ b/virtual/perl-Package-Constants/perl-Package-Constants-0.40.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Package-Constants/perl-Package-Constants-0.40.0.ebuild,v 1.8 2015/02/17 08:13:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Package-Constants/perl-Package-Constants-0.40.0.ebuild,v 1.9 2015/02/17 21:38:15 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r1.ebuild b/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r1.ebuild
index a194806ac465..aae2be6c5f94 100644
--- a/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r1.ebuild
+++ b/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r1.ebuild,v 1.8 2015/02/17 08:13:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r1.ebuild,v 1.9 2015/02/17 21:38:42 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild
index 32eecf2a16ac..e6119e8fabbe 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild
+++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild,v 1.9 2015/02/17 08:13:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-1.441.400.ebuild,v 1.10 2015/02/17 21:39:10 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Perl-OSType/perl-Perl-OSType-1.7.0.ebuild b/virtual/perl-Perl-OSType/perl-Perl-OSType-1.7.0.ebuild
index d473603c6fa5..0f78e5123962 100644
--- a/virtual/perl-Perl-OSType/perl-Perl-OSType-1.7.0.ebuild
+++ b/virtual/perl-Perl-OSType/perl-Perl-OSType-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Perl-OSType/perl-Perl-OSType-1.7.0.ebuild,v 1.8 2015/02/17 08:13:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Perl-OSType/perl-Perl-OSType-1.7.0.ebuild,v 1.9 2015/02/17 21:39:37 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.60.0.ebuild b/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.60.0.ebuild
index 38731d44f2cb..79a6f3273c8d 100644
--- a/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.60.0.ebuild
+++ b/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.60.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.60.0.ebuild,v 1.8 2015/02/17 08:13:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.60.0.ebuild,v 1.9 2015/02/17 21:40:05 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Pod-Parser/perl-Pod-Parser-1.620.0.ebuild b/virtual/perl-Pod-Parser/perl-Pod-Parser-1.620.0.ebuild
index 1790d30f5989..f8382c77712e 100644
--- a/virtual/perl-Pod-Parser/perl-Pod-Parser-1.620.0.ebuild
+++ b/virtual/perl-Pod-Parser/perl-Pod-Parser-1.620.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Pod-Parser/perl-Pod-Parser-1.620.0.ebuild,v 1.8 2015/02/17 08:13:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Pod-Parser/perl-Pod-Parser-1.620.0.ebuild,v 1.9 2015/02/17 21:40:33 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.380.0.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.380.0.ebuild
index d68a1947f956..3a053260eac3 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.380.0.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.380.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.380.0.ebuild,v 1.9 2015/02/17 08:13:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.380.0.ebuild,v 1.10 2015/02/17 21:41:20 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Storable/perl-Storable-2.490.0.ebuild b/virtual/perl-Storable/perl-Storable-2.490.0.ebuild
index 3e789dc172e8..7a55d2a9affe 100644
--- a/virtual/perl-Storable/perl-Storable-2.490.0.ebuild
+++ b/virtual/perl-Storable/perl-Storable-2.490.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Storable/perl-Storable-2.490.0.ebuild,v 1.10 2015/02/17 08:13:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Storable/perl-Storable-2.490.0.ebuild,v 1.11 2015/02/17 21:41:49 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.0-r1.ebuild b/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.0-r1.ebuild
index 2eb589becd90..20275ad01a8c 100644
--- a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.0-r1.ebuild
+++ b/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.0-r1.ebuild,v 1.9 2015/02/17 08:13:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.330.0-r1.ebuild,v 1.10 2015/02/17 21:42:17 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.140.0.ebuild b/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.140.0.ebuild
index 7b726d77014f..be79d30e99d7 100644
--- a/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.140.0.ebuild
+++ b/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.140.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.140.0.ebuild,v 1.8 2015/02/17 08:13:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.140.0.ebuild,v 1.9 2015/02/17 21:42:49 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.330.0.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.330.0.ebuild
index 98b291a4191f..653358909f5e 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.330.0.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.330.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Harness/perl-Test-Harness-3.330.0.ebuild,v 1.9 2015/02/17 08:13:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Harness/perl-Test-Harness-3.330.0.ebuild,v 1.10 2015/02/17 21:43:21 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-1.1.2.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-1.1.2.ebuild
index 7bb015c385b8..32970b781a28 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-1.1.2.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Simple/perl-Test-Simple-1.1.2.ebuild,v 1.9 2015/02/17 08:13:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Test-Simple/perl-Test-Simple-1.1.2.ebuild,v 1.10 2015/02/17 21:43:47 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.290.0-r1.ebuild b/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.290.0-r1.ebuild
index 017751ac3a33..1acc6aed985d 100644
--- a/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.290.0-r1.ebuild
+++ b/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.290.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.290.0-r1.ebuild,v 1.10 2015/02/17 08:13:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.290.0-r1.ebuild,v 1.11 2015/02/17 21:35:02 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 
diff --git a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.600-r1.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.600-r1.ebuild
index 7b6e4451c2c8..c42cb89114ed 100644
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.600-r1.ebuild
+++ b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.600-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.600-r1.ebuild,v 1.8 2015/02/17 08:13:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Time-HiRes/perl-Time-HiRes-1.972.600-r1.ebuild,v 1.9 2015/02/17 21:44:19 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-XSLoader/perl-XSLoader-0.170.0.ebuild b/virtual/perl-XSLoader/perl-XSLoader-0.170.0.ebuild
index b2528a1e7e70..703581b8452c 100644
--- a/virtual/perl-XSLoader/perl-XSLoader-0.170.0.ebuild
+++ b/virtual/perl-XSLoader/perl-XSLoader-0.170.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-XSLoader/perl-XSLoader-0.170.0.ebuild,v 1.8 2015/02/17 08:13:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-XSLoader/perl-XSLoader-0.170.0.ebuild,v 1.9 2015/02/17 21:44:50 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-bignum/perl-bignum-0.370.0.ebuild b/virtual/perl-bignum/perl-bignum-0.370.0.ebuild
index b9025d7e14ed..8376d9084be3 100644
--- a/virtual/perl-bignum/perl-bignum-0.370.0.ebuild
+++ b/virtual/perl-bignum/perl-bignum-0.370.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-bignum/perl-bignum-0.370.0.ebuild,v 1.8 2015/02/17 08:14:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-bignum/perl-bignum-0.370.0.ebuild,v 1.9 2015/02/17 21:45:16 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
 
 IUSE=""
 RDEPEND="
diff --git a/virtual/perl-if/perl-if-0.60.300.ebuild b/virtual/perl-if/perl-if-0.60.300.ebuild
index 278bbfc1c054..3a0ed81849bf 100644
--- a/virtual/perl-if/perl-if-0.60.300.ebuild
+++ b/virtual/perl-if/perl-if-0.60.300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-if/perl-if-0.60.300.ebuild,v 1.9 2015/02/17 08:14:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-if/perl-if-0.60.300.ebuild,v 1.10 2015/02/17 21:45:43 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-libnet/perl-libnet-1.270.0.ebuild b/virtual/perl-libnet/perl-libnet-1.270.0.ebuild
index e5b51cb75931..3e3d6aa31691 100644
--- a/virtual/perl-libnet/perl-libnet-1.270.0.ebuild
+++ b/virtual/perl-libnet/perl-libnet-1.270.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-libnet/perl-libnet-1.270.0.ebuild,v 1.9 2015/02/17 08:14:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-libnet/perl-libnet-1.270.0.ebuild,v 1.10 2015/02/17 21:46:39 maekke Exp $
 
 # Some important notes about detecting libnet version 
 # http://dev.gentoo.org/~zlogene/perl-libnet-mantainer-notes   
@@ -16,7 +16,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-parent/perl-parent-0.228-r1.ebuild b/virtual/perl-parent/perl-parent-0.228-r1.ebuild
index 63cec9717ef1..b1ef89c642d0 100644
--- a/virtual/perl-parent/perl-parent-0.228-r1.ebuild
+++ b/virtual/perl-parent/perl-parent-0.228-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-parent/perl-parent-0.228-r1.ebuild,v 1.9 2015/02/17 08:14:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-parent/perl-parent-0.228-r1.ebuild,v 1.10 2015/02/17 21:47:06 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-podlators/perl-podlators-2.5.3.ebuild b/virtual/perl-podlators/perl-podlators-2.5.3.ebuild
index 19623243fdf4..ce8bd0c90876 100644
--- a/virtual/perl-podlators/perl-podlators-2.5.3.ebuild
+++ b/virtual/perl-podlators/perl-podlators-2.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-podlators/perl-podlators-2.5.3.ebuild,v 1.8 2015/02/17 08:14:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-podlators/perl-podlators-2.5.3.ebuild,v 1.9 2015/02/17 21:47:33 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="amd64 ~arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/virtual/perl-version/perl-version-0.990.900.ebuild b/virtual/perl-version/perl-version-0.990.900.ebuild
index da52162f920a..31fb740cdcb7 100644
--- a/virtual/perl-version/perl-version-0.990.900.ebuild
+++ b/virtual/perl-version/perl-version-0.990.900.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-version/perl-version-0.990.900.ebuild,v 1.9 2015/02/17 08:14:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-version/perl-version-0.990.900.ebuild,v 1.10 2015/02/17 21:47:58 maekke Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index effd3ac6c2b7..fd30bcec75e1 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,2 +1,2 @@
-DIST opera-developer_29.0.1770.1_amd64.deb 42992000 SHA256 4f7230e506c8c951ef6f0b574df4e865ecceb1eba7cea44a05a1f1f71de13423 SHA512 b98c062e8c871617c7750239707d317f3260bffafab18c7efab9e9f2b0cea7936a56ad0c2f3d1363000d48b2d474679dfac21a00899cce5058c623ee2421f4dd WHIRLPOOL 97ada40790c3fe83d0c8100757eb4853f441b505a4e8b28e0d7429646976e96a04c4e8a202004390b9f18f0f37b62f2d73707fe5382bffdeaf35de211b226733
 DIST opera-developer_29.0.1773.0_amd64.deb 42806988 SHA256 3008c4606aabe349e788fafa06f862c1375bec49089221abfbc4c9a533a2da5a SHA512 39dd77bc280f3e754fb29fa97535535a74a122cd260ec40ce122124d78fef2d4a500448e1859bd5398dce0b5bdc17f48dab7135d1681d6fe205283ad21f84a82 WHIRLPOOL f76b42228dad2c20b1d609b698944f7964a39f87e6c4473a8c71e0000075d77322b17e413610b1cc0962d9fb3bd6871f28f37aef20068d829745ac89cd8e9e3e
+DIST opera-developer_29.0.1778.0_amd64.deb 42248546 SHA256 43e72f9949ca87d16c3ba7b4ed0a7405b020033e5458c20e99eec3465c796347 SHA512 939fa759269971deed99291637badb580b57da3de853c041fb4fe3f671d5de3a1f3f420e17721463b8eeeec8b2dc90ece10c8cd07f3edd2e1396ca423bbd0139 WHIRLPOOL 40c2b783c3456f6100d5eaed259e3c4f386bd718342b84cb0535de5838ef32053a68510a2c1df5057985b1d8952a65eef229efb36fdaf7bc165aa78700d4ebbb
diff --git a/www-client/opera-developer/opera-developer-29.0.1770.1.ebuild b/www-client/opera-developer/opera-developer-29.0.1778.0.ebuild
similarity index 96%
rename from www-client/opera-developer/opera-developer-29.0.1770.1.ebuild
rename to www-client/opera-developer/opera-developer-29.0.1778.0.ebuild
index 4808ff26be80..56e20aa269db 100644
--- a/www-client/opera-developer/opera-developer-29.0.1770.1.ebuild
+++ b/www-client/opera-developer/opera-developer-29.0.1778.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-developer/opera-developer-29.0.1770.1.ebuild,v 1.1 2015/02/10 16:33:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-developer/opera-developer-29.0.1778.0.ebuild,v 1.1 2015/02/17 18:10:16 jer Exp $
 
 EAPI=5
 CHROMIUM_LANGS="
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index a7e2dd923519..ad9834989bd2 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,2 +1 @@
-DIST py3status-1.6.tar.gz 29900 SHA256 cecc0fb7a1cc7c6bfc4845417b652eeeb144232b07680fad3466d0f8737a9506 SHA512 bba9e7a016d41c1c82cdbed1fe7b2ee9fcf4492bac0551de66276f3925ffce74ffa12f563dc43683615bc442dde8ded74c0da4756bbf9af60b97b9dfa23b84d1 WHIRLPOOL c199301b01fbe392c3794bfc8cb76300667744a6513a95baab39720c0f5661fed89c23f64c66cb4ff42b0b8477793e1d7ee612a7e75cac180da8517f6acedb44
-DIST py3status-2.2.tar.gz 36721 SHA256 7ffbdc428f026652e7f5bee8302a5a4a42b04e25329ae051764bdf30998f381a SHA512 1a2d700bf040f5b309ad73d008bf4287068fddc42193a26c8462c08f33a67a64ed17f613b52e681d4f54f7a4149d0722737de28b712a22d43577ccfc8e20e302 WHIRLPOOL 65d22a51ace50080d15c15c4f3a8cff723aa210f57364aaa67cebfef278a98efb6615d1feddf34f62b9cbba3fac67994d8b02defafe846d04cf81b76686ffd16
+DIST py3status-2.3.tar.gz 39924 SHA256 372ac406b1ed7dfef9bb96f280ea217516464fa82415500fc4b8a26d7f341f3f SHA512 0f46cd4394a9fd38d6036d774425a970a793aeb81a5160d9dd2622a00552baaa22316e005046d73879573b59e2b7497e9a925e6726d52c7d0b7502e47b42c9ca WHIRLPOOL 0f3ec1b35a9100d52d5b5c7a91471d1f2c048eea99b73369b97dcb0d149e5b42c350d04a8b84454cf03ada063d8a0d2a443647f798c4c57fc30883dd0605c004
diff --git a/x11-misc/py3status/py3status-1.6.ebuild b/x11-misc/py3status/py3status-1.6.ebuild
deleted file mode 100644
index ab8935c3d5b6..000000000000
--- a/x11-misc/py3status/py3status-1.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/py3status/py3status-1.6.ebuild,v 1.1 2014/10/08 08:43:03 ultrabug Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-
-SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-inherit distutils-r1
-
-MY_PN="py3status"
-MY_P="${MY_PN}-${PV/_/-}"
-
-DESCRIPTION="py3status is an extensible i3status wrapper written in python"
-HOMEPAGE="https://github.com/ultrabug/py3status"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-misc/i3status"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/x11-misc/py3status/py3status-2.2.ebuild b/x11-misc/py3status/py3status-2.3.ebuild
similarity index 92%
rename from x11-misc/py3status/py3status-2.2.ebuild
rename to x11-misc/py3status/py3status-2.3.ebuild
index b4954e5e46ab..29bc47c1dbac 100644
--- a/x11-misc/py3status/py3status-2.2.ebuild
+++ b/x11-misc/py3status/py3status-2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/py3status/py3status-2.2.ebuild,v 1.1 2015/01/23 17:06:51 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/py3status/py3status-2.3.ebuild,v 1.1 2015/02/17 16:00:13 ultrabug Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )