diff --git a/app-admin/logrotate/logrotate-3.9.1-r1.ebuild b/app-admin/logrotate/logrotate-3.9.1-r1.ebuild
index 985cab0f6aab..9a75800448a0 100644
--- a/app-admin/logrotate/logrotate-3.9.1-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.9.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index e69de29bb2d1..78c4d5188e3e 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -0,0 +1 @@
+DIST letsencrypt-0.0.0.dev20151123.tar.gz 403690 SHA256 3f909ef521ab91eade4fa83f1f72c4b1cb74c9192144bc072d999248eb25e902 SHA512 e62cd4bf966b75e159949d84eda1005649dd4f11efbb1515601a5c6690e09ea1cc73bb3f535b6b20655752b7218fa3f02cf50e4cb12a335d76b10461e385aa96 WHIRLPOOL 5352083e3eabe69ea07b830fcdd3d9de2f431d5b8681c3484288feb2f6394d1c4dd9d46feffe08f7733015755e39df24e61293915877b97470339a3fa11c668c
diff --git a/app-crypt/acme/acme-0.0.0_pre20151123.ebuild b/app-crypt/acme/acme-0.0.0_pre20151123.ebuild
new file mode 100644
index 000000000000..cdd87cd8e6f0
--- /dev/null
+++ b/app-crypt/acme/acme-0.0.0_pre20151123.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PN="letsencrypt"
+MY_PV="${PV/_pre/.dev}"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
+	inherit git-r3 distutils-r1
+else
+	SRC_URI="https://github.com/letsencrypt/letsencrypt/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/ndg-httpsclient-0.4[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 1f9364034341..050f571d38f1 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -3,18 +3,28 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=(python{2_7,3_4,3_5})
 
-EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
-inherit git-r3 distutils-r1
+inherit distutils-r1
 
-DESCRIPTION="An implementation of the ACME protocol"
+MY_PN="letsencrypt"
+MY_PV="${PV/_pre/.dev}"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
+	inherit git-r3 distutils-r1
+else
+	SRC_URI="https://github.com/letsencrypt/letsencrypt/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="An implementation of the Automatic Certificate Management Environment (ACME) protocol"
 HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
 IUSE="test"
 
 RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
@@ -27,10 +37,13 @@ RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/werkzeug[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
 
-S=${WORKDIR}/${P}/${PN}
+S="${WORKDIR}/${MY_P}/${PN}"
 
 python_test() {
 	nosetests -w ${PN} || die
diff --git a/app-crypt/letsencrypt/Manifest b/app-crypt/letsencrypt/Manifest
index e69de29bb2d1..78c4d5188e3e 100644
--- a/app-crypt/letsencrypt/Manifest
+++ b/app-crypt/letsencrypt/Manifest
@@ -0,0 +1 @@
+DIST letsencrypt-0.0.0.dev20151123.tar.gz 403690 SHA256 3f909ef521ab91eade4fa83f1f72c4b1cb74c9192144bc072d999248eb25e902 SHA512 e62cd4bf966b75e159949d84eda1005649dd4f11efbb1515601a5c6690e09ea1cc73bb3f535b6b20655752b7218fa3f02cf50e4cb12a335d76b10461e385aa96 WHIRLPOOL 5352083e3eabe69ea07b830fcdd3d9de2f431d5b8681c3484288feb2f6394d1c4dd9d46feffe08f7733015755e39df24e61293915877b97470339a3fa11c668c
diff --git a/app-crypt/letsencrypt/letsencrypt-0.0.0_pre20151123.ebuild b/app-crypt/letsencrypt/letsencrypt-0.0.0_pre20151123.ebuild
new file mode 100644
index 000000000000..ed22257e4dd7
--- /dev/null
+++ b/app-crypt/letsencrypt/letsencrypt-0.0.0_pre20151123.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_pre/.dev}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://github.com/letsencrypt/letsencrypt/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Let's Encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	dev-python/configargparse[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-0.7[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/parsedatetime[${PYTHON_USEDEP}]
+	>=dev-python/psutil-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pythondialog-3.2.2:python-2[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests -w ${PN}/tests || die
+}
diff --git a/app-crypt/letsencrypt/letsencrypt-9999.ebuild b/app-crypt/letsencrypt/letsencrypt-9999.ebuild
index c271da785b44..f62f8dfda28a 100644
--- a/app-crypt/letsencrypt/letsencrypt-9999.ebuild
+++ b/app-crypt/letsencrypt/letsencrypt-9999.ebuild
@@ -3,18 +3,27 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=(python2_7)
 
-EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
+PYTHON_COMPAT=( python2_7 )
 
-inherit git-r3 distutils-r1
+inherit distutils-r1
 
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+MY_PV="${PV/_pre/.dev}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/letsencrypt/letsencrypt/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Let's Encrypt client to automate deployment of X.509 certificates"
 HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
 IUSE="test"
 
 RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
@@ -31,9 +40,13 @@ RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
 
 python_test() {
 	nosetests -w ${PN}/tests || die
diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest
index 2e071e6bce6d..097af39d1c19 100644
--- a/dev-php/phpunit/Manifest
+++ b/dev-php/phpunit/Manifest
@@ -1,2 +1,4 @@
 DIST phpunit-3.7.20.phar 2769487 SHA256 7972291d498a425f7daaf0274eed45d8ba564b87da3250fc975e1af2b0d60602 SHA512 9263364087ad2f4870ce4d849c31b75c82799088809e444206b9e113e917d05923ece62264568ee5f2a6d7aeb04d75cbdc375ddd7825ceff16704431de5f68bf WHIRLPOOL 7e6399ccfe01f5e59bd14e243ee4fed760a40d36708aea8c1c5be08b2814125effb89f351f8ea0777d280d7a5557aadfe6142330bbc020d4c1159658cfc99baa
 DIST phpunit-4.3.1.phar 3324489 SHA256 1bac0c5f53bc04efa680bf9b3dcb35e804714eb8f497931ba81bdf08ae432c37 SHA512 de123e2301dc1d64e7401ceaec48c9458c3ab0dfc78faa488bed12c5b30b1367e1f9f6dfbbd5a07b427a56aad6d989f36a11b4642a0a843eed9c39e551be0490 WHIRLPOOL dbe5bed2251832c6c905b09c131bc2dc98de6247ef55077d9882c41a0b20b2e8b1c2489dbc0b3c1ed746f81c2b7163042e73790fff2b2ca78f8470875d77d88f
+DIST phpunit-4.8.19.phar 3079159 SHA256 ff0e3c284f0170c2f8a6759937d7e0f1689c079e6aff114218a339bab79de8a9 SHA512 08b2d6743e3f6c3bcc09d60391886fb3a21bffe338304bbe65703d430ded1fab96d9ef426467e5703af5c3ebed771d21fa49059e994e8b02056f340087ba616b WHIRLPOOL f69dde07d401b112bacddd6aec81ff4241552c5be9b3ccf2a447da353e32470f80e2b90e3fe9e2c723ad845d16a90a32778275b54abf6995c8ecc9d1c14f6b80
+DIST phpunit-5.0.10.phar 2773192 SHA256 e740f1376fec6dd19023d38537583276f804d02f818af1f1b2012599743c7c29 SHA512 978bbc409aeb6823c8a8a630fb6221fad5e6aac1d49288c93a69936468bdc6c01d2c58344b161b6fa6a6ccf6ff1100738edb00d7c3cef357751d00323c365d8d WHIRLPOOL 52255b646c063b60d2094fd1f08546b4c498ddd3c4b7fe0ebfc3f6370581e00679774e5492a30a3f5428007250a1c13937c34016e746004a019bfa26e52cdc18
diff --git a/dev-php/phpunit/phpunit-4.8.19.ebuild b/dev-php/phpunit/phpunit-4.8.19.ebuild
new file mode 100644
index 000000000000..826179f33bd1
--- /dev/null
+++ b/dev-php/phpunit/phpunit-4.8.19.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A PHP Unit Testing framework"
+HOMEPAGE="http://phpunit.de"
+
+PHPUNIT_PHAR="${P}.phar"
+
+SRC_URI="https://phar.phpunit.de/${PHPUNIT_PHAR}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+DEPEND="
+	|| (
+		dev-lang/php:5.5[phar,xml]
+		dev-lang/php:5.6[phar,xml]
+	)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return
+}
+
+src_install() {
+	insinto /usr/share/php/phpunit
+	insopts -m755
+	newins "${DISTDIR}"/${PHPUNIT_PHAR} phpunit.phar
+	dosym /usr/share/php/phpunit/phpunit.phar /usr/bin/phpunit
+}
+
+pkg_postinst() {
+	elog "${PN} can optionally use json, pdo-sqlite and pdo-mysql features."
+	elog "If you want those, emerge dev-lang/php with USE=\"json pdo sqlite mysql\"."
+}
diff --git a/dev-php/phpunit/phpunit-5.0.10.ebuild b/dev-php/phpunit/phpunit-5.0.10.ebuild
new file mode 100644
index 000000000000..4c2b768ecde9
--- /dev/null
+++ b/dev-php/phpunit/phpunit-5.0.10.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A PHP Unit Testing framework"
+HOMEPAGE="http://phpunit.de"
+
+PHPUNIT_PHAR="${P}.phar"
+
+SRC_URI="https://phar.phpunit.de/${PHPUNIT_PHAR}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+DEPEND="
+	|| (
+		dev-lang/php:5.6[phar,xml]
+		dev-lang/php:7.0[phar,xml]
+	)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return
+}
+
+src_install() {
+	insinto /usr/share/php/phpunit
+	insopts -m755
+	newins "${DISTDIR}"/${PHPUNIT_PHAR} phpunit.phar
+	dosym /usr/share/php/phpunit/phpunit.phar /usr/bin/phpunit
+}
+
+pkg_postinst() {
+	elog "${PN} can optionally use json, pdo-sqlite and pdo-mysql features."
+	elog "If you want those, emerge dev-lang/php with USE=\"json pdo sqlite mysql\"."
+}
diff --git a/dev-python/configargparse/configargparse-0.9.3.ebuild b/dev-python/configargparse/configargparse-0.9.3.ebuild
index 672542ea6f17..3ad83ba1a442 100644
--- a/dev-python/configargparse/configargparse-0.9.3.ebuild
+++ b/dev-python/configargparse/configargparse-0.9.3.ebuild
@@ -16,6 +16,6 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/configobj/configobj-5.0.6.ebuild b/dev-python/configobj/configobj-5.0.6.ebuild
index c58c7ad3f1cc..be694c53505b 100644
--- a/dev-python/configobj/configobj-5.0.6.ebuild
+++ b/dev-python/configobj/configobj-5.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
new file mode 100644
index 000000000000..6363b4cd93c5
--- /dev/null
+++ b/dev-python/iminuit/Manifest
@@ -0,0 +1 @@
+DIST iminuit-1.2.tar.gz 931630 SHA256 7651105fc3f186cfb5742f075ffebcc5088bf7797d8ed124c00977eebe0d1c64 SHA512 b9836abf57a3c33bfdf044655e3b8f465cf5252a10a50c17a70f382b8283754095f083e523060fd6d33c7e4c345b8c9923255408120e8bcfcedf1eee8de2dbca WHIRLPOOL 98966c69bf356c3239b0228846361aa037143c7563b192abaaec153b19051f14aea4b5a0151c7f91ba2816edce6a284aaa5287f100e57e24576a57767a0e4632
diff --git a/dev-python/iminuit/iminuit-1.2.ebuild b/dev-python/iminuit/iminuit-1.2.ebuild
new file mode 100644
index 000000000000..c6e00dbd663d
--- /dev/null
+++ b/dev-python/iminuit/iminuit-1.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+inherit distutils-r1
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/iminuit/iminuit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="dev-python/cython"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/iminuit/metadata.xml b/dev-python/iminuit/metadata.xml
new file mode 100644
index 000000000000..c98fc1d1164a
--- /dev/null
+++ b/dev-python/iminuit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">iminuit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/parsedatetime/parsedatetime-1.5.ebuild b/dev-python/parsedatetime/parsedatetime-1.5.ebuild
index a6b437d2313d..20a266729179 100644
--- a/dev-python/parsedatetime/parsedatetime-1.5.ebuild
+++ b/dev-python/parsedatetime/parsedatetime-1.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bear/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyrfc3339/pyrfc3339-0.2.ebuild b/dev-python/pyrfc3339/pyrfc3339-0.2.ebuild
index 275f20b65a29..3c41c6fac92c 100644
--- a/dev-python/pyrfc3339/pyrfc3339-0.2.ebuild
+++ b/dev-python/pyrfc3339/pyrfc3339-0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
index d984fd430fbc..15381718e26a 100644
--- a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
+++ b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
diff --git a/dev-python/pythondialog/pythondialog-3.2.2.ebuild b/dev-python/pythondialog/pythondialog-3.2.2.ebuild
index 896573b9dc05..40f408c1cca2 100644
--- a/dev-python/pythondialog/pythondialog-3.2.2.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
 IUSE="doc examples"
 
 RDEPEND="dev-util/dialog"
diff --git a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
index e1f504e90667..a2488455b681 100644
--- a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/python2-${PN}/python2-${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="python-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 IUSE="doc examples"
 
 RDEPEND="dev-util/dialog"
diff --git a/dev-python/pythondialog/pythondialog-3.3.0.ebuild b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
index db6497f13f56..5e90feaaa6bc 100644
--- a/dev-python/pythondialog/pythondialog-3.3.0.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 IUSE="doc examples"
 
 RDEPEND="dev-util/dialog"
diff --git a/dev-python/zope-component/zope-component-4.2.2.ebuild b/dev-python/zope-component/zope-component-4.2.2.ebuild
index 5da95d8bcdff..f99e70137c93 100644
--- a/dev-python/zope-component/zope-component-4.2.2.ebuild
+++ b/dev-python/zope-component/zope-component-4.2.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 RDEPEND="dev-python/zope-event[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-event/zope-event-4.0.3.ebuild b/dev-python/zope-event/zope-event-4.0.3.ebuild
index 0277959a9b45..4ca8341bb034 100644
--- a/dev-python/zope-event/zope-event-4.0.3.ebuild
+++ b/dev-python/zope-event/zope-event-4.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
diff --git a/dev-ros/audio_capture/Manifest b/dev-ros/audio_capture/Manifest
index 3a2fcd27aca0..967f52c1efcd 100644
--- a/dev-ros/audio_capture/Manifest
+++ b/dev-ros/audio_capture/Manifest
@@ -1,2 +1,3 @@
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
 DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
+DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/dev-ros/audio_capture/audio_capture-0.2.9.ebuild b/dev-ros/audio_capture/audio_capture-0.2.9.ebuild
new file mode 100644
index 000000000000..dd65eace76e5
--- /dev/null
+++ b/dev-ros/audio_capture/audio_capture-0.2.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transports audio from a source to a destination"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	media-libs/gstreamer:0.10
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	media-plugins/gst-plugins-lame:0.10
+	media-libs/gst-plugins-good:0.10
+	media-libs/gst-plugins-base:0.10
+"
diff --git a/dev-ros/audio_common_msgs/Manifest b/dev-ros/audio_common_msgs/Manifest
index 3a2fcd27aca0..967f52c1efcd 100644
--- a/dev-ros/audio_common_msgs/Manifest
+++ b/dev-ros/audio_common_msgs/Manifest
@@ -1,2 +1,3 @@
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
 DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
+DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.2.9.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.9.ebuild
new file mode 100644
index 000000000000..e872a7e500db
--- /dev/null
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for transmitting audio via ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/audio_play/Manifest b/dev-ros/audio_play/Manifest
index 3a2fcd27aca0..967f52c1efcd 100644
--- a/dev-ros/audio_play/Manifest
+++ b/dev-ros/audio_play/Manifest
@@ -1,2 +1,3 @@
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
 DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
+DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/dev-ros/audio_play/audio_play-0.2.9.ebuild b/dev-ros/audio_play/audio_play-0.2.9.ebuild
new file mode 100644
index 000000000000..d8c67040ec3b
--- /dev/null
+++ b/dev-ros/audio_play/audio_play-0.2.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Outputs audio to a speaker from a source node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	media-libs/gstreamer:0.10
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	media-plugins/gst-plugins-alsa:0.10
+	media-libs/gst-plugins-good:0.10
+	media-libs/gst-plugins-base:0.10
+"
diff --git a/dev-ros/mavros/Manifest b/dev-ros/mavros/Manifest
index eaa73c1daf82..cce6612981cd 100644
--- a/dev-ros/mavros/Manifest
+++ b/dev-ros/mavros/Manifest
@@ -1,5 +1 @@
-DIST mavros-0.15.0.tar.gz 189901 SHA256 f03d5f5968108d43a95d6774f2a76f56131d7d408481ea10f391ab7dc757af1d SHA512 bfd73130e2aa00b4d17f0558d5554d616546909c8a43ceff96623ad78faa77a426229da6c3bce296801014822bf1c61e27b4740c0b2d82d53a7094c892a03306 WHIRLPOOL 3bebdd948d9ab2923a98cc2bca0c845de198292a4013bc03dd5d96bc573d10fd5a6148643a2778358552836043f849375773b4b6dfc430dea965310eab668bd2
-DIST mavros-0.16.0.tar.gz 193327 SHA256 3712bd20209ff725bb1b8055e6c10f57a91535b3aa7f726101a815e120cc8745 SHA512 a3e23685fb98ebb3d630bc5810eae246b45987aeb34ecdcbcb9c7528f09a554dae511e10676c0cbd57bc9e86890b8c0d1f88a350470639fd0f0a9159cd2ceb70 WHIRLPOOL 7dd30b591fa392495e931fde2f114e8c906a0238b415bc8f8db850a3cedf67ca554b0b4795e624c5e3179631e548adf4b3af9f09d8009847ed34d0738b3727f6
-DIST mavros-0.16.1.tar.gz 193407 SHA256 1ae2e8988d15f65d3e724373045b034a2fd1af9438b7f044b0fc9887f3579fb8 SHA512 2b1a6792cf244ca647e6150cad92542dab32f73b13122af72cbe10ff1deaeda81183ec02d80a318bc8292dac55f981ec0d6e1812db81d2d20f1cc96bf7474492 WHIRLPOOL 852d852da73e8a956b5be7d31c2ef2da7d524b9b2ab4818cc1267d1fdcdf3760f8f2cc295f51cfb51982c73d8c50158170508e8f9d2b5af9d368916341ab30be
-DIST mavros-0.16.2.tar.gz 193530 SHA256 5f2b7cc609e68b14c67153590d01edc28bceb5af64febc97728cc09dad1b29ad SHA512 dc8767d3416e7290743ebe7073d721cbffe8400be20f54c8c6c9c5ed6129f614a670c81d910c25f054065ffa1022d862709364fe06ec1522dbd25344516e4343 WHIRLPOOL 3215a413732dab0e722aad5d06c1d048ae814ee85a248608d6aa41f67aabd081a01b7c883ffef483e596437c651827a03c92af248a70ef9973e95227e7477a48
 DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cbaf938fd7cbe96241ba0ad03c SHA512 0ebec5b04a2b28abc24936ba6082edd08aa45cd6e59eef0ff94cce189c57bd0fdb5f5464110c07d563cf5bf9748c309a1659cf37fb61bdff423747f85f9fd1b7 WHIRLPOOL bf55006fa98c6bf9625b8517c2c775ae515147847f8a611e2d3f46eca21c6f3be270015903c4134e5dcd39039e9870abd4f2f3adaabfeb1e62c4957b642ba014
diff --git a/dev-ros/mavros/mavros-0.16.0.ebuild b/dev-ros/mavros/mavros-0.16.0.ebuild
deleted file mode 100644
index 00414b533c24..000000000000
--- a/dev-ros/mavros/mavros-0.16.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink extendable communication node for ROS"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/angles
-	dev-ros/libmavconn
-	dev-ros/rosconsole_bridge
-	dev-libs/boost:=
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros/mavros-0.16.1.ebuild b/dev-ros/mavros/mavros-0.16.1.ebuild
deleted file mode 100644
index 00414b533c24..000000000000
--- a/dev-ros/mavros/mavros-0.16.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink extendable communication node for ROS"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/angles
-	dev-ros/libmavconn
-	dev-ros/rosconsole_bridge
-	dev-libs/boost:=
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros/mavros-0.16.2.ebuild b/dev-ros/mavros/mavros-0.16.2.ebuild
deleted file mode 100644
index 00414b533c24..000000000000
--- a/dev-ros/mavros/mavros-0.16.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink extendable communication node for ROS"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/angles
-	dev-ros/libmavconn
-	dev-ros/rosconsole_bridge
-	dev-libs/boost:=
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros/mavros-0.15.0.ebuild b/dev-ros/mavros/mavros-0.16.3-r1.ebuild
similarity index 96%
rename from dev-ros/mavros/mavros-0.15.0.ebuild
rename to dev-ros/mavros/mavros-0.16.3-r1.ebuild
index 00414b533c24..8dee36918a67 100644
--- a/dev-ros/mavros/mavros-0.15.0.ebuild
+++ b/dev-ros/mavros/mavros-0.16.3-r1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-ros/libmavconn
 	dev-ros/rosconsole_bridge
 	dev-libs/boost:=
+	dev-ros/eigen_conversions
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
diff --git a/dev-ros/mavros/mavros-0.16.3.ebuild b/dev-ros/mavros/mavros-0.16.3.ebuild
deleted file mode 100644
index 00414b533c24..000000000000
--- a/dev-ros/mavros/mavros-0.16.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink extendable communication node for ROS"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/angles
-	dev-ros/libmavconn
-	dev-ros/rosconsole_bridge
-	dev-libs/boost:=
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros/mavros-9999.ebuild b/dev-ros/mavros/mavros-9999.ebuild
index 00414b533c24..8dee36918a67 100644
--- a/dev-ros/mavros/mavros-9999.ebuild
+++ b/dev-ros/mavros/mavros-9999.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-ros/libmavconn
 	dev-ros/rosconsole_bridge
 	dev-libs/boost:=
+	dev-ros/eigen_conversions
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
diff --git a/dev-ros/opencv_apps/Manifest b/dev-ros/opencv_apps/Manifest
index ae2c9da2cd55..db9c55a72d20 100644
--- a/dev-ros/opencv_apps/Manifest
+++ b/dev-ros/opencv_apps/Manifest
@@ -1 +1,2 @@
 DIST vision_opencv-1.11.8.tar.gz 80160 SHA256 0cf0934d4d9bd91e966afc2f25a4e54646016b6628f4fe58e81faee0c58c88c2 SHA512 55ca2554a3736bd5102bfef14562a6bc341d13eb098fbb7d8d050c90b5d397820791aed54a3697f5084a1b629d959c7abc24172a8efbdfc65490ebdbcb548c77 WHIRLPOOL 8b2b9f4968618258ebd6b2d6d0674ca9c24ed5e7d1adcc4cbbf769e13206017ea06fe5172277a19d67c73c88066270a2e259743ee1b63e4cec7ce8508405b8d3
+DIST vision_opencv-1.11.9.tar.gz 97544 SHA256 3ce781847f5f855083cfae94a8d89defbe4cc83e086b4c796653561aee08b826 SHA512 e1a40997d6a3cf821fb1d57f818b3bcb52d2d0372159eec7f756c7df52fbd2a3ec91ac960cd1a7454f13cd6fe0192f4c019e70fcd4b20d0f797f4845ce676211 WHIRLPOOL c0388e6a40a2b166231b960eff5a011ea2e96c23319209315a86744ac5628d75b9bcb3fd0abdebe941ff89b12852b8813b5e97b3ab7827a2320e0dc0fc64ab74
diff --git a/dev-ros/opencv_apps/opencv_apps-1.11.9.ebuild b/dev-ros/opencv_apps/opencv_apps-1.11.9.ebuild
new file mode 100644
index 000000000000..cfea26daf0b4
--- /dev/null
+++ b/dev-ros/opencv_apps/opencv_apps-1.11.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="OpenCV applications for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/image_transport
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nodelet
+	dev-ros/roscpp
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/sound_play/Manifest b/dev-ros/sound_play/Manifest
index 3a2fcd27aca0..967f52c1efcd 100644
--- a/dev-ros/sound_play/Manifest
+++ b/dev-ros/sound_play/Manifest
@@ -1,2 +1,3 @@
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
 DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
+DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/dev-ros/sound_play/sound_play-0.2.9.ebuild b/dev-ros/sound_play/sound_play-0.2.9.ebuild
new file mode 100644
index 000000000000..c4b4cb101276
--- /dev/null
+++ b/dev-ros/sound_play/sound_play-0.2.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslib
+	media-libs/gstreamer:0.10
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	dev-python/gst-python[${PYTHON_USEDEP}]
+	app-accessibility/festival
+	media-libs/gst-plugins-good:0.10
+	media-libs/gst-plugins-base:0.10
+"
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index 71893b34848b..ba3495c0cf89 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,3 +1,2 @@
-DIST sshkit-1.5.1.gem 135168 SHA256 be1510b4936ee23174a4152a6b0e382a2b8244aa0d47d4e94908b641d639cd53 SHA512 d590568216366c7171e9364a260ec92e7d1ecfb00c28f0238aaa4ef40b51d21b9121ce710e627f0161b095d2a105f660e2ccaf523cc2b48557aea0f35c2ce1fe WHIRLPOOL cd004fcbfcd83bf1fb49352e1968746b40e4733fa2c2fac25a41f3179be667c71062c8d0f181ec877c708959bbe28a0a3423c89261ea91199a3318c4c21b53e1
-DIST sshkit-1.6.1.gem 135680 SHA256 8ca67e46bb4ea50fdb0553cda77552f3e41b17a5aa919877d93875dfa22c03a7 SHA512 3e1c7c0a4a5121034fccb91cf12321741dd0c8b4a1eca251a1b5daa98b23b304ca211366b488158a1b04785e5b81d392d6365ee85da8ef9cc567355692cb0054 WHIRLPOOL 9e170935062a7c3bb730bb3227f30b05f8c05d56b1b7bcaaf75267752b2d02a7689320757ba7e094309cef134249e0f514ef314625e934fcc0bf995420046081
 DIST sshkit-1.7.1.gem 136192 SHA256 69d38907dc35e21412fc143443c569c3b6a60247164507edd730557e583c0788 SHA512 55d1ac6d4f76112b9159ae2a6bc425fa54738943ffa28b94300012c8af2d69c7b060dd00adb3789940cd29f52a384edc1cfdf9a26189e0307f2662c1b7a7e1f4 WHIRLPOOL 5b9ec3772e8f79960d5cc5328ccdac943c820e55c053c689baefa5ed99bee5e5a4bae2e18e69272cc7a74897110f94502d13bb18f5de1545a3ca394518a44b55
+DIST sshkit-1.8.0.gem 152576 SHA256 e235dbc8ad3854141242cd1a1ee9ac4062eabe5a7be8a2fc8cb5512cd53bb8cd SHA512 437d4c46f599e786bdffcdd38d15d0f8645b1435bd49c1797dc872887f09f56cfff3f2803b5b60a5be954e2cb2b9aab35ef099e1f3da1264ccc8f78ccf2bd40c WHIRLPOOL 9c07a0ce73cf36c07760839cea693618b761f5bee17588df6a3d6b4710c71d9f209fd73a8343b97f5953c004812b7292e5048abbd327a22b95a9e95b040eeec7
diff --git a/dev-ruby/sshkit/sshkit-1.6.1.ebuild b/dev-ruby/sshkit/sshkit-1.6.1.ebuild
deleted file mode 100644
index f4554a419eb7..000000000000
--- a/dev-ruby/sshkit/sshkit-1.6.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-# There are functional tests that require vagrant boxes to be set up.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
-HOMEPAGE="https://github.com/capistrano/sshkit"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/net-ssh-2.8.0
-	>=dev-ruby/net-scp-1.1.2
-	>=dev-ruby/colorize-0.7.0
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e '/\(turn\|unindent\)/I s:^:#:' test/helper.rb || die
-}
diff --git a/dev-ruby/sshkit/sshkit-1.5.1.ebuild b/dev-ruby/sshkit/sshkit-1.8.0.ebuild
similarity index 75%
rename from dev-ruby/sshkit/sshkit-1.5.1.ebuild
rename to dev-ruby/sshkit/sshkit-1.8.0.ebuild
index de983be219f6..f446ce8ce9b6 100644
--- a/dev-ruby/sshkit/sshkit-1.5.1.ebuild
+++ b/dev-ruby/sshkit/sshkit-1.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 # There are functional tests that require vagrant boxes to be set up.
 RUBY_FAKEGEM_TASK_TEST="test:units"
@@ -22,9 +22,8 @@ KEYWORDS="~amd64"
 IUSE=""
 
 ruby_add_rdepend "
-	>=dev-ruby/net-ssh-2.8.0
+	>=dev-ruby/net-ssh-2.8.0:*
 	>=dev-ruby/net-scp-1.1.2
-	dev-ruby/colorize
 "
 
 ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
@@ -32,4 +31,7 @@ ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
 all_ruby_prepare() {
 	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
 	sed -i -e '/\(turn\|unindent\)/I s:^:#:' test/helper.rb || die
+
+	# Fix assumption about parent directory name
+	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
 }
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 44014b7c3e15..47efeea1a132 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -4,3 +4,4 @@ DIST re2c-0.13.7.5.tar.gz 2347921 SHA256 d58afd50579e4564c9fc4218aec860d41b88583
 DIST re2c-0.14.2.tar.gz 2554944 SHA256 a702eb63977af4715555edb41eba3b47bbfdcdb44b566d146869a7db022f1c30 SHA512 25e682aafe434f838c41f01588f69b4979c73bab8562f56d1b1db656753c43a606b13eeb0e6542f793cdb73d001c304c61811630f7001131edd3eb76248a0a60 WHIRLPOOL 5f6864b800b7838177badf37b7ff5e7bcca73474da4f180319a9cf860694ab1191b14f913af919fa2fcce60f7bfdd85c3e6b87c91a5060260026520a8d059bd6
 DIST re2c-0.14.3.tar.gz 2576859 SHA256 1c6806df599f3aef0804b576cfdf64bdba5ad590626dfca2d44e473460917e84 SHA512 c1fa20c9c1e69d085415dde3177cb03688f8a9314dd4854241812f479a2b1e4306c3abbb8f9f31763918afbd1f7a821e7337551a898f6ae57f814c66e59e2382 WHIRLPOOL dd08d837c93737d9a4dd8fd9f01de721e26b569b2686a2d066636e130f6eb82a8b8b71e8b5d84fcf44993998250effc17c2c3dbc1fd6e1651c5b5ba18a36e8fe
 DIST re2c-0.15.2.tar.gz 4074407 SHA256 fe708c3477d908f02f2ab1646ac194d88b5dbfd92912b020a2b7a5bdfb778889 SHA512 6e46e45b55665a0898354b2684326ca91ff3fb50d2f52e7a7cba59658876c743cb141c827f3d3c77c1d44089c16a4207cb48e97f5af383ac1c95bc063388ba73 WHIRLPOOL 9f5f5636e19d7e9cb136b9f18a0059569ca6f1562f2c1302bc0212386e61f5be8eb866c4513e91231cfc4bf6ac3eeb24a672cd81675155dce244a48152b7ea3a
+DIST re2c-0.15.3.tar.gz 4881197 SHA256 f9d2a96c60a8c60d9c6c70e10590cbceaf0776d3115e7b3b35c7d7240cc1613b SHA512 eebe372543b8c8fafa5d1a206c5fc5e92ea36e78da3ac5cd2e52d2710435cc83c8604bfb5397b48abef1d6ba241b9ed8a15119b436236b116bc81579a8dd9247 WHIRLPOOL 3bb18924d008762f49c78c98f7678b6f81295f86e4a69a884c86763a3b7855870adfcafe5912f8cbd81672ca7c38c00ffd51e5d5e8f4935fd0ac842f394128f9
diff --git a/dev-util/re2c/re2c-0.15.3.ebuild b/dev-util/re2c/re2c-0.15.3.ebuild
new file mode 100644
index 000000000000..b7e4e5af3227
--- /dev/null
+++ b/dev-util/re2c/re2c-0.15.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.org/"
+SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+
+src_prepare() {
+	epatch_user
+	export ac_cv_path_BISON="no"
+}
+
+src_install() {
+	default
+
+	docompress -x /usr/share/doc/${PF}/{examples,paper}
+	dodoc -r README CHANGELOG examples
+	docinto paper
+	dodoc doc/loplas.ps doc/sample.bib
+}
diff --git a/games-mud/tintin/Manifest b/games-mud/tintin/Manifest
index e79dc09b433d..87db99983be8 100644
--- a/games-mud/tintin/Manifest
+++ b/games-mud/tintin/Manifest
@@ -1 +1,2 @@
 DIST tintin-2.01.0.tar.gz 293651 SHA256 e0e35463a97ee5b33ef0b29b2c57fa8276c4e76328cb19c98a6ea92c603a9c76 SHA512 9bad5c3900965ff009c130f5bbeeee197b16bddaf4068329fd3282945ff7b8e17517254468c14f9c9979828ca3ea8bfebacdd3bbfb436d92a02b6ed9ed30af4f WHIRLPOOL e2fb023a38f0be63868ae0f333d19f621624f7b8b0bc8498d0b8cceb0e344df52ba7419829f341b7632a7f1d2c535add215c07911693ee479da74c616433d12a
+DIST tintin-2.01.1.tar.gz 272506 SHA256 cc0ba550880bd5efdba8fde11d1e4ddd4ae8737f81e6f64649de23ed99cbbca4 SHA512 b77a1ecc09438a165a27f70f31132d60350d790e4e6b0509af00979517a7f21838407acdbf1fe0d3b4612853c4e1269679e95fe90b8588133b17f98b85a28b07 WHIRLPOOL 6ed2f53759e6430fb3f785d732341866bc80623343c6b701886d8a3025f6238b7b28bb78e397725a95333c554ffae75932d745678921869133e10b1c5edf1fb4
diff --git a/games-mud/tintin/tintin-2.01.1.ebuild b/games-mud/tintin/tintin-2.01.1.ebuild
new file mode 100644
index 000000000000..5e37153f41c3
--- /dev/null
+++ b/games-mud/tintin/tintin-2.01.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit games
+
+DESCRIPTION="(T)he k(I)cki(N) (T)ickin d(I)kumud clie(N)t"
+HOMEPAGE="http://tintin.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tintin/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	net-libs/gnutls
+	dev-libs/libpcre
+	sys-libs/readline:0"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/tt/src
+
+src_install () {
+	dogamesbin tt++
+	dodoc ../{CREDITS,FAQ,README,SCRIPTS,TODO,docs/*}
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	ewarn "**** OLD TINTIN SCRIPTS ARE NOT 100% COMPATIBLE WITH THIS VERSION ****"
+	ewarn "read the README for more details."
+	echo
+}
diff --git a/games-puzzle/atomix/Manifest b/games-puzzle/atomix/Manifest
index 3bfce39db945..f0395412a13a 100644
--- a/games-puzzle/atomix/Manifest
+++ b/games-puzzle/atomix/Manifest
@@ -1,3 +1 @@
-DIST atomix-2.14.0.tar.bz2 284987 SHA256 5d4e073c29e7d23d49b1bfcce9edf1e8f0c04bdb91db368e05e854e2b2636bb8 SHA512 9fffd28e1bdda80911ad99da8dc1125d43440de459679763c8502b0b0a68594ab06800198537b067ddac3768d2d90c8772e2b7a6628fa6a5e71fdca77410e709 WHIRLPOOL d5c6b96e974d80826bf5495ace5aaec2278dbe9c2e30bb5402142944e9fde52e5ebb86321bd7c89fde696c18fd60438d0cfa2ad087f1a3923d6cfca9ac82b3b2
-DIST atomix-3.16.0.tar.xz 261464 SHA256 29b0dd200344d6ceb9e4e9ad6034a4d5d14bf06dead343a3b70331f81f66a630 SHA512 bc2c78af2a6b2791d611414cdef24537f2d9e93bd6dd1fdb06a4733d876f2f2eaf197fa75578260c3de810ebbb69c99d4b4344eda0e3a77d7f52b0901eadf1d5 WHIRLPOOL 731a4f6fcd3f83f105ca7b6e0d35fb5ac7210b7fb42538aef4d7c3bea27387b40355fd25766fcdbca3211f68656fd4619f2b1c6cf176cc6a39e284f4c3f018db
 DIST atomix-3.18.0.tar.xz 262624 SHA256 3751cb2810bb993fd71d2a8441c4e08dccd36042ff02b7175c7c828b62db1de6 SHA512 a5d6614d9d4a0a37ce2740bf0e1fce5632fb45ea1d878868f13fde5ec2d8ed13d9ea12e7af5bdfc91f64cba623fb4bdf4c48a2a67331443101ebc0dc40d4dd95 WHIRLPOOL 5d4198912a3a4456d0de2dd01dcfb6b433310297a2011841937b0d7c7d3bca061da6c8eab9f7bd1f7998c0ef086362a904b0b27a24fc64e9cc8d4db872d7a5c5
diff --git a/games-puzzle/atomix/atomix-2.14.0.ebuild b/games-puzzle/atomix/atomix-2.14.0.ebuild
deleted file mode 100644
index 0a1be957d1c6..000000000000
--- a/games-puzzle/atomix/atomix-2.14.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GNOME_TARBALL_SUFFIX=bz2
-inherit autotools gnome2
-
-DESCRIPTION="a game where you build full molecules, from simple inorganic to extremely complex organic ones"
-HOMEPAGE="http://ftp.gnome.org/pub/GNOME/sources/atomix/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
-	>=x11-libs/pango-1.0.3
-	>=x11-libs/gtk+-2.6:2
-	>=dev-libs/glib-2.6:2
-	>=gnome-base/gconf-2.12
-	>=gnome-base/libglade-2.4
-	>=gnome-base/libgnome-2.12
-	>=gnome-base/libgnomeui-2.12
-	>=gnome-base/libbonoboui-2.0.0
-	>=gnome-base/libgnomecanvas-2.0.0
-	>=dev-libs/libxml2-2.4.23
-	dev-perl/XML-Parser"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.17"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	sed -i \
-		-e '/Icon/s/\.png//' \
-		-e '/Categories/s/PuzzleGame;//' \
-		atomix.desktop.in || die
-	epatch "${FILESDIR}"/${P}-underlink.patch
-	eautoreconf
-	gnome2_src_prepare
-}
diff --git a/games-puzzle/atomix/atomix-3.16.0.ebuild b/games-puzzle/atomix/atomix-3.16.0.ebuild
deleted file mode 100644
index e118e8578683..000000000000
--- a/games-puzzle/atomix/atomix-3.16.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit gnome-games
-
-DESCRIPTION="a game where you build full molecules, from simple inorganic to extremely complex organic ones"
-HOMEPAGE="http://ftp.gnome.org/pub/GNOME/sources/atomix/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.23
-	>=x11-libs/gdk-pixbuf-2.0.5:2
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/games-puzzle/atomix/files/atomix-2.14.0-underlink.patch b/games-puzzle/atomix/files/atomix-2.14.0-underlink.patch
deleted file mode 100644
index 682180c048b2..000000000000
--- a/games-puzzle/atomix/files/atomix-2.14.0-underlink.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Makefile.am.old	2013-12-07 22:25:30.513540434 +0100
-+++ src/Makefile.am	2013-12-07 22:25:43.209654104 +0100
-@@ -26,7 +26,8 @@
- 
- atomix_LDADD = \
- 	libatomix.a \
--	$(ATOMIX_LIBS)
-+	$(ATOMIX_LIBS) \
-+	-lm
- 
- noinst_LIBRARIES = libatomix.a
- 
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 1642a54228b4..4685eff553aa 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,3 +1,4 @@
 DIST libass-0.11.2.tar.xz 297172 SHA256 499dbaf14d7743e5899c9ca918988e81a9894f674b22d4682922f2e5d095ff9e SHA512 93e7b9ce328fc8ac7555c49015baf89c2f07957e501e3ea9ee5a2a7750c1454891a202a92f1348aef27c877bf01674bb7958b7e500c59538b67fe68a89315540 WHIRLPOOL 9c0e0b869efc815e9ecd0e0dfa0488b9643404bd8fc33fe4be2cbf7c026989b27ee7eeb6d8f11218d903881629d864b52bdb0f3a7433325f03b0a6c5a21d1d23
 DIST libass-0.12.3.tar.xz 313852 SHA256 a67c54ebaf5ec19ae72e86259ee6ab6adfe2e64ed9f9149db03dc863360ea38c SHA512 84931e89f02487ff01bfe24be3d90b1db8599ab2a5ec2277824b4330cd9219189a54f19d2d83f223d2d6f973b5e7474f2691905091749a776147669b72754be2 WHIRLPOOL 7187d678dfec621d5736ecb4d9dbf6559c74d6c1b4dfcdd7bc4f78313e8f10f73d3cefd33bfa9a1ceed87cb00767e4235b95e144c527e74746e680b6bb12c719
 DIST libass-0.13.0.tar.xz 336128 SHA256 e0071a3b2e95411c8d474014678368e3f0b852f7d663e0564b344e7335eb0671 SHA512 0253d0cd306603b2721bd128ad6eb050c74f1ee415145f238f3a10c4041b054bf94857f4c0043a6578c4fd0865e809e25fa9f61071631ba647c731c13418627f WHIRLPOOL 7ccf4df975a07e94cdc85b4436b08eae1a6ce60d027d0db21855bbdfd21e4770a5e21cae90ce7646b477094241df3b36c247f043f347f2f1494f3d6a02e91f28
+DIST libass-0.13.1.tar.xz 318840 SHA256 4aa36b1876a61cab46fc9284fee84224b9e2840fe7b3e63d96a8d32574343fe7 SHA512 0558e6bb139d9e3c506fa358b02dbeecf574098defb9a4d4c935dac402fc9cf09725114612d3a987f54dee5a08d55f135a64fd87d35fc25dda1bef72bc23d720 WHIRLPOOL ef128daecc0a4a3a026d8fb90da44088c9451bb1acd91fb3b8c90b0e564b62576e7328bd7c4442b6e6f6efa1b18cb3c9a0ac80e44acbfec45d65d834f712f1c2
diff --git a/media-libs/libass/libass-0.13.1.ebuild b/media-libs/libass/libass-0.13.1.ebuild
new file mode 100644
index 000000000000..20df06146ee7
--- /dev/null
+++ b/media-libs/libass/libass-0.13.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="Library for SSA/ASS subtitles rendering"
+HOMEPAGE="https://github.com/libass/libass"
+SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0/5" # subslot = libass soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+fontconfig +harfbuzz static-libs"
+
+RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
+	harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+X86_CPU_OPTS="abi_x86_32 abi_x86_64"
+for i in ${X86_CPU_OPTS} ; do
+	DEPEND="${DEPEND}
+		${i}? ( dev-lang/yasm )"
+done
+
+DOCS="Changelog"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable fontconfig) \
+		$(use_enable harfbuzz) \
+		$(use_enable static-libs static) \
+		--disable-require-system-font-provider
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 419d052a3ef6..6ed3d5869e86 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -2,3 +2,4 @@ DIST libbluray-0.6.2.tar.bz2 582227 SHA256 8ca410c8a4a1e2e8344014a67e2c908182cff
 DIST libbluray-0.8.1.tar.bz2 623402 SHA256 cdbec680c5bbc2251de6ccd109cf5f798ea51db6fcb938df39283be1799efb8f SHA512 6618e01a567f0dc5d21302fc771d4155589c81703028b76f6090a2d12ef1c7e9d08d9c79312a7c8b2ca0d6c63ce980195f0866509a4f8f05f64ed6650c7f78dc WHIRLPOOL 899ffe320997d245ed76987993d7d7e1697fcea61474ad7fb664c0c519d2c6578344986e22a9fe7d23d7c458525f6effff68718619334916fbe42cccb6c5c801
 DIST libbluray-0.9.0.tar.bz2 624614 SHA256 84b61da9202fa724a76ac885af69df16a5583eb11d43e940dc201833bbfd694d SHA512 12db8b9ace0629158c1ce0e5447fc154609e9f78c55ff7d830c7ee38ccafa9824bfcdbe622d7e13e8c6d74205ae648ccf2e7c7b756692acc27e48fe9e2cc95ec WHIRLPOOL 7b8191bf0adcd1c612662a9bf66d2f94ba43bda1bd5a23425aee85b486aced4c0edf0f720a17361640f7982e5794bd531bfc9efa45e883495be4acd9ae42b8cc
 DIST libbluray-0.9.1.tar.bz2 703068 SHA256 d9647fa55802907b33d85e9ffcc6d97e3133490f3721afd649d9b361c42f3940 SHA512 78a768d26454067f904e0c15717e81bbce624f8e13d1e8a8e84611a4fc29191860640b86633ad9611cc461d9ee84472d3388fc2429d302d87908e3900898c5a1 WHIRLPOOL 788f5714689cf08798149860a450a17b0b6abb717bfb6e0fce805c90592e01ffbb15da621c6ee2317dde88379619bb678a930ebb1c2234ac139b08fc7be0ab73
+DIST libbluray-0.9.2.tar.bz2 704357 SHA256 efc994f42d2bce6af2ce69d05ba89dbbd88bcec7aca065de094fb3a7880ce7ea SHA512 f7fda2ef4c0ec70eb9a38aed0e76d21d8784410cb13713e7ee66ecd23a1cc58325977b046d40c526554a4a4e4cf96706a233e15451bf34892aff201b47e25aef WHIRLPOOL 96716027cd8d62c55cdde4f05d8a3c2023c30231ae86ca3231abc52db66e8a4b7338ea3ca871cfc971b83104875429c6d4058d132c488aed09d6d50eb9b4afb1
diff --git a/media-libs/libbluray/libbluray-0.9.1.ebuild b/media-libs/libbluray/libbluray-0.9.1.ebuild
index 805d248c84dc..768289ccb938 100644
--- a/media-libs/libbluray/libbluray-0.9.1.ebuild
+++ b/media-libs/libbluray/libbluray-0.9.1.ebuild
@@ -4,16 +4,25 @@
 
 EAPI=5
 
-inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal
+if [ "${PV#9999}" != "${PV}" ] ; then
+	VCSECLASS="git-r3"
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
+	SRC_URI=""
+else
+	VCSECLASS=""
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+fi
+
+inherit autotools ${VCSECLASS} java-pkg-opt-2 flag-o-matic eutils multilib-minimal
 
 DESCRIPTION="Blu-ray playback libraries"
 HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
+IUSE="aacs bdplus +fontconfig java static-libs +truetype udf utils +xml"
 
 COMMON_DEPEND="
 	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
@@ -51,40 +60,30 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	local myconf
-	if multilib_is_native_abi && use java; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		append-cflags "$(java-pkg_get-jni-cflags)"
-		myconf="--enable-bdjava"
-	else
-		myconf="--disable-bdjava"
-	fi
-
 	ECONF_SOURCE="${S}" econf \
 		--disable-optimizations \
 		$(multilib_native_use_enable utils examples) \
+		$(multilib_native_use_enable java bdjava) \
 		$(use_with fontconfig) \
 		$(use_with truetype freetype) \
 		$(use_enable static-libs static) \
-		$(use_with xml libxml2) \
-		${myconf}
+		$(use_enable udf) \
+		$(use_with xml libxml2)
 }
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 
 	if multilib_is_native_abi && use utils; then
-		dobin index_dump mobj_dump mpls_dump
 		cd .libs/
-		dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
+		dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
 		if use java; then
 			dobin bdj_test
 		fi
 	fi
 
 	if multilib_is_native_abi && use java; then
-		java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-${PV}.jar
-		doenvd "${FILESDIR}"/90${PN}
+		java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-*.jar
 	fi
 }
 
diff --git a/media-libs/libbluray/libbluray-0.9.2.ebuild b/media-libs/libbluray/libbluray-0.9.2.ebuild
new file mode 100644
index 000000000000..768289ccb938
--- /dev/null
+++ b/media-libs/libbluray/libbluray-0.9.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	VCSECLASS="git-r3"
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
+	SRC_URI=""
+else
+	VCSECLASS=""
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+fi
+
+inherit autotools ${VCSECLASS} java-pkg-opt-2 flag-o-matic eutils multilib-minimal
+
+DESCRIPTION="Blu-ray playback libraries"
+HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="aacs bdplus +fontconfig java static-libs +truetype udf utils +xml"
+
+COMMON_DEPEND="
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
+	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.6 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	java? (
+		>=virtual/jdk-1.6
+		dev-java/ant-core
+	)
+	virtual/pkgconfig
+"
+
+DOCS=( ChangeLog README.txt )
+
+src_prepare() {
+	if use java ; then
+		export JDK_HOME="$(java-config -g JAVA_HOME)"
+
+		# don't install a duplicate jar file
+		sed -i '/^jar_DATA/d' Makefile.am || die
+
+		java-pkg-opt-2_src_prepare
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-optimizations \
+		$(multilib_native_use_enable utils examples) \
+		$(multilib_native_use_enable java bdjava) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_enable static-libs static) \
+		$(use_enable udf) \
+		$(use_with xml libxml2)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use utils; then
+		cd .libs/
+		dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
+		if use java; then
+			dobin bdj_test
+		fi
+	fi
+
+	if multilib_is_native_abi && use java; then
+		java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-*.jar
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index 5aae52ef6068..768289ccb938 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -3,16 +3,26 @@
 # $Id$
 
 EAPI=5
-inherit autotools java-pkg-opt-2 git-r3 flag-o-matic eutils multilib-minimal
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	VCSECLASS="git-r3"
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
+	SRC_URI=""
+else
+	VCSECLASS=""
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+fi
+
+inherit autotools ${VCSECLASS} java-pkg-opt-2 flag-o-matic eutils multilib-minimal
 
 DESCRIPTION="Blu-ray playback libraries"
 HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
-IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
+IUSE="aacs bdplus +fontconfig java static-libs +truetype udf utils +xml"
 
 COMMON_DEPEND="
 	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
@@ -41,49 +51,39 @@ src_prepare() {
 		export JDK_HOME="$(java-config -g JAVA_HOME)"
 
 		# don't install a duplicate jar file
-		sed -i '/^jar_DATA/d' src/Makefile.am || die
+		sed -i '/^jar_DATA/d' Makefile.am || die
 
 		java-pkg-opt-2_src_prepare
 	fi
+
 	eautoreconf
 }
 
 multilib_src_configure() {
-	local myconf
-	if multilib_is_native_abi && use java; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		append-cflags "$(java-pkg_get-jni-cflags)"
-		myconf="--enable-bdjava"
-	else
-		myconf="--disable-bdjava"
-	fi
-
 	ECONF_SOURCE="${S}" econf \
 		--disable-optimizations \
 		$(multilib_native_use_enable utils examples) \
+		$(multilib_native_use_enable java bdjava) \
 		$(use_with fontconfig) \
 		$(use_with truetype freetype) \
 		$(use_enable static-libs static) \
-		$(use_with xml libxml2) \
-		${myconf}
+		$(use_enable udf) \
+		$(use_with xml libxml2)
 }
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 
 	if multilib_is_native_abi && use utils; then
-		cd src
-		dobin index_dump mobj_dump mpls_dump
 		cd .libs/
-		dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
+		dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
 		if use java; then
 			dobin bdj_test
 		fi
 	fi
 
 	if multilib_is_native_abi && use java; then
-		java-pkg_dojar "${BUILD_DIR}"/src/.libs/${PN}-j2se-${PV}.jar
-		doenvd "${FILESDIR}"/90${PN}
+		java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-*.jar
 	fi
 }
 
diff --git a/media-libs/libbluray/metadata.xml b/media-libs/libbluray/metadata.xml
index f9c1f5a88cdc..6f34503d189d 100644
--- a/media-libs/libbluray/metadata.xml
+++ b/media-libs/libbluray/metadata.xml
@@ -6,6 +6,7 @@
     <flag name='aacs'>Add support for decryption of AACS</flag>
     <flag name='bdplus'>Use <pkg>media-libs/libbdplus</pkg> for BD+ decryption</flag>
     <flag name='java'>Add support for BD-J</flag>
+	<flag name='udf'>Add UDF (Universal Disk Format) support</flag>
     <flag name='utils'>Install command-line utilities and examples</flag>
   </use>
 </pkgmetadata>
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index d0940c4d1b3e..e34fae269478 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,2 +1,3 @@
 DIST opus-1.0.2.tar.gz 777306 SHA256 da615edbee5d019c1833071d69a4782c19f178cf9ca1401375036ecef25cd78a SHA512 73f089ac9c6fcf6adea6c862f6ac0e56712473f9dcaec3aec444a988ded1abcec7fa69da286af38500182dfaf96ba0b6ca52431c39ed08f2aa1caf84ffd43b39 WHIRLPOOL f953cc7f8bd4332524ee403e7dbd9647a29d324a30ef820e5b96a316366ab0a168f55e36a0ab5b239afe7f547874eb28aff1529e38774c1a880da1b7ce7daa86
+DIST opus-1.1.1.tar.gz 957948 SHA256 9b84ff56bd7720d5554103c557664efac2b8b18acc4bbcc234cb881ab9a3371e SHA512 1e55ed19f07ed399371aaf92544b3c5fb3d214c8ae67210a709edfede2102a5fa5c6f5b8287d26dcacad62b5c0a591bfe14ee7ae7d846629e5a814a05da4e149 WHIRLPOOL 35c20393f308beb56b07b722a78b82ad27d38095a0a4fcc5ad7d39f9dd99c9cae8e4646462faeb769c42e8286089e3d83d8f7cebc0362cdd9da7fb26da21b372
 DIST opus-1.1.tar.gz 850208 SHA256 b9727015a58affcf3db527322bf8c4d2fcf39f5f6b8f15dbceca20206cbe1d95 SHA512 b603efe66d65ef38dbcd0d2bbf213a1d15fa456aee00eca73e99abe4ec78668ed82e661ca7a69e9af4e0bc39e1aa76c4151b7f9840ff621ddcfd69f596cf2ba9 WHIRLPOOL 9d53e57d0c99b7e5e330822808f5b79e19bb3fbbffb9054e3d1d421b42fd70463d5fc39517eff1169d218bad8ab2440162c334ace013ffba846cbcfb57206201
diff --git a/media-libs/opus/opus-1.1.1.ebuild b/media-libs/opus/opus-1.1.1.ebuild
new file mode 100644
index 000000000000..39593d15ba21
--- /dev/null
+++ b/media-libs/opus/opus-1.1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-multilib
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.opus-codec.org/opus.git"
+else
+	SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="Open versatile codec designed for interactive speech and audio transmission over the internet"
+HOMEPAGE="http://opus-codec.org/"
+SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+INTRINSIC_FLAGS="cpu_flags_x86_sse neon"
+IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable custom-modes)
+		$(use_enable doc)
+	)
+	for i in ${INTRINSIC_FLAGS} ; do
+		use ${i} && myeconfargs+=( --enable-intrinsics )
+	done
+	autotools-multilib_src_configure
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 085082eaa607..f83aea7f2cf1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 02 Dec 2015 20:43:46 +0000
+Thu, 03 Dec 2015 10:13:54 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 1509cd346bc7..f83aea7f2cf1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 02 Dec 2015 20:43:47 +0000
+Thu, 03 Dec 2015 10:13:54 +0000
diff --git a/metadata/md5-cache/app-admin/logrotate-3.9.1-r1 b/metadata/md5-cache/app-admin/logrotate-3.9.1-r1
index a003e28ea466..914f82dd0715 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.9.1-r1
+++ b/metadata/md5-cache/app-admin/logrotate-3.9.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Rotates, compresses, and mails system logs
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/logrotate/
 IUSE=acl +cron selinux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.9.1.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f3812e3c9f11ca63c0af6aacab4dc0a5
+_md5_=e33be430e7e451b06af621b14552085a
diff --git a/metadata/md5-cache/app-crypt/acme-0.0.0_pre20151123 b/metadata/md5-cache/app-crypt/acme-0.0.0_pre20151123
new file mode 100644
index 000000000000..2dcdee5ae64c
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-0.0.0_pre20151123
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/ndg-httpsclient-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyopenssl-0.15[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/werkzeug[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=5
+HOMEPAGE=https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/ndg-httpsclient-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyopenssl-0.15[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/werkzeug[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/letsencrypt/letsencrypt/archive/v0.0.0.dev20151123.tar.gz -> letsencrypt-0.0.0.dev20151123.tar.gz
+_eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=4dbb21b8cf12ff40d0c0db6c14f287b6
diff --git a/metadata/md5-cache/app-crypt/acme-9999 b/metadata/md5-cache/app-crypt/acme-9999
index 316a1494e8ba..b18876c45068 100644
--- a/metadata/md5-cache/app-crypt/acme-9999
+++ b/metadata/md5-cache/app-crypt/acme-9999
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/ndg-httpsclient-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyopenssl-0.15[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/werkzeug[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=An implementation of the ACME protocol
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/ndg-httpsclient-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyopenssl-0.15[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/werkzeug[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1
+DESCRIPTION=An implementation of the Automatic Certificate Management Environment (ACME) protocol
 EAPI=5
 HOMEPAGE=https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
@@ -9,4 +9,4 @@ RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	git-r3	e6443022d06c4de81a14e017bdfcc306	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a7b3b75539d098aabbb1f01f6c67aeaf
+_md5_=640b9927fbc22d3682ae6ac5a2688533
diff --git a/metadata/md5-cache/app-crypt/letsencrypt-0.0.0_pre20151123 b/metadata/md5-cache/app-crypt/letsencrypt-0.0.0_pre20151123
new file mode 100644
index 000000000000..55373205b631
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/letsencrypt-0.0.0_pre20151123
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=app-crypt/acme-0.0.0_pre20151123[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configargparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/parsedatetime[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.15[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pythondialog-3.2.2:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zope-component[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Let's Encrypt client to automate deployment of X.509 certificates
+EAPI=5
+HOMEPAGE=https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-0.0.0_pre20151123[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configargparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/parsedatetime[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.15[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pythondialog-3.2.2:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zope-component[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/letsencrypt/letsencrypt/archive/v0.0.0.dev20151123.tar.gz -> letsencrypt-0.0.0.dev20151123.tar.gz
+_eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=bf8850e599b8b3d1083915d0126fb23b
diff --git a/metadata/md5-cache/app-crypt/letsencrypt-9999 b/metadata/md5-cache/app-crypt/letsencrypt-9999
index f6a217931afc..32bb779e3362 100644
--- a/metadata/md5-cache/app-crypt/letsencrypt-9999
+++ b/metadata/md5-cache/app-crypt/letsencrypt-9999
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=app-crypt/acme-9999[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configargparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/parsedatetime[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.15[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pythondialog-3.2.2:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zope-component[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=app-crypt/acme-9999[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configargparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cryptography-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/parsedatetime[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.15[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pythondialog-3.2.2:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zope-component[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Let's Encrypt client to automate deployment of X.509 certificates
 EAPI=5
 HOMEPAGE=https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/
 IUSE=test python_targets_python2_7
@@ -9,4 +9,4 @@ RDEPEND=>=app-crypt/acme-9999[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	git-r3	e6443022d06c4de81a14e017bdfcc306	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=6cbf57410ec75b4055692c10232ca5b8
+_md5_=94dd621e6101cd10a17340ca460b22b9
diff --git a/metadata/md5-cache/dev-php/phpunit-4.8.19 b/metadata/md5-cache/dev-php/phpunit-4.8.19
new file mode 100644
index 000000000000..2b3dde023b07
--- /dev/null
+++ b/metadata/md5-cache/dev-php/phpunit-4.8.19
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst unpack
+DEPEND=|| ( dev-lang/php:5.5[phar,xml] dev-lang/php:5.6[phar,xml] )
+DESCRIPTION=A PHP Unit Testing framework
+EAPI=5
+HOMEPAGE=http://phpunit.de
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=BSD
+RDEPEND=|| ( dev-lang/php:5.5[phar,xml] dev-lang/php:5.6[phar,xml] )
+SLOT=0
+SRC_URI=https://phar.phpunit.de/phpunit-4.8.19.phar
+_md5_=45e229d9c693c8b2c499f607f36544b7
diff --git a/metadata/md5-cache/dev-php/phpunit-5.0.10 b/metadata/md5-cache/dev-php/phpunit-5.0.10
new file mode 100644
index 000000000000..d7f3a43fd272
--- /dev/null
+++ b/metadata/md5-cache/dev-php/phpunit-5.0.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst unpack
+DEPEND=|| ( dev-lang/php:5.6[phar,xml] dev-lang/php:7.0[phar,xml] )
+DESCRIPTION=A PHP Unit Testing framework
+EAPI=5
+HOMEPAGE=http://phpunit.de
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=BSD
+RDEPEND=|| ( dev-lang/php:5.6[phar,xml] dev-lang/php:7.0[phar,xml] )
+SLOT=0
+SRC_URI=https://phar.phpunit.de/phpunit-5.0.10.phar
+_md5_=0934a26a8b026d6a281882dc7f425f3f
diff --git a/metadata/md5-cache/dev-python/configargparse-0.9.3 b/metadata/md5-cache/dev-python/configargparse-0.9.3
index f00a6eb141ce..5b9263662bc1 100644
--- a/metadata/md5-cache/dev-python/configargparse-0.9.3
+++ b/metadata/md5-cache/dev-python/configargparse-0.9.3
@@ -4,11 +4,11 @@ DESCRIPTION=A drop-in replacement for argparse that adds support for config file
 EAPI=5
 HOMEPAGE=https://github.com/zorro3/ConfigArgParse https://pypi.python.org/pypi/ConfigArgParse
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 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-2:=[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=mirror://pypi/C/ConfigArgParse/ConfigArgParse-0.9.3.tar.gz
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=721c5925404747a9ab40e0e293a158b8
+_md5_=05fcca91c493fcf31f7090c23eae428a
diff --git a/metadata/md5-cache/dev-python/configobj-5.0.6 b/metadata/md5-cache/dev-python/configobj-5.0.6
index 9f6f4e61d24c..39ac0527a470 100644
--- a/metadata/md5-cache/dev-python/configobj-5.0.6
+++ b/metadata/md5-cache/dev-python/configobj-5.0.6
@@ -4,11 +4,11 @@ DESCRIPTION=Simple config file reader and writer
 EAPI=5
 HOMEPAGE=http://www.voidspace.org.uk/python/configobj.html https://code.google.com/p/configobj/ https://pypi.python.org/pypi/configobj
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] 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_python3_5? ( dev-lang/python:3.5 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/configobj/configobj-5.0.6.tar.gz
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=76cc339e64b37e96f8ecbcaaaaa952bc
+_md5_=abb4312518a3ca2b38a8974d528a421b
diff --git a/metadata/md5-cache/dev-python/iminuit-1.2 b/metadata/md5-cache/dev-python/iminuit-1.2
new file mode 100644
index 000000000000..df37e707b22f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/iminuit-1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/cython 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-2:=[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=Minuit numerical function minimization in Python
+EAPI=5
+HOMEPAGE=https://github.com/iminuit/iminuit
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT LGPL-2
+RDEPEND=dev-python/cython 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-2:=[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=mirror://pypi/i/iminuit/iminuit-1.2.tar.gz
+_eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=5db652920bd9cfa01933c35e438dd257
diff --git a/metadata/md5-cache/dev-python/parsedatetime-1.5 b/metadata/md5-cache/dev-python/parsedatetime-1.5
index 1982aa5d7276..af8e7ec97ffe 100644
--- a/metadata/md5-cache/dev-python/parsedatetime-1.5
+++ b/metadata/md5-cache/dev-python/parsedatetime-1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Parse human-readable date/time strings
 EAPI=5
 HOMEPAGE=https://github.com/bear/parsedatetime
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 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-2:=[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/bear/parsedatetime/archive/v1.5.tar.gz -> parsedatetime-1.5.tar.gz
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f17302583eb9a9f6e62479ad5f6a774e
+_md5_=3ba14c08a8b9518432a28730dacfef52
diff --git a/metadata/md5-cache/dev-python/pyrfc3339-0.2 b/metadata/md5-cache/dev-python/pyrfc3339-0.2
index cca2b2ff5a77..24e119e73fcd 100644
--- a/metadata/md5-cache/dev-python/pyrfc3339-0.2
+++ b/metadata/md5-cache/dev-python/pyrfc3339-0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Generates and parses RFC 3339 timestamps
 EAPI=5
 HOMEPAGE=https://github.com/kurtraschke/pyRFC3339
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pytz[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-2:=[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=mirror://pypi/p/pyRFC3339/pyRFC3339-0.2.tar.gz
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=7abaf1b1e1e562ccd1014681bbb4a822
+_md5_=b116589442a6e69bbb2aec4c1fc36264
diff --git a/metadata/md5-cache/dev-python/pyrfc3339-1.0 b/metadata/md5-cache/dev-python/pyrfc3339-1.0
index 31ca26e06aaa..870ea5f4c116 100644
--- a/metadata/md5-cache/dev-python/pyrfc3339-1.0
+++ b/metadata/md5-cache/dev-python/pyrfc3339-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Generates and parses RFC 3339 timestamps
 EAPI=5
 HOMEPAGE=https://github.com/kurtraschke/pyRFC3339
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyRFC3339/pyRFC3339-1.0.tar.gz
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=df986426454cb79fffbe3656ba18efa7
+_md5_=f361221ee625dae0847231c84856688b
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.2.2 b/metadata/md5-cache/dev-python/pythondialog-3.2.2
index b399944e733e..3c7e1a421c8b 100644
--- a/metadata/md5-cache/dev-python/pythondialog-3.2.2
+++ b/metadata/md5-cache/dev-python/pythondialog-3.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=A Python module for making simple text/console-mode user interfaces
 EAPI=5
 HOMEPAGE=http://pythondialog.sourceforge.net/
 IUSE=doc examples python_targets_python3_3 python_targets_python3_4 python_targets_pypy3
-KEYWORDS=alpha amd64 ia64 ppc sparc x86
+KEYWORDS=alpha amd64 ~arm ia64 ppc sparc x86
 LICENSE=LGPL-2
 RDEPEND=dev-util/dialog python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy3(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pythondialog//3.2.2/python3-pythondialog-3.2.2.tar.bz2
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=6d556d7907d24670f8bc87add62d33df
+_md5_=46f43b67d33abb34c9d86d1f7729b2b2
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.3.0 b/metadata/md5-cache/dev-python/pythondialog-3.3.0
index 3357b6cdcbab..fcc23d123867 100644
--- a/metadata/md5-cache/dev-python/pythondialog-3.3.0
+++ b/metadata/md5-cache/dev-python/pythondialog-3.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Python module for making simple text/console-mode user interfaces
 EAPI=5
 HOMEPAGE=http://pythondialog.sourceforge.net/
 IUSE=doc examples python_targets_python3_3 python_targets_python3_4 python_targets_pypy3
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=dev-util/dialog python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy3(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pythondialog//3.3.0/python3-pythondialog-3.3.0.tar.bz2
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=be0330892c5c3cdda848e76a7505f090
+_md5_=c91b7ef42c31b2cabd0621ab08c91a2c
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.3.0-r200 b/metadata/md5-cache/dev-python/pythondialog-3.3.0-r200
index 6b3c0c5de5dc..0b177f0a97ba 100644
--- a/metadata/md5-cache/dev-python/pythondialog-3.3.0-r200
+++ b/metadata/md5-cache/dev-python/pythondialog-3.3.0-r200
@@ -4,11 +4,11 @@ DESCRIPTION=A Python module for making simple text/console-mode user interfaces
 EAPI=5
 HOMEPAGE=http://pythondialog.sourceforge.net/ https://pypi.python.org/pypi/python2-pythondialog
 IUSE=doc examples python_targets_python2_7 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=dev-util/dialog python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=python-2
 SRC_URI=mirror://pypi/p/python2-pythondialog/python2-pythondialog-3.3.0.tar.gz
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=3364153de7655fbe97df6c64983673d7
+_md5_=6a9f3ca83cb71d491569f5a4814ed496
diff --git a/metadata/md5-cache/dev-python/zope-component-4.2.2 b/metadata/md5-cache/dev-python/zope-component-4.2.2
index 595e29223e48..9d1b47c36c48 100644
--- a/metadata/md5-cache/dev-python/zope-component-4.2.2
+++ b/metadata/md5-cache/dev-python/zope-component-4.2.2
@@ -4,7 +4,7 @@ DESCRIPTION=Zope Component Architecture
 EAPI=5
 HOMEPAGE=https://github.com/zopefoundation/zope.component http://docs.zope.org/zope.component/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ZPL
 RDEPEND=dev-python/zope-event[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/zope-interface-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.component/zope.component-4.2.2.tar.gz
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=786f65a4b576e27f1e15fa17e6ea51e7
+_md5_=3e9d908ec352b93faf84026b641c66cf
diff --git a/metadata/md5-cache/dev-python/zope-event-4.0.3 b/metadata/md5-cache/dev-python/zope-event-4.0.3
index 37820a46a1f3..3bdc7f7b5298 100644
--- a/metadata/md5-cache/dev-python/zope-event-4.0.3
+++ b/metadata/md5-cache/dev-python/zope-event-4.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Event publishing / dispatch, used by Zope Component Architecture
 EAPI=5
 HOMEPAGE=https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ZPL
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.event/zope.event-4.0.3.tar.gz
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=4b75affc4386f7e7277341d8e11a7e6c
+_md5_=711a3210c3b5ff4f503c5c4651449bb2
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.2.9 b/metadata/md5-cache/dev-ros/audio_capture-0.2.9
new file mode 100644
index 000000000000..f652b36b13b0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:0.10 virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin dev-python/empy
+DESCRIPTION=Transports audio from a source to a destination
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/audio_capture
+IUSE=test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:0.10 media-plugins/gst-plugins-lame:0.10 media-libs/gst-plugins-good:0.10 media-libs/gst-plugins-base:0.10 dev-util/catkin dev-python/empy
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.9.tar.gz -> audio_common-0.2.9.tar.gz
+_eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6cf62e552da9503c9094f0bb755ea4e4
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.9 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.9
new file mode 100644
index 000000000000..96a7838dfdf8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.9
@@ -0,0 +1,13 @@
+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 ) dev-util/catkin[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/empy[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-2:=[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-util/catkin[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/empy[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-lang/python-exec:2 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-2:=[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(-)] ros_messages_cxx? ( dev-ros/gencpp:=[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(-)] ) ros_messages_eus? ( dev-ros/geneus:=[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(-)] ) ros_messages_python? ( dev-ros/genpy:=[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(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[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-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[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=Messages for transmitting audio via ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/audio_common_msgs
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-util/catkin[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/empy[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-lang/python-exec:2 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-2:=[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(-)] ros_messages_cxx? ( dev-ros/gencpp:=[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(-)] ) ros_messages_eus? ( dev-ros/geneus:=[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(-)] ) ros_messages_python? ( dev-ros/genpy:=[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(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[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-ros/message_runtime
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.9.tar.gz -> audio_common-0.2.9.tar.gz
+_eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=2dbea56187a7ecc5a19d0c788186644c
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.2.9 b/metadata/md5-cache/dev-ros/audio_play-0.2.9
new file mode 100644
index 000000000000..676554a28d6d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/audio_play-0.2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:0.10 virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin dev-python/empy
+DESCRIPTION=Outputs audio to a speaker from a source node
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/audio_play
+IUSE=test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:0.10 media-plugins/gst-plugins-alsa:0.10 media-libs/gst-plugins-good:0.10 media-libs/gst-plugins-base:0.10 dev-util/catkin dev-python/empy
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.9.tar.gz -> audio_common-0.2.9.tar.gz
+_eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d02c4ab89c354af74d22fa408bef2735
diff --git a/metadata/md5-cache/dev-ros/mavros-0.15.0 b/metadata/md5-cache/dev-ros/mavros-0.15.0
deleted file mode 100644
index 9f229ea985c5..000000000000
--- a/metadata/md5-cache/dev-ros/mavros-0.15.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=MAVLink extendable communication node for ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/mavros
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.15.0.tar.gz -> mavros-0.15.0.tar.gz
-_eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3d642a542864662c05d355731e484b8d
diff --git a/metadata/md5-cache/dev-ros/mavros-0.16.0 b/metadata/md5-cache/dev-ros/mavros-0.16.0
deleted file mode 100644
index d6093830376d..000000000000
--- a/metadata/md5-cache/dev-ros/mavros-0.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=MAVLink extendable communication node for ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/mavros
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.16.0.tar.gz -> mavros-0.16.0.tar.gz
-_eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3d642a542864662c05d355731e484b8d
diff --git a/metadata/md5-cache/dev-ros/mavros-0.16.1 b/metadata/md5-cache/dev-ros/mavros-0.16.1
deleted file mode 100644
index b19f86117c11..000000000000
--- a/metadata/md5-cache/dev-ros/mavros-0.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=MAVLink extendable communication node for ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/mavros
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.16.1.tar.gz -> mavros-0.16.1.tar.gz
-_eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3d642a542864662c05d355731e484b8d
diff --git a/metadata/md5-cache/dev-ros/mavros-0.16.2 b/metadata/md5-cache/dev-ros/mavros-0.16.2
deleted file mode 100644
index cd6cde4410fc..000000000000
--- a/metadata/md5-cache/dev-ros/mavros-0.16.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=MAVLink extendable communication node for ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/mavros
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.16.2.tar.gz -> mavros-0.16.2.tar.gz
-_eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3d642a542864662c05d355731e484b8d
diff --git a/metadata/md5-cache/dev-ros/mavros-0.16.3 b/metadata/md5-cache/dev-ros/mavros-0.16.3
deleted file mode 100644
index 7021a990ae6f..000000000000
--- a/metadata/md5-cache/dev-ros/mavros-0.16.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=MAVLink extendable communication node for ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/mavros
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.16.3.tar.gz -> mavros-0.16.3.tar.gz
-_eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3d642a542864662c05d355731e484b8d
diff --git a/metadata/md5-cache/dev-ros/mavros-0.16.3-r1 b/metadata/md5-cache/dev-ros/mavros-0.16.3-r1
new file mode 100644
index 000000000000..78107f26c682
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavros-0.16.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=MAVLink extendable communication node for ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/mavros
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-3 LGPL-3 BSD
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/0.16.3.tar.gz -> mavros-0.16.3.tar.gz
+_eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6404f34742324352a5d249f77e15ef0b
diff --git a/metadata/md5-cache/dev-ros/mavros-9999 b/metadata/md5-cache/dev-ros/mavros-9999
index 3378f6238746..24184ef82f30 100644
--- a/metadata/md5-cache/dev-ros/mavros-9999
+++ b/metadata/md5-cache/dev-ros/mavros-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros
 IUSE=python_targets_python2_7 test
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	git-r3	e6443022d06c4de81a14e017bdfcc306	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3d642a542864662c05d355731e484b8d
+_md5_=6404f34742324352a5d249f77e15ef0b
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-1.11.9 b/metadata/md5-cache/dev-ros/opencv_apps-1.11.9
new file mode 100644
index 000000000000..25afc06bae02
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/opencv_apps-1.11.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/nodelet dev-ros/roscpp sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=OpenCV applications for ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/opencv_apps
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/nodelet dev-ros/roscpp dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+SLOT=0
+SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.11.9.tar.gz -> vision_opencv-1.11.9.tar.gz
+_eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=8cfb75f959580e9e8856831573639d1f
diff --git a/metadata/md5-cache/dev-ros/sound_play-0.2.9 b/metadata/md5-cache/dev-ros/sound_play-0.2.9
new file mode 100644
index 000000000000..d4f9ebcd64f2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/sound_play-0.2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:0.10 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=ROS node that translates commands on a ROS topic (robotsound) into sounds
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/sound_play
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:0.10 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gst-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-accessibility/festival media-libs/gst-plugins-good:0.10 media-libs/gst-plugins-base:0.10 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.9.tar.gz -> audio_common-0.2.9.tar.gz
+_eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3ce8c3b0c453cfbd25cdebd21e3b6285
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.5.1 b/metadata/md5-cache/dev-ruby/sshkit-1.5.1
deleted file mode 100644
index 8a43f0b95c94..000000000000
--- a/metadata/md5-cache/dev-ruby/sshkit-1.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby19] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby19] dev-ruby/colorize[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] dev-ruby/colorize[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] dev-ruby/colorize[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in Ruby
-EAPI=5
-HOMEPAGE=https://github.com/capistrano/sshkit
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby19] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby19] dev-ruby/colorize[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] dev-ruby/colorize[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] dev-ruby/colorize[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/sshkit-1.5.1.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bb34edf0173efe65bae889ac1a93012d
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.6.1 b/metadata/md5-cache/dev-ruby/sshkit-1.6.1
deleted file mode 100644
index f1e847eca3a0..000000000000
--- a/metadata/md5-cache/dev-ruby/sshkit-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby19] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby19] >=dev-ruby/colorize-0.7.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] >=dev-ruby/colorize-0.7.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] >=dev-ruby/colorize-0.7.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in Ruby
-EAPI=5
-HOMEPAGE=https://github.com/capistrano/sshkit
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby19] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby19] >=dev-ruby/colorize-0.7.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] >=dev-ruby/colorize-0.7.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] >=dev-ruby/colorize-0.7.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/sshkit-1.6.1.gem
-_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=824a1ad92c9b8e6e02bbfba9e720f0ed
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.8.0 b/metadata/md5-cache/dev-ruby/sshkit-1.8.0
new file mode 100644
index 000000000000..ff8f6290803a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] dev-ruby/mocha[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] dev-ruby/mocha[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in Ruby
+EAPI=5
+HOMEPAGE=https://github.com/capistrano/sshkit
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://rubygems/sshkit-1.8.0.gem
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=053124df5e7c0aac30540c9b66bf0cb1
diff --git a/metadata/md5-cache/dev-util/re2c-0.15.3 b/metadata/md5-cache/dev-util/re2c-0.15.3
new file mode 100644
index 000000000000..8b08f69c2a97
--- /dev/null
+++ b/metadata/md5-cache/dev-util/re2c-0.15.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=tool for generating C-based recognizers from regular expressions
+EAPI=5
+HOMEPAGE=http://re2c.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://github.com/skvadrik/re2c/releases/download/0.15.3/re2c-0.15.3.tar.gz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=f292f7d87edd244d350fa185518c94ea
diff --git a/metadata/md5-cache/games-mud/tintin-2.01.1 b/metadata/md5-cache/games-mud/tintin-2.01.1
new file mode 100644
index 000000000000..d0dd01904742
--- /dev/null
+++ b/metadata/md5-cache/games-mud/tintin-2.01.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=sys-libs/zlib net-libs/gnutls dev-libs/libpcre sys-libs/readline:0
+DESCRIPTION=(T)he k(I)cki(N) (T)ickin d(I)kumud clie(N)t
+EAPI=5
+HOMEPAGE=http://tintin.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=sys-libs/zlib net-libs/gnutls dev-libs/libpcre sys-libs/readline:0 games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/tintin/tintin-2.01.1.tar.gz
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=93fbbb3b072359161441d8a6fb6c43b1
diff --git a/metadata/md5-cache/games-puzzle/atomix-2.14.0 b/metadata/md5-cache/games-puzzle/atomix-2.14.0
deleted file mode 100644
index 7eff59e7b47d..000000000000
--- a/metadata/md5-cache/games-puzzle/atomix-2.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/pango-1.0.3 >=x11-libs/gtk+-2.6:2 >=dev-libs/glib-2.6:2 >=gnome-base/gconf-2.12 >=gnome-base/libglade-2.4 >=gnome-base/libgnome-2.12 >=gnome-base/libgnomeui-2.12 >=gnome-base/libbonoboui-2.0.0 >=gnome-base/libgnomecanvas-2.0.0 >=dev-libs/libxml2-2.4.23 dev-perl/XML-Parser virtual/pkgconfig >=dev-util/intltool-0.17 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=a game where you build full molecules, from simple inorganic to extremely complex organic ones
-EAPI=5
-HOMEPAGE=http://ftp.gnome.org/pub/GNOME/sources/atomix/
-IUSE=debug
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/pango-1.0.3 >=x11-libs/gtk+-2.6:2 >=dev-libs/glib-2.6:2 >=gnome-base/gconf-2.12 >=gnome-base/libglade-2.4 >=gnome-base/libgnome-2.12 >=gnome-base/libgnomeui-2.12 >=gnome-base/libbonoboui-2.0.0 >=gnome-base/libgnomecanvas-2.0.0 >=dev-libs/libxml2-2.4.23 dev-perl/XML-Parser
-SLOT=0
-SRC_URI=mirror://gnome/sources/atomix/2.14/atomix-2.14.0.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c59493435c5a35586a6b19260304c162	gnome2-utils	968e31c6fcd13eb2eaf6852e88dfdd36	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a529dfc84e0a6b0db363c794c034f2c4
diff --git a/metadata/md5-cache/games-puzzle/atomix-3.16.0 b/metadata/md5-cache/games-puzzle/atomix-3.16.0
deleted file mode 100644
index 0a7a37705848..000000000000
--- a/metadata/md5-cache/games-puzzle/atomix-3.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.23 >=x11-libs/gdk-pixbuf-2.0.5:2 >=x11-libs/gtk+-3.10:3 dev-libs/appstream-glib >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-util/intltool-0.50.2-r1
-DESCRIPTION=a game where you build full molecules, from simple inorganic to extremely complex organic ones
-EAPI=5
-HOMEPAGE=http://ftp.gnome.org/pub/GNOME/sources/atomix/
-IUSE=debug
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.23 >=x11-libs/gdk-pixbuf-2.0.5:2 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
-SLOT=0
-SRC_URI=mirror://gnome/sources/atomix/3.16/atomix-3.16.0.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	d9bd2ddd85a58e470b49ca997e255a4c	games	4dae170e58f773c484e07d18ef441804	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c59493435c5a35586a6b19260304c162	gnome2-utils	968e31c6fcd13eb2eaf6852e88dfdd36	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4d7d63c584d1af2472637b3626c019d9
diff --git a/metadata/md5-cache/media-libs/libass-0.13.1 b/metadata/md5-cache/media-libs/libass-0.13.1
new file mode 100644
index 000000000000..beb24cea2e1e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libass-0.13.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] harfbuzz? ( >=media-libs/harfbuzz-0.9.12[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(-)?] ) virtual/pkgconfig abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm )
+DESCRIPTION=Library for SSA/ASS subtitles rendering
+EAPI=5
+HOMEPAGE=https://github.com/libass/libass
+IUSE=+fontconfig +harfbuzz static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=ISC
+RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] harfbuzz? ( >=media-libs/harfbuzz-0.9.12[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(-)?] )
+SLOT=0/5
+SRC_URI=https://github.com/libass/libass/releases/download/0.13.1/libass-0.13.1.tar.xz
+_eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=5caa5e1e639d7f6540a69978eaff1d70
diff --git a/metadata/md5-cache/media-libs/libbluray-0.9.1 b/metadata/md5-cache/media-libs/libbluray-0.9.1
index b7e28cd83002..7052de8a485f 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.9.1
+++ b/metadata/md5-cache/media-libs/libbluray-0.9.1
@@ -3,11 +3,11 @@ DEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 DESCRIPTION=Blu-ray playback libraries
 EAPI=5
 HOMEPAGE=http://www.videolan.org/developers/libbluray.html
-IUSE=aacs bdplus +fontconfig java static-libs +truetype utils +xml elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=aacs bdplus +fontconfig java static-libs +truetype udf utils +xml elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bdplus? ( media-libs/libbdplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.9.1/libbluray-0.9.1.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a96633177f44ee992b3fce360d1c4f16	libtool	b75230758539a7da029e24afdb693960	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ce2d42780cd2c12164a5e02ad1b68688
+_md5_=b76b11bce2d68dc1c9f97c395ff0bd9d
diff --git a/metadata/md5-cache/media-libs/libbluray-0.9.2 b/metadata/md5-cache/media-libs/libbluray-0.9.2
new file mode 100644
index 000000000000..917927f17a36
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libbluray-0.9.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=xml? ( >=dev-libs/libxml2-2.9.1-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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) java? ( >=virtual/jdk-1.6 dev-java/ant-core ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0 )
+DESCRIPTION=Blu-ray playback libraries
+EAPI=5
+HOMEPAGE=http://www.videolan.org/developers/libbluray.html
+IUSE=aacs bdplus +fontconfig java static-libs +truetype udf utils +xml elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bdplus? ( media-libs/libbdplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
+SLOT=0
+SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.9.2/libbluray-0.9.2.tar.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a96633177f44ee992b3fce360d1c4f16	libtool	b75230758539a7da029e24afdb693960	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b76b11bce2d68dc1c9f97c395ff0bd9d
diff --git a/metadata/md5-cache/media-libs/libbluray-9999 b/metadata/md5-cache/media-libs/libbluray-9999
index 16a79ab160a3..b6297d8bb38a 100644
--- a/metadata/md5-cache/media-libs/libbluray-9999
+++ b/metadata/md5-cache/media-libs/libbluray-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=xml? ( >=dev-libs/libxml2-2.9.1-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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) java? ( >=virtual/jdk-1.6 dev-java/ant-core ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0 ) >=dev-vcs/git-1.8.2.1
+DEPEND=xml? ( >=dev-libs/libxml2-2.9.1-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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) java? ( >=virtual/jdk-1.6 dev-java/ant-core ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1 java? ( >=dev-java/java-config-2.2.0 )
 DESCRIPTION=Blu-ray playback libraries
 EAPI=5
 HOMEPAGE=http://www.videolan.org/developers/libbluray.html
-IUSE=aacs bdplus +fontconfig java static-libs +truetype utils +xml elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=aacs bdplus +fontconfig java static-libs +truetype udf utils +xml elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bdplus? ( media-libs/libbdplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	git-r3	e6443022d06c4de81a14e017bdfcc306	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a96633177f44ee992b3fce360d1c4f16	libtool	b75230758539a7da029e24afdb693960	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7aeb24ef8e911af6cb653d65fb659c2c
+_md5_=b76b11bce2d68dc1c9f97c395ff0bd9d
diff --git a/metadata/md5-cache/media-libs/opus-1.1.1 b/metadata/md5-cache/media-libs/opus-1.1.1
new file mode 100644
index 000000000000..6df33cbb35e0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opus-1.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-doc/doxygen )
+DESCRIPTION=Open versatile codec designed for interactive speech and audio transmission over the internet
+EAPI=5
+HOMEPAGE=http://opus-codec.org/
+IUSE=custom-modes doc static-libs cpu_flags_x86_sse neon abi_x86_32 abi_x86_64 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 ~amd64-fbsd
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=http://downloads.xiph.org/releases/opus/opus-1.1.1.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	d9bd2ddd85a58e470b49ca997e255a4c	libtool	b75230758539a7da029e24afdb693960	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=9cb73b8c3edd4f88f1fe0fb113aa50cb
diff --git a/metadata/md5-cache/ros-meta/audio_common-0.2.9 b/metadata/md5-cache/ros-meta/audio_common-0.2.9
new file mode 100644
index 000000000000..6ee83af6cf3e
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/audio_common-0.2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin dev-python/empy
+DESCRIPTION=Common code for working with audio in ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/audio_common
+IUSE=test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play dev-ros/sound_play dev-util/catkin dev-python/empy
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.9.tar.gz -> audio_common-0.2.9.tar.gz
+_eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=5dd1158b192762100a61d94c25087c0a
diff --git a/metadata/md5-cache/ros-meta/vision_opencv-1.11.9 b/metadata/md5-cache/ros-meta/vision_opencv-1.11.9-r1
similarity index 76%
rename from metadata/md5-cache/ros-meta/vision_opencv-1.11.9
rename to metadata/md5-cache/ros-meta/vision_opencv-1.11.9-r1
index 2724a348be43..5fbca297927e 100644
--- a/metadata/md5-cache/ros-meta/vision_opencv-1.11.9
+++ b/metadata/md5-cache/ros-meta/vision_opencv-1.11.9-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests dev-ros/opencv_apps sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin dev-python/empy
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/vision_opencv
 IUSE=test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests dev-util/catkin dev-python/empy
+RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests dev-ros/opencv_apps dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.11.9.tar.gz -> vision_opencv-1.11.9.tar.gz
 _eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8270b06ded16324cc519004cb72abb73
+_md5_=f210c64696a0b4d53d33d981546bf43f
diff --git a/metadata/md5-cache/ros-meta/vision_opencv-9999 b/metadata/md5-cache/ros-meta/vision_opencv-9999
index c63868a3ee95..bc771d8d1a18 100644
--- a/metadata/md5-cache/ros-meta/vision_opencv-9999
+++ b/metadata/md5-cache/ros-meta/vision_opencv-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests dev-ros/opencv_apps >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/catkin dev-python/empy
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/vision_opencv
 IUSE=test
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests dev-util/catkin dev-python/empy
+RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests dev-ros/opencv_apps dev-util/catkin dev-python/empy
 SLOT=0
 _eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	git-r3	e6443022d06c4de81a14e017bdfcc306	multilib	3972ca401cf7dbb430df9995f5d8d580	ros-catkin	5bd0782bea06cf2dd93b07f40e0a5e09	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8270b06ded16324cc519004cb72abb73
+_md5_=f210c64696a0b4d53d33d981546bf43f
diff --git a/metadata/md5-cache/sys-apps/busybox-1.24.1 b/metadata/md5-cache/sys-apps/busybox-1.24.1
index 067421c2a2b1..3fb2f3dd6cb5 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.24.1
+++ b/metadata/md5-cache/sys-apps/busybox-1.24.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.busybox.net/downloads/busybox-1.24.1.tar.bz2
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	portability	3a50b3ec310b86914f98babecc8f89c6	savedconfig	7de7daa586f6bf361639e77d6f2299db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=53b6a7e45188300040aba74bbdccc028
+_md5_=9ea22c44b35723e804e0e376004e274c
diff --git a/metadata/md5-cache/www-client/chromium-47.0.2526.73 b/metadata/md5-cache/www-client/chromium-47.0.2526.73
index 8e38c8acd5ac..28996c41f679 100644
--- a/metadata/md5-cache/www-client/chromium-47.0.2526.73
+++ b/metadata/md5-cache/www-client/chromium-47.0.2526.73
@@ -4,11 +4,11 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=5
 HOMEPAGE=http://chromium.org/
 IUSE=cups gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD hotwording? ( no-source-code )
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= >=dev-libs/icu-55.1:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= gtk3? ( x11-libs/gtk+:3= ) !gtk3? ( x11-libs/gtk+:2= ) x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-47.0.2526.73-lite.tar.xz
 _eclasses_=check-reqs	4f43fb72bc73bd58d75ec601713fae20	chromium	e6257bd55bfdac1269e99d4d7ed21cda	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	968e31c6fcd13eb2eaf6852e88dfdd36	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	9dd3f9de6dccb2463faf55e568439d1c	portability	3a50b3ec310b86914f98babecc8f89c6	python-any-r1	63d890c175bcc4604e8327cef1dec948	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	31995099f3454bb5fc3e8b5cdd3af7a8	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c92f77d7363895d382766867b6e4b9ea
+_md5_=f08506ebc7338b11ad0793f61274caf1
diff --git a/metadata/md5-cache/www-client/elinks-0.12_pre6-r1 b/metadata/md5-cache/www-client/elinks-0.12_pre6-r1
index 18626e8c7019..42dfa73c21c5 100644
--- a/metadata/md5-cache/www-client/elinks-0.12_pre6-r1
+++ b/metadata/md5-cache/www-client/elinks-0.12_pre6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-libs/openssl-0.9.6g:0 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0 ) gpm? ( >=sys-libs/ncurses-5.2:0 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( dev-lang/spidermonkey:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=bzip2? ( >=app-arch/bzip2-1.0.2 ) gc? ( dev-libs/boehm-gc ) ssl? ( >=dev-libs/openssl-0.9.6g:0 ) xml? ( >=dev-libs/expat-1.95.4 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0 ) gpm? ( >=sys-libs/ncurses-5.2:0 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( dev-lang/spidermonkey:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Advanced and well-established text-mode web browser
 EAPI=4
 HOMEPAGE=http://elinks.or.cz/
-IUSE=bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 javascript lua +mouse nls nntp perl ruby samba ssl unicode X zlib
+IUSE=bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6 javascript lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib
 KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-libs/openssl-0.9.6g:0 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0 ) gpm? ( >=sys-libs/ncurses-5.2:0 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( dev-lang/spidermonkey:0 )
+RDEPEND=bzip2? ( >=app-arch/bzip2-1.0.2 ) gc? ( dev-libs/boehm-gc ) ssl? ( >=dev-libs/openssl-0.9.6g:0 ) xml? ( >=dev-libs/expat-1.95.4 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0 ) gpm? ( >=sys-libs/ncurses-5.2:0 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( dev-lang/spidermonkey:0 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://elinks.or.cz/download/elinks-0.12pre6.tar.bz2 https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2 https://dev.gentoo.org/~axs/distfiles/elinks-0.12_pre5-js185-patches.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=836418fc02cbe5dc3f8eedf7f9b53c9e
+_md5_=f99a8e615269db15e62f078cbeacb72d
diff --git a/metadata/md5-cache/www-client/elinks-0.12_pre6-r2 b/metadata/md5-cache/www-client/elinks-0.12_pre6-r2
index 0e63b1f72f4e..4d00a026edf2 100644
--- a/metadata/md5-cache/www-client/elinks-0.12_pre6-r2
+++ b/metadata/md5-cache/www-client/elinks-0.12_pre6-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0 ) gpm? ( >=sys-libs/ncurses-5.2:0 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( dev-lang/spidermonkey:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=bzip2? ( >=app-arch/bzip2-1.0.2 ) gc? ( dev-libs/boehm-gc ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( >=dev-libs/expat-1.95.4 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0 ) gpm? ( >=sys-libs/ncurses-5.2:0 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( dev-lang/spidermonkey:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Advanced and well-established text-mode web browser
 EAPI=5
 HOMEPAGE=http://elinks.or.cz/
-IUSE=bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 javascript libressl lua +mouse nls nntp perl ruby samba ssl unicode X zlib
+IUSE=bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6 javascript libressl lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0 ) gpm? ( >=sys-libs/ncurses-5.2:0 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( dev-lang/spidermonkey:0 )
+RDEPEND=bzip2? ( >=app-arch/bzip2-1.0.2 ) gc? ( dev-libs/boehm-gc ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) xml? ( >=dev-libs/expat-1.95.4 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0 ) gpm? ( >=sys-libs/ncurses-5.2:0 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( dev-lang/spidermonkey:0 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://elinks.or.cz/download/elinks-0.12pre6.tar.bz2 https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2 https://dev.gentoo.org/~axs/distfiles/elinks-0.12_pre5-js185-patches.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=39c2e3c22a42fa55f8eba80cf006b09b
+_md5_=4919b689e3d01146738b0b79277a4a98
diff --git a/metadata/md5-cache/www-client/elinks-9999 b/metadata/md5-cache/www-client/elinks-9999
index cdeb437a096a..39d732c7104b 100644
--- a/metadata/md5-cache/www-client/elinks-9999
+++ b/metadata/md5-cache/www-client/elinks-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-libs/openssl-0.9.6g:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0= ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEPEND=bzip2? ( >=app-arch/bzip2-1.0.2 ) gc? ( dev-libs/boehm-gc ) ssl? ( >=dev-libs/openssl-0.9.6g:0= ) xml? ( >=dev-libs/expat-1.95.4 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0= ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Advanced and well-established text-mode web browser
 EAPI=5
 HOMEPAGE=http://elinks.or.cz/
-IUSE=bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 javascript lua +mouse nls nntp perl ruby samba ssl unicode X zlib
+IUSE=bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6 javascript lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib
 LICENSE=GPL-2
-RDEPEND=dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-libs/openssl-0.9.6g:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0= ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
+RDEPEND=bzip2? ( >=app-arch/bzip2-1.0.2 ) gc? ( dev-libs/boehm-gc ) ssl? ( >=dev-libs/openssl-0.9.6g:0= ) xml? ( >=dev-libs/expat-1.95.4 ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5:0= ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	d9bd2ddd85a58e470b49ca997e255a4c	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	git-r3	e6443022d06c4de81a14e017bdfcc306	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	63d890c175bcc4604e8327cef1dec948	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=9f04f87dc50c69c32486dae1f278967c
+_md5_=a8a8793d37be5b345d6ba43e6f382c85
diff --git a/metadata/md5-cache/www-client/opera-developer-35.0.2064.0 b/metadata/md5-cache/www-client/opera-developer-35.0.2064.0
new file mode 100644
index 000000000000..991a6b8c16f3
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-35.0.2064.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+linguas_af +linguas_az +linguas_be +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_en_US +linguas_es_419 +linguas_es +linguas_fil +linguas_fi +linguas_fr_CA +linguas_fr +linguas_fy +linguas_gd +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kk +linguas_ko +linguas_lt +linguas_lv +linguas_me +linguas_mk +linguas_ms +linguas_nb +linguas_nl +linguas_nn +linguas_pa +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_uz +linguas_vi +linguas_zh_CN +linguas_zh_TW +linguas_zu
+KEYWORDS=~amd64 ~x86
+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/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-developer/35.0.2064.0/linux/opera-developer_35.0.2064.0_amd64.deb ) x86? ( http://get.geo.opera.com/pub/opera-developer/35.0.2064.0/linux/opera-developer_35.0.2064.0_i386.deb )
+_eclasses_=chromium	e6257bd55bfdac1269e99d4d7ed21cda	eutils	d9bd2ddd85a58e470b49ca997e255a4c	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	968e31c6fcd13eb2eaf6852e88dfdd36	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=356f3a966652b3d585d192f316210208
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-15.9-r1 b/metadata/md5-cache/x11-drivers/ati-drivers-15.9-r1
index 7e1703fc296d..fcd5b8da65bb 100644
--- a/metadata/md5-cache/x11-drivers/ati-drivers-15.9-r1
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-15.9-r1
@@ -8,8 +8,8 @@ KEYWORDS=-* amd64 x86
 LICENSE=AMD GPL-2 QPL-1.0
 RDEPEND=<=x11-base/xorg-server-1.17.49[-minimal] >=app-eselect/eselect-opengl-1.0.7 app-eselect/eselect-opencl sys-power/acpid x11-apps/xauth !x11-libs/xvba-video virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] qt4? ( x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] ) gdm-hack? ( x11-base/xorg-server:= ) !x11-drivers/ati-drivers:legacy kernel_linux? ( virtual/modutils )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
-RESTRICT=bindist test fetch
+RESTRICT=bindist test
 SLOT=1
 SRC_URI=mirror://gentoo/amd-catalyst-15.9-linux-installer-15.201.1151-x86.x86_64.zip http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz
 _eclasses_=eutils	d9bd2ddd85a58e470b49ca997e255a4c	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	linux-mod	9e27971daa324852d78bc7d4d811afae	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	c47eec09e82c8a750127ff2abf0745b1	pax-utils	9dd3f9de6dccb2463faf55e568439d1c	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=abc24d99a659ac45b67f45d7530b4075
+_md5_=83ebb3be25883b6f218781650a45a557
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 1509cd346bc7..f83aea7f2cf1 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 02 Dec 2015 20:43:47 +0000
+Thu, 03 Dec 2015 10:13:54 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 6d5331df5a7b..7e5f56b489c4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Dec  2 20:42:51 UTC 2015
+Thu Dec  3 10:12:59 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 86513e31512f..70e16960c81e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 02 Dec 2015 21:00:01 +0000
+Thu, 03 Dec 2015 11:00:02 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 678060a8629d..4224e1f96598 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1449088801 Wed 02 Dec 2015 08:40:01 PM UTC
+1449137401 Thu 03 Dec 2015 10:10:01 AM UTC
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b941eb9988f5..a1d337da3119 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3918,6 +3918,7 @@ media-libs/libbdplus:aacs - Add support for decryption of AACS
 media-libs/libbluray:aacs - Add support for decryption of AACS
 media-libs/libbluray:bdplus - Use media-libs/libbdplus for BD+ decryption
 media-libs/libbluray:java - Add support for BD-J
+media-libs/libbluray:udf - Add UDF (Universal Disk Format) support
 media-libs/libbluray:utils - Install command-line utilities and examples
 media-libs/libcanberra:alsa - Enables ALSA sound driver.
 media-libs/libcanberra:gstreamer - Enables gstreamer sound driver. Not useful when alsa or pulseaudio is available.
@@ -7819,8 +7820,10 @@ www-client/dwb:gtk3 - Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2
 www-client/dwb:libsecret - Enable libsecret support to store login credentials
 www-client/elinks:bittorrent - Enable support for the BitTorrent protocol
 www-client/elinks:finger - Enable support for the finger protocol
+www-client/elinks:gc - Enable garbage collection support via dev-libs/boehm-gc
 www-client/elinks:gopher - Enable support for the gopher protocol
 www-client/elinks:mouse - Make elinks to grab all mouse events
+www-client/elinks:xml - Enable support for bookmarks via dev-libs/expat
 www-client/epiphany:nss - Import passwords from older gecko based www-client/epiphany keyring.
 www-client/firefox:bindist - Disable official Firefox branding (icons, name) which are not binary-redistributable according to upstream.
 www-client/firefox:custom-optimization - Fine-tune custom compiler optimizations (-Os, -O0, -O1, -O2, -O3)
diff --git a/ros-meta/audio_common/Manifest b/ros-meta/audio_common/Manifest
index 3a2fcd27aca0..967f52c1efcd 100644
--- a/ros-meta/audio_common/Manifest
+++ b/ros-meta/audio_common/Manifest
@@ -1,2 +1,3 @@
 DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
 DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
+DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/ros-meta/audio_common/audio_common-0.2.9.ebuild b/ros-meta/audio_common/audio_common-0.2.9.ebuild
new file mode 100644
index 000000000000..618c77ecf99b
--- /dev/null
+++ b/ros-meta/audio_common/audio_common-0.2.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common code for working with audio in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/audio_capture
+	dev-ros/audio_common_msgs
+	dev-ros/audio_play
+	dev-ros/sound_play
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/vision_opencv/vision_opencv-1.11.9.ebuild b/ros-meta/vision_opencv/vision_opencv-1.11.9-r1.ebuild
similarity index 95%
rename from ros-meta/vision_opencv/vision_opencv-1.11.9.ebuild
rename to ros-meta/vision_opencv/vision_opencv-1.11.9-r1.ebuild
index faed03b24e6b..a4e236615daa 100644
--- a/ros-meta/vision_opencv/vision_opencv-1.11.9.ebuild
+++ b/ros-meta/vision_opencv/vision_opencv-1.11.9-r1.ebuild
@@ -18,5 +18,6 @@ RDEPEND="
 	dev-ros/cv_bridge
 	dev-ros/image_geometry
 	dev-ros/opencv_tests
+	dev-ros/opencv_apps
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/vision_opencv/vision_opencv-9999.ebuild b/ros-meta/vision_opencv/vision_opencv-9999.ebuild
index faed03b24e6b..a4e236615daa 100644
--- a/ros-meta/vision_opencv/vision_opencv-9999.ebuild
+++ b/ros-meta/vision_opencv/vision_opencv-9999.ebuild
@@ -18,5 +18,6 @@ RDEPEND="
 	dev-ros/cv_bridge
 	dev-ros/image_geometry
 	dev-ros/opencv_tests
+	dev-ros/opencv_apps
 "
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/busybox/busybox-1.24.1.ebuild b/sys-apps/busybox/busybox-1.24.1.ebuild
index 819b655df1f8..562c6c7c154a 100644
--- a/sys-apps/busybox/busybox-1.24.1.ebuild
+++ b/sys-apps/busybox/busybox-1.24.1.ebuild
@@ -67,7 +67,9 @@ src_prepare() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-	epatch "${FILESDIR}"/${P}-*.patch
+	epatch "${FILESDIR}"/busybox-1.24.1-trylink-ldflags.patch
+	epatch "${FILESDIR}"/busybox-1.24.1-unzip.patch
+	epatch "${FILESDIR}"/busybox-1.24.1-unzip-regression.patch
 	cp "${FILESDIR}"/ginit.c init/ || die
 
 	# flag cleanup
diff --git a/www-client/chromium/chromium-47.0.2526.73.ebuild b/www-client/chromium/chromium-47.0.2526.73.ebuild
index fbb9efae5654..423252862cf3 100644
--- a/www-client/chromium/chromium-47.0.2526.73.ebuild
+++ b/www-client/chromium/chromium-47.0.2526.73.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD hotwording? ( no-source-code )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="cups gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
diff --git a/www-client/elinks/elinks-0.12_pre6-r1.ebuild b/www-client/elinks/elinks-0.12_pre6-r1.ebuild
index a9ffcf6941dd..62908260f985 100644
--- a/www-client/elinks/elinks-0.12_pre6-r1.ebuild
+++ b/www-client/elinks/elinks-0.12_pre6-r1.ebuild
@@ -15,14 +15,15 @@ SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
-	  javascript lua +mouse nls nntp perl ruby samba ssl unicode X zlib"
+IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6
+	  javascript lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib"
 RESTRICT="test"
 
-DEPEND="dev-libs/boehm-gc
-	>=dev-libs/expat-1.95.4
+DEPEND="
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	gc? ( dev-libs/boehm-gc )
 	ssl? ( >=dev-libs/openssl-0.9.6g:0 )
+	xml? ( >=dev-libs/expat-1.95.4 )
 	X? ( x11-libs/libX11 x11-libs/libXt )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	lua? ( >=dev-lang/lua-5:0 )
@@ -122,6 +123,7 @@ src_configure() {
 		$(use_with gpm) \
 		$(use_with zlib) \
 		$(use_with bzip2 bzlib) \
+		$(use_with gc) \
 		$(use_with X x) \
 		$(use_with lua) \
 		$(use_with guile) \
@@ -138,6 +140,7 @@ src_configure() {
 		$(use_enable finger) \
 		$(use_enable samba smb) \
 		$(use_enable mouse) \
+		$(use_enable xml xbel) \
 		${myconf}
 }
 
diff --git a/www-client/elinks/elinks-0.12_pre6-r2.ebuild b/www-client/elinks/elinks-0.12_pre6-r2.ebuild
index 23044aac1892..88b93c0b8b1a 100644
--- a/www-client/elinks/elinks-0.12_pre6-r2.ebuild
+++ b/www-client/elinks/elinks-0.12_pre6-r2.ebuild
@@ -15,17 +15,18 @@ SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
-	  javascript libressl lua +mouse nls nntp perl ruby samba ssl unicode X zlib"
+IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6
+	  javascript libressl lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib"
 RESTRICT="test"
 
-DEPEND="dev-libs/boehm-gc
-	>=dev-libs/expat-1.95.4
+DEPEND="
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	gc? ( dev-libs/boehm-gc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0 )
 		libressl? ( dev-libs/libressl )
 	)
+	xml? ( >=dev-libs/expat-1.95.4 )
 	X? ( x11-libs/libX11 x11-libs/libXt )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	lua? ( >=dev-lang/lua-5:0 )
@@ -125,6 +126,7 @@ src_configure() {
 		$(use_with gpm) \
 		$(use_with zlib) \
 		$(use_with bzip2 bzlib) \
+		$(use_with gc) \
 		$(use_with X x) \
 		$(use_with lua) \
 		$(use_with guile) \
@@ -141,6 +143,7 @@ src_configure() {
 		$(use_enable finger) \
 		$(use_enable samba smb) \
 		$(use_enable mouse) \
+		$(use_enable xml xbel) \
 		${myconf}
 }
 
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 476a6210fa07..3feac4b6c251 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -17,14 +17,15 @@ SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
-	  javascript lua +mouse nls nntp perl ruby samba ssl unicode X zlib"
+IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6
+	  javascript lua +mouse nls nntp perl ruby samba ssl unicode X xml zlib"
 RESTRICT="test"
 
-DEPEND="dev-libs/boehm-gc
-	>=dev-libs/expat-1.95.4
+DEPEND="
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	gc? ( dev-libs/boehm-gc )
 	ssl? ( >=dev-libs/openssl-0.9.6g:0= )
+	xml? ( >=dev-libs/expat-1.95.4 )
 	X? ( x11-libs/libX11 x11-libs/libXt )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	lua? ( >=dev-lang/lua-5:0= )
@@ -91,6 +92,7 @@ src_configure() {
 		$(use_with gpm) \
 		$(use_with zlib) \
 		$(use_with bzip2 bzlib) \
+		$(use_with gc) \
 		$(use_with X x) \
 		$(use_with lua) \
 		$(use_with guile) \
@@ -107,6 +109,7 @@ src_configure() {
 		$(use_enable finger) \
 		$(use_enable samba smb) \
 		$(use_enable mouse) \
+		$(use_enable xml xbel) \
 		${myconf}
 }
 
diff --git a/www-client/elinks/metadata.xml b/www-client/elinks/metadata.xml
index 88787459505e..6ee34d0bf74c 100644
--- a/www-client/elinks/metadata.xml
+++ b/www-client/elinks/metadata.xml
@@ -9,7 +9,9 @@
 	<use>
 		<flag name='bittorrent'>Enable support for the BitTorrent protocol</flag>
 		<flag name='finger'>Enable support for the finger protocol</flag>
+		<flag name='gc'>Enable garbage collection support via <pkg>dev-libs/boehm-gc</pkg></flag>
 		<flag name='gopher'>Enable support for the gopher protocol</flag>
 		<flag name='mouse'>Make elinks to grab all mouse events</flag>
+		<flag name='xml'>Enable support for bookmarks via <pkg>dev-libs/expat</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 9e0ff34d1175..fd98b44459e0 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -2,3 +2,5 @@ DIST opera-developer_35.0.2052.0_amd64.deb 45039830 SHA256 6f47dd2afc2bd06bb25e5
 DIST opera-developer_35.0.2052.0_i386.deb 46286074 SHA256 72b19463c3253803185be5f668b1c8440911cd1833fd5bc0439e852f312eb643 SHA512 a16f25513175d6e1c4182525aef53a1fe127a9a8c28c3ad367bf67ad4fb0a46a56f4de5cbf1857c56b23972f2dde73590d5b363f5b47fe395de1be9e92ac088a WHIRLPOOL d222d9cfa0197b8d00947dcbf13ab24deccbfef321dcd53db280c5435c23bf42bc51bb50609050dfacd064f4fd29f1900c2554bf40643cfc9bfddaa593d08eea
 DIST opera-developer_35.0.2060.0_amd64.deb 45864416 SHA256 c955fd892c22966be68217222a7f7eb390199ad0f465481ce371a1a78da116d9 SHA512 5abe533ad6180e4e5592771b67764a2dc99d86a06d174b918886fd8516564062f6eb3317afa77a53ce001a00c7a28254ca74bfb4782d195347fdba65c2da7845 WHIRLPOOL e676a83732c91604f580683dad010351a82edfbaea655516d7351f8fdb249cf2ad9dc77f606e0719a7e22931aab06342a92c2f368f08fdd2f82aced973658e37
 DIST opera-developer_35.0.2060.0_i386.deb 46540244 SHA256 516b1de671a4b1c6f7937fb65c7e3e1e48878adee46a88d01a35e16f7d8c4f99 SHA512 0191229671d3731c58d0eb8da6ba031c9d79373ee4e1f44703820ee117e93ca0ced8afc51e8d1b0d6b7d938befe7047cf97c8df19b4132ac29580a5ae00c8f53 WHIRLPOOL fb463b71917e7d6c490654b319756b07da9dcce7e5e9bc487469d3913c2f14849953f05f2f07864b99a8669d63d9d95d151073b81fc12413da4e0400d509bf0d
+DIST opera-developer_35.0.2064.0_amd64.deb 46017124 SHA256 1f4221dcf266cfe5a7b0c931df106f4686c0c277a30f839a346f99aa652f283c SHA512 270c5a21dde40164ae3efb522a17b33b18dac6e640c713ca56dc124364684a2a255112878a737e7e2179685d421ca965b1ecaea0b60a0e844ad598a199224f7e WHIRLPOOL fd3f2cd8a198eb750a9b71f3df1bd4cb4ba095ef861c37dbfa7d246c3d95229de119119df1d3b499be57bfead9a67dc4e026274db3d8303525933d924cc7e874
+DIST opera-developer_35.0.2064.0_i386.deb 46705518 SHA256 cffb1dd084208249a2e989a4cdfc047e449a54d6557533bae26f8500b127de0b SHA512 51767d2ff8c2eaee6abee069be31984e81885ebf34604c1a5fc4a15e1a150753b6b308334ef87f5db3e1a4b83c7d77d6b9cda9963aec3482fb9d60bc3f03b86f WHIRLPOOL 502859b3c8ea12bbaf9483feac5ca30efdd8ad993c542f0d31f9e12f19c3380c4581cd060d57ae18aae3f3d50dc788d64056ef44b2aa37f197386eb71d74d2de
diff --git a/www-client/opera-developer/opera-developer-35.0.2064.0.ebuild b/www-client/opera-developer/opera-developer-35.0.2064.0.ebuild
new file mode 100644
index 000000000000..bfeded8ebfc9
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-35.0.2064.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+	hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
+	sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
+	x86?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_i386.deb" )
+"
+KEYWORDS="~amd64 ~x86"
+
+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/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}/copyright || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
diff --git a/x11-drivers/ati-drivers/ati-drivers-15.9-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-15.9-r1.ebuild
index 1838bc6de782..4e2468cbab97 100644
--- a/x11-drivers/ati-drivers/ati-drivers-15.9-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-15.9-r1.ebuild
@@ -24,7 +24,7 @@ IUSE="debug +modules qt4 static-libs pax_kernel gdm-hack"
 LICENSE="AMD GPL-2 QPL-1.0"
 KEYWORDS="-* amd64 x86"
 
-RESTRICT="bindist test fetch"
+RESTRICT="bindist test"
 
 RDEPEND="
 	<=x11-base/xorg-server-1.17.49[-minimal]