From 26670ab07e38f74b3727f5ede0af2f3f58cb5135 Mon Sep 17 00:00:00 2001
From: root <root@sandbox.local.calculate.ru>
Date: Sun, 25 Jan 2015 11:55:47 +0300
Subject: [PATCH] Sync with portage [Sun Jan 25 11:55:47 MSK 2015].

---
 dev-db/mariadb/mariadb-10.0.15-r1.ebuild      |   4 +-
 dev-db/mysql/mysql-5.6.22.ebuild              |   4 +-
 dev-python/pbr/pbr-0.8.0.ebuild               |   7 +-
 dev-python/pbr/pbr-0.8.2-r1.ebuild            |  61 +++++
 dev-ruby/power_assert/Manifest                |   1 +
 dev-ruby/power_assert/metadata.xml            |   5 +
 .../power_assert/power_assert-0.2.2.ebuild    |  23 ++
 dev-ruby/pry/Manifest                         |   1 +
 dev-ruby/pry/pry-0.10.1.ebuild                |  49 ++++
 dev-ruby/spy/Manifest                         |   1 +
 dev-ruby/spy/metadata.xml                     |   5 +
 dev-ruby/spy/spy-0.4.1.ebuild                 |  26 ++
 metadata/dtd/timestamp.chk                    |   2 +-
 metadata/glsa/timestamp.chk                   |   2 +-
 metadata/md5-cache/dev-db/mariadb-10.0.15-r1  |   4 +-
 metadata/md5-cache/dev-db/mysql-5.6.22        |   4 +-
 metadata/md5-cache/dev-python/pbr-0.8.0       |   2 +-
 metadata/md5-cache/dev-python/pbr-0.8.2-r1    |  14 ++
 .../md5-cache/dev-ruby/power_assert-0.2.2     |  14 ++
 metadata/md5-cache/dev-ruby/pry-0.10.1        |  14 ++
 metadata/md5-cache/dev-ruby/spy-0.4.1         |  14 ++
 metadata/md5-cache/net-misc/openntpd-5.7_p1   |  13 -
 metadata/md5-cache/net-misc/openntpd-5.7_p2   |  13 +
 metadata/md5-cache/sys-devel/distcc-3.1-r10   |   2 +-
 .../md5-cache/sys-devel/distcc-3.2_rc1-r2     |   2 +-
 metadata/md5-cache/virtual/mysql-5.6-r2       |   4 +-
 metadata/news/timestamp.chk                   |   2 +-
 metadata/timestamp                            |   2 +-
 metadata/timestamp.chk                        |   2 +-
 metadata/timestamp.x                          |   2 +-
 net-misc/openntpd/Manifest                    |   2 +-
 .../files/openntpd-5.7_p1-signal.patch        |  17 --
 .../openntpd-5.7_p1-warn-s-failure.patch      |  12 -
 .../files/openntpd-5.7_p2-adjtimex.patch      |  50 ++++
 .../files/openntpd-5.7_p2-proctitle.patch     | 237 ++++++++++++++++++
 ...d-5.7_p1.ebuild => openntpd-5.7_p2.ebuild} |  16 +-
 sys-devel/distcc/distcc-3.1-r10.ebuild        |   5 +-
 sys-devel/distcc/distcc-3.2_rc1-r2.ebuild     |   3 +-
 virtual/mysql/mysql-5.6-r2.ebuild             |   4 +-
 39 files changed, 566 insertions(+), 79 deletions(-)
 create mode 100644 dev-python/pbr/pbr-0.8.2-r1.ebuild
 create mode 100644 dev-ruby/power_assert/Manifest
 create mode 100644 dev-ruby/power_assert/metadata.xml
 create mode 100644 dev-ruby/power_assert/power_assert-0.2.2.ebuild
 create mode 100644 dev-ruby/pry/pry-0.10.1.ebuild
 create mode 100644 dev-ruby/spy/Manifest
 create mode 100644 dev-ruby/spy/metadata.xml
 create mode 100644 dev-ruby/spy/spy-0.4.1.ebuild
 create mode 100644 metadata/md5-cache/dev-python/pbr-0.8.2-r1
 create mode 100644 metadata/md5-cache/dev-ruby/power_assert-0.2.2
 create mode 100644 metadata/md5-cache/dev-ruby/pry-0.10.1
 create mode 100644 metadata/md5-cache/dev-ruby/spy-0.4.1
 delete mode 100644 metadata/md5-cache/net-misc/openntpd-5.7_p1
 create mode 100644 metadata/md5-cache/net-misc/openntpd-5.7_p2
 delete mode 100644 net-misc/openntpd/files/openntpd-5.7_p1-signal.patch
 delete mode 100644 net-misc/openntpd/files/openntpd-5.7_p1-warn-s-failure.patch
 create mode 100644 net-misc/openntpd/files/openntpd-5.7_p2-adjtimex.patch
 create mode 100644 net-misc/openntpd/files/openntpd-5.7_p2-proctitle.patch
 rename net-misc/openntpd/{openntpd-5.7_p1.ebuild => openntpd-5.7_p2.ebuild} (87%)

diff --git a/dev-db/mariadb/mariadb-10.0.15-r1.ebuild b/dev-db/mariadb/mariadb-10.0.15-r1.ebuild
index edfbccc3eeaa..20afa1d43420 100644
--- a/dev-db/mariadb/mariadb-10.0.15-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.15-r1.ebuild,v 1.4 2015/01/24 17:05:54 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.15-r1.ebuild,v 1.6 2015/01/24 20:43:27 ago Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20141215-0144Z"
@@ -10,7 +10,7 @@ inherit toolchain-funcs mysql-multilib
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
diff --git a/dev-db/mysql/mysql-5.6.22.ebuild b/dev-db/mysql/mysql-5.6.22.ebuild
index c4b95685abef..48f6ea763183 100644
--- a/dev-db/mysql/mysql-5.6.22.ebuild
+++ b/dev-db/mysql/mysql-5.6.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.22.ebuild,v 1.5 2015/01/24 17:07:23 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.22.ebuild,v 1.7 2015/01/24 20:43:19 ago Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-multilib
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
diff --git a/dev-python/pbr/pbr-0.8.0.ebuild b/dev-python/pbr/pbr-0.8.0.ebuild
index 84f23fd1e039..4b235883c6d6 100644
--- a/dev-python/pbr/pbr-0.8.0.ebuild
+++ b/dev-python/pbr/pbr-0.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.8.0.ebuild,v 1.6 2014/08/20 20:37:21 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.8.0.ebuild,v 1.7 2015/01/25 05:06:09 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3} )
@@ -33,8 +33,6 @@ RDEPEND=">dev-python/pip-1.4[${PYTHON_USEDEP}]"
 
 # Requ'd for testsuite
 DISTUTILS_IN_SOURCE_BUILD=1
-# You can do this in about 3 different ways; throw it in a src_test() and prepend it to a
-# distutils-r1_src_test or os it a distutils-r1_python_test, but really it makes for a HUGE 'meh'
 
 # This normally actually belongs here.
 python_prepare_all() {
@@ -47,5 +45,4 @@ python_prepare_all() {
 python_test() {
 	testr init
 	testr run || die "Testsuite failed under ${EPYTHON}"
-	flake8 "${PN}"/tests || die "Run over tests folder by flake8 drew error"
 }
diff --git a/dev-python/pbr/pbr-0.8.2-r1.ebuild b/dev-python/pbr/pbr-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..b8470a503fcd
--- /dev/null
+++ b/dev-python/pbr/pbr-0.8.2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.8.2-r1.ebuild,v 1.1 2015/01/25 05:06:09 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="PBR is a library that injects some useful and sensible default
+behaviors into your setuptools run."
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/flake8-2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
+RDEPEND=">dev-python/pip-1.4[${PYTHON_USEDEP}]"
+
+# Requ'd for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+# This normally actually belongs here.
+python_prepare_all() {
+	# This test passes when run within the source and doesn't represent a failure, but rather
+	# a gentoo sandbox constraint
+	# Rm tests that rely upon the package being already installed and fail
+	sed -e s':test_console_script_develop:_&:' \
+		-e s':test_console_script_install:_&:' \
+		-e s':test_sdist_extra_files:_&:' \
+		-e s':test_command_hooks:_&:' \
+		-e s':test_sdist_git_extra_files:_&:' \
+		-i pbr/tests/test_core.py || die
+	sed -e s':test_command_hooks:_&:' \
+		-e s':test_global_setup_hooks:_&:' \
+		-i pbr/tests/test_hooks.py || die
+	einfo "rogue tests disabled"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Note; removed tests pass once package is emerged, 
+	# it's the suite's design that breaks form, not the tests' intended purpose
+	testr init
+	testr run || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
new file mode 100644
index 000000000000..6d77ad22c770
--- /dev/null
+++ b/dev-ruby/power_assert/Manifest
@@ -0,0 +1 @@
+DIST power_assert-0.2.2.gem 12800 SHA256 ea8146b060a4da226f5d4519cb122a6572741f5354b7cc40f74147bcbe033558 SHA512 f1bd1677734375eb03b4b9166ff84e29bd96b25e66751c4a2a305e1d9c4a63de76b7bf152a2af54871b6901230b2d2926a935aece3165a736eee1b7813e92400 WHIRLPOOL bf58578391c9b926cb38eb80d17497311f1bdb818af5f1ebb83e2ae390d594e644a38c2be14b2c49c01213dc530d239f42e40fda6b4484f4a376ef3e54ff3440
diff --git a/dev-ruby/power_assert/metadata.xml b/dev-ruby/power_assert/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/power_assert/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
diff --git a/dev-ruby/power_assert/power_assert-0.2.2.ebuild b/dev-ruby/power_assert/power_assert-0.2.2.ebuild
new file mode 100644
index 000000000000..4ccdfbb0622f
--- /dev/null
+++ b/dev-ruby/power_assert/power_assert-0.2.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/power_assert/power_assert-0.2.2.ebuild,v 1.1 2015/01/25 07:28:30 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shows each value of variables and method calls in the expression"
+HOMEPAGE="https://github.com/k-tsj/power_assert"
+LICENSE="|| ( Ruby BSD-2 )"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' Rakefile || die
+}
diff --git a/dev-ruby/pry/Manifest b/dev-ruby/pry/Manifest
index 02c92b57e190..1a82bfb74661 100644
--- a/dev-ruby/pry/Manifest
+++ b/dev-ruby/pry/Manifest
@@ -1,2 +1,3 @@
+DIST pry-0.10.1.tar.gz 204021 SHA256 c04af53883e742d6cf44c3923a6e397b14f14520f73da0d3f68dfc0855e8645b SHA512 cbb850d5bc9012da376ed87a894c939e20f0c1992565e3f9c282a85fd3026c2eb71a487672e2dc141a8f1ac0016f467782448e318012ef761e5cc21edb376b92 WHIRLPOOL 1b320e9e6956121b4b51d9d56b09deec823e00b3384b74065047bf2c32fc7d145bb34e63906cd1b0093f160c3e7b5a449f1ae1cecaeed5d36a388cb053786780
 DIST pry-0.9.11.4.gem 192512 SHA256 fb4ac57bd13e72469ed11414e4cea389e4a70040d9d0c84b158470b4c3353a91 SHA512 7af52b79992f9472aafd2dcb3a32aea4fc3b89c6cafba2a59dbbe56c19e9afe6324c9c94af5c698bf4f8b0b34b0435effde24580769c09063537acd9af75ef9b WHIRLPOOL e1df46561d742a6dfa1523be7cb91091b906c6180086079d0732bdde49264f336721392ed2514758b8fa4950033c8785840ddf6e3aef2fa546fde1d58cb0e02f
 DIST pry-0.9.12.6.gem 198144 SHA256 0107730b35bdd4fd042fa9c92263174a38f975844230bc5c583fd4816c55af72 SHA512 451da80d9224f3c826bdcb0492d1880005143ae489dc1de0021ed73fd3d34ef3bab7c06dd631cf9737c7b4d9b031d1ee7be05c4e4d99ab9af24231ce388ac3b9 WHIRLPOOL c04d80c3e2a357dbdab549be0d5b83ce319dcfbac286dd5b7e156e1a800cd87d89974a5213e8fb0860819a606a5633295ed0b645ab049a68674cf68a2d1a947d
diff --git a/dev-ruby/pry/pry-0.10.1.ebuild b/dev-ruby/pry/pry-0.10.1.ebuild
new file mode 100644
index 000000000000..4473fe7f33d5
--- /dev/null
+++ b/dev-ruby/pry/pry-0.10.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pry/pry-0.10.1.ebuild,v 1.1 2015/01/24 22:35:11 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+RUBY_FAKEGEM_GEMSPEC=${PN}.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pry is a powerful alternative to the standard IRB shell for Ruby"
+HOMEPAGE="https://github.com/pry/pry/wiki"
+SRC_URI="https://github.com/pry/pry/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE=""
+SLOT="ruby19"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/coderay-1.1.0
+	>=dev-ruby/slop-3.4.1:3
+	>=dev-ruby/method_source-0.8"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/open4-1.3
+		>=dev-ruby/rake-0.9
+		>=dev-ruby/mocha-1.0
+	)"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on git.
+	# Loosen coderay dependency.
+	sed -e '/git ls-files/d' \
+		-e '/coderay/s/~>/>=/' \
+		-e '/bundler/d' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e '/[Bb]undler/d' -e "1irequire 'mocha/api'\ " -i spec/helper.rb || die
+	sed -e "1irequire 'ostruct'\ " -i spec/hooks_spec.rb || die
+	sed -e '/of Class after the singleton classes/,+4d' -i spec/method_spec.rb || die
+	# Out of date tests
+	rm spec/commands/gist_spec.rb || die
+}
diff --git a/dev-ruby/spy/Manifest b/dev-ruby/spy/Manifest
new file mode 100644
index 000000000000..00d6259bea86
--- /dev/null
+++ b/dev-ruby/spy/Manifest
@@ -0,0 +1 @@
+DIST spy-0.4.1.gem 32768 SHA256 cd93acce16e546cd6a7d6a19cd03991e5654b5b7e2a1cde142cec37332a558e5 SHA512 37c6c2892ce28e9512661bbf6fae8d76214e6cd4610c27c1a62dba48e6744dbcf1eb499db6f8c2e1873db4eb677e5f974e9f7c24ae32f6408d7e7f53bee1185d WHIRLPOOL ab2b546910f99d4e8afccee73a37ebbd9d4a421497fca5501c7fa77003d680ede9d6a3c6b5e6b0394f9bce00c9f9fac5b1c8f79814e295ee02fe0173470d6e11
diff --git a/dev-ruby/spy/metadata.xml b/dev-ruby/spy/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/spy/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
diff --git a/dev-ruby/spy/spy-0.4.1.ebuild b/dev-ruby/spy/spy-0.4.1.ebuild
new file mode 100644
index 000000000000..11f3f929b902
--- /dev/null
+++ b/dev-ruby/spy/spy-0.4.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spy/spy-0.4.1.ebuild,v 1.1 2015/01/24 22:36:31 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A simple opinionated mocking framework"
+HOMEPAGE="https://github.com/ryanong/spy"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:0
+	dev-ruby/pry )"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/pry-nav/d" -e "/[Cc]overalls/d" Rakefile test/test_helper.rb || die
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 97d22bfab7a6..54169f27f5cb 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Jan 2015 20:07:01 +0000
+Sun, 25 Jan 2015 08:06:50 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 97d22bfab7a6..54169f27f5cb 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Jan 2015 20:07:01 +0000
+Sun, 25 Jan 2015 08:06:50 +0000
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.15-r1 b/metadata/md5-cache/dev-db/mariadb-10.0.15-r1
index eac5c85c8924..81ca7b0c8a98 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.0.15-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.15-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=5
 HOMEPAGE=http://mariadb.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +community cluster debug embedded extraengine jemalloc latin1 max-idx-128 minimal +perl profiling selinux ssl systemtap static static-libs tcmalloc test oqgraph pam sphinx tokudb odbc xml
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6
 RDEPEND=ssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] oqgraph? ( >=dev-libs/boost-1.40.0:0= ) !minimal? ( pam? ( virtual/pam:0= ) ) perl? ( !dev-db/mytop ) odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) oqgraph? ( dev-libs/judy:0= ) >=dev-libs/libpcre-8.35:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes )
@@ -12,4 +12,4 @@ REQUIRED_USE=odbc? ( extraengine !minimal ) xml? ( extraengine !minimal ) minima
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-10.0.15/kvm-tarbake-jaunty-x86/mariadb-10.0.15.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-10.0.15/source/mariadb-10.0.15.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-10.0.15/kvm-tarbake-jaunty-x86/mariadb-10.0.15.tar.gz http://mirrors.coreix.net/mariadb/mariadb-10.0.15/kvm-tarbake-jaunty-x86/mariadb-10.0.15.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-10.0.15/kvm-tarbake-jaunty-x86/mariadb-10.0.15.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-10.0.15/kvm-tarbake-jaunty-x86/mariadb-10.0.15.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-10.0.15/kvm-tarbake-jaunty-x86/mariadb-10.0.15.tar.gz mirror://gentoo/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20141215-0144Z.tar.bz2
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	1bc60850e6eb816ed20370329cfe5331	mysql-multilib	5693e12764b90a7385eeaf3a67fe241e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fbfd3f29a39b7f791f3efd2e20869b3e
+_md5_=a707f4325c54f487f1dc23ab7da13d53
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.22 b/metadata/md5-cache/dev-db/mysql-5.6.22
index 4d79f9ea7c4b..1dcc4c58c127 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.22
+++ b/metadata/md5-cache/dev-db/mysql-5.6.22
@@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=5
 HOMEPAGE=http://www.mysql.com/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +community cluster debug embedded extraengine jemalloc latin1 max-idx-128 minimal +perl profiling selinux ssl systemtap static static-libs tcmalloc test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6
 RDEPEND=ssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
@@ -12,4 +12,4 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.6/mysql-5.6.22.tar.gz mirror://mysql/Downloads/MySQL-5.6/mysql-5.6.22.tar.gz mirror://gentoo/mysql-extras-20141203-2105Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20141203-2105Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20141203-2105Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20141203-2105Z.tar.bz2
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	1bc60850e6eb816ed20370329cfe5331	mysql-multilib	5693e12764b90a7385eeaf3a67fe241e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4f8f3d7a8d33751f2932c1d1f0f8b96d
+_md5_=6f6e755e0f13ad5c263e90e15d8c55e3
diff --git a/metadata/md5-cache/dev-python/pbr-0.8.0 b/metadata/md5-cache/dev-python/pbr-0.8.0
index 435e9b467245..f8b44950c488 100644
--- a/metadata/md5-cache/dev-python/pbr-0.8.0
+++ b/metadata/md5-cache/dev-python/pbr-0.8.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-0.8.0.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0c57498cee1a7d7a739075d6f1061718
+_md5_=6104bb56f984fb55b300a57028475ffc
diff --git a/metadata/md5-cache/dev-python/pbr-0.8.2-r1 b/metadata/md5-cache/dev-python/pbr-0.8.2-r1
new file mode 100644
index 000000000000..dc10b10b4275
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pbr-0.8.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/coverage-3.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/flake8-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testresources-0.2.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testscenarios-0.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=PBR is a library that injects some useful and sensible default behaviors into your setuptools run.
+EAPI=5
+HOMEPAGE=https://github.com/openstack-dev/pbr
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pip-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pbr/pbr-0.8.2.tar.gz
+_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=28abc435c8b7fb89f8d76e9a48576454
diff --git a/metadata/md5-cache/dev-ruby/power_assert-0.2.2 b/metadata/md5-cache/dev-ruby/power_assert-0.2.2
new file mode 100644
index 000000000000..aeb83d47d98b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/power_assert-0.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=Shows each value of variables and method calls in the expression
+EAPI=5
+HOMEPAGE=https://github.com/k-tsj/power_assert
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64
+LICENSE=|| ( Ruby BSD-2 )
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://rubygems/power_assert-0.2.2.gem
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=8b7cd744aba121948d3cb3efcd33809a
diff --git a/metadata/md5-cache/dev-ruby/pry-0.10.1 b/metadata/md5-cache/dev-ruby/pry-0.10.1
new file mode 100644
index 000000000000..b34ac9d843b9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pry-0.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby19] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby19] >=dev-ruby/method_source-0.8[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby20] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby20] >=dev-ruby/method_source-0.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby21] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby21] >=dev-ruby/method_source-0.8[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/open4-1.3[ruby_targets_ruby19] >=dev-ruby/rake-0.9[ruby_targets_ruby19] >=dev-ruby/mocha-1.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/open4-1.3[ruby_targets_ruby20] >=dev-ruby/rake-0.9[ruby_targets_ruby20] >=dev-ruby/mocha-1.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/open4-1.3[ruby_targets_ruby21] >=dev-ruby/rake-0.9[ruby_targets_ruby21] >=dev-ruby/mocha-1.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=Pry is a powerful alternative to the standard IRB shell for Ruby
+EAPI=5
+HOMEPAGE=https://github.com/pry/pry/wiki
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby19] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby19] >=dev-ruby/method_source-0.8[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby20] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby20] >=dev-ruby/method_source-0.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby21] >=dev-ruby/slop-3.4.1:3[ruby_targets_ruby21] >=dev-ruby/method_source-0.8[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=ruby19
+SRC_URI=https://github.com/pry/pry/archive/v0.10.1.tar.gz -> pry-0.10.1.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=695bb86c94811385d6b8bfd340e7fc63
diff --git a/metadata/md5-cache/dev-ruby/spy-0.4.1 b/metadata/md5-cache/dev-ruby/spy-0.4.1
new file mode 100644
index 000000000000..f1064f4a390d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/spy-0.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby19] dev-ruby/pry[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby20] dev-ruby/pry[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=A simple opinionated mocking framework
+EAPI=5
+HOMEPAGE=https://github.com/ryanong/spy
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=mirror://rubygems/spy-0.4.1.gem
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e05114d5a0cb156f695b0c53738b8cd0
diff --git a/metadata/md5-cache/net-misc/openntpd-5.7_p1 b/metadata/md5-cache/net-misc/openntpd-5.7_p1
deleted file mode 100644
index d03aa5db8b05..000000000000
--- a/metadata/md5-cache/net-misc/openntpd-5.7_p1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=config configure install postinst postrm prepare setup
-DEPEND=!<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd] virtual/pkgconfig
-DESCRIPTION=Lightweight NTP server ported from OpenBSD
-EAPI=5
-HOMEPAGE=http://www.openntpd.org/
-IUSE=selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD GPL-2
-RDEPEND=!<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd] selinux? ( sec-policy/selinux-ntp )
-SLOT=0
-SRC_URI=mirror://openbsd/OpenNTPD/openntpd-5.7p1.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=e1c0523ecc931ece5e314a4baecae430
diff --git a/metadata/md5-cache/net-misc/openntpd-5.7_p2 b/metadata/md5-cache/net-misc/openntpd-5.7_p2
new file mode 100644
index 000000000000..8de7b8b6286f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openntpd-5.7_p2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=config configure install postinst postrm prepare setup
+DEPEND=!<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Lightweight NTP server ported from OpenBSD
+EAPI=5
+HOMEPAGE=http://www.openntpd.org/
+IUSE=selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD GPL-2
+RDEPEND=!<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd] selinux? ( sec-policy/selinux-ntp )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenNTPD/openntpd-5.7p2.tar.gz
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=e91fa86e4ab1781fbc019fa54a3e2f7f
diff --git a/metadata/md5-cache/sys-devel/distcc-3.1-r10 b/metadata/md5-cache/sys-devel/distcc-3.1-r10
index fcc6def24385..88bb3cf09747 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.1-r10
+++ b/metadata/md5-cache/sys-devel/distcc-3.1-r10
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://distcc.googlecode.com/files/distcc-3.1.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=1aa1762c3dfb50d071be38305a786d13
+_md5_=c2a34fa886a0a44eec593d244d70e002
diff --git a/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r2 b/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r2
index 2fdf6470be28..64f0d5952cd1 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r2
+++ b/metadata/md5-cache/sys-devel/distcc-3.2_rc1-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://distcc.googlecode.com/files/distcc-3.2rc1.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=759a4bd2d28db20162f71ea991bf9d5d
+_md5_=0ba623cdcaa57ae719333c7104c2aacb
diff --git a/metadata/md5-cache/virtual/mysql-5.6-r2 b/metadata/md5-cache/virtual/mysql-5.6-r2
index 4e831715e883..70cc91ac41f1 100644
--- a/metadata/md5-cache/virtual/mysql-5.6-r2
+++ b/metadata/md5-cache/virtual/mysql-5.6-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for MySQL client or database
 EAPI=5
 IUSE=embedded minimal static 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 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-db/mariadb-10.0*[embedded=,minimal=,static=,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(-)?] =dev-db/mysql-5.6*[embedded=,minimal=,static=,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(-)?] =dev-db/percona-server-5.6*[embedded=,minimal=,static=,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(-)?] =dev-db/mariadb-galera-10.0*[embedded=,minimal=,static=,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(-)?] =dev-db/mysql-cluster-7.3*[embedded=,minimal=,static=,static-libs=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/18
 _eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=843b8c436a563c27ff9f298d3acf8961
+_md5_=32112fa0e100d482ac292bd69874de0e
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index cca272e352e7..62e90885032e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Jan 2015 20:07:04 +0000
+Sun, 25 Jan 2015 08:06:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 157a6217cdb7..9e88086999de 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jan 24 20:07:01 UTC 2015
+Sun Jan 25 08:06:50 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 324b7bfcee18..da46cff96e09 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Jan 2015 20:30:01 +0000
+Sun, 25 Jan 2015 08:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1c4521aabb1d..303a0abe70a9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1422129901 Sat 24 Jan 2015 08:05:01 PM UTC UTC
+1422173101 Sun 25 Jan 2015 08:05:01 AM UTC UTC
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 1a561d003bdf..a4d74c005f38 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -1,3 +1,3 @@
-DIST openntpd-5.7p1.tar.gz 400113 SHA256 071cfdcfc179c481568a2b8262945243a3123abfc7fa8831da1bbff3729b8307 SHA512 2fe6f7daae147eca616bbc76bbcc9d0d2d03cb705f1437a3fa21c98114ce9b78eabbbcbf9ed38d4d7752936a9bf2ee2cabe0a75dfa8f00980088dc2d9f8ac4df WHIRLPOOL 79120a4634badc3b0f38d621bb369f07672ec7d3e27e953012fbb84ffac15d09c9a7ba2f1cb0cc17c1b2bb580308e6beddc5968e8e771b10ee39afbeca24c502
+DIST openntpd-5.7p2.tar.gz 408421 SHA256 1640ad4a6e6475f6065d5f999b17b5dc6ab40dc17309b782b9ae390fe54bd6a5 SHA512 f320c6262eccf428428e7a3578cb0e6cf6305c93faa0dd98e5fb9d55474accd5c5e73d636b8c1339a34c2f46071fb6fc31e6fc296453eaa1501b0e2c01cf6e13 WHIRLPOOL f544e920892e4b44864febbb790affa496aca1c998257b298072903722c41cce47fd9c8a2a0707b14b24d02779d5296fb1326e0ea7fb341fc2c1d7394a463a53
 DIST openntpd_20080406p-6.debian.tar.gz 11849 SHA256 6718ffb52b7f34c7c3e9532d245f31ee5c749bac2cc2c2d4594d8161925a3122 SHA512 f857fbc85e29035470af0855c8fc416c188f55586ba2e1d719159ecfa4a0274ba4dd526409dfd915056a1c15f5e44cb8c40196a7e03c3026c5d73851ebb5abc8 WHIRLPOOL 35bc0ab16d161c7878d438641eede8425238fbce4d32f6b56e347252e6ad561dc1a5795e3bc3cf133fa09dccb69520cb9837c7134bc0fe6cec9ea14be314ee51
 DIST openntpd_20080406p.orig.tar.gz 175923 SHA256 52f473dd8ea8864023ebcdce16a9a50571803af7ffc32a00212242c6a866c3b2 SHA512 9561788002b232786d1589f74bbe2f07a029e3407da4471d2ac9d5e20d8839dbb6e6e53493c78829058611ca23bf00560bbe7bcfe76204d206747752fd47f696 WHIRLPOOL 545125d0ee5ced7827df3d804ac63938d2614e9fb4a2bf3c6bbc17f6040175aa03c057d7a4d3da71ae944f4a556e2b66266d1c6d0463c1cad5d86de3ae896712
diff --git a/net-misc/openntpd/files/openntpd-5.7_p1-signal.patch b/net-misc/openntpd/files/openntpd-5.7_p1-signal.patch
deleted file mode 100644
index 68bd5992eeac..000000000000
--- a/net-misc/openntpd/files/openntpd-5.7_p1-signal.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Only in openntpd-5.7p1: .ntpd.8.swp
-diff -u -r openntpd-5.7p1-orig/ntpd.8 openntpd-5.7p1/ntpd.8
---- openntpd-5.7p1-orig/ntpd.8	2015-01-09 18:51:48.724711211 -0800
-+++ openntpd-5.7p1/ntpd.8	2015-01-09 18:56:32.461471870 -0800
-@@ -126,7 +126,11 @@
- .Pq engine
- receives a
- .Dv SIGINFO
--signal, it writes its peer and sensor status to
-+signal (or a
-+.Dv SIGUSR1
-+signal on systems without
-+.Dv SIGINFO),
-+it writes its peer and sensor status to
- .Xr syslog 3 .
- .Sh FILES
- .Bl -tag -width "/var/db/ntpd.driftXXX" -compact
diff --git a/net-misc/openntpd/files/openntpd-5.7_p1-warn-s-failure.patch b/net-misc/openntpd/files/openntpd-5.7_p1-warn-s-failure.patch
deleted file mode 100644
index 884c0865d4c2..000000000000
--- a/net-misc/openntpd/files/openntpd-5.7_p1-warn-s-failure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r openntpd-5.7p1-orig/ntpd.c openntpd-5.7p1/ntpd.c
---- openntpd-5.7p1-orig/ntpd.c	2015-01-09 18:58:14.498903138 -0800
-+++ openntpd-5.7p1/ntpd.c	2015-01-09 19:00:59.917844614 -0800
-@@ -242,7 +242,7 @@
- 			lconf.settime = 0;
- 			timeout = INFTIM;
- 			log_init(lconf.debug);
--			log_debug("no reply received in time, skipping initial "
-+			log_warnx("no reply received in time, skipping initial "
- 			    "time setting");
- 			if (!lconf.debug) {
- 				if (daemon(1, 0))
diff --git a/net-misc/openntpd/files/openntpd-5.7_p2-adjtimex.patch b/net-misc/openntpd/files/openntpd-5.7_p2-adjtimex.patch
new file mode 100644
index 000000000000..b856276a3109
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd-5.7_p2-adjtimex.patch
@@ -0,0 +1,50 @@
+From eeb97529cd5a332a69a312687e41939eb17f7a81 Mon Sep 17 00:00:00 2001
+From: Brent Cook <busterb@gmail.com>
+Date: Wed, 21 Jan 2015 10:30:37 -0600
+Subject: [PATCH] prefer adjtimex over the deprecated ntp_adjtime on Linux
+
+Thanks to @chneukirchen for the suggestion.
+---
+ compat/adjfreq_linux.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/compat/adjfreq_linux.c b/compat/adjfreq_linux.c
+index 21ee40f..e4a8ae9 100644
+--- a/compat/adjfreq_linux.c
++++ b/compat/adjfreq_linux.c
+@@ -15,7 +15,7 @@
+  */
+ 
+ #include <sys/types.h>
+-# include <sys/timex.h>
++#include <sys/timex.h>
+ 
+ #include <unistd.h>
+ 
+@@ -37,20 +37,20 @@ adjfreq(const int64_t *freq, int64_t *oldfreq)
+ 		txc.modes = ADJ_FREQUENCY;
+ 		txc.freq = *freq / 1e3 / (1LL << 16);
+ 
+-		if ((ntp_adjtime(&txc)) == -1)
+-			log_warn("ntp_adjtime (2) failed");
++		if ((adjtimex(&txc)) == -1)
++			log_warn("adjtimex failed");
+ 
+-		log_debug("ntp_adjtime adjusted frequency by %fppm",
++		log_debug("adjtimex adjusted frequency by %fppm",
+ 			  ((txc.freq * 1e3) *  (1LL<<16) / 1e3 / (1LL << 32)));
+ 	}
+ 	if (oldfreq != NULL) {
+ 		txc.modes = 0;
+-		if ((ntp_adjtime(&txc)) == -1) {
+-			log_warn("ntp_adjtime (1) failed");
++		if ((adjtimex(&txc)) == -1) {
++			log_warn("adjtimex failed");
+ 			return -1;
+ 		}
+ 		newfreq = (txc.freq * 1e3) *  (1LL<<16);
+-		log_debug("ntp_adjtime returns frequency of %fppm",
++		log_debug("adjtimex returns frequency of %fppm",
+ 			  newfreq / 1e3 / (1LL << 32));
+ 		*oldfreq = newfreq;
+ 	}
diff --git a/net-misc/openntpd/files/openntpd-5.7_p2-proctitle.patch b/net-misc/openntpd/files/openntpd-5.7_p2-proctitle.patch
new file mode 100644
index 000000000000..63531c8b630c
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd-5.7_p2-proctitle.patch
@@ -0,0 +1,237 @@
+diff -Nur openntpd-5.7p2-orig/Makefile.am openntpd-5.7p2/Makefile.am
+--- openntpd-5.7p2-orig/Makefile.am	2015-01-19 17:18:56.000000000 -0800
++++ openntpd-5.7p2/Makefile.am	2015-01-21 12:09:17.221031344 -0800
+@@ -162,6 +162,8 @@
+ libcompat_la_SOURCES += compat/md5.c
+ endif
+ 
++libcompat_la_SOURCES += compat/progname.c
++
+ if !HAVE_REALLOCARRAY
+ libcompat_la_SOURCES += compat/reallocarray.c
+ endif
+diff -Nur openntpd-5.7p2-orig/configure.ac openntpd-5.7p2/configure.ac
+--- openntpd-5.7p2-orig/configure.ac	2015-01-19 17:18:56.000000000 -0800
++++ openntpd-5.7p2/configure.ac	2015-01-21 12:10:32.118825079 -0800
+@@ -153,6 +153,18 @@
+ 	   -a "x$HOST_OS" != xnetbsd \
+ 	   -a "x$ac_cv_func_arc4random_uniform" = xyes])
+ 
++AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
++       AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
++                [[ extern char *__progname; printf("%s", __progname); ]])],
++        [ ac_cv_libc_defines___progname="yes" ],
++        [ ac_cv_libc_defines___progname="no"
++        ])
++])
++if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
++        AC_DEFINE([HAVE___PROGNAME], [1], [Define if libc defines __progname])
++fi
++
++
+ AC_CACHE_CHECK([whether va_copy exists], ac_cv_have_va_copy, [
+ 	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <stdarg.h>
+diff -Nur openntpd-5.7p2-orig/configure openntpd-5.7p2/configure
+--- openntpd-5.7p2-orig/configure	2015-01-19 18:30:48.000000000 -0800
++++ openntpd-5.7p2/configure	2015-01-21 12:11:19.827967669 -0800
+@@ -13519,6 +13519,42 @@
+ fi
+ 
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libc defines __progname" >&5
++$as_echo_n "checking if libc defines __progname... " >&6; }
++if ${ac_cv_libc_defines___progname+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++
++       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
++ extern char *__progname; printf("%s", __progname);
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++   ac_cv_libc_defines___progname="yes"
++else
++   ac_cv_libc_defines___progname="no"
++
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libc_defines___progname" >&5
++$as_echo "$ac_cv_libc_defines___progname" >&6; }
++if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
++
++$as_echo "#define HAVE___PROGNAME 1" >>confdefs.h
++
++fi
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether va_copy exists" >&5
+ $as_echo_n "checking whether va_copy exists... " >&6; }
+ if ${ac_cv_have_va_copy+:} false; then :
+diff -Nur openntpd-5.7p2-orig/Makefile.in openntpd-5.7p2/Makefile.in
+--- openntpd-5.7p2-orig/Makefile.in	2015-01-19 18:30:49.000000000 -0800
++++ openntpd-5.7p2/Makefile.in	2015-01-21 12:11:17.319907603 -0800
+@@ -161,13 +161,14 @@
+ 	compat/adjfreq_osx.c compat/adjfreq_solaris.c \
+ 	compat/bsd-asprintf.c compat/clock_getres.c \
+ 	compat/clock_gettime_osx.c compat/imsg.c compat/imsg-buffer.c \
+-	compat/md5.c compat/reallocarray.c compat/setproctitle.c \
+-	compat/strlcat.c compat/strlcpy.c compat/strtonum.c \
+-	compat/bsd-setresgid.c compat/bsd-setresuid.c \
+-	compat/arc4random.c compat/getentropy_freebsd.c \
+-	compat/getentropy_linux.c compat/sha2.c \
+-	compat/getentropy_netbsd.c compat/getentropy_osx.c \
+-	compat/getentropy_solaris.c compat/arc4random_uniform.c
++	compat/md5.c compat/progname.c compat/reallocarray.c \
++	compat/setproctitle.c compat/strlcat.c compat/strlcpy.c \
++	compat/strtonum.c compat/bsd-setresgid.c \
++	compat/bsd-setresuid.c compat/arc4random.c \
++	compat/getentropy_freebsd.c compat/getentropy_linux.c \
++	compat/sha2.c compat/getentropy_netbsd.c \
++	compat/getentropy_osx.c compat/getentropy_solaris.c \
++	compat/arc4random_uniform.c
+ am__dirstamp = $(am__leading_dot)dirstamp
+ @HAVE_ADJFREQ_FALSE@@HOST_FREEBSD_TRUE@am__objects_1 = compat/libcompat_la-adjfreq_freebsd.lo
+ @HAVE_ADJFREQ_FALSE@@HOST_LINUX_TRUE@am__objects_2 = compat/libcompat_la-adjfreq_linux.lo
+@@ -207,7 +208,8 @@
+ am_libcompat_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+ 	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
+ 	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
+-	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
++	$(am__objects_9) $(am__objects_10) \
++	compat/libcompat_la-progname.lo $(am__objects_11) \
+ 	$(am__objects_12) $(am__objects_13) $(am__objects_14) \
+ 	$(am__objects_15) $(am__objects_16) $(am__objects_17) \
+ 	$(am__objects_18) $(am__objects_19) $(am__objects_20) \
+@@ -562,12 +564,13 @@
+ libcompat_la_SOURCES = $(am__append_4) $(am__append_5) $(am__append_6) \
+ 	$(am__append_7) $(am__append_8) $(am__append_9) \
+ 	$(am__append_10) $(am__append_11) $(am__append_12) \
+-	$(am__append_13) $(am__append_14) $(am__append_15) \
+-	$(am__append_16) $(am__append_17) $(am__append_18) \
+-	$(am__append_19) $(am__append_20) $(am__append_21) \
+-	$(am__append_22) $(am__append_23) $(am__append_24) \
+-	$(am__append_25) $(am__append_26) $(am__append_27) \
+-	$(am__append_28) $(am__append_29) $(am__append_30)
++	$(am__append_13) compat/progname.c $(am__append_14) \
++	$(am__append_15) $(am__append_16) $(am__append_17) \
++	$(am__append_18) $(am__append_19) $(am__append_20) \
++	$(am__append_21) $(am__append_22) $(am__append_23) \
++	$(am__append_24) $(am__append_25) $(am__append_26) \
++	$(am__append_27) $(am__append_28) $(am__append_29) \
++	$(am__append_30)
+ libcompat_la_LIBADD = $(PLATFORM_LDADD)
+ noinst_HEADERS = compat/arc4random.h compat/arc4random_freebsd.h \
+ 	compat/arc4random_linux.h compat/arc4random_netbsd.h \
+@@ -649,6 +652,8 @@
+ 	compat/$(DEPDIR)/$(am__dirstamp)
+ compat/libcompat_la-md5.lo: compat/$(am__dirstamp) \
+ 	compat/$(DEPDIR)/$(am__dirstamp)
++compat/libcompat_la-progname.lo: compat/$(am__dirstamp) \
++	compat/$(DEPDIR)/$(am__dirstamp)
+ compat/libcompat_la-reallocarray.lo: compat/$(am__dirstamp) \
+ 	compat/$(DEPDIR)/$(am__dirstamp)
+ compat/libcompat_la-setproctitle.lo: compat/$(am__dirstamp) \
+@@ -783,6 +788,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-imsg-buffer.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-imsg.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-md5.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-progname.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-reallocarray.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-setproctitle.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-sha2.Plo@am__quote@
+@@ -893,6 +899,13 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -c -o compat/libcompat_la-md5.lo `test -f 'compat/md5.c' || echo '$(srcdir)/'`compat/md5.c
+ 
++compat/libcompat_la-progname.lo: compat/progname.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -MT compat/libcompat_la-progname.lo -MD -MP -MF compat/$(DEPDIR)/libcompat_la-progname.Tpo -c -o compat/libcompat_la-progname.lo `test -f 'compat/progname.c' || echo '$(srcdir)/'`compat/progname.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) compat/$(DEPDIR)/libcompat_la-progname.Tpo compat/$(DEPDIR)/libcompat_la-progname.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='compat/progname.c' object='compat/libcompat_la-progname.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -c -o compat/libcompat_la-progname.lo `test -f 'compat/progname.c' || echo '$(srcdir)/'`compat/progname.c
++
+ compat/libcompat_la-reallocarray.lo: compat/reallocarray.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -MT compat/libcompat_la-reallocarray.lo -MD -MP -MF compat/$(DEPDIR)/libcompat_la-reallocarray.Tpo -c -o compat/libcompat_la-reallocarray.lo `test -f 'compat/reallocarray.c' || echo '$(srcdir)/'`compat/reallocarray.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) compat/$(DEPDIR)/libcompat_la-reallocarray.Tpo compat/$(DEPDIR)/libcompat_la-reallocarray.Plo
+diff -Nur openntpd-5.7p2-orig/compat/progname.c openntpd-5.7p2/compat/progname.c
+--- openntpd-5.7p2-orig/compat/progname.c	1969-12-31 16:00:00.000000000 -0800
++++ openntpd-5.7p2/compat/progname.c	2015-01-21 12:09:55.528948784 -0800
+@@ -0,0 +1,46 @@
++/*
++ * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include <string.h>
++
++#ifndef HAVE___PROGNAME
++char *__progname;
++#endif
++
++/*
++ * NB. duplicate __progname in case it is an alias for argv[0]
++ * Otherwise it may get clobbered by setproctitle()
++ */
++char *get_progname(char *argv0)
++{
++#ifdef HAVE___PROGNAME
++	extern char *__progname;
++
++	return strdup(__progname);
++#else
++	char *p;
++
++	if (argv0 == NULL)
++		return ("unknown");	/* XXX */
++	p = strrchr(argv0, '/');
++	if (p == NULL)
++		p = argv0;
++	else
++		p++;
++
++	return (strdup(p));
++#endif
++}
+diff -Nur openntpd-5.7p2-orig/ntpd.c openntpd-5.7p2/ntpd.c
+--- openntpd-5.7p2-orig/ntpd.c	2015-01-19 18:30:41.000000000 -0800
++++ openntpd-5.7p2/ntpd.c	2015-01-21 12:11:05.744630385 -0800
+@@ -116,6 +116,8 @@
+ static char **saved_argv;
+ #endif
+ 
++char *get_progname(char *argv0);
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -139,6 +141,8 @@
+ 
+ 	log_init(1);		/* log to stderr until daemonized */
+ 
++	__progname = get_progname(argv[0]);
++
+ #ifndef HAVE_SETPROCTITLE
+ 	int i;
+ 	/* Prepare for later setproctitle emulation */
diff --git a/net-misc/openntpd/openntpd-5.7_p1.ebuild b/net-misc/openntpd/openntpd-5.7_p2.ebuild
similarity index 87%
rename from net-misc/openntpd/openntpd-5.7_p1.ebuild
rename to net-misc/openntpd/openntpd-5.7_p2.ebuild
index aea04df87a78..4b20c77d1d9e 100644
--- a/net-misc/openntpd/openntpd-5.7_p1.ebuild
+++ b/net-misc/openntpd/openntpd-5.7_p2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-5.7_p1.ebuild,v 1.1 2015/01/12 18:09:55 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-5.7_p2.ebuild,v 1.1 2015/01/25 00:54:30 ottxor Exp $
 
 EAPI=5
 
-inherit eutils systemd user
+inherit autotools eutils systemd user
 
 DESCRIPTION="Lightweight NTP server ported from OpenBSD"
 HOMEPAGE="http://www.openntpd.org/"
@@ -43,11 +43,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-runpath.patch"
-	epatch "${FILESDIR}/${P}-driftpath.patch"
-	epatch "${FILESDIR}/${P}-signal.patch"
-	epatch "${FILESDIR}/${P}-gentoopool.patch"
-	epatch "${FILESDIR}/${P}-warn-s-failure.patch"
+	epatch "${FILESDIR}/${PN}-5.7_p1-runpath.patch"
+	epatch "${FILESDIR}/${PN}-5.7_p1-driftpath.patch"
+	epatch "${FILESDIR}/${PN}-5.7_p1-gentoopool.patch"
+	epatch "${FILESDIR}/${P}-adjtimex.patch"
+	epatch "${FILESDIR}/${P}-proctitle.patch"
+	#Due to last patch
+	eautoreconf
 }
 
 src_configure() {
diff --git a/sys-devel/distcc/distcc-3.1-r10.ebuild b/sys-devel/distcc/distcc-3.1-r10.ebuild
index 18cb669d825b..e3cd11cbc149 100644
--- a/sys-devel/distcc/distcc-3.1-r10.ebuild
+++ b/sys-devel/distcc/distcc-3.1-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r10.ebuild,v 1.2 2014/11/02 10:10:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r10.ebuild,v 1.3 2015/01/24 23:18:13 mgorny Exp $
 
 EAPI=5
 
@@ -52,6 +52,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-python.patch"
 	# bug #351979
 	epatch "${FILESDIR}/${P}-argc-fix.patch"
+	epatch_user
 
 	sed -i -e "/PATH/s:\$distcc_location:${DCCC_PATH}:" pump.in || die
 
diff --git a/sys-devel/distcc/distcc-3.2_rc1-r2.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r2.ebuild
index 9fc4da101d75..67a8b87e1081 100644
--- a/sys-devel/distcc/distcc-3.2_rc1-r2.ebuild
+++ b/sys-devel/distcc/distcc-3.2_rc1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1-r2.ebuild,v 1.1 2015/01/01 23:31:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1-r2.ebuild,v 1.2 2015/01/24 23:18:13 mgorny Exp $
 
 EAPI=5
 
@@ -61,6 +61,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.2_rc1-python.patch"
 	# for net-libs/libgssglue
 	epatch "${FILESDIR}/${PN}-3.2_rc1-gssapi.patch"
+	epatch_user
 
 	# Bugs #120001, #167844 and probably more. See patch for description.
 	use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
diff --git a/virtual/mysql/mysql-5.6-r2.ebuild b/virtual/mysql/mysql-5.6-r2.ebuild
index 35ea464d75a4..324bfb7dc594 100644
--- a/virtual/mysql/mysql-5.6-r2.ebuild
+++ b/virtual/mysql/mysql-5.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.6-r2.ebuild,v 1.4 2015/01/24 17:06:24 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.6-r2.ebuild,v 1.6 2015/01/24 20:43:11 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/18"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="embedded minimal static static-libs"
 
 DEPEND=""