From 3c609e14699f04d2f58f28863cfd7ce7c700e218 Mon Sep 17 00:00:00 2001
From: root <root@sandbox.local.calculate.ru>
Date: Thu, 27 Apr 2017 14:26:59 +0300
Subject: [PATCH] Sync with portage [Thu Apr 27 14:26:59 MSK 2017].

---
 dev-lang/hy/hy-0.12.1.ebuild                  |   2 +-
 dev-lang/ruby/Manifest                        |   2 -
 dev-lang/ruby/ruby-2.4.0.ebuild               | 237 ------------------
 dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild  |   2 +-
 .../Math-BigInt-GMP-1.490.0.ebuild            |   4 +-
 dev-python/pygame/Manifest                    |   1 +
 dev-python/pygame/metadata.xml                |   3 +
 dev-python/pygame/pygame-1.9.3.ebuild         |  79 ++++++
 dev-ros/collada_parser/Manifest               |   1 +
 .../collada_parser-1.12.9.ebuild              |  25 ++
 dev-ros/collada_urdf/Manifest                 |   1 +
 .../collada_urdf/collada_urdf-1.12.9.ebuild   |  28 +++
 dev-ros/joint_state_publisher/Manifest        |   1 +
 .../joint_state_publisher-1.12.9.ebuild       |  22 ++
 dev-ros/kdl_parser/Manifest                   |   1 +
 dev-ros/kdl_parser/kdl_parser-1.12.9.ebuild   |  26 ++
 dev-ros/kdl_parser_py/Manifest                |   1 +
 .../kdl_parser_py/kdl_parser_py-1.12.9.ebuild |  21 ++
 dev-ros/urdf/Manifest                         |   1 +
 dev-ros/urdf/urdf-1.12.9.ebuild               |  29 +++
 dev-ros/urdf_parser_plugin/Manifest           |   1 +
 .../urdf_parser_plugin-1.12.9.ebuild          |  17 ++
 dev-ruby/backports/Manifest                   |   1 +
 dev-ruby/backports/backports-3.8.0.ebuild     |  19 ++
 dev-ruby/mail/Manifest                        |   1 +
 dev-ruby/mail/mail-2.6.5.ebuild               |  33 +++
 dev-util/jenkins-bin/Manifest                 |   2 +
 .../jenkins-bin/jenkins-bin-2.46.2.ebuild     |  46 ++++
 dev-util/jenkins-bin/jenkins-bin-2.57.ebuild  |  46 ++++
 dev-vcs/git/Manifest                          |   6 +-
 ...it-2.12.1.ebuild => git-2.13.0_rc1.ebuild} |   1 +
 media-libs/lilv/lilv-0.24.2.ebuild            |   2 +-
 media-libs/lv2/lv2-1.14.0.ebuild              |   2 +-
 media-plugins/live/Manifest                   |   1 +
 media-plugins/live/live-2017.04.26.ebuild     | 128 ++++++++++
 metadata/dtd/timestamp.chk                    |   2 +-
 metadata/glsa/glsa-201704-04.xml              |  58 +++++
 metadata/glsa/timestamp.chk                   |   2 +-
 metadata/glsa/timestamp.commit                |   2 +-
 metadata/md5-cache/dev-lang/hy-0.12.1         |   6 +-
 metadata/md5-cache/dev-lang/ruby-2.4.0        |  14 --
 .../md5-cache/dev-libs/xmlrpc-c-1.39.11-r1    |   4 +-
 .../dev-perl/Math-BigInt-GMP-1.490.0          |   4 +-
 metadata/md5-cache/dev-python/pygame-1.9.3    |  15 ++
 .../md5-cache/dev-ros/collada_parser-1.12.9   |  13 +
 .../md5-cache/dev-ros/collada_urdf-1.12.9     |  13 +
 .../dev-ros/joint_state_publisher-1.12.9      |  14 ++
 metadata/md5-cache/dev-ros/kdl_parser-1.12.9  |  14 ++
 .../md5-cache/dev-ros/kdl_parser_py-1.12.9    |  14 ++
 metadata/md5-cache/dev-ros/urdf-1.12.9        |  14 ++
 .../dev-ros/urdf_parser_plugin-1.12.9         |  13 +
 metadata/md5-cache/dev-ruby/backports-3.8.0   |  14 ++
 metadata/md5-cache/dev-ruby/mail-2.6.5        |  14 ++
 .../md5-cache/dev-util/jenkins-bin-2.46.2     |  13 +
 metadata/md5-cache/dev-util/jenkins-bin-2.57  |  13 +
 .../dev-vcs/{git-2.12.1 => git-2.13.0_rc1}    |   5 +-
 metadata/md5-cache/media-libs/lilv-0.24.2     |   4 +-
 metadata/md5-cache/media-libs/lv2-1.14.0      |   4 +-
 .../md5-cache/media-plugins/live-2017.04.26   |  11 +
 metadata/md5-cache/net-misc/tigervnc-1.7.1-r2 |   4 +-
 metadata/md5-cache/net-vpn/tor-0.2.9.10       |   4 +-
 .../md5-cache/ros-meta/robot_model-1.12.9     |  13 +
 metadata/md5-cache/sys-apps/moreutils-0.61    |  13 +
 metadata/md5-cache/www-apache/passenger-5.1.0 |  14 --
 metadata/md5-cache/www-apache/passenger-5.1.1 |  14 --
 metadata/md5-cache/www-apache/passenger-5.1.2 |   4 +-
 metadata/news/timestamp.chk                   |   2 +-
 metadata/timestamp                            |   2 +-
 metadata/timestamp.chk                        |   2 +-
 metadata/timestamp.commit                     |   2 +-
 metadata/timestamp.x                          |   2 +-
 metadata/xml-schema/timestamp.chk             |   2 +-
 net-misc/tigervnc/metadata.xml                |  10 +-
 net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild    |   3 +-
 net-vpn/tor/tor-0.2.9.10.ebuild               |   2 +-
 profiles/use.local.desc                       |   2 +
 ros-meta/robot_model/Manifest                 |   1 +
 .../robot_model/robot_model-1.12.9.ebuild     |  25 ++
 sys-apps/moreutils/Manifest                   |   1 +
 sys-apps/moreutils/moreutils-0.61.ebuild      |  64 +++++
 www-apache/passenger/Manifest                 |   2 -
 www-apache/passenger/passenger-5.1.0.ebuild   | 118 ---------
 www-apache/passenger/passenger-5.1.1.ebuild   | 118 ---------
 www-apache/passenger/passenger-5.1.2.ebuild   |   2 +-
 84 files changed, 938 insertions(+), 561 deletions(-)
 delete mode 100644 dev-lang/ruby/ruby-2.4.0.ebuild
 create mode 100644 dev-python/pygame/pygame-1.9.3.ebuild
 create mode 100644 dev-ros/collada_parser/collada_parser-1.12.9.ebuild
 create mode 100644 dev-ros/collada_urdf/collada_urdf-1.12.9.ebuild
 create mode 100644 dev-ros/joint_state_publisher/joint_state_publisher-1.12.9.ebuild
 create mode 100644 dev-ros/kdl_parser/kdl_parser-1.12.9.ebuild
 create mode 100644 dev-ros/kdl_parser_py/kdl_parser_py-1.12.9.ebuild
 create mode 100644 dev-ros/urdf/urdf-1.12.9.ebuild
 create mode 100644 dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.12.9.ebuild
 create mode 100644 dev-ruby/backports/backports-3.8.0.ebuild
 create mode 100644 dev-ruby/mail/mail-2.6.5.ebuild
 create mode 100644 dev-util/jenkins-bin/jenkins-bin-2.46.2.ebuild
 create mode 100644 dev-util/jenkins-bin/jenkins-bin-2.57.ebuild
 rename dev-vcs/git/{git-2.12.1.ebuild => git-2.13.0_rc1.ebuild} (99%)
 create mode 100644 media-plugins/live/live-2017.04.26.ebuild
 create mode 100644 metadata/glsa/glsa-201704-04.xml
 delete mode 100644 metadata/md5-cache/dev-lang/ruby-2.4.0
 create mode 100644 metadata/md5-cache/dev-python/pygame-1.9.3
 create mode 100644 metadata/md5-cache/dev-ros/collada_parser-1.12.9
 create mode 100644 metadata/md5-cache/dev-ros/collada_urdf-1.12.9
 create mode 100644 metadata/md5-cache/dev-ros/joint_state_publisher-1.12.9
 create mode 100644 metadata/md5-cache/dev-ros/kdl_parser-1.12.9
 create mode 100644 metadata/md5-cache/dev-ros/kdl_parser_py-1.12.9
 create mode 100644 metadata/md5-cache/dev-ros/urdf-1.12.9
 create mode 100644 metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.9
 create mode 100644 metadata/md5-cache/dev-ruby/backports-3.8.0
 create mode 100644 metadata/md5-cache/dev-ruby/mail-2.6.5
 create mode 100644 metadata/md5-cache/dev-util/jenkins-bin-2.46.2
 create mode 100644 metadata/md5-cache/dev-util/jenkins-bin-2.57
 rename metadata/md5-cache/dev-vcs/{git-2.12.1 => git-2.13.0_rc1} (85%)
 create mode 100644 metadata/md5-cache/media-plugins/live-2017.04.26
 create mode 100644 metadata/md5-cache/ros-meta/robot_model-1.12.9
 create mode 100644 metadata/md5-cache/sys-apps/moreutils-0.61
 delete mode 100644 metadata/md5-cache/www-apache/passenger-5.1.0
 delete mode 100644 metadata/md5-cache/www-apache/passenger-5.1.1
 create mode 100644 ros-meta/robot_model/robot_model-1.12.9.ebuild
 create mode 100644 sys-apps/moreutils/moreutils-0.61.ebuild
 delete mode 100644 www-apache/passenger/passenger-5.1.0.ebuild
 delete mode 100644 www-apache/passenger/passenger-5.1.1.ebuild

diff --git a/dev-lang/hy/hy-0.12.1.ebuild b/dev-lang/hy/hy-0.12.1.ebuild
index bc27ab71eb3c..63fcce06bf62 100644
--- a/dev-lang/hy/hy-0.12.1.ebuild
+++ b/dev-lang/hy/hy-0.12.1.ebuild
@@ -19,7 +19,7 @@ IUSE="test doc examples"
 RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]
 	>=dev-python/rply-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/astor-0.5[${PYTHON_USEDEP}]
-	dev-python/clint[${PYTHON_USEDEP}]
+	>=dev-python/clint-0.4[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index c7ab7d4480d8..937db51ec592 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -4,7 +4,6 @@ DIST ruby-2.2.6.tar.xz 10487776 SHA256 9414ecc0d09cf71c9a24e8dc82fcc87919ac7359f
 DIST ruby-2.2.7.tar.xz 10507528 SHA256 234c8aee6543da9efd67008e6e7ee740d41ed57a52e797f65043c3b5ec3bcb53 SHA512 21bebec6d0972f4e6f2988f471c58520e32096e43a61d627eb2210df283a6fd6d0fc49da9063f2d086f3d489f13e948462a6f084f9e931b4fde6102f490cc225 WHIRLPOOL 35e1470b7d5de25efd213b70befa7b0ce599f3e2ef73aacdf343d7ed3fe14836ab0899124cce8670c00470af9428a81a7f693cb5897448c2d2e824d5b8a1819b
 DIST ruby-2.3.3.tar.xz 11444164 SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc SHA512 73dd6ed896ff52d953b153b2cab359c87953ea77521878f1ee16c1e217cc46bcb253100debe61ba631e6ffa0bc773e592d603a374508ed5189a311136ccd8d20 WHIRLPOOL aa368a2d0f067ac9d0c6fed62c0e1bdfac0d49c473cd49be9b2774ed3097b76286d091a0887528227f36307b8c1217a2493c5c48fb462db52a3e23cb251a7f79
 DIST ruby-2.3.4.tar.xz 11450108 SHA256 341cd9032e9fd17c452ed8562a8d43f7e45bfe05e411d0d7d627751dd82c578c SHA512 9e3adc2de6703e50e75db37db2981006d4c69759929d61db6a0d63627cfe5977d0ad66d2c69d7161cfc0c0d1c2cb38e5181a06ccd2790df2f72ec25c2ad01e02 WHIRLPOOL 1e9d4112134910ebf1bd241b5031551fdfa882405ca850d9b11af9dc79251379971e18666600d88ef2054c4794a98142df150f83cb06f1dff616faee45ffe1cc
-DIST ruby-2.4.0.tar.xz 9906880 SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 SHA512 975a5388592adc038461e0acebb6c0efee242891b2ea8621476401458efe2bc0fdd317d3bf99beb745b0b3808410efdff33862da29c95c027f457943721e3ab6 WHIRLPOOL 5e0594aa853f9a8a64837d6c34d7110f32471bda719df3ae724643cbe9722b5003cf014ac10130b5a1d59c3f4cc65967c4c00edeea47801e389241be7fe0b53f
 DIST ruby-2.4.1.tar.xz 9939188 SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 SHA512 e6fd290b6edd166348b70f0f1c56f7ed9d956c4c1eb91d97d0548041ca4196b9b75ec1ad35c745bdbfd4de195899093e7205d7f02b014ecf1c48e6f31cf25903 WHIRLPOOL b45a6e3bd70e6ef802d084ad87ad0eddd85932e07939bd6ed6a2e6944aa289f231971fedd7d1eece792becb08312f37b80073a2a9df070f61f32747c0708523e
 DIST ruby-patches-2.1.10.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
 DIST ruby-patches-2.1.9.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
@@ -12,5 +11,4 @@ DIST ruby-patches-2.2.6.tar.bz2 2272 SHA256 f54373704ce8df732490e8d1e7e35188503f
 DIST ruby-patches-2.2.7.tar.bz2 2272 SHA256 f54373704ce8df732490e8d1e7e35188503faacc5278fe0ab0d8c07bdc762fed SHA512 ed8bff8f730ccb114e62784d29541f276b2821d9eb121a9772dc4aabc139b688f2b14f5f27710098a8cd751c62d31b46170b427ad54dc4f6490c003450ae1583 WHIRLPOOL 8598c9284252c1e7cc9f9019c5f468ce5ab8b4ae013e71c631cd00cc8bfde068b041f1bc6851bb2962982a1e46cbde0ddc51c186ea41638a7881c587c658e603
 DIST ruby-patches-2.3.3-r1.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64
 DIST ruby-patches-2.3.4.tar.bz2 2255 SHA256 32bb888f3ea9e81e4fdff5e852493aafc8f12bfcf9997981f7b7588d6e8ec9c1 SHA512 af7ad3255cf8450859e3c5564393ca106893fd1e40178ad153fb8e66871d30e326f63d48c1904fac5c353408f71e767c72d49fdbf47198c041a628b41c51c868 WHIRLPOOL dc412a788ec77dc9dad4fd631fc8aa5c909b9d21bf6b0b538c4ba398c1670cb01fbf1e4d92a38fa869b96f786707a9c45c7fe5ca7e04f75ff428b20d9fb34c53
-DIST ruby-patches-2.4.0.tar.bz2 2047 SHA256 9560b8e8dc4a5517814df07aa635c9269f5e7cff5a15827a25a9f0811194e450 SHA512 b35db875a7e4a226e75eb6f7bc68b4bc97cc699bdc5f6930015e55cdc324b67b9883a2aa574c9c9a8b5dc5345c4df8a5ca8ace5b794b3e4de6517f3eefd25745 WHIRLPOOL fc5d226f46fe4ee1c86f6fff51ec9184b8c0ec08a1793eab365437d4ce2fd573cfc8857386cd10932f7dde05254bc975eff5b7986aea429730c606147fae2a5c
 DIST ruby-patches-2.4.1.tar.bz2 2047 SHA256 9560b8e8dc4a5517814df07aa635c9269f5e7cff5a15827a25a9f0811194e450 SHA512 b35db875a7e4a226e75eb6f7bc68b4bc97cc699bdc5f6930015e55cdc324b67b9883a2aa574c9c9a8b5dc5345c4df8a5ca8ace5b794b3e4de6517f3eefd25745 WHIRLPOOL fc5d226f46fe4ee1c86f6fff51ec9184b8c0ec08a1793eab365437d4ce2fd573cfc8857386cd10932f7dde05254bc975eff5b7986aea429730c606147fae2a5c
diff --git a/dev-lang/ruby/ruby-2.4.0.ebuild b/dev-lang/ruby/ruby-2.4.0.ebuild
deleted file mode 100644
index c922fd97df2a..000000000000
--- a/dev-lang/ruby/ruby-2.4.0.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.3.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~graaff/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	jemalloc? ( dev-libs/jemalloc )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20161226
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24]
-	>=dev-ruby/minitest-5.10.1[ruby_targets_ruby24]
-	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24]
-	>=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24]
-	>=dev-ruby/rake-12.0.0[ruby_targets_ruby24]
-	>=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24]
-	>=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby24]
-	>=dev-ruby/json-2.0.2[ruby_targets_ruby24]
-	rdoc? ( >=dev-ruby/rdoc-5.0.0[ruby_targets_ruby24] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700. Use explicit version numbers to ensure rm fails when they
-	# change so we can update dependencies accordingly.
-	rm -f gems/{did_you_mean-1.1.0,minitest-5.10.1,net-telnet-0.1.1,power_assert-0.4.1,rake-12.0.0,test-unit-3.2.3,xmlrpc-0.2.1}.gem || die
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_enable jemalloc jemalloc) \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(19|20|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
index 9ccb7d3e5378..b3b46f059c97 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test tools"
 
 REQUIRED_USE="test? ( abyss curl cxx ) tools? ( curl )"
diff --git a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.490.0.ebuild b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.490.0.ebuild
index 4d2805826314..6f26f714cce3 100644
--- a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.490.0.ebuild
+++ b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.490.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use the GMP library for Math::BigInt routines"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 25f8d9bab0b0..28081fc28d93 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1 +1,2 @@
 DIST pygame-1.9.2_pre20120101.tar.xz 2263028 SHA256 86d386a84a29387e98f6650edbd7fffe5b800115b69e6b15b2588c13eae56335 SHA512 1e82cf720da28d4e4213f6b7a029ab4c9dd592c3155f3d11da8272a7d81d28c54f93402383fa5fa4a4e8863dfc039062838d0317cfedde30a4455e52ce680576 WHIRLPOOL 437555ba4816e42bb745ad5ce13b7f164d5a1ff467cd7193327856b98047eeb56c1d1043c2cc75c6a0ca71ea96240df75b1dc544122034c7e4628c544f8d9486
+DIST pygame-1.9.3.tar.gz 2974541 SHA256 751021819bdc0cbe5cbd51904abb6ff9e9aee5b0e8955af02284d0e77d6c9ec2 SHA512 8920c598a97b4ff8602391517f070b67263bacb6330e13ea5d7d5432ee592a7c984fe986837b90a032da3d4e717f9df0cc99f0fb39f1cbde1b4f6a4c132feffe WHIRLPOOL 639de0f3fff185c09a145f0aab569358f92a8aca5e549e7f05005717ac081ab6f4d5c8ecd98d93030a2e0dc344913cec86093e9df9d3fe38043372c325c5bb96
diff --git a/dev-python/pygame/metadata.xml b/dev-python/pygame/metadata.xml
index 9e5274c5b4ae..d614a7a832a5 100644
--- a/dev-python/pygame/metadata.xml
+++ b/dev-python/pygame/metadata.xml
@@ -5,4 +5,7 @@
 	<email>python@gentoo.org</email>
 	<name>Python</name>
 </maintainer>
+	<use>
+		<flag name="midi">Enable midi support using <pkg>media-libs/portmidi</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/pygame/pygame-1.9.3.ebuild b/dev-python/pygame/pygame-1.9.3.ebuild
new file mode 100644
index 000000000000..85663969f5d9
--- /dev/null
+++ b/dev-python/pygame/pygame-1.9.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit flag-o-matic distutils-r1 virtualx
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="http://www.pygame.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples midi X"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=media-libs/sdl-image-1.2.2[png,jpeg]
+	>=media-libs/sdl-mixer-1.2.4
+	>=media-libs/sdl-ttf-2.0.6
+	>=media-libs/smpeg-0.4.4-r1
+	midi? ( media-libs/portmidi )
+	X? ( >=media-libs/libsdl-1.2.5[X,video] )
+	!X? ( >=media-libs/libsdl-1.2.5 )"
+RDEPEND="${DEPEND}"
+
+DOCS=( WHATSNEW )
+
+# various module import and data path issues
+RESTRICT=test
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 "${EPYTHON}" config.py -auto
+
+	if ! use X; then
+		sed -e "s:^scrap :#&:" -i Setup || die "sed failed"
+	fi
+
+	# Disable automagic dependency on PortMidi.
+	if ! use midi; then
+		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
+	fi
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2* ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" virtx "${EPYTHON}" -m pygame.tests
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+	fi
+}
diff --git a/dev-ros/collada_parser/Manifest b/dev-ros/collada_parser/Manifest
index 43cb89d3f670..72d70a587c23 100644
--- a/dev-ros/collada_parser/Manifest
+++ b/dev-ros/collada_parser/Manifest
@@ -1 +1,2 @@
 DIST robot_model-1.12.8.tar.gz 1297591 SHA256 dd8a6dec56e06bcc84582da4163efe22dcc4bf6badd6011ebb209db342c495a1 SHA512 77770e3ce1fe7c143c15581fa262dc01ccc04dd9313d022b9f0f254451db80415b558f339063debc5712590f846690d957848ba977f2175d2a4cda72b2102914 WHIRLPOOL afaeaee66821165efccc049a0f7972c597dde89f4f6814501694542e8d88d7591945872ca18020ea04742ab96ec133c306bccfddc81dd4f221b1def2f436cfbe
+DIST robot_model-1.12.9.tar.gz 1298115 SHA256 96b104f7a77e82a4af7df4ff6de7cc6ce11b76819537e0dc9b9a3c870d2df910 SHA512 fe1da6fd290af012d53cd2875cdfa5e746bfb964a6cf4ca91786218b33603858d478f49a8e18c9581ba52d9e1d68409f919ec19997de7549b3fb2bc4a3686121 WHIRLPOOL 74fa337c6e09dce970ec8e646ab52256d36261e77fb9ced0d08a66dcac0d33c0922ed6fe1ba90a57d9e8dfd3861436698b217bdb7b97357c162f6ce4e7cd11c3
diff --git a/dev-ros/collada_parser/collada_parser-1.12.9.ebuild b/dev-ros/collada_parser/collada_parser-1.12.9.ebuild
new file mode 100644
index 000000000000..f68feaefd688
--- /dev/null
+++ b/dev-ros/collada_parser/collada_parser-1.12.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ parser for the Collada robot description format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	>=dev-ros/urdf_parser_plugin-1.12.6
+	dev-ros/roscpp
+	dev-ros/class_loader
+	dev-libs/urdfdom_headers
+	dev-libs/collada-dom
+	>=dev-ros/urdf-1.12.6
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/collada_urdf/Manifest b/dev-ros/collada_urdf/Manifest
index 27acdba1a053..bc7433e00803 100644
--- a/dev-ros/collada_urdf/Manifest
+++ b/dev-ros/collada_urdf/Manifest
@@ -1,3 +1,4 @@
 DIST robot_model-1.12.6.tar.gz 1295666 SHA256 ac335cec5a3706a104411222a2f89ef1862c0ac8caa5ddadd390e9c25641bf27 SHA512 60270b3ec20c0473e9c8d02d661794e253405c836b06cf5c15b65dddf104bfb5e4865463e12232e94548d68eead2b5499eb04c71aee3f851fa9f85dbe733ee12 WHIRLPOOL 6cec339181a6570fbe4e61415d341f5f7404ea69d8d2a4058d5c837fa15f74c7c95a4ee3f74a78fcca624d272995f09aae4ad3a6027178b2c25daa466754adc4
 DIST robot_model-1.12.7.tar.gz 1296028 SHA256 c9aad0e23970507c30490678fb76514faf1bd577ec2c30b4703fd322543be3bc SHA512 bc1901473f890b7200ef67db891ca9269c867ee1cf67a316948587d27549c6d58ce8c0b4a0d9255a5419a235ead3b19065b135486188efc21cbb6594d1863291 WHIRLPOOL 7575227d3388652eb71c5fd4265fe70c26f44149ee63d793ad87906805dff8938313f2f085edfee82847a4050b8639bc9c0773090b9f0ecbe84e29291f9d7593
 DIST robot_model-1.12.8.tar.gz 1297591 SHA256 dd8a6dec56e06bcc84582da4163efe22dcc4bf6badd6011ebb209db342c495a1 SHA512 77770e3ce1fe7c143c15581fa262dc01ccc04dd9313d022b9f0f254451db80415b558f339063debc5712590f846690d957848ba977f2175d2a4cda72b2102914 WHIRLPOOL afaeaee66821165efccc049a0f7972c597dde89f4f6814501694542e8d88d7591945872ca18020ea04742ab96ec133c306bccfddc81dd4f221b1def2f436cfbe
+DIST robot_model-1.12.9.tar.gz 1298115 SHA256 96b104f7a77e82a4af7df4ff6de7cc6ce11b76819537e0dc9b9a3c870d2df910 SHA512 fe1da6fd290af012d53cd2875cdfa5e746bfb964a6cf4ca91786218b33603858d478f49a8e18c9581ba52d9e1d68409f919ec19997de7549b3fb2bc4a3686121 WHIRLPOOL 74fa337c6e09dce970ec8e646ab52256d36261e77fb9ced0d08a66dcac0d33c0922ed6fe1ba90a57d9e8dfd3861436698b217bdb7b97357c162f6ce4e7cd11c3
diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.9.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.9.ebuild
new file mode 100644
index 000000000000..2c6ead23bcda
--- /dev/null
+++ b/dev-ros/collada_urdf/collada_urdf-1.12.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/angles
+	dev-ros/collada_parser
+	dev-ros/resource_retriever
+	dev-ros/urdf
+	dev-ros/geometric_shapes
+	dev-ros/tf
+	media-libs/assimp
+	dev-libs/tinyxml
+	dev-libs/collada-dom
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/joint_state_publisher/Manifest b/dev-ros/joint_state_publisher/Manifest
index c7052b0c98d8..36c4e1d7682e 100644
--- a/dev-ros/joint_state_publisher/Manifest
+++ b/dev-ros/joint_state_publisher/Manifest
@@ -1,2 +1,3 @@
 DIST robot_model-1.12.7.tar.gz 1296028 SHA256 c9aad0e23970507c30490678fb76514faf1bd577ec2c30b4703fd322543be3bc SHA512 bc1901473f890b7200ef67db891ca9269c867ee1cf67a316948587d27549c6d58ce8c0b4a0d9255a5419a235ead3b19065b135486188efc21cbb6594d1863291 WHIRLPOOL 7575227d3388652eb71c5fd4265fe70c26f44149ee63d793ad87906805dff8938313f2f085edfee82847a4050b8639bc9c0773090b9f0ecbe84e29291f9d7593
 DIST robot_model-1.12.8.tar.gz 1297591 SHA256 dd8a6dec56e06bcc84582da4163efe22dcc4bf6badd6011ebb209db342c495a1 SHA512 77770e3ce1fe7c143c15581fa262dc01ccc04dd9313d022b9f0f254451db80415b558f339063debc5712590f846690d957848ba977f2175d2a4cda72b2102914 WHIRLPOOL afaeaee66821165efccc049a0f7972c597dde89f4f6814501694542e8d88d7591945872ca18020ea04742ab96ec133c306bccfddc81dd4f221b1def2f436cfbe
+DIST robot_model-1.12.9.tar.gz 1298115 SHA256 96b104f7a77e82a4af7df4ff6de7cc6ce11b76819537e0dc9b9a3c870d2df910 SHA512 fe1da6fd290af012d53cd2875cdfa5e746bfb964a6cf4ca91786218b33603858d478f49a8e18c9581ba52d9e1d68409f919ec19997de7549b3fb2bc4a3686121 WHIRLPOOL 74fa337c6e09dce970ec8e646ab52256d36261e77fb9ced0d08a66dcac0d33c0922ed6fe1ba90a57d9e8dfd3861436698b217bdb7b97357c162f6ce4e7cd11c3
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.12.9.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.12.9.ebuild
new file mode 100644
index 000000000000..7a7a68e62676
--- /dev/null
+++ b/dev-ros/joint_state_publisher/joint_state_publisher-1.12.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
diff --git a/dev-ros/kdl_parser/Manifest b/dev-ros/kdl_parser/Manifest
index 27acdba1a053..bc7433e00803 100644
--- a/dev-ros/kdl_parser/Manifest
+++ b/dev-ros/kdl_parser/Manifest
@@ -1,3 +1,4 @@
 DIST robot_model-1.12.6.tar.gz 1295666 SHA256 ac335cec5a3706a104411222a2f89ef1862c0ac8caa5ddadd390e9c25641bf27 SHA512 60270b3ec20c0473e9c8d02d661794e253405c836b06cf5c15b65dddf104bfb5e4865463e12232e94548d68eead2b5499eb04c71aee3f851fa9f85dbe733ee12 WHIRLPOOL 6cec339181a6570fbe4e61415d341f5f7404ea69d8d2a4058d5c837fa15f74c7c95a4ee3f74a78fcca624d272995f09aae4ad3a6027178b2c25daa466754adc4
 DIST robot_model-1.12.7.tar.gz 1296028 SHA256 c9aad0e23970507c30490678fb76514faf1bd577ec2c30b4703fd322543be3bc SHA512 bc1901473f890b7200ef67db891ca9269c867ee1cf67a316948587d27549c6d58ce8c0b4a0d9255a5419a235ead3b19065b135486188efc21cbb6594d1863291 WHIRLPOOL 7575227d3388652eb71c5fd4265fe70c26f44149ee63d793ad87906805dff8938313f2f085edfee82847a4050b8639bc9c0773090b9f0ecbe84e29291f9d7593
 DIST robot_model-1.12.8.tar.gz 1297591 SHA256 dd8a6dec56e06bcc84582da4163efe22dcc4bf6badd6011ebb209db342c495a1 SHA512 77770e3ce1fe7c143c15581fa262dc01ccc04dd9313d022b9f0f254451db80415b558f339063debc5712590f846690d957848ba977f2175d2a4cda72b2102914 WHIRLPOOL afaeaee66821165efccc049a0f7972c597dde89f4f6814501694542e8d88d7591945872ca18020ea04742ab96ec133c306bccfddc81dd4f221b1def2f436cfbe
+DIST robot_model-1.12.9.tar.gz 1298115 SHA256 96b104f7a77e82a4af7df4ff6de7cc6ce11b76819537e0dc9b9a3c870d2df910 SHA512 fe1da6fd290af012d53cd2875cdfa5e746bfb964a6cf4ca91786218b33603858d478f49a8e18c9581ba52d9e1d68409f919ec19997de7549b3fb2bc4a3686121 WHIRLPOOL 74fa337c6e09dce970ec8e646ab52256d36261e77fb9ced0d08a66dcac0d33c0922ed6fe1ba90a57d9e8dfd3861436698b217bdb7b97357c162f6ce4e7cd11c3
diff --git a/dev-ros/kdl_parser/kdl_parser-1.12.9.ebuild b/dev-ros/kdl_parser/kdl_parser-1.12.9.ebuild
new file mode 100644
index 000000000000..fa9bae179a73
--- /dev/null
+++ b/dev-ros/kdl_parser/kdl_parser-1.12.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Constructs a KDL tree from an XML robot representation in URDF"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/roscpp
+	dev-ros/rosconsole
+	dev-ros/urdf
+	sci-libs/orocos_kdl
+	dev-libs/tinyxml
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/kdl_parser_py/Manifest b/dev-ros/kdl_parser_py/Manifest
index b5ecbd65d012..6f53517a3a37 100644
--- a/dev-ros/kdl_parser_py/Manifest
+++ b/dev-ros/kdl_parser_py/Manifest
@@ -8,3 +8,4 @@ DIST robot_model-1.12.5.tar.gz 1294607 SHA256 c0784cebf4b5ef38c9bf7a0f6e66f5350a
 DIST robot_model-1.12.6.tar.gz 1295666 SHA256 ac335cec5a3706a104411222a2f89ef1862c0ac8caa5ddadd390e9c25641bf27 SHA512 60270b3ec20c0473e9c8d02d661794e253405c836b06cf5c15b65dddf104bfb5e4865463e12232e94548d68eead2b5499eb04c71aee3f851fa9f85dbe733ee12 WHIRLPOOL 6cec339181a6570fbe4e61415d341f5f7404ea69d8d2a4058d5c837fa15f74c7c95a4ee3f74a78fcca624d272995f09aae4ad3a6027178b2c25daa466754adc4
 DIST robot_model-1.12.7.tar.gz 1296028 SHA256 c9aad0e23970507c30490678fb76514faf1bd577ec2c30b4703fd322543be3bc SHA512 bc1901473f890b7200ef67db891ca9269c867ee1cf67a316948587d27549c6d58ce8c0b4a0d9255a5419a235ead3b19065b135486188efc21cbb6594d1863291 WHIRLPOOL 7575227d3388652eb71c5fd4265fe70c26f44149ee63d793ad87906805dff8938313f2f085edfee82847a4050b8639bc9c0773090b9f0ecbe84e29291f9d7593
 DIST robot_model-1.12.8.tar.gz 1297591 SHA256 dd8a6dec56e06bcc84582da4163efe22dcc4bf6badd6011ebb209db342c495a1 SHA512 77770e3ce1fe7c143c15581fa262dc01ccc04dd9313d022b9f0f254451db80415b558f339063debc5712590f846690d957848ba977f2175d2a4cda72b2102914 WHIRLPOOL afaeaee66821165efccc049a0f7972c597dde89f4f6814501694542e8d88d7591945872ca18020ea04742ab96ec133c306bccfddc81dd4f221b1def2f436cfbe
+DIST robot_model-1.12.9.tar.gz 1298115 SHA256 96b104f7a77e82a4af7df4ff6de7cc6ce11b76819537e0dc9b9a3c870d2df910 SHA512 fe1da6fd290af012d53cd2875cdfa5e746bfb964a6cf4ca91786218b33603858d478f49a8e18c9581ba52d9e1d68409f919ec19997de7549b3fb2bc4a3686121 WHIRLPOOL 74fa337c6e09dce970ec8e646ab52256d36261e77fb9ced0d08a66dcac0d33c0922ed6fe1ba90a57d9e8dfd3861436698b217bdb7b97357c162f6ce4e7cd11c3
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-1.12.9.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-1.12.9.ebuild
new file mode 100644
index 000000000000..d588d618fdfe
--- /dev/null
+++ b/dev-ros/kdl_parser_py/kdl_parser_py-1.12.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Python tools to construct a KDL tree from an XML robot representation in URDF"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/urdf[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/urdf/Manifest b/dev-ros/urdf/Manifest
index 27acdba1a053..bc7433e00803 100644
--- a/dev-ros/urdf/Manifest
+++ b/dev-ros/urdf/Manifest
@@ -1,3 +1,4 @@
 DIST robot_model-1.12.6.tar.gz 1295666 SHA256 ac335cec5a3706a104411222a2f89ef1862c0ac8caa5ddadd390e9c25641bf27 SHA512 60270b3ec20c0473e9c8d02d661794e253405c836b06cf5c15b65dddf104bfb5e4865463e12232e94548d68eead2b5499eb04c71aee3f851fa9f85dbe733ee12 WHIRLPOOL 6cec339181a6570fbe4e61415d341f5f7404ea69d8d2a4058d5c837fa15f74c7c95a4ee3f74a78fcca624d272995f09aae4ad3a6027178b2c25daa466754adc4
 DIST robot_model-1.12.7.tar.gz 1296028 SHA256 c9aad0e23970507c30490678fb76514faf1bd577ec2c30b4703fd322543be3bc SHA512 bc1901473f890b7200ef67db891ca9269c867ee1cf67a316948587d27549c6d58ce8c0b4a0d9255a5419a235ead3b19065b135486188efc21cbb6594d1863291 WHIRLPOOL 7575227d3388652eb71c5fd4265fe70c26f44149ee63d793ad87906805dff8938313f2f085edfee82847a4050b8639bc9c0773090b9f0ecbe84e29291f9d7593
 DIST robot_model-1.12.8.tar.gz 1297591 SHA256 dd8a6dec56e06bcc84582da4163efe22dcc4bf6badd6011ebb209db342c495a1 SHA512 77770e3ce1fe7c143c15581fa262dc01ccc04dd9313d022b9f0f254451db80415b558f339063debc5712590f846690d957848ba977f2175d2a4cda72b2102914 WHIRLPOOL afaeaee66821165efccc049a0f7972c597dde89f4f6814501694542e8d88d7591945872ca18020ea04742ab96ec133c306bccfddc81dd4f221b1def2f436cfbe
+DIST robot_model-1.12.9.tar.gz 1298115 SHA256 96b104f7a77e82a4af7df4ff6de7cc6ce11b76819537e0dc9b9a3c870d2df910 SHA512 fe1da6fd290af012d53cd2875cdfa5e746bfb964a6cf4ca91786218b33603858d478f49a8e18c9581ba52d9e1d68409f919ec19997de7549b3fb2bc4a3686121 WHIRLPOOL 74fa337c6e09dce970ec8e646ab52256d36261e77fb9ced0d08a66dcac0d33c0922ed6fe1ba90a57d9e8dfd3861436698b217bdb7b97357c162f6ce4e7cd11c3
diff --git a/dev-ros/urdf/urdf-1.12.9.ebuild b/dev-ros/urdf/urdf-1.12.9.ebuild
new file mode 100644
index 000000000000..7e228f156c7d
--- /dev/null
+++ b/dev-ros/urdf/urdf-1.12.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-libs/urdfdom
+	dev-libs/urdfdom_headers
+	dev-ros/urdf_parser_plugin
+	dev-ros/pluginlib
+	dev-ros/rosconsole_bridge
+	dev-ros/roscpp
+	dev-libs/tinyxml
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/urdf_parser_plugin/Manifest b/dev-ros/urdf_parser_plugin/Manifest
index c7052b0c98d8..36c4e1d7682e 100644
--- a/dev-ros/urdf_parser_plugin/Manifest
+++ b/dev-ros/urdf_parser_plugin/Manifest
@@ -1,2 +1,3 @@
 DIST robot_model-1.12.7.tar.gz 1296028 SHA256 c9aad0e23970507c30490678fb76514faf1bd577ec2c30b4703fd322543be3bc SHA512 bc1901473f890b7200ef67db891ca9269c867ee1cf67a316948587d27549c6d58ce8c0b4a0d9255a5419a235ead3b19065b135486188efc21cbb6594d1863291 WHIRLPOOL 7575227d3388652eb71c5fd4265fe70c26f44149ee63d793ad87906805dff8938313f2f085edfee82847a4050b8639bc9c0773090b9f0ecbe84e29291f9d7593
 DIST robot_model-1.12.8.tar.gz 1297591 SHA256 dd8a6dec56e06bcc84582da4163efe22dcc4bf6badd6011ebb209db342c495a1 SHA512 77770e3ce1fe7c143c15581fa262dc01ccc04dd9313d022b9f0f254451db80415b558f339063debc5712590f846690d957848ba977f2175d2a4cda72b2102914 WHIRLPOOL afaeaee66821165efccc049a0f7972c597dde89f4f6814501694542e8d88d7591945872ca18020ea04742ab96ec133c306bccfddc81dd4f221b1def2f436cfbe
+DIST robot_model-1.12.9.tar.gz 1298115 SHA256 96b104f7a77e82a4af7df4ff6de7cc6ce11b76819537e0dc9b9a3c870d2df910 SHA512 fe1da6fd290af012d53cd2875cdfa5e746bfb964a6cf4ca91786218b33603858d478f49a8e18c9581ba52d9e1d68409f919ec19997de7549b3fb2bc4a3686121 WHIRLPOOL 74fa337c6e09dce970ec8e646ab52256d36261e77fb9ced0d08a66dcac0d33c0922ed6fe1ba90a57d9e8dfd3861436698b217bdb7b97357c162f6ce4e7cd11c3
diff --git a/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.12.9.ebuild b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.12.9.ebuild
new file mode 100644
index 000000000000..b711fa9ab4bc
--- /dev/null
+++ b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.12.9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ base class for URDF parsers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/urdfdom_headers"
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index db18e9c87ac5..2e12b536a552 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,2 +1,3 @@
 DIST backports-3.6.8.gem 88064 SHA256 b3a81049fb3026b49302b6badedad33c710b302b8a7229d6b168c9530fc78ffd SHA512 5b4bebb56623043a4524715292f785b92f4993728deb30ef0268b099372a1835901e596ba33d374f501c45ffe960cc27a7ddd5c061c6fd02fe7bc6cc335b38c0 WHIRLPOOL 6f2fc79ec363fbff401882ddc5e143b6d906553caffcee1a022c9060a516a56d4c4abd6909841a2c7e64833f2b4757a0593afd16b6fe4bbb8851258e7ed800b5
 DIST backports-3.7.0.gem 99328 SHA256 1458571360a5ee2990f1a96cd26c8d6ce516b75c7c82c513978bda9f52c28ae2 SHA512 8cda47200630c37a7654a9efc6017bbbc931622258d8a67830ab313a71b774fdfa866197b40f83583b849337c224cf228c6738768d1e83be6c8000e9868449ba WHIRLPOOL b6bdc1fd9cf9efa5318e85e61c899ec7bdc5e3dbba422aa75df29786f79a0cb9b851a36ebdad5990275bf9e6baa8e3738a5913f90e6213bf23767a8d7d6aaa66
+DIST backports-3.8.0.gem 146944 SHA256 f5b6109367910c280c33223f8882d175ccbb829b25e5909b974557693ef8ec9e SHA512 898472ee88dd0df46067de12ef38bb033b270573ff09db99982336b9eb264c90003e6e150101f7fc0034998961d81eac7b2f72e1e843e0a7e683b6b98980153f WHIRLPOOL 773ebec85227cf898179fe50fda942d4f3ca82532ca9a9e10cbb465bcff8c9b877feba1fa2694ce2144484923ca0881c6bde68bdc22f14bf3d8516fb503243fd
diff --git a/dev-ruby/backports/backports-3.8.0.ebuild b/dev-ruby/backports/backports-3.8.0.ebuild
new file mode 100644
index 000000000000..1b96cbcd1138
--- /dev/null
+++ b/dev-ruby/backports/backports-3.8.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_TASK_TEST="test"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Backports of Ruby features for older Ruby"
+HOMEPAGE="https://github.com/marcandre/backports"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rails )"
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index 3dbce0e1e720..16f3358df094 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -1 +1,2 @@
 DIST mail-2.6.4-git.tar.gz 963211 SHA256 d3e4a384cf60759a839e07fcf12b8cee4ea47775de66e1999cecce03e70af50c SHA512 b92702db0c989371414ef1f4f2855a2b815d2a46f0b110b4c5d63b79b8baaca80aed957865176c4cc1e7142f1d0edd8e3138a85ab42e510a5bd888f32eba5ee2 WHIRLPOOL b69a5cdb28599bd4c766fc219292e9992c660c8bc644d9d5ab6ef2cba68d1fb7b50826838d9fa98d3e5f3b2cf841aaf312194d48c825dc5e22d94d1c5f68e840
+DIST mail-2.6.5-git.tar.gz 963838 SHA256 6a64b02d12862b22e3535f0820b8595589c6a63f89eaf642aeacbd4181a25a86 SHA512 0048c1c90f211e0037b071506bc26e25b910b4085e870334885cd78804174eb8ca9df87f5e695b3a4866727f6607b94cf202a3ca7a500e9509dc77856fba954f WHIRLPOOL 909c6f4843b6de01808c9ee41687a6e2ac45728c9803a34bcaefb24281074f54e0505899b7ab96e035f53f0b3dce2b742d4d5c8cfaddf2e43240a8bd96893ad1
diff --git a/dev-ruby/mail/mail-2.6.5.ebuild b/dev-ruby/mail/mail-2.6.5.ebuild
new file mode 100644
index 000000000000..4a9b4866992c
--- /dev/null
+++ b/dev-ruby/mail/mail-2.6.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md ROADMAP TODO.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
+
+inherit ruby-fakegem versionator
+
+GITHUB_USER="mikel"
+
+DESCRIPTION="An email handling library"
+HOMEPAGE="https://github.com/mikel/mail"
+SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/mime-types-1.16:* <dev-ruby/mime-types-4:*"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 871795197ffa..cf5a30073384 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,3 +2,5 @@ DIST jenkins-bin-2.32.2.war 69874457 SHA256 73b216449cb5eacd4fe5a6ee2e089245705e
 DIST jenkins-bin-2.32.3.war 69875039 SHA256 3eb599dd78ecf00e5f177ec5c4b1ba4274be4e5f63236da6ac92401a66fa91e8 SHA512 afe6b935dad970e1b89d35413982635b06a216a794d9bf3b1587f193b8edc4e369f51bcd344c9354271d40838c1d1c5178461ecdd800bceb2df07ece8d8b4bf2 WHIRLPOOL 8efb195b29627be117f73d51136bc6785d2058e3e5a4ba89c489f64d194f8933160c233fe175c0310f595bd7644292a8b3c4d2cc278e20f20a5de501b15af90a
 DIST jenkins-bin-2.45.war 68649092 SHA256 0e57ee3645aec0742b8b2a0d4cd62cb80c3e6718b810200ab33851109f1f5488 SHA512 e2ec91827231efc39a1dd4b149239627e556391170d9b1b65eb8091f71787981863ecc5ee8a4b82d777672edb3ff0dbc59cd0dba68df9872af40661edcb4e615 WHIRLPOOL a0f4d3126020e8caecdfc2b54cb3f3f97d778f5f20c62722339494ec0884ce500b85938043dfc5fcfeb88853b21c871a9820900c0668e9cfbc08aafe3dbc93fc
 DIST jenkins-bin-2.46.1.war 68669812 SHA256 33a3f4d983c6188a332291e1d974afa0a2ee96a0ae3cb6dd4f2098086525f9f1 SHA512 a15beda88320c80ff149972c880627c236421c0d2363d2194f4e6c6392891f3c386d7ff0738c03a2c9de449e71f059a9f5f5ebd00f048b18aa231dd0e45ef83c WHIRLPOOL 5be3076bfe669420837529d91920508f0e661ba782c8362246a8167b3772f9301fa6a4a484f29697eb315f8097a562ba7028bb9a886808f7d359eede894144a9
+DIST jenkins-bin-2.46.2.war 70342163 SHA256 aa7f243a4c84d3d6cfb99a218950b8f7b926af7aa2570b0e1707279d464472c7 SHA512 6d998ff8b9da54817ef7b21038b4921cee77cb76011a5c7cca949f63c68eb318e21f6108c962e2b55ba7f9901da89fbab95c7cfd32ac6933658511040595f61a WHIRLPOOL 2eb04831f682be0b8dd2e58cb01a4442a7c0123524dd5ce2c7a9130f90bd415aef57300c7bf33e2812589bb4ecb72af4375a1222dc04f5fd88a9a7f102dc374f
+DIST jenkins-bin-2.57.war 70476328 SHA256 5d7a66864d0941629e1fb8ef82ed98a38e54da39f4a9f3ca31561d573e18b2a5 SHA512 8207174bff1395b017b78b9d99e26b612a138977e75a2e01f59bb17fd42ac4470b7ab3b0b4fa305741bf5bf22987a2e51d61b907cb69c7ccce1697edaf331f76 WHIRLPOOL 17267b5df3ca296f42f711d73070b2a0a54e1a5ec293200bc1fd312a5bfc32abe4dfd63d97e9bd0834640bd28c9d625520e5e221cdde6b48c40fad5e0ba87435
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.46.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.46.2.ebuild
new file mode 100644
index 000000000000..296fff22b7a5
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.46.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.7.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.57.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.57.ebuild
new file mode 100644
index 000000000000..2101948a704e
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.57.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index dd089c3bb5c8..799576388ec6 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,12 +1,12 @@
 DIST git-2.10.2.tar.xz 4106108 SHA256 94802903dd707d85ca3b9a2be35e936a54ce86375f52c6a789efe7ce7e238671 SHA512 0ab09de481dbb31c3304382afaa5d3fc9f861115c9954c65b11a8a1c34b939118c7ed3ff60ac329145888596388e3e4d2b2fb677fe109d33a57206d531b5ee6a WHIRLPOOL 808404fa13f908d149028f64aaf5b73400448fff6393dabfaa874d750065e86ff5dae4903724cbca4e59fb74b3ff30b8b8f0a0f1435a0a90c18267c7a0550de6
 DIST git-2.11.1.tar.xz 4208132 SHA256 c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415 SHA512 c9d4196ad9c4f656b5a25fe688c06248bfce4fadac38e9bc835e5e9063ab95e3d4b3db4174acea0b3b64c5455adc93d39870f2b6009d2dd6aa0edb5a5f5bda40 WHIRLPOOL c91d7d096348cacd5a691d12406acb98d7fd703ac06e4d4fc31d85eead29c87860a96d43df06c1e3610837b4eb34adccb5b7b259531e064d495347fd2b14914e
-DIST git-2.12.1.tar.xz 4271828 SHA256 db11674364b764e101966d829a2e271c9b9d2a8bd4d8ecb4221a1dcdc9a3ada2 SHA512 4f7203782f018e74c7ff273bb4290887524d67f34e794b26ef8f2d4cb98e57d6c95e29e2da7dd92a626228aad3d02befed9a0b5c9f97f43fe1ba52dad6ff5adb WHIRLPOOL be2d67d925c05bb50b610b4e5eed24b317e95400d0ed3d0c362116da2a2e5c768b7973d66e57cab6cd1e96da00a4f6e526d0d71dcc1b03e7c7195da7ae53c58e
 DIST git-2.12.2.tar.xz 4273748 SHA256 d21a9e23506e618d561fb25a8a7bd6134f927b86147930103487117a7a678c4a SHA512 0e980ea6932b43c87892c0628d23bce62dc8fa8be3510e6e8bbd14605526e3b13c8a32ea9fbe8a74c286c4fe0e1fa34e85922edf743a9405a31d5657804b4b8d WHIRLPOOL 45b60d67aa930f1e298ef9b02d95b8cfe7caa806716ba3bbfdb3a0b7736dc16631e1888d50844d5dba8ffe4c7a4216006edd32f1ddda0ed0f770472befa6bb8c
+DIST git-2.13.0.rc1.tar.xz 4723660 SHA256 68c4ce9b49500df85b01485408be56debcebb2593cb64671408e4494380dc031 SHA512 6e534f85e7a6282d468247df9fc2202ca370734c61b6a60025cfa6784830193912c2c0abf5168afb7885bf98cade0e2b862965254f7da2152eb0a8a1efa886c8 WHIRLPOOL f7598d8fc60971cdcbff91c986aefe9cd447ffc2be1a38977483e0a622cc42bdba814fcbc493d81812ff73f56ffa28c23789aeb6d88ebe3a81c766eba84ee5a0
 DIST git-htmldocs-2.10.2.tar.xz 1068436 SHA256 dd43111c3518a92a7fe64ac5cd32a5d4d77d49c67f7d89dce3e8293bc3d6b491 SHA512 8ef57218d7eef285ac427414d92bd5e8eba5c85c2a2a9ec0e423705ee2cb6f26dd33ad780d1b4237e7534dbe5cc3b4d8eea5780d0acc49066d78fc1893df2525 WHIRLPOOL 160fe3446d959d0f2315c9b2be182925619a4d89343602038e92283abdb393805eb5252799c502b83641d9e23a157332033baaa1ef2f1d9401cbbf372d8e86d7
 DIST git-htmldocs-2.11.1.tar.xz 1083264 SHA256 1a5f1e4a5eadad89b0783efa08bb1f7e3802d4a4d0a135bf5f61fd672ea3846e SHA512 dee37cfa0870f7289c66c3c58bb86d01324bfd30f4d4a05dedebef98ddb38339c7937bb2caee0e1d35ef579de414e5f280d5fd9f48fb427f497fe2f7d62f7d2a WHIRLPOOL 0ec4856405dbbc89547ab6d7236a787516fb7b8a8d2a3ff190b310c6b83cccfd080a5e9bac0523c99b34849b14a0eb96ffc16348643f65b38ebcdc3c8d8cd17e
-DIST git-htmldocs-2.12.1.tar.xz 1091792 SHA256 10598f2f2693e066b58e8d269c3d682595a99340f29e8e7a66dda5e226fd181e SHA512 76c830360692cff09b36da2ac81572cd660a84f06f3b12360022a268bbd88c48c0f4d29b6b097b6b7459548012d419f53418dfd0cbebc0c7b23db78dc135d208 WHIRLPOOL 967bb04ea942cc94206403aad4e98ea092bfc215a70f435ea0cc3b78cea9c9c178f5b509976f861c1b7f2ef69414e376e98b82b45e73fc136861412494324134
 DIST git-htmldocs-2.12.2.tar.xz 1092716 SHA256 6f656085c2fdca94df1cc3eb8624c38099f920318c428e34ef0333ecf7f4cd59 SHA512 225aa58becc5d45a8f39333a68b4078147f3d8e31b1653eea181b83f5650c07b10c917596c6ca62b22e812932145fcde6932fa116a9731fda3c263e66f9a560f WHIRLPOOL 562a3f9ebd39563f92420274a02464cd1a4dfdcba7d01906d8e03f1f853d272e1edcf29969a76662e83fb7f11da502e0617ef7a30c961c23b881f889d63766d3
+DIST git-htmldocs-2.13.0.rc1.tar.xz 1106688 SHA256 bbc20f2f3499c8d3ac884c430a75a0df2db2aabebe02530ea768518a321fff91 SHA512 b19bae6e6e4f318f93cc14bdfb4d9c85ba87c3dca63cd899f868389549d92fa5c4a60322783c31704eea57fe5ca81a39ffd5482375dd4b87b0378ee3d5126b3d WHIRLPOOL a831692d7db69034cbd0ccd28303ff9e8bf80760a816b88a41f80847982c4b976f0a9d04f2052035624f37fff64b57c7d2029782a17cc9b264ceb09971f65033
 DIST git-manpages-2.10.2.tar.xz 395556 SHA256 83b0a317f6039ad95ef6af6a182cf659c2d053eed5d8f70b06710eb787f8aa6f SHA512 0dc5df8441601865511983b85762102396cbf7c704fd831eb6666ef7b7639252b971f6b4080b8a57226a86124edcdd77acf24374da22047bd315769a09109bef WHIRLPOOL e1d6b9cb4479b584c16a25a4f3b0528d96d483307e768efea3d7bd8156d74e1c59b61a641dfe5671f4cb01a02f10322262d133cb76f85194ac97ee74c6195d0e
 DIST git-manpages-2.11.1.tar.xz 400812 SHA256 69486ed339ee0591001ae83d43c888aa26351b9680b6ceb59e06b593051bca31 SHA512 ffa197ed163031f14882f85124399a7de3b1cadee089cb3d85a6b936215b23243102fd99fdf877f0a8b9d660711e994022cce8893ae27c0295a12dceb41c7f6b WHIRLPOOL 072416db28149c4531f05183ad515bc030611d68c1e7975dcf3f173aeedfb96607262ed120fcf8bea74a1c95b18ec98580cc2ae5e825b8f359e9b24021de7218
-DIST git-manpages-2.12.1.tar.xz 402644 SHA256 fbf5c34dde4385b04a0266444cda6834a97e6a589fc0a510c220da87f3d2a0ce SHA512 d06ad96aa368d2dadf9aeafaa50cefcf8015dcfb2aa0f356c5d70233470aee6aa1e831427e4a05ec8b1646ec8e1b9940d5f70cc331caecbda67e4811c79e1e94 WHIRLPOOL af2600e4157569c4a103a93811d6c7b320063f0d946620849ca55a2ce6f85447add6d065cee234afe9143f8612c3d593c7547a311795e2977054848af2136126
 DIST git-manpages-2.12.2.tar.xz 402804 SHA256 7ed1da04e6b0f7fb54a3c7546c6a30fe999b5c8ffcf5e3418521e7550b7f9558 SHA512 98991bc14248f95fe837d1fb9f3e451b48825fa2b1cef94cc016dbf796f5e4293c295a7bf1c35244d835d0d66b7008855c475dd3aa7fcabd5be1e382a4ff0c91 WHIRLPOOL 33d216bfdce99b0083abdcc175286fdfb189e729c38a8df1589757555bba2b7ac33e5cf9a3f927fc44d14caec590e4d6c9872dec0e4c7b3f5675fcbe07312895
+DIST git-manpages-2.13.0.rc1.tar.xz 407468 SHA256 23c82d32645281a03a19d1b60e3fe530e71effddcf86816e27a49430b7206af5 SHA512 e7263090de83387ff4a8a99b9e4b0266f376de72c2e55390748103bd912841041e6b244870e541f16db8e1ad95f715fe151cd88dbd92cd629d5b9f6242aec854 WHIRLPOOL e1192aca918e064922930923b2fa6846f3bbbac7625c08779e17d6fefa70848da903b32cc8dd45562f8df8e253092133176ca1fbf8d4b04440d94eee92a31101
diff --git a/dev-vcs/git/git-2.12.1.ebuild b/dev-vcs/git/git-2.13.0_rc1.ebuild
similarity index 99%
rename from dev-vcs/git/git-2.12.1.ebuild
rename to dev-vcs/git/git-2.13.0_rc1.ebuild
index 2b9db07f35da..44bb787dffdb 100644
--- a/dev-vcs/git/git-2.12.1.ebuild
+++ b/dev-vcs/git/git-2.13.0_rc1.ebuild
@@ -37,6 +37,7 @@ if [[ ${PV} != *9999 ]]; then
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
+	[[ "${PV}" = *_rc* ]] || \
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
diff --git a/media-libs/lilv/lilv-0.24.2.ebuild b/media-libs/lilv/lilv-0.24.2.ebuild
index ae0aac0e0a9f..d8806c4b7b29 100644
--- a/media-libs/lilv/lilv-0.24.2.ebuild
+++ b/media-libs/lilv/lilv-0.24.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc +dyn-manifest static-libs test"
 
 RDEPEND=">=media-libs/lv2-1.14.0
diff --git a/media-libs/lv2/lv2-1.14.0.ebuild b/media-libs/lv2/lv2-1.14.0.ebuild
index 284d435f39c3..9c451243a8e1 100644
--- a/media-libs/lv2/lv2-1.14.0.ebuild
+++ b/media-libs/lv2/lv2-1.14.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index dc0d6650d00e..5cc40c3a00bc 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,2 +1,3 @@
 DIST live.2017.01.26.tar.gz 629183 SHA256 3c4d440b79e415eb3a86d30d0cd061d3edcaaa0281909e8629e9756c2c375458 SHA512 2123d78c18cb2a0f522450aa426beceefe7f70b659ec9c9f04045cbde8e53a927b7909172a42da3967be73989b16f444f02e0b70dab671d4c75e567d8939ad23 WHIRLPOOL 49db6d3f25e310dc8d90e7e257af1b5a844bd1efbe79525bb196e7bc4b5d65a56eecac9cb2a421c3425f3a5caae4efa3856469880f1d578117f52e43f67ede48
 DIST live.2017.04.10.tar.gz 629185 SHA256 4c37d9c828f9028403997272e49968c260385dbbaef62e28ba24faef0dda868b SHA512 ab5e790c654b01893fc5409ec69007096b31b19ccecb323319f759738e264f3cde06c7d60b84a4d078fbd20e44aa832352fec61d7ba6e0abbc24027203613349 WHIRLPOOL 2a08d77630f3bec9b639aaa7bf1646bf00ef28152aa21ae0e9092c7d231bb48f7ab751689d7279ca3d11759ef421f1d43c5c5578de6c446a283ab7c587301f62
+DIST live.2017.04.26.tar.gz 629195 SHA256 a97372c84d49520dbaa595b65c39800fbd7813e717b5df9cd6c70308ce1a6033 SHA512 444b3c63e30b2ddd0fac8b11f09efff3796953f6bad558cc59c093273a351ef6b1631abc5d89a8be422caf54b1c46104c59b507fc104785795c3e8622a8a4efd WHIRLPOOL cbf7cf011fb49b4ad0c24d87e4fcda220354330ac52778c233789b1c836047e33424cbdfea3ab7d8e06ef6124148c4313218f2d3e98c2d0193a33285eacda6b9
diff --git a/media-plugins/live/live-2017.04.26.ebuild b/media-plugins/live/live-2017.04.26.ebuild
new file mode 100644
index 000000000000..22ccb8b6eb6d
--- /dev/null
+++ b/media-plugins/live/live-2017.04.26.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
+HOMEPAGE="http://www.live555.com/"
+SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
+	mirror://gentoo/${P/-/.}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~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="examples static-libs"
+DOCS=( "live-shared/README" )
+
+# Alexis Ballier <aballier@gentoo.org>
+# Be careful, bump this everytime you bump the package and the ABI has changed.
+# If you don't know, ask someone.
+LIVE_ABI_VERSION=7
+SLOT="0/${LIVE_ABI_VERSION}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}"
+	mv "${WORKDIR}/live" "${S}/" || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-recursive3.patch"
+
+	if use static-libs ; then
+		cp -pPR live live-shared
+		mv live live-static
+	else
+		mv live live-shared
+	fi
+
+	use static-libs && cp "${FILESDIR}/config.gentoo" live-static
+	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+
+	case ${CHOST} in
+		*-solaris*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-static/config.gentoo \
+				|| die ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-shared/config.gentoo-so-r1 \
+				|| die
+		;;
+		*-darwin*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
+				live-static/config.gentoo \
+				|| die static ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
+				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
+				-e '/^LIB_SUFFIX /s/so/dylib/' \
+				live-shared/config.gentoo-so-r1 \
+				|| die shared
+		;;
+	esac
+	multilib_copy_sources
+}
+
+src_configure() { :; }
+
+multilib_src_compile() {
+	tc-export CC CXX LD
+
+	if use static-libs ; then
+		cd "${BUILD_DIR}/live-static"
+
+		einfo "Beginning static library build"
+		./genMakefiles gentoo
+		emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+	fi
+
+	cd "${BUILD_DIR}/live-shared"
+	einfo "Beginning shared library build"
+	./genMakefiles gentoo-so-r1
+	local suffix=$(get_libname ${LIVE_ABI_VERSION})
+	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
+
+	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
+		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
+		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
+		popd > /dev/null
+	done
+
+	if multilib_is_native_abi; then
+		einfo "Beginning programs build"
+		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
+			cd "${BUILD_DIR}/live-shared/${i}"
+			emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
+		done
+	fi
+}
+
+multilib_src_install() {
+	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
+		use static-libs && dolib.a live-static/${library}/lib${library}.a
+		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
+		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
+
+		insinto /usr/include/${library}
+		doins live-shared/${library}/include/*h
+	done
+
+	if multilib_is_native_abi; then
+		# Should we really install these?
+		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
+			xargs -0 dobin
+
+		dobin live-shared/mediaServer/live555MediaServer
+		dobin live-shared/proxyServer/live555ProxyServer
+	fi
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 813ea00554c5..0fd6e2199e5b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Apr 2017 05:09:31 +0000
+Thu, 27 Apr 2017 10:39:31 +0000
diff --git a/metadata/glsa/glsa-201704-04.xml b/metadata/glsa/glsa-201704-04.xml
new file mode 100644
index 000000000000..874fbb53e961
--- /dev/null
+++ b/metadata/glsa/glsa-201704-04.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201704-04">
+  <title>Adobe Flash Player: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Adobe Flash Player, the
+    worst of which allows remote attackers to execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">adobe-flash</product>
+  <announced>2017-04-27</announced>
+  <revised>2017-04-27: 2</revised>
+  <bug>615244</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-plugins/adobe-flash" auto="yes" arch="*">
+      <unaffected range="ge">25.0.0.148</unaffected>
+      <vulnerable range="lt">25.0.0.148</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>The Adobe Flash Player is a renderer for the SWF file format, which is
+      commonly used to provide interactive websites.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Adobe Flash Player.
+      Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process or bypass security restrictions.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Adobe Flash users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-plugins/adobe-flash-25.0.0.148"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-3058">CVE-2017-3058</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-3059">CVE-2017-3059</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-3060">CVE-2017-3060</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-3061">CVE-2017-3061</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-3062">CVE-2017-3062</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-3063">CVE-2017-3063</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-3064">CVE-2017-3064</uri>
+  </references>
+  <metadata tag="requester" timestamp="2017-04-13T15:19:39Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2017-04-27T05:32:52Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 18a182da6423..0fd6e2199e5b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Apr 2017 05:09:32 +0000
+Thu, 27 Apr 2017 10:39:31 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 30c46d2e505a..ab301edae16d 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-23d33fb690b351b02a3a99568186111d3dc57e3f 1492452532 2017-04-17T18:08:52+00:00
+95d012e63f570ed786a745489b5bdf0a5d7776ce 1493271251 2017-04-27T05:34:11+00:00
diff --git a/metadata/md5-cache/dev-lang/hy-0.12.1 b/metadata/md5-cache/dev-lang/hy-0.12.1
index 07ee7107987d..a8736803970c 100644
--- a/metadata/md5-cache/dev-lang/hy-0.12.1
+++ b/metadata/md5-cache/dev-lang/hy-0.12.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/flake8[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/rply-0.7.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(-)] >=dev-python/astor-0.5[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/clint[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(-)] doc? ( dev-python/sphinx[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/tox[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/sphinx[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/coverage[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(-)]
+DEPEND=dev-python/flake8[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/rply-0.7.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(-)] >=dev-python/astor-0.5[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/clint-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(-)] doc? ( dev-python/sphinx[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/tox[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/sphinx[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/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=A LISP dialect running in python
 EAPI=5
 HOMEPAGE=http://hylang.org/
 IUSE=test doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/flake8[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/rply-0.7.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(-)] >=dev-python/astor-0.5[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/clint[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(-)]
+RDEPEND=dev-python/flake8[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/rply-0.7.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(-)] >=dev-python/astor-0.5[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/clint-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(-)] 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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.12.1.tar.gz -> hy-0.12.1.tar.gz
 _eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	b4b2ab22637f2be1315af83f2d89cfc6	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=837709073ccd58895b21cf76df49a7d2
+_md5_=b5a49874e46d8500422057409e27398b
diff --git a/metadata/md5-cache/dev-lang/ruby-2.4.0 b/metadata/md5-cache/dev-lang/ruby-2.4.0
deleted file mode 100644
index b2f57da7f528..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 >=app-portage/elt-patches-20170317 !<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=An object-oriented scripting language
-EAPI=6
-HOMEPAGE=http://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24] >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24] >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24] >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24] virtual/rubygems[ruby_targets_ruby24] >=dev-ruby/json-2.0.2[ruby_targets_ruby24] rdoc? ( >=dev-ruby/rdoc-5.0.0[ruby_targets_ruby24] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
-SLOT=2.4
-SRC_URI=mirror://ruby/2.4/ruby-2.4.0.tar.xz https://dev.gentoo.org/~graaff/ruby-team/ruby-patches-2.4.0.tar.bz2
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=758fec06a80e8dea96e8bdbe40305c65
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.39.11-r1 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.39.11-r1
index 3679fa360269..bd09358eee09 100644
--- a/metadata/md5-cache/dev-libs/xmlrpc-c-1.39.11-r1
+++ b/metadata/md5-cache/dev-libs/xmlrpc-c-1.39.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweigt RPC library based on XML and HTTP
 EAPI=6
 HOMEPAGE=http://xmlrpc-c.sourceforge.net/
 IUSE=abyss +cgi +curl +cxx +libxml2 threads test tools
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= curl? ( net-misc/curl ) libxml2? ( dev-libs/libxml2 )
 REQUIRED_USE=test? ( abyss curl cxx ) tools? ( curl )
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlrpc-c/xmlrpc-c-1.39.11.tgz
-_md5_=b7f1ccde4515607ae793d1a1d23d3221
+_md5_=77af70b3b3cadd46ecfe7a39bde5e3ad
diff --git a/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.490.0 b/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.490.0
index ab029c3ebc0f..1a20f8397d3d 100644
--- a/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.490.0
+++ b/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.490.0
@@ -4,10 +4,10 @@ DESCRIPTION=Use the GMP library for Math::BigInt routines
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Math-BigInt-GMP/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.999.714 >=virtual/perl-XSLoader-0.20.0 >=dev-libs/gmp-4.0.0:0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.49.tar.gz
 _eclasses_=multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9e4a52069afc6bbe1a8c80f26abca5d5
+_md5_=0b29632bf070cddaf08f448e805616f6
diff --git a/metadata/md5-cache/dev-python/pygame-1.9.3 b/metadata/md5-cache/dev-python/pygame-1.9.3
new file mode 100644
index 000000000000..ba3f8c41134f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygame-1.9.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/sdl-image-1.2.2[png,jpeg] >=media-libs/sdl-mixer-1.2.4 >=media-libs/sdl-ttf-2.0.6 >=media-libs/smpeg-0.4.4-r1 midi? ( media-libs/portmidi ) X? ( >=media-libs/libsdl-1.2.5[X,video] ) !X? ( >=media-libs/libsdl-1.2.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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Python bindings for SDL multimedia library
+EAPI=6
+HOMEPAGE=http://www.pygame.org/
+IUSE=doc examples midi X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/sdl-image-1.2.2[png,jpeg] >=media-libs/sdl-mixer-1.2.4 >=media-libs/sdl-ttf-2.0.6 >=media-libs/smpeg-0.4.4-r1 midi? ( media-libs/portmidi ) X? ( >=media-libs/libsdl-1.2.5[X,video] ) !X? ( >=media-libs/libsdl-1.2.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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pygame/pygame-1.9.3.tar.gz
+_eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	b4b2ab22637f2be1315af83f2d89cfc6	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=7f01d0f860d84dce60557f02b2239f3c
diff --git a/metadata/md5-cache/dev-ros/collada_parser-1.12.9 b/metadata/md5-cache/dev-ros/collada_parser-1.12.9
new file mode 100644
index 000000000000..282b29e21345
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/collada_parser-1.12.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom >=dev-ros/urdf-1.12.6 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/catkin dev-python/empy
+DESCRIPTION=C++ parser for the Collada robot description format
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/collada_parser
+IUSE=test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom >=dev-ros/urdf-1.12.6 dev-util/catkin dev-python/empy
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.9.tar.gz -> robot_model-1.12.9.tar.gz
+_eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	ros-catkin	c2f80f4530b85640ead89682ff5ce66c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5811403f65fcd9329a0a7a05d1c0ec75
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-1.12.9 b/metadata/md5-cache/dev-ros/collada_urdf-1.12.9
new file mode 100644
index 000000000000..5e25951947cd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/collada_urdf-1.12.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom sys-devel/make >=dev-util/cmake-3.7.2 dev-util/catkin dev-python/empy
+DESCRIPTION=Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/collada_urdf
+IUSE=test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom dev-util/catkin dev-python/empy
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.9.tar.gz -> robot_model-1.12.9.tar.gz
+_eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	ros-catkin	c2f80f4530b85640ead89682ff5ce66c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=e53779d157e080c4c098ea12a0c32fad
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.9 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.9
new file mode 100644
index 000000000000..b034949f1d1f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 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=Tool for setting and publishing joint state values for a given URDF
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/joint_state_publisher
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),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(-)] 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/ros/robot_model/archive/1.12.9.tar.gz -> robot_model-1.12.9.tar.gz
+_eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	b4b2ab22637f2be1315af83f2d89cfc6	ros-catkin	c2f80f4530b85640ead89682ff5ce66c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fe154dbcbc034df44bbb85d385aa20d7
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.12.9 b/metadata/md5-cache/dev-ros/kdl_parser-1.12.9
new file mode 100644
index 000000000000..2448070dbc55
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/kdl_parser-1.12.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-ros/urdf sci-libs/orocos_kdl dev-libs/tinyxml test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 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=Constructs a KDL tree from an XML robot representation in URDF
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/kdl_parser
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-ros/urdf sci-libs/orocos_kdl dev-libs/tinyxml 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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.9.tar.gz -> robot_model-1.12.9.tar.gz
+_eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	b4b2ab22637f2be1315af83f2d89cfc6	ros-catkin	c2f80f4530b85640ead89682ff5ce66c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=eec12e5862a00d5dbcbce883282b8fab
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.9 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.9
new file mode 100644
index 000000000000..048c5f261e17
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 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=Python tools to construct a KDL tree from an XML robot representation in URDF
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/kdl_parser_py
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/urdf[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(-)] 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/ros/robot_model/archive/1.12.9.tar.gz -> robot_model-1.12.9.tar.gz
+_eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	b4b2ab22637f2be1315af83f2d89cfc6	ros-catkin	c2f80f4530b85640ead89682ff5ce66c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0a73299bd27c9ceb956db3d6cdffffd3
diff --git a/metadata/md5-cache/dev-ros/urdf-1.12.9 b/metadata/md5-cache/dev-ros/urdf-1.12.9
new file mode 100644
index 000000000000..7fafc7ac52ea
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/urdf-1.12.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-ros/roscpp dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2 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=C++ parser for the Unified Robot Description Format (URDF)
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/urdf
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-ros/roscpp dev-libs/tinyxml 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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.9.tar.gz -> robot_model-1.12.9.tar.gz
+_eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	b4b2ab22637f2be1315af83f2d89cfc6	ros-catkin	c2f80f4530b85640ead89682ff5ce66c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=423f5733dd7da8c50cf2304d623c6ae0
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.9 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.9
new file mode 100644
index 000000000000..1eff4d349b02
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/urdfdom_headers sys-devel/make >=dev-util/cmake-3.7.2 dev-util/catkin dev-python/empy
+DESCRIPTION=C++ base class for URDF parsers
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/urdf_parser_plugin
+IUSE=test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/urdfdom_headers dev-util/catkin dev-python/empy
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.9.tar.gz -> robot_model-1.12.9.tar.gz
+_eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	ros-catkin	c2f80f4530b85640ead89682ff5ce66c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1c955f877a99bfdd68041e9be7950ce0
diff --git a/metadata/md5-cache/dev-ruby/backports-3.8.0 b/metadata/md5-cache/dev-ruby/backports-3.8.0
new file mode 100644
index 000000000000..19b146b75c76
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/backports-3.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rails[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rails[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Backports of Ruby features for older Ruby
+EAPI=6
+HOMEPAGE=https://github.com/marcandre/backports
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/backports-3.8.0.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f33817349120241bcec33c319131a76f
diff --git a/metadata/md5-cache/dev-ruby/mail-2.6.5 b/metadata/md5-cache/dev-ruby/mail-2.6.5
new file mode 100644
index 000000000000..1b60269193f2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mail-2.6.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=An email handling library
+EAPI=6
+HOMEPAGE=https://github.com/mikel/mail
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby21] <dev-ruby/mime-types-4:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby22] <dev-ruby/mime-types-4:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby23] <dev-ruby/mime-types-4:*[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=2.6
+SRC_URI=https://github.com/mikel/mail/archive/2.6.5.tar.gz -> mail-2.6.5-git.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=42edd28262d9a422ece0865b88574914
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.46.2 b/metadata/md5-cache/dev-util/jenkins-bin-2.46.2
new file mode 100644
index 000000000000..f3cd272bb67c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.46.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Extensible continuous integration server
+EAPI=6
+HOMEPAGE=http://jenkins-ci.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.7.0
+RESTRICT=mirror
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.46.2/jenkins.war -> jenkins-bin-2.46.2.war
+_eclasses_=multilib	0236be304ee52e7f179ed2f337075515	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=4652f9bfbdaa532d663e0efd790b9832
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.57 b/metadata/md5-cache/dev-util/jenkins-bin-2.57
new file mode 100644
index 000000000000..7a36df13b895
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.57
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Extensible continuous integration server
+EAPI=6
+HOMEPAGE=http://jenkins-ci.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://mirrors.jenkins-ci.org/war/2.57/jenkins.war -> jenkins-bin-2.57.war
+_eclasses_=multilib	0236be304ee52e7f179ed2f337075515	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=62e8d5a174d9794790c833c251dc4e85
diff --git a/metadata/md5-cache/dev-vcs/git-2.12.1 b/metadata/md5-cache/dev-vcs/git-2.13.0_rc1
similarity index 85%
rename from metadata/md5-cache/dev-vcs/git-2.12.1
rename to metadata/md5-cache/dev-vcs/git-2.13.0_rc1
index 71eb0771889c..7b0071153680 100644
--- a/metadata/md5-cache/dev-vcs/git-2.12.1
+++ b/metadata/md5-cache/dev-vcs/git-2.13.0_rc1
@@ -4,11 +4,10 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) python? ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/git-2.12.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.12.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.12.1.tar.xz )
+SRC_URI=mirror://kernel/software/scm/git/testing/git-2.13.0.rc1.tar.xz mirror://kernel/software/scm/git/testing/git-manpages-2.13.0.rc1.tar.xz doc? ( mirror://kernel/software/scm/git/testing/git-htmldocs-2.13.0.rc1.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	l10n	8f52d9ce1814aca2ed1a46920084ea66	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	c3e54dd0dc1e70c6252f2551a55bf053	python-utils-r1	b4b2ab22637f2be1315af83f2d89cfc6	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=4b1944c4a885e96a5337a5cc82d4169a
+_md5_=4855ef2b845f205bc47ca7daadadd713
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.2 b/metadata/md5-cache/media-libs/lilv-0.24.2
index 1490979cd35c..805365f7e2f5 100644
--- a/metadata/md5-cache/media-libs/lilv-0.24.2
+++ b/metadata/md5-cache/media-libs/lilv-0.24.2
@@ -4,10 +4,10 @@ DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for app
 EAPI=4
 HOMEPAGE=http://drobilla.net/software/lilv/
 IUSE=doc +dyn-manifest static-libs test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=media-libs/lv2-1.14.0 >=media-libs/sratom-0.4.0 >=dev-libs/serd-0.14.0 >=dev-libs/sord-0.13.0
 SLOT=0
 SRC_URI=http://download.drobilla.net/lilv-0.24.2.tar.bz2
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-any-r1	be89e882151ba4b847089b860d79729c	python-utils-r1	b4b2ab22637f2be1315af83f2d89cfc6	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=769e373254f36a8085d46753a4208746
+_md5_=29afad13f9a2611fa1372de13cde58b8
diff --git a/metadata/md5-cache/media-libs/lv2-1.14.0 b/metadata/md5-cache/media-libs/lv2-1.14.0
index 5c49cdadc318..dd3bfde0fb40 100644
--- a/metadata/md5-cache/media-libs/lv2-1.14.0
+++ b/metadata/md5-cache/media-libs/lv2-1.14.0
@@ -4,11 +4,11 @@ DESCRIPTION=A simple but extensible successor of LADSPA
 EAPI=5
 HOMEPAGE=http://lv2plug.in/
 IUSE=doc plugins python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] dev-python/rdflib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] !<media-libs/slv2-0.4.2 !media-libs/lv2core !media-libs/lv2-ui
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://lv2plug.in/spec/lv2-1.14.0.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-single-r1	c3e54dd0dc1e70c6252f2551a55bf053	python-utils-r1	b4b2ab22637f2be1315af83f2d89cfc6	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=33ee3be39c658215e39d9f5fcc27a4ac
+_md5_=0d574947b4383c291dd6a44b87dcd9cc
diff --git a/metadata/md5-cache/media-plugins/live-2017.04.26 b/metadata/md5-cache/media-plugins/live-2017.04.26
new file mode 100644
index 000000000000..763b382395a7
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/live-2017.04.26
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
+EAPI=5
+HOMEPAGE=http://www.live555.com/
+IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~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=LGPL-2.1
+SLOT=0/7
+SRC_URI=http://www.live555.com/liveMedia/public/live.2017.04.26.tar.gz mirror://gentoo/live.2017.04.26.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=779f959b269e44711d6b20c8ebdc726c
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.7.1-r2 b/metadata/md5-cache/net-misc/tigervnc-1.7.1-r2
index a1956257b550..5982009549a6 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.7.1-r2
+++ b/metadata/md5-cache/net-misc/tigervnc-1.7.1-r2
@@ -3,11 +3,11 @@ DEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-
 DESCRIPTION=Remote desktop viewer display system
 EAPI=6
 HOMEPAGE=http://www.tigervnc.org
-IUSE=+drm gnutls java +opengl pam server +xorgmodule elibc_FreeBSD java
+IUSE=+drm gnutls java nls +opengl pam server +xorgmodule elibc_FreeBSD java
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 ) xorgmodule? ( =x11-base/xorg-server-1.19* ) drm? ( x11-libs/libdrm ) ) java? ( >=virtual/jre-1.5:* ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.7.1.tar.gz -> tigervnc-1.7.1.tar.gz https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 mirror://gentoo/tigervnc.png server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.19.1.tar.bz2 )
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-pkg-opt-2	be255db325e3af8fbf3506cf63998341	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0b47bcb7ab303bc9d161b8e82238cc98
+_md5_=b0034a3b518665c6e6d5e4fc49718e53
diff --git a/metadata/md5-cache/net-vpn/tor-0.2.9.10 b/metadata/md5-cache/net-vpn/tor-0.2.9.10
index 157f97175c44..f4e59a8a8d72 100644
--- a/metadata/md5-cache/net-vpn/tor-0.2.9.10
+++ b/metadata/md5-cache/net-vpn/tor-0.2.9.10
@@ -4,10 +4,10 @@ DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=6
 HOMEPAGE=http://www.torproject.org/
 IUSE=libressl scrypt seccomp selinux systemd tor-hardening test web
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.2.9.10.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.2.9.10.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b2a2a852a8a773e750be783c555c56c8
+_md5_=08b48b836d8af753a4ed718672fc1337
diff --git a/metadata/md5-cache/ros-meta/robot_model-1.12.9 b/metadata/md5-cache/ros-meta/robot_model-1.12.9
new file mode 100644
index 000000000000..d82c0973890a
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/robot_model-1.12.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/collada_parser dev-ros/collada_urdf dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/urdf dev-ros/urdf_parser_plugin sys-devel/make >=dev-util/cmake-3.7.2 dev-util/catkin dev-python/empy
+DESCRIPTION=Packages for modeling various aspects of robot information
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/robot_model
+IUSE=test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/collada_parser dev-ros/collada_urdf dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/urdf dev-ros/urdf_parser_plugin dev-util/catkin dev-python/empy
+SLOT=0
+SRC_URI=https://github.com/ros/robot_model/archive/1.12.9.tar.gz -> robot_model-1.12.9.tar.gz
+_eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	ros-catkin	c2f80f4530b85640ead89682ff5ce66c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=25a8828321b769be1be2aa339c6b637f
diff --git a/metadata/md5-cache/sys-apps/moreutils-0.61 b/metadata/md5-cache/sys-apps/moreutils-0.61
new file mode 100644
index 000000000000..086476214b35
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/moreutils-0.61
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=app-admin/eselect doc? ( dev-lang/perl >=app-text/docbook2X-0.8.8-r2 app-text/docbook-xml-dtd:4.4 )
+DESCRIPTION=a collection of tools that nobody thought to write when Unix was young
+EAPI=6
+HOMEPAGE=http://joeyh.name/code/moreutils/
+IUSE=+doc +perl
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux
+LICENSE=GPL-2
+RDEPEND=perl? ( dev-lang/perl dev-perl/IPC-Run dev-perl/Time-Duration dev-perl/TimeDate )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~radhermit/dist/moreutils-0.61.tar.gz
+_eclasses_=multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=13cd3fd87fe5c9395a3e30cc00a89934
diff --git a/metadata/md5-cache/www-apache/passenger-5.1.0 b/metadata/md5-cache/www-apache/passenger-5.1.0
deleted file mode 100644
index 42af9b74a1aa..000000000000
--- a/metadata/md5-cache/www-apache/passenger-5.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=dev-ruby/rake-0.8.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* 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_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
-EAPI=5
-HOMEPAGE=https://www.phusionpassenger.com/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=dev-ruby/rake-0.8.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* 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_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.1.0.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=38d6f9191a57e8cf5cde9345dcab0102
diff --git a/metadata/md5-cache/www-apache/passenger-5.1.1 b/metadata/md5-cache/www-apache/passenger-5.1.1
deleted file mode 100644
index b6587ae49aeb..000000000000
--- a/metadata/md5-cache/www-apache/passenger-5.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=dev-ruby/rake-0.8.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* 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_ruby23? ( dev-lang/ruby:2.3 )
-DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
-EAPI=5
-HOMEPAGE=https://www.phusionpassenger.com/
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=dev-ruby/rake-0.8.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* 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_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.1.1.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=38d6f9191a57e8cf5cde9345dcab0102
diff --git a/metadata/md5-cache/www-apache/passenger-5.1.2 b/metadata/md5-cache/www-apache/passenger-5.1.2
index 3560d5671c0e..79e85d5483d1 100644
--- a/metadata/md5-cache/www-apache/passenger-5.1.2
+++ b/metadata/md5-cache/www-apache/passenger-5.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
 EAPI=5
 HOMEPAGE=https://www.phusionpassenger.com/
 IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.1.2.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=52d947545e3236deb2cd43cd3179bdc0
+_md5_=279262ef725ee153c508cac74472543f
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 18a182da6423..0fd6e2199e5b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Apr 2017 05:09:32 +0000
+Thu, 27 Apr 2017 10:39:31 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 62d83840b272..71353f89680f 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Apr 27 05:09:31 UTC 2017
+Thu Apr 27 10:39:31 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c7468e914650..2bb20b4c0392 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Apr 2017 05:30:01 +0000
+Thu, 27 Apr 2017 11:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 7249a8a5769e..a095fc48b3d3 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-569d183a43a92d5f29d47d9e8fda41df39ee8030 1493267265 2017-04-27T04:27:45+00:00
+09703c3ecd7bce67431b7ae04e8c4ec427fd3c9e 1493288071 2017-04-27T10:14:31+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 30be134dba83..b45c4a3613cd 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1493269501 Thu 27 Apr 2017 05:05:01 AM UTC
+1493289302 Thu 27 Apr 2017 10:35:02 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 813ea00554c5..0fd6e2199e5b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 27 Apr 2017 05:09:31 +0000
+Thu, 27 Apr 2017 10:39:31 +0000
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 8df2e3d37a80..ca02735318f2 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer needed -->
+    <maintainer type="person">
+        <email>otakuto.gentoo@gmail.com</email>
+        <name>Tact Yoshida</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
   <use>
     <flag name="drm">build with DRM support</flag>
+    <flag name="nls">Add Native Language Support</flag>
     <flag name="server">Build TigerVNC server</flag>
     <flag name="xorgmodule">Build the Xorg module</flag>
   </use>
diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild b/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
index 297e4521dbd1..f2245309c050 100644
--- a/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="+drm gnutls java +opengl pam server +xorgmodule"
+IUSE="+drm gnutls java nls +opengl pam server +xorgmodule"
 
 CDEPEND="virtual/jpeg:0
 	sys-libs/zlib
@@ -104,6 +104,7 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
 		-DENABLE_PAM=$(usex pam)
 		-DBUILD_JAVA=$(usex java)
 	)
diff --git a/net-vpn/tor/tor-0.2.9.10.ebuild b/net-vpn/tor/tor-0.2.9.10.ebuild
index 035d07ef861f..62dc606d4ec6 100644
--- a/net-vpn/tor/tor-0.2.9.10.ebuild
+++ b/net-vpn/tor/tor-0.2.9.10.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 IUSE="libressl scrypt seccomp selinux systemd tor-hardening test web"
 
 DEPEND="
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index cc418652d211..31fa8e3802cc 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2503,6 +2503,7 @@ dev-python/paste:flup - enable support for flup (and therefore for various wgsi
 dev-python/paste:openid - enable OpenID support
 dev-python/pillow:webp - Enable support for webp image format.
 dev-python/py-amqp:extras - Install extra tools to generate initial Python mod from an AMQP XML file
+dev-python/pygame:midi - Enable midi support using media-libs/portmidi
 dev-python/pygpu:cuda - Enable NVIDIA CUDA toolkit support
 dev-python/pygpu:opencl - Enable OpenCL support
 dev-python/pyhamcrest:numpy - Enable optional dependence on dev-python/numpy
@@ -6469,6 +6470,7 @@ net-misc/stunnel:stunnel3 - Install the stunnel3 wrapper.
 net-misc/teamviewer:system-wine - Use app-emulation/wine instead of bundled wine.
 net-misc/termpkg:uucp - Adds support for uucp style device locking
 net-misc/tigervnc:drm - build with DRM support
+net-misc/tigervnc:nls - Add Native Language Support
 net-misc/tigervnc:server - Build TigerVNC server
 net-misc/tigervnc:xorgmodule - Build the Xorg module
 net-misc/uftp:server - Install uftp server daemon
diff --git a/ros-meta/robot_model/Manifest b/ros-meta/robot_model/Manifest
index c7052b0c98d8..36c4e1d7682e 100644
--- a/ros-meta/robot_model/Manifest
+++ b/ros-meta/robot_model/Manifest
@@ -1,2 +1,3 @@
 DIST robot_model-1.12.7.tar.gz 1296028 SHA256 c9aad0e23970507c30490678fb76514faf1bd577ec2c30b4703fd322543be3bc SHA512 bc1901473f890b7200ef67db891ca9269c867ee1cf67a316948587d27549c6d58ce8c0b4a0d9255a5419a235ead3b19065b135486188efc21cbb6594d1863291 WHIRLPOOL 7575227d3388652eb71c5fd4265fe70c26f44149ee63d793ad87906805dff8938313f2f085edfee82847a4050b8639bc9c0773090b9f0ecbe84e29291f9d7593
 DIST robot_model-1.12.8.tar.gz 1297591 SHA256 dd8a6dec56e06bcc84582da4163efe22dcc4bf6badd6011ebb209db342c495a1 SHA512 77770e3ce1fe7c143c15581fa262dc01ccc04dd9313d022b9f0f254451db80415b558f339063debc5712590f846690d957848ba977f2175d2a4cda72b2102914 WHIRLPOOL afaeaee66821165efccc049a0f7972c597dde89f4f6814501694542e8d88d7591945872ca18020ea04742ab96ec133c306bccfddc81dd4f221b1def2f436cfbe
+DIST robot_model-1.12.9.tar.gz 1298115 SHA256 96b104f7a77e82a4af7df4ff6de7cc6ce11b76819537e0dc9b9a3c870d2df910 SHA512 fe1da6fd290af012d53cd2875cdfa5e746bfb964a6cf4ca91786218b33603858d478f49a8e18c9581ba52d9e1d68409f919ec19997de7549b3fb2bc4a3686121 WHIRLPOOL 74fa337c6e09dce970ec8e646ab52256d36261e77fb9ced0d08a66dcac0d33c0922ed6fe1ba90a57d9e8dfd3861436698b217bdb7b97357c162f6ce4e7cd11c3
diff --git a/ros-meta/robot_model/robot_model-1.12.9.ebuild b/ros-meta/robot_model/robot_model-1.12.9.ebuild
new file mode 100644
index 000000000000..f9b78f8d0f1f
--- /dev/null
+++ b/ros-meta/robot_model/robot_model-1.12.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Packages for modeling various aspects of robot information"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/collada_parser
+	dev-ros/collada_urdf
+	dev-ros/joint_state_publisher
+	dev-ros/kdl_parser
+	dev-ros/kdl_parser_py
+	dev-ros/urdf
+	dev-ros/urdf_parser_plugin
+"
+DEPEND="${RDEPEND}"
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index d07002518887..b1f0df916f52 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1 +1,2 @@
 DIST moreutils-0.60.tar.gz 93137 SHA256 a095e9647ccde72d43a4d39ee215c6ac59a00b2cd1da17ccbcaf70e3923ae011 SHA512 b09b81606fc307abe26173fbd2e50ab3ee84db53b7242dc57a0747a83489088b1702435cfad5a171af00d56ab154b9d4c3062a3d4ac7c002dc03315c6fca0cab WHIRLPOOL 9d0183cf422a408957ccf027f5f141cae11ab5b99eaeff2b3a5949b88d87544b865a3466286a2e2208103bda7a91728f3ec5078361940d6ce3bc058277ba568a
+DIST moreutils-0.61.tar.gz 93234 SHA256 e361d7da29125a81bf7899275460ac91f6a2e538f3bb61160a0d1d3754af876f SHA512 6164680c8bfec02f7a84274b1d4342a1d6c296e14843496dcc9f9ac71b3e3b1663dea72e2251a546a646775afa70589483e8d5da71b388b1022476bb3dd91b56 WHIRLPOOL 3c5fa18c37ef9633f487d55605ad627dc64a3dc9ce3065ae2a43086efdad367d12badfbb71d3aebc986d56988334e84394e9ce3e3a4b6ea3d70c31d30296bd0b
diff --git a/sys-apps/moreutils/moreutils-0.61.ebuild b/sys-apps/moreutils/moreutils-0.61.ebuild
new file mode 100644
index 000000000000..c2fc3e353df1
--- /dev/null
+++ b/sys-apps/moreutils/moreutils-0.61.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="a collection of tools that nobody thought to write when Unix was young"
+HOMEPAGE="http://joeyh.name/code/moreutils/"
+#SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz"
+SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux"
+IUSE="+doc +perl"
+
+RDEPEND="
+	perl? (
+		dev-lang/perl
+		dev-perl/IPC-Run
+		dev-perl/Time-Duration
+		dev-perl/TimeDate
+	)"
+DEPEND="
+	app-admin/eselect
+	doc? (
+		dev-lang/perl
+		>=app-text/docbook2X-0.8.8-r2
+		app-text/docbook-xml-dtd:4.4
+	)"
+
+src_prepare() {
+	# don't build manpages
+	if ! use doc ; then
+		sed -i -e '/^all:/s/$(MANS)//' -e '/man1/d' Makefile || die
+	fi
+
+	# don't install perl scripts
+	if ! use perl ; then
+		sed -i -e '/PERLSCRIPTS/d' Makefile || die
+	fi
+
+	default
+}
+
+src_compile() {
+	tc-export CC
+	emake CFLAGS="${CFLAGS}" DOCBOOK2XMAN=docbook2man.pl PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
+
+	# sys-process is more advanced than parallel from moreutils, rename it
+	if use doc; then
+		mv "${ED}"usr/share/man/man1/{,${PN}_}parallel.1 || die
+	fi
+	mv "${ED}"usr/bin/{,${PN}_}parallel || die
+}
+
+pkg_postinst() {
+	# try to make sure $EDITOR is valid for vipe (bug #604630)
+	eselect editor update
+}
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index a857dcca28b9..00c8cc8595c6 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,5 +1,3 @@
 DIST passenger-4.0.60.tar.gz 5271049 SHA256 bbb8c18cc371441ce4ee9a4de4d124b6ec5e6af6e95a472b93a72d0357dc88fe SHA512 144df1e5e3dfbf9f9fa13d959c0324760b01c5e86b3f8e52c3d7d9c32eec916a35cc5c52a8c7a5ab9ed1ccee4d7efc9f77fc9940ad1515937a7bfe964753b219 WHIRLPOOL c8f3993b2745eb577c2eddbca2fd280e7db56adbeb4f72ba4b29770d95b991a8012243d1a9bd19aa59a28cfb9326117d649f70cf6d406a4e53acd1e40deb5b57
 DIST passenger-5.0.30.tar.gz 5588130 SHA256 f367e0c1d808d7356c3749222194a72ea03efe61a3bf1b682bd05d47f087b4e3 SHA512 08de84f63e26260b759240278f905b86a0ae105a332182ba8bb6f47beaf43f28fc22feb6b577c9e185cf0ff8a90c4ee7773bc6380a5066738040f161737d7800 WHIRLPOOL 0c2f4201fd9974cf8b16750beb56d7685cdf1067bf5524e2a12e9ab7b71781bb3daad2a225540847a9f9ce20b321bfb0bc82af65a94501492ff20d0efb61f5d1
-DIST passenger-5.1.0.tar.gz 5641864 SHA256 a46970b520ba0b1ecc9eac5c9b45f459fcdae882a02e462a375bab7ff0683545 SHA512 14717e298eafcb3bcb86d437eee196e4da7c74bae64c4a365317f5599486e6b7c2e5abdbf84daf1712e32eabdf9f3379038ecf88ce7f8be31502a6eeb9a27316 WHIRLPOOL 661cb6f113f7e4027902c7cabd422562277b5b4208e742023d893243106bc905ae720686a00e5d4e4307144a853e7c0515a0a431cdbe4b661794f2525035d72a
-DIST passenger-5.1.1.tar.gz 5643654 SHA256 cc59ed164a71aec1d06dd993172729ae656948788528d04e5453595ce5e5a10e SHA512 8e800ecb7465e61b0645ce2bba217b548ab3f3b5daa63b4cecb2def9346eef59997f943334a720bbe88067e3404aef61e3ec6ee51b3d0fa9ebaab21b139bba9d WHIRLPOOL 460bafef57f864feb8435963ac4cf9002b346d7b53f539807a21d4ad24809d7b390878322d16d632b3497026cbd4d1dd1a300cf5c5094ce6cfb0cb03fbc74c1d
 DIST passenger-5.1.2.tar.gz 5646103 SHA256 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea6797e81f017fedddfdbab SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd WHIRLPOOL 8f115162e2a7c43af20cef1d689290c8a523cce10f617500eeb50ab6a226c203a404fc7ce53fd0e21e63276aa359c5d64b685318be36f79ce165ff598bac8766
diff --git a/www-apache/passenger/passenger-5.1.0.ebuild b/www-apache/passenger/passenger-5.1.0.ebuild
deleted file mode 100644
index 3b85f06171df..000000000000
--- a/www-apache/passenger/passenger-5.1.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="https://www.phusionpassenger.com/"
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-ruby_add_rdepend "
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rake-0.8.1"
-
-# libev is bundled but with adapations that do not seem to be accepted
-# upstream, so we must use the bundled version :-(
-CDEPEND="
-	>=dev-libs/libuv-1.8.0
-	net-misc/curl[ssl]
-	www-servers/apache[apache2_modules_unixd(+)]"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}"
-
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
-APACHE2_MOD_DEFINE="PASSENGER"
-
-need_apache2
-
-pkg_setup() {
-	use debug && append-flags -DPASSENGER_DEBUG
-}
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
-
-	# Change these with sed instead of a patch so that we can easily use
-	# the toolchain-funcs methods.
-	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
-		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
-		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
-
-	# Avoid fixed debugging CFLAGs.
-	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
-
-	# Use sed here so that we can dynamically set the documentation directory.
-	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
-		-e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
-		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
-		src/ruby_supportlib/phusion_passenger.rb || die
-	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
-
-	# Don't install a tool that won't work in our setup.
-	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
-	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
-
-	# Make sure we use the system-provided version where possible
-	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
-
-	# Avoid building documentation to avoid a dependency on mizuho.
-	#sed -i -e 's/, :doc//' build/packaging.rb || die
-	touch doc/*.html || die
-
-	# Fix hard-coded use of AR
-	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
-}
-
-all_ruby_compile() {
-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	ruby -S rake apache2 || die "rake failed"
-}
-
-each_ruby_compile() {
-	append-flags -fno-strict-aliasing
-
-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake native_support || die "rake failed"
-}
-
-all_ruby_install() {
-	APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
-	apache-module_src_install
-
-	# Patch in the correct libdir
-	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
-
-	dodoc CHANGELOG README.md
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	EXTRA_LDFLAGS="${LDFLAGS}" \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake fakeroot || die "rake failed"
-}
diff --git a/www-apache/passenger/passenger-5.1.1.ebuild b/www-apache/passenger/passenger-5.1.1.ebuild
deleted file mode 100644
index 3b85f06171df..000000000000
--- a/www-apache/passenger/passenger-5.1.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="https://www.phusionpassenger.com/"
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-ruby_add_rdepend "
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rake-0.8.1"
-
-# libev is bundled but with adapations that do not seem to be accepted
-# upstream, so we must use the bundled version :-(
-CDEPEND="
-	>=dev-libs/libuv-1.8.0
-	net-misc/curl[ssl]
-	www-servers/apache[apache2_modules_unixd(+)]"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}"
-
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
-APACHE2_MOD_DEFINE="PASSENGER"
-
-need_apache2
-
-pkg_setup() {
-	use debug && append-flags -DPASSENGER_DEBUG
-}
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
-
-	# Change these with sed instead of a patch so that we can easily use
-	# the toolchain-funcs methods.
-	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
-		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
-		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
-
-	# Avoid fixed debugging CFLAGs.
-	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
-
-	# Use sed here so that we can dynamically set the documentation directory.
-	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
-		-e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
-		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
-		src/ruby_supportlib/phusion_passenger.rb || die
-	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
-
-	# Don't install a tool that won't work in our setup.
-	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
-	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
-
-	# Make sure we use the system-provided version where possible
-	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
-
-	# Avoid building documentation to avoid a dependency on mizuho.
-	#sed -i -e 's/, :doc//' build/packaging.rb || die
-	touch doc/*.html || die
-
-	# Fix hard-coded use of AR
-	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
-}
-
-all_ruby_compile() {
-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	ruby -S rake apache2 || die "rake failed"
-}
-
-each_ruby_compile() {
-	append-flags -fno-strict-aliasing
-
-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake native_support || die "rake failed"
-}
-
-all_ruby_install() {
-	APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
-	apache-module_src_install
-
-	# Patch in the correct libdir
-	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
-
-	dodoc CHANGELOG README.md
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	EXTRA_LDFLAGS="${LDFLAGS}" \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake fakeroot || die "rake failed"
-}
diff --git a/www-apache/passenger/passenger-5.1.2.ebuild b/www-apache/passenger/passenger-5.1.2.ebuild
index 568d17159856..18580bb34980 100644
--- a/www-apache/passenger/passenger-5.1.2.ebuild
+++ b/www-apache/passenger/passenger-5.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 ruby_add_bdepend "dev-ruby/rake"