From 078264290ec5b4718ef50c26779bd08e1a88c010 Mon Sep 17 00:00:00 2001
From: root <root@sandbox.local.calculate.ru>
Date: Tue, 5 Apr 2016 13:59:17 +0300
Subject: [PATCH] Sync with portage [Tue Apr  5 13:59:17 MSK 2016].

---
 .../logstash-bin/files/logstash.initd-r2      |  65 +++++++
 ...ash.logrotate-r1 => logstash.logrotate-r2} |   2 +-
 ...r1.ebuild => logstash-bin-2.2.2-r2.ebuild} |   2 +-
 ....0.ebuild => logstash-bin-2.3.0-r1.ebuild} |   4 +-
 .../commons-launcher-1.1-r2.ebuild            |  44 +++++
 dev-java/forehead/files/build.xml             |  26 ---
 .../forehead/forehead-1.0_beta5-r1.ebuild     |  38 -----
 .../forehead/forehead-1.0_beta5-r2.ebuild     |  16 +-
 dev-java/xml-commons/Manifest                 |   1 -
 .../xml-commons/files/1.0_beta2-jdk15.patch   |  36 ----
 .../xml-commons-1.0_beta2-r1.ebuild           |  54 ------
 .../xml-commons/xml-commons-1.4.01.ebuild     |  12 +-
 dev-java/xml-im-exporter/Manifest             |   1 -
 .../xml-im-exporter-1.1-r1.ebuild             |  31 ----
 .../xml-im-exporter-1.1-r2.ebuild             |   8 +-
 dev-java/xml-writer/xml-writer-0.2-r1.ebuild  |  37 ++++
 dev-python/gevent/Manifest                    |   1 +
 dev-python/gevent/gevent-1.1.1.ebuild         |  76 +++++++++
 dev-ruby/factory_girl/Manifest                |   1 +
 .../factory_girl/factory_girl-4.7.0.ebuild    |  49 ++++++
 .../mecab-ruby/mecab-ruby-0.996-r1.ebuild     |   2 +-
 dev-ruby/mecab-ruby/mecab-ruby-0.996.ebuild   |  38 -----
 dev-ruby/ox/Manifest                          |   1 -
 dev-ruby/ox/ox-2.2.4.ebuild                   |  33 ----
 .../text-hyphen/text-hyphen-1.4.1-r1.ebuild   |  33 ----
 .../text-hyphen/text-hyphen-1.4.1-r2.ebuild   |   8 +-
 .../geany-plugins/geany-plugins-1.25.ebuild   |   2 +-
 dev-util/geany/geany-1.25.ebuild              |   2 +-
 media-libs/harfbuzz/Manifest                  |   2 +-
 ...uzz-1.2.3.ebuild => harfbuzz-1.2.5.ebuild} |   0
 metadata/dtd/timestamp.chk                    |   2 +-
 metadata/glsa/glsa-201604-03.xml              | 159 ++++++++++++++++++
 metadata/glsa/timestamp.chk                   |   2 +-
 ...ash-bin-2.2.2-r1 => logstash-bin-2.2.2-r2} |   2 +-
 ...gstash-bin-2.3.0 => logstash-bin-2.3.0-r1} |   2 +-
 .../dev-java/commons-launcher-1.1-r2          |  13 ++
 .../md5-cache/dev-java/forehead-1.0_beta5-r1  |  13 --
 .../md5-cache/dev-java/forehead-1.0_beta5-r2  |  10 +-
 .../dev-java/xml-commons-1.0_beta2-r1         |  13 --
 .../md5-cache/dev-java/xml-commons-1.4.01     |   5 +-
 .../md5-cache/dev-java/xml-im-exporter-1.1-r1 |  13 --
 .../md5-cache/dev-java/xml-im-exporter-1.1-r2 |   6 +-
 metadata/md5-cache/dev-java/xml-writer-0.2-r1 |  13 ++
 metadata/md5-cache/dev-python/gevent-1.1.1    |  15 ++
 .../md5-cache/dev-ruby/factory_girl-4.7.0     |  14 ++
 metadata/md5-cache/dev-ruby/mecab-ruby-0.996  |  14 --
 .../md5-cache/dev-ruby/mecab-ruby-0.996-r1    |   4 +-
 metadata/md5-cache/dev-ruby/ox-2.2.4          |  14 --
 .../md5-cache/dev-ruby/text-hyphen-1.4.1-r1   |  14 --
 .../md5-cache/dev-ruby/text-hyphen-1.4.1-r2   |  14 +-
 metadata/md5-cache/dev-util/geany-1.25        |   4 +-
 .../md5-cache/dev-util/geany-plugins-1.25     |   4 +-
 .../{harfbuzz-1.2.3 => harfbuzz-1.2.5}        |   2 +-
 metadata/md5-cache/www-apps/kibana-bin-4.5.0  |   2 +-
 metadata/md5-cache/www-apps/piwigo-2.8.0      |  14 ++
 metadata/news/timestamp.chk                   |   2 +-
 metadata/timestamp                            |   2 +-
 metadata/timestamp.chk                        |   2 +-
 metadata/timestamp.x                          |   2 +-
 www-apps/kibana-bin/kibana-bin-4.5.0.ebuild   |   2 +-
 www-apps/piwigo/Manifest                      |   1 +
 www-apps/piwigo/metadata.xml                  |  18 ++
 www-apps/piwigo/piwigo-2.8.0.ebuild           |  44 +++++
 63 files changed, 630 insertions(+), 436 deletions(-)
 create mode 100644 app-admin/logstash-bin/files/logstash.initd-r2
 rename app-admin/logstash-bin/files/{logstash.logrotate-r1 => logstash.logrotate-r2} (60%)
 rename app-admin/logstash-bin/{logstash-bin-2.2.2-r1.ebuild => logstash-bin-2.2.2-r2.ebuild} (96%)
 rename app-admin/logstash-bin/{logstash-bin-2.3.0.ebuild => logstash-bin-2.3.0-r1.ebuild} (92%)
 create mode 100644 dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild
 delete mode 100644 dev-java/forehead/files/build.xml
 delete mode 100644 dev-java/forehead/forehead-1.0_beta5-r1.ebuild
 delete mode 100644 dev-java/xml-commons/files/1.0_beta2-jdk15.patch
 delete mode 100644 dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild
 delete mode 100644 dev-java/xml-im-exporter/xml-im-exporter-1.1-r1.ebuild
 create mode 100644 dev-java/xml-writer/xml-writer-0.2-r1.ebuild
 create mode 100644 dev-python/gevent/gevent-1.1.1.ebuild
 create mode 100644 dev-ruby/factory_girl/factory_girl-4.7.0.ebuild
 delete mode 100644 dev-ruby/mecab-ruby/mecab-ruby-0.996.ebuild
 delete mode 100644 dev-ruby/ox/ox-2.2.4.ebuild
 delete mode 100644 dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild
 rename media-libs/harfbuzz/{harfbuzz-1.2.3.ebuild => harfbuzz-1.2.5.ebuild} (100%)
 create mode 100644 metadata/glsa/glsa-201604-03.xml
 rename metadata/md5-cache/app-admin/{logstash-bin-2.2.2-r1 => logstash-bin-2.2.2-r2} (90%)
 rename metadata/md5-cache/app-admin/{logstash-bin-2.3.0 => logstash-bin-2.3.0-r1} (90%)
 create mode 100644 metadata/md5-cache/dev-java/commons-launcher-1.1-r2
 delete mode 100644 metadata/md5-cache/dev-java/forehead-1.0_beta5-r1
 delete mode 100644 metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1
 delete mode 100644 metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1
 create mode 100644 metadata/md5-cache/dev-java/xml-writer-0.2-r1
 create mode 100644 metadata/md5-cache/dev-python/gevent-1.1.1
 create mode 100644 metadata/md5-cache/dev-ruby/factory_girl-4.7.0
 delete mode 100644 metadata/md5-cache/dev-ruby/mecab-ruby-0.996
 delete mode 100644 metadata/md5-cache/dev-ruby/ox-2.2.4
 delete mode 100644 metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
 rename metadata/md5-cache/media-libs/{harfbuzz-1.2.3 => harfbuzz-1.2.5} (99%)
 create mode 100644 metadata/md5-cache/www-apps/piwigo-2.8.0
 create mode 100644 www-apps/piwigo/Manifest
 create mode 100644 www-apps/piwigo/metadata.xml
 create mode 100644 www-apps/piwigo/piwigo-2.8.0.ebuild

diff --git a/app-admin/logstash-bin/files/logstash.initd-r2 b/app-admin/logstash-bin/files/logstash.initd-r2
new file mode 100644
index 000000000000..81d5ceb838f1
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd-r2
@@ -0,0 +1,65 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LS_USER=${LS_USER:-logstash}
+LS_GROUP=${LS_GROUP:-$LS_USER}
+LS_LOG_FILE=${LS_LOG_FILE:-/var/log/logstash/logstash.log}
+LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
+LS_HOME=${LS_HOME:-/var/lib/logstash}
+LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
+LS_NICE=${LS_NICE:-19}
+LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
+LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
+LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
+KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
+
+command="/opt/logstash/bin/logstash"
+command_args="agent --config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${LS_OPTS}"
+command_background="true"
+pidfile=${LS_PIDFILE:-"/run/logstash/logstash.pid"}
+
+start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
+	--chdir ${LS_HOME}
+	--nicelevel ${LS_NICE}
+	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}
+	--env LS_JAVA_OPTS=${LS_JAVA_OPTS}
+	--env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+checkconfig() {
+	ebegin "Checking your configuration"
+	${command} ${command_args} --configtest
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	rc_ulimit="-n ${LS_OPEN_FILES}"
+
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOG_FILE}")"
+	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_FILE}"
+}
+
+stop() {
+	ebegin "Stopping logstash"
+	if [ "${KILL_ON_STOP_TIMEOUT}" == "1" ]; then
+		start-stop-daemon --stop \
+			--pidfile=${pidfile} \
+			--retry=TERM/5/KILL/5
+	else
+		start-stop-daemon --stop \
+			--pidfile=${pidfile}
+	fi
+}
diff --git a/app-admin/logstash-bin/files/logstash.logrotate-r1 b/app-admin/logstash-bin/files/logstash.logrotate-r2
similarity index 60%
rename from app-admin/logstash-bin/files/logstash.logrotate-r1
rename to app-admin/logstash-bin/files/logstash.logrotate-r2
index 5de699ad15e3..0a9c28cabfdf 100644
--- a/app-admin/logstash-bin/files/logstash.logrotate-r1
+++ b/app-admin/logstash-bin/files/logstash.logrotate-r2
@@ -1,4 +1,4 @@
-/var/log/logstash/*.{err,log} {
+/var/log/logstash/*.err /var/log/logstash/*.log {
         copytruncate
         compress
         missingok
diff --git a/app-admin/logstash-bin/logstash-bin-2.2.2-r1.ebuild b/app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild
similarity index 96%
rename from app-admin/logstash-bin/logstash-bin-2.2.2-r1.ebuild
rename to app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild
index 8d3ffea69b66..7fcd1d8e0f57 100644
--- a/app-admin/logstash-bin/logstash-bin-2.2.2-r1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild
@@ -43,7 +43,7 @@ src_install() {
 	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate-r1" "${MY_PN}"
+	newins "${FILESDIR}/${MY_PN}.logrotate-r2" "${MY_PN}"
 
 	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
 	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
diff --git a/app-admin/logstash-bin/logstash-bin-2.3.0.ebuild b/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
similarity index 92%
rename from app-admin/logstash-bin/logstash-bin-2.3.0.ebuild
rename to app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
index 8d3ffea69b66..e7cee56e5b71 100644
--- a/app-admin/logstash-bin/logstash-bin-2.3.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
@@ -43,10 +43,10 @@ src_install() {
 	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate-r1" "${MY_PN}"
+	newins "${FILESDIR}/${MY_PN}.logrotate-r2" "${MY_PN}"
 
 	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
 }
 
 pkg_postinst() {
diff --git a/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild b/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild
new file mode 100644
index 000000000000..62e0414109d1
--- /dev/null
+++ b/dev-java/commons-launcher/commons-launcher-1.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="examples doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Commons-launcher eliminates the need for a batch or shell script to launch a Java class"
+HOMEPAGE="http://commons.apache.org/launcher/"
+SRC_URI="mirror://apache/${PN%%-*}/${PN##*-}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples example
+}
diff --git a/dev-java/forehead/files/build.xml b/dev-java/forehead/files/build.xml
deleted file mode 100644
index 8500031afabb..000000000000
--- a/dev-java/forehead/files/build.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<project name="forehead" default="jar" basedir=".">
-   <property name="src" value="src"/>
-   <property name="build" value="build"/>
-   <property name="dest" value="dest"/>
-   <property name="docs" value="docs"/>
-   <property name="packages" value="com.werken.forehead.*"/>
-   
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-      <mkdir dir="${dest}"/>
-      <mkdir dir="${docs}"/>
-   </target>
-
-   <target name="compile" depends="init">
-      <javac srcdir="${src}" destdir="${build}"/>
-   </target>
-
-   <target name="jar" depends="compile">
-      <jar destfile="${dest}/forehead-${version}.jar" basedir="${build}"/>
-   </target>
-
-   <target name="javadoc" depends="compile,jar">
-      <javadoc packagenames="${packages}" sourcepath="${src}/java" destdir="${docs}"/>
-   </target>
-</project>
diff --git a/dev-java/forehead/forehead-1.0_beta5-r1.ebuild b/dev-java/forehead/forehead-1.0_beta5-r1.ebuild
deleted file mode 100644
index 098cbb878168..000000000000
--- a/dev-java/forehead/forehead-1.0_beta5-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A framework to assist in controlling the run-time ClassLoader"
-HOMEPAGE="http://forehead.werken.com"
-SRC_URI="mirror://gentoo/forehead-${PV}.tbz2"
-
-LICENSE="Werken-1.1.1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc source"
-
-DEPEND=">=virtual/jdk-1.3
-		dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.3"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Copy over the new build.xml
-	cp "${FILESDIR}"/build.xml "${S}" || die
-}
-
-src_compile() {
-	eant jar -Dversion=${PV} $(use_doc)
-}
-
-src_install() {
-	java-pkg_newjar "${S}"/dest/forehead-${PV}.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc src/{java,misc}
-}
diff --git a/dev-java/forehead/forehead-1.0_beta5-r2.ebuild b/dev-java/forehead/forehead-1.0_beta5-r2.ebuild
index 432221e3c430..a029003163f9 100644
--- a/dev-java/forehead/forehead-1.0_beta5-r2.ebuild
+++ b/dev-java/forehead/forehead-1.0_beta5-r2.ebuild
@@ -1,7 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-
 EAPI=5
 
 JAVA_PKG_IUSE="doc source"
@@ -10,15 +9,20 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A framework to assist in controlling the run-time ClassLoader"
 HOMEPAGE="http://forehead.werken.com"
-SRC_URI="mirror://gentoo/forehead-${PV}.tbz2"
+SRC_URI="mirror://gentoo/forehead-${PV}.tbz2 -> ${P}.tbz2"
 
 LICENSE="Werken-1.1.1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jre-1.3"
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
 
 S="${WORKDIR}/${PN}"
+
 JAVA_SRC_DIR="src"
diff --git a/dev-java/xml-commons/Manifest b/dev-java/xml-commons/Manifest
index bfdb9cf25687..148363ba5599 100644
--- a/dev-java/xml-commons/Manifest
+++ b/dev-java/xml-commons/Manifest
@@ -1,2 +1 @@
-DIST xml-commons-1.0.b2.tar.gz 1821110 SHA256 22b9e53919e4aa15fdd074a515c8a8dc9823a91d72eb91fbb3e1bd8cfc488375 SHA512 72e4df0776e96514bf787b958f80309bd9e4ea47cde9b3fa157db08c921e7e7607899b1b0d43b16cf34e1c055812d052b3b873b13246ef693ebb7c74fdcfda94 WHIRLPOOL 2e73c513fa3f72823c001f8676b925ce87b0759da91c848a55f2245738245e5f557aaff3fdc14b0b8aef5de8122c97fd3f1d856738cd4112d315c38c8b99caf4
 DIST xml-commons-1.4.01.tar.gz 358779 SHA256 d34bd88dc89c5c1ed2545ec5c61e4606fc28beb200a6fecf8c3ed17694181866 SHA512 9e8f77f7dc65a492548fa2313b49855ad0880fe663acdac865a1b235ea3bc0ba347c4fad3ca16f0c92a60df42a0a802a74525b56ea58dc575cd2d94013561868 WHIRLPOOL 58cd1152ad822562b15f3e1e62559137dbeabb13a1635c33eba0c162974c799384cf937859fea06f62ea9b7bfb102e6cbb71489269b4bdae0097c2783e920fc8
diff --git a/dev-java/xml-commons/files/1.0_beta2-jdk15.patch b/dev-java/xml-commons/files/1.0_beta2-jdk15.patch
deleted file mode 100644
index 6080e14e7232..000000000000
--- a/dev-java/xml-commons/files/1.0_beta2-jdk15.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -uprN xml-commons-1.0.b2/java/external/build.xml java/external/build.xml
---- xml-commons-1.0.b2/java/external/build.xml	2002-02-06 16:52:59.000000000 +0100
-+++ java/external/build.xml	2005-02-06 20:42:52.645987384 +0100
-@@ -65,7 +65,7 @@
- 
-   <target name="compile" depends="prepare"
-     description="Compile all classes">
--   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" />
-+   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" source="1.4" target="1.4" />
-   </target>
- 
-   <target name="jar" depends="compile"
-diff -uprN xml-commons-1.0.b2/java/resolver.xml java/resolver.xml
---- xml-commons-1.0.b2/java/resolver.xml	2002-02-06 16:52:46.000000000 +0100
-+++ java/resolver.xml	2005-02-06 20:45:57.003960712 +0100
-@@ -63,7 +63,7 @@ Build file for org.apache.xml.resolver. 
- 
-   <target name="compile" depends="init"
-     description="Compile all classes">
--   <javac srcdir="${src.dir}" destdir="${build.classes.dir}">
-+   <javac srcdir="${src.dir}" destdir="${build.classes.dir}" source="1.4" target="1.4">
-      <include name="${resolver.subdir}/*.java"/>
-      <include name="${resolver.subdir}/helpers/*.java"/>
-      <include name="${resolver.subdir}/readers/*.java"/>
-diff -uprN xml-commons-1.0.b2/java/which.xml java/which.xml
---- xml-commons-1.0.b2/java/which.xml	2002-02-06 16:52:28.000000000 +0100
-+++ java/which.xml	2005-02-06 20:45:38.379792016 +0100
-@@ -64,7 +64,7 @@ Build file for org.apache.env.Which serv
-   <target name="compile" depends="init"
-     description="Compile all classes">
-    <javac srcdir="${src.dir}" destdir="${build.classes.dir}" 
--       includes="${env.subdir}/*.java" />
-+       includes="${env.subdir}/*.java" source="1.4" target="1.4" />
-   </target>
- 
-   <target name="jar" depends="compile"
diff --git a/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild b/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild
deleted file mode 100644
index 6697d7c55890..000000000000
--- a/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV=${PV/_beta/.b}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Jakarta project for for XML bindings for java"
-HOMEPAGE="http://xml.apache.org/commons/"
-SRC_URI="mirror://apache/xml/commons/${MY_P}.tar.gz"
-
-# Resolver is under Apache-1.1
-# SAX2 is public-domain
-# DOM documentation is under W3C-document
-# DOM software is under W3C
-# See ${S}/java/external for the license files
-LICENSE="Apache-1.1 public-domain W3C-document W3C"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PV}-jdk15.patch"
-}
-
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadocs"
-
-	cd "${S}"/java
-	eant -f resolver.xml ${antflags} || die "XML-Resolver Compile failed"
-	eant -f which.xml ${antflags} || die "XML-Which Compile failed"
-}
-
-src_install() {
-	java-pkg_dojar java/build/which.jar
-	java-pkg_dojar java/build/resolver.jar
-	java-pkg_dojar java/external/build/xml-apis.jar
-
-	dodoc README.html || die
-	use doc && java-pkg_dojavadoc java/build/docs/javadocs
-	use source && java-pkg_dosrc java/src/org
-}
diff --git a/dev-java/xml-commons/xml-commons-1.4.01.ebuild b/dev-java/xml-commons/xml-commons-1.4.01.ebuild
index 015ec23eb182..6c6642943aba 100644
--- a/dev-java/xml-commons/xml-commons-1.4.01.ebuild
+++ b/dev-java/xml-commons/xml-commons-1.4.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,14 +17,14 @@ SRC_URI="mirror://apache/xerces/${PN}/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-1.1 public-domain W3C-document W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE=""
 
-RESTRICT="test"
+RDEPEND="
+	>=virtual/jre-1.6"
 
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
+DEPEND="
+	>=virtual/jdk-1.6
 	source? ( app-arch/zip )"
 
 JAVA_SRC_DIR="org javax"
diff --git a/dev-java/xml-im-exporter/Manifest b/dev-java/xml-im-exporter/Manifest
index f579d1ae516c..cb12b566b84a 100644
--- a/dev-java/xml-im-exporter/Manifest
+++ b/dev-java/xml-im-exporter/Manifest
@@ -1,2 +1 @@
 DIST xml-im-exporter-1.1.tgz 235161 SHA256 26b7ec388b39f2094af8d270dde5d84c46839328e5c58446f3dd2e857b153c76 SHA512 a762fe18a90abcc558fe3921038db7338a8bd98d9a7a0fe3ce86d733df5641541663126afcfa06dd1723dc9da205c80e2cf5f38f39ad84300b4750ceb77aa19c WHIRLPOOL 04accb4fedd521a529868c47c138256d158ab3b15d961f357e7d147708a9f392de631c1b96b1de676997a96f3af9b1b070dc7649fdcbd65a13f878917ad1c465
-DIST xml-im-exporter1.1.tgz 235161 SHA256 26b7ec388b39f2094af8d270dde5d84c46839328e5c58446f3dd2e857b153c76 SHA512 a762fe18a90abcc558fe3921038db7338a8bd98d9a7a0fe3ce86d733df5641541663126afcfa06dd1723dc9da205c80e2cf5f38f39ad84300b4750ceb77aa19c WHIRLPOOL 04accb4fedd521a529868c47c138256d158ab3b15d961f357e7d147708a9f392de631c1b96b1de676997a96f3af9b1b070dc7649fdcbd65a13f878917ad1c465
diff --git a/dev-java/xml-im-exporter/xml-im-exporter-1.1-r1.ebuild b/dev-java/xml-im-exporter/xml-im-exporter-1.1-r1.ebuild
deleted file mode 100644
index caf6a619e99a..000000000000
--- a/dev-java/xml-im-exporter/xml-im-exporter-1.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="XML Im-/Exporter is a library to assist you in the process of importing and exporting XML"
-HOMEPAGE="http://xml-im-exporter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${PN}"
-
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
-	java-pkg_newjar "lib/${PN}${PV}.jar"
-
-	dodoc Changes.txt Open-Issues.txt Readme.txt Version.txt
-	use doc && java-pkg_dojavadoc doc
-	use source && java-pkg_dosrc src/main/*
-}
diff --git a/dev-java/xml-im-exporter/xml-im-exporter-1.1-r2.ebuild b/dev-java/xml-im-exporter/xml-im-exporter-1.1-r2.ebuild
index 1929a4866e3a..80e19a8e84bb 100644
--- a/dev-java/xml-im-exporter/xml-im-exporter-1.1-r2.ebuild
+++ b/dev-java/xml-im-exporter/xml-im-exporter-1.1-r2.ebuild
@@ -14,14 +14,14 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}.tgz -> ${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=virtual/jre-1.6"
 
 DEPEND="
-	source? ( app-arch/zip )
-	>=virtual/jdk-1.6"
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
 
 S="${WORKDIR}/${PN}"
 
@@ -31,7 +31,7 @@ JAVA_SRC_DIR="src"
 
 java_prepare() {
 	java-pkg_clean
-	rm -rf src/test || die
+	rm -rv src/test || die
 }
 
 src_install() {
diff --git a/dev-java/xml-writer/xml-writer-0.2-r1.ebuild b/dev-java/xml-writer/xml-writer-0.2-r1.ebuild
new file mode 100644
index 000000000000..6604bde0ef80
--- /dev/null
+++ b/dev-java/xml-writer/xml-writer-0.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A simple XML Writer"
+HOMEPAGE="http://www.megginson.com/downloads/"
+SRC_URI="http://www.megginson.com/downloads/${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples *.java sample.xml
+}
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 5d7fd7508161..3bfa5f5c42ef 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -2,3 +2,4 @@ DIST gevent-1.0.1.tar.gz 1455636 SHA256 4627e215d058f71d95e6b26d9e7be4c263788a47
 DIST gevent-1.0.2.tar.gz 1735721 SHA256 3ae1ca0f533ddcb17aab16ce66b424b3f3b855ff3b9508526915d3c6b73fba31 SHA512 95b8a24e53ad1ac135e63cb13942c5af6f7efb0fdb4fc2737759d07b09c2408b0d569dd30f63b45a342f81501211e98b5b6116ba9574c8a7801b9c551c14bd53 WHIRLPOOL 402d2af5993a0c04cb0c371190edbd6d4b56bbade2062beb4e7bedb522c0dd32c89452d6d7c1400884043d2f3bcae9ab718a5bccc1d98a563b7b92aeeff38f4e
 DIST gevent-1.0.tar.gz 1437122 SHA256 bfa9d846db91a7d8b6a36e87353eed641c7e3e7d0bfa0b9975796d227f2db4eb SHA512 5f452c799323e8c16172e04a538dfd8ef4066781207ec06ad0bc2d4892a7309b46146e4ab819bf8b99ad4f6ce226d013ded98800efc16458e2626dcc7a77d853 WHIRLPOOL 799fc6402ec3d0e7cc2580d0af8fab06eb01c3cd3dc61e85672e0abb211ba768dea4585ee8a3d204455f19a537974509d992275aaf243ff4948231603b828c6a
 DIST gevent-1.1.0.tar.gz 1968902 SHA256 34f7a5eca1326affe149eaa5467220d89002facd338028d2340868015407ae75 SHA512 e4dcb117e3c18359faefe9e9233dcda2089fdb6a4149b048881af3925f6c7b1e91447dbdcbaadd1c840c3161555f30054e60563cf78f000821cf7f12716c051d WHIRLPOOL a3508d805e24c3d10580127bb97a3c8c4f87ea928fa1d70096553e2e51bfa4497b8dda327d2418d916aedf4661478cdac25a42f951f13b698060f1b5187806cf
+DIST gevent-1.1.1.tar.gz 2008368 SHA256 6ee5b9851b2acde08df7ab9b9a2903f58b4b0e555405c444f4b1dd16f71caeea SHA512 b6342249695232532824f8ba643c4727bc409f9869aca7c26f95f8d6cb09c8fbd4ad7b04f7b4f37db9ac11e1d824a9bf9b67bf393fe183afc1b21c68959e4f78 WHIRLPOOL 8f6dd5fb848851e2c6d1fa4e4792c4c6ad4ceaeed429bac2052c4e40cc918ca5755be0f9b70663e89295a3860a9ac02f89b00e6503db26ab8881e1cc2dedca64
diff --git a/dev-python/gevent/gevent-1.1.1.ebuild b/dev-python/gevent/gevent-1.1.1.ebuild
new file mode 100644
index 000000000000..bed0b54d9e00
--- /dev/null
+++ b/dev-python/gevent/gevent-1.1.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Note: pypy3 not supported
+# Note: py3.5 preliminary support
+# http://www.gevent.org/whatsnew_1_1.html#broader-platform-support
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="http://gevent.org/ https://pypi.python.org/pypi/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	dev-libs/libev
+	>=net-dns/c-ares-1.10
+	>=dev-python/greenlet-0.4.9
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd greentest || die
+
+	GEVENT_RESOLVER=thread \
+		"${PYTHON}" testrunner.py --config ../known_failures.py || die
+	GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 \
+		"${PYTHON}" testrunner.py --config ../known_failures.py \
+		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${PYTHON}" testrunner.py --config ../known_failures.py $(grep -l subprocess test_*.py) || die
+}
+
+python_install_all() {
+	DOCS+=( changelog.rst )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXMAPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-ruby/factory_girl/Manifest b/dev-ruby/factory_girl/Manifest
index 565ed2c5bd5f..62904b070d32 100644
--- a/dev-ruby/factory_girl/Manifest
+++ b/dev-ruby/factory_girl/Manifest
@@ -1 +1,2 @@
 DIST factory_girl-4.5.0.gem 64000 SHA256 4078a55b2ca6f56c8cde9af1d4d6f14f9bf040ff9e141474fdb6c51ad422c362 SHA512 0d202ffddbf3d7479446e3deb951f3266d67063242ee1b930034b277f3b228326dc99feab0f5b61db64ef973bdd1e77d3d3fc57f6d84f9026c04c2f480423da7 WHIRLPOOL 5bca2ca7b4e812ef8f157cc59f9c673989dbff0c6a8518734b2e2e3877aff8c0637ec5f184fddaea563c55505f2c2e0f69f70e899a9fb92db92db590dab91f20
+DIST factory_girl-4.7.0.tar.gz 64403 SHA256 8218e063479aa2dd64b0868d4f3afa0ba9c079b3d4c279de6ca07f9c78bb3c18 SHA512 0ac67c03880697933f46c9f2abe18e5335c536a89c400248fd61d41049c9eb8697c1f1bec004103d330e9b7427a9e436c34500489bf2128e5d11377361ffe172 WHIRLPOOL f686ab69e6f638f31edb9ec944027d7505a7411b7aad982cd21bff7bd93e5d793cd361869376be3ba80bb1b18d0d3c3fba7a9aacf34238ca0eaa32594bc37718
diff --git a/dev-ruby/factory_girl/factory_girl-4.7.0.ebuild b/dev-ruby/factory_girl/factory_girl-4.7.0.ebuild
new file mode 100644
index 000000000000..acdcd0548bf3
--- /dev/null
+++ b/dev-ruby/factory_girl/factory_girl-4.7.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+# Tests depend on unpackaged appraisal, for now we just run the specs
+# with the version of Rails that is installed.
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="GETTING_STARTED.md NEWS README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="features"
+
+inherit ruby-fakegem
+
+DESCRIPTION="factory_girl provides a framework and DSL for defining and using factories"
+HOMEPAGE="https://github.com/thoughtbot/factory_girl"
+SRC_URI="https://github.com/thoughtbot/factory_girl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/activerecord-3.1[sqlite]
+		dev-ruby/bourne
+		>=dev-ruby/mocha-0.12.8
+		dev-ruby/rspec-its
+		dev-ruby/timecop
+	)
+"
+
+all_ruby_prepare() {
+	# Avoid unneeded test dependencies
+	sed -i -e '/simplecov/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid specs that may fail due to more strict rspec 2.99
+	# interpretation.
+	sed -i -e '/callbacks using syntax methods without referencing FactoryGirl explicitly/,/^end/ s:^:#:' spec/acceptance/callbacks_spec.rb || die
+}
diff --git a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
index d3619d91fc81..b382753e3f67 100644
--- a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
+++ b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://mecab.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND="~app-text/mecab-${PV}"
diff --git a/dev-ruby/mecab-ruby/mecab-ruby-0.996.ebuild b/dev-ruby/mecab-ruby/mecab-ruby-0.996.ebuild
deleted file mode 100644
index 6b8836eb9571..000000000000
--- a/dev-ruby/mecab-ruby/mecab-ruby-0.996.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-USE_RUBY="ruby19 ruby20"
-
-inherit ruby-ng
-
-DESCRIPTION="Ruby binding for MeCab"
-HOMEPAGE="http://mecab.sourceforge.net/"
-SRC_URI="https://mecab.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="~app-text/mecab-${PV}"
-RDEPEND="${DEPEND}"
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1
-}
-
-each_ruby_install() {
-	emake DESTDIR="${D}" install
-}
-
-all_ruby_install() {
-	dodoc AUTHORS README test.rb
-	dohtml bindings.html
-}
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 25e84cec8ec8..0890df476178 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,2 +1 @@
-DIST ox-2.2.4.tar.gz 178162 SHA256 28e579520ff2f858cefb2d1fd0ecff30f2a32d394bb4fcc9f74f078f594b6536 SHA512 f279233d83d504f0ef9e0b28d526b57f4072f08d718c827dcc9ef6671b6efb0f7eb272c570638fb962e581791d15c397c5a45f0e3d362f12501d5baac725e832 WHIRLPOOL 2fcc33d0b2a697a938f5b059f3f52360adafc31066fa7a96897128efce1b42dbf4776db5d45b168b02ecf2db9e46bd9d2f5a619402eabe77452115769ffe4df7
 DIST ox-2.3.0.tar.gz 181318 SHA256 39b148be07479b8b017af8026eed936dc1f36f29b7b3fbca089aeffea2d97af9 SHA512 fbe09bf7e8073a660ba8cc4fbc47580b34c740cf59dec7db0b339103872947a76f118debf0ab306bd12170e9db1c327075c511b6d0fbb42d87dfba6ddcd57610 WHIRLPOOL 8af68bfff2bc0e3b472c7ed0d5bcadb8431caa0e64d5dc3a712cb90a3feebd81ea930fb9480ada2d3638f00bde9624258ab5b9b19ce6c17f90f16833a9fb2cfb
diff --git a/dev-ruby/ox/ox-2.2.4.ebuild b/dev-ruby/ox/ox-2.2.4.ebuild
deleted file mode 100644
index 71373194215b..000000000000
--- a/dev-ruby/ox/ox-2.2.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/ox extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ox
-	cp ext/ox/ox$(get_modname) lib/ox/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild
deleted file mode 100644
index e161d8c42f24..000000000000
--- a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hyphenates various words according to the rules of the language the word is written in"
-HOMEPAGE="http://rubyforge.org/projects/text-format"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	doc? (
-		>=dev-ruby/hoe-2.8.0
-	)
-	test? (
-		>=dev-ruby/hoe-2.8.0
-		dev-ruby/test-unit:2
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '2igem "test-unit", ">= 2.0"' test/test_*.rb || die
-}
diff --git a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
index df2185cc3a44..896daaeff37d 100644
--- a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
+++ b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -12,12 +12,12 @@ RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
 
 inherit ruby-fakegem
 
-DESCRIPTION="Hyphenates various words according to the rules of the language the word is written in"
+DESCRIPTION="Hyphenates words according to the rules of the language the word is written in"
 HOMEPAGE="http://rubyforge.org/projects/text-format"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-util/geany-plugins/geany-plugins-1.25.ebuild b/dev-util/geany-plugins/geany-plugins-1.25.ebuild
index 628d04beb6e1..f720246789a5 100644
--- a/dev-util/geany-plugins/geany-plugins-1.25.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.25.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE="+autoclose +automark +commander ctags debugger +defineformat devhelp enchant git gpg gtkspell lua markdown multiterm nls +overview python scope soup webkit"
 
 LINGUAS="be ca da de es fr gl ja pt pt_BR ru tr zh_CN"
diff --git a/dev-util/geany/geany-1.25.ebuild b/dev-util/geany/geany-1.25.ebuild
index 4c21f67b923a..42b4610102f7 100644
--- a/dev-util/geany/geany-1.25.ebuild
+++ b/dev-util/geany/geany-1.25.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.geany.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+ HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gtk3 +vte"
 
 RDEPEND=">=dev-libs/glib-2.28:2
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 86dbc483548b..3c5b96788a04 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,4 +1,4 @@
 DIST harfbuzz-0.9.41.tar.bz2 1188176 SHA256 d81aa53d0c02b437beeaac159d7fc16394d676bbce0860fb6f6a10b587dc057c SHA512 821b2fbd0d668c90e9e0040f60b7cfd8d35954d218045cebfb5e9c6ba29aba4230d0cd8e951697c26afcc4da447177fe967fa323449499fa710b52dd7e1a7011 WHIRLPOOL 84ba899d8fbc27b19d255d3c40e2d1f92c8c0dcc0a764b5c83c8c470af4902891f954d11aa64b6eb69aac0e8cf55c36ee9babff0a9260fc9f6286ce48330accb
 DIST harfbuzz-1.1.3.tar.bz2 1294579 SHA256 d93d7cb7979c32672e902fdfa884599e63f07f2fa5b06c66147d20c516d4b8f7 SHA512 e418a1543ec2a1e58e5d8d0ba9a40e8675eda13c94c664ff83ed6303c724f078cf1744883b454c46ec40157db8dc05e7f2cf5e52200601bb1e13827d8dfbaccf WHIRLPOOL 9d18d985df77ff841b1a87d25f17eb472517e109a051f2ed213b44ec91de3a499853cf7d93e23f5ac4c199ec65f2dd02300e05097cb4983565ebb9227c8d3810
-DIST harfbuzz-1.2.3.tar.bz2 1337003 SHA256 8216d2404aaab7fde87be0365a90d64aa6c55928e104557cfcb37b54a096cb8c SHA512 9df730dd07f726150252e6c1db1b9f49182492d9b0443388aa3bb102482749cb3299079dde8f83430e7947633ccf8d21bc41a95f02ba497bfd8195e702d3b031 WHIRLPOOL 6de549bbf357eb59e601cc4ce9a06418ed46c65cdaf7f23feda4652cea0ed87eedce4f20facd5b293176149ebef2b916d07f79e9d5aae583f5181826566ebb4c
 DIST harfbuzz-1.2.4.tar.bz2 1320609 SHA256 449dbdf12a8f94aedbdefaac831d8b1bf45e7decaa9192eaa4f74104ef9de491 SHA512 fd721f172b329cb39ae053da77fc4ef9675d9578bf1043647dcdc06d6dd92f43cf39a75a780899364b82363f8271269c6eae71169f5c160c726d65fe3fafd16e WHIRLPOOL 0b751f988eb88bf958a7a7ab7783b9c83952f1b2324434630f43e12e7618afebd045b1499bd5605ebf35ce4f4ed15c12761a2a84a3412248bbd17476e6885b95
+DIST harfbuzz-1.2.5.tar.bz2 1334740 SHA256 cfca0b6ba42c36a1f7b03fffb926dc4d137be2aa2a2ad8930259072e43a347d5 SHA512 a94b032895490215fdace430f04db02caf79c4ab705edea26844f31a79f4e213558550be216a14fd406cb2aecfab1ae8e1503f7f90b4a38ad498b78554495eb9 WHIRLPOOL 84a41974547eedd8f0306a70092fc06f9d643fcc89eaf2d04fba74f1e0005c36328b44a574723fde2287109813feb314fbbe74d0e8587850751fb0b8458e3d1f
diff --git a/media-libs/harfbuzz/harfbuzz-1.2.3.ebuild b/media-libs/harfbuzz/harfbuzz-1.2.5.ebuild
similarity index 100%
rename from media-libs/harfbuzz/harfbuzz-1.2.3.ebuild
rename to media-libs/harfbuzz/harfbuzz-1.2.5.ebuild
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7f1456238f3f..74585ed0241c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 05 Apr 2016 05:09:03 +0000
+Tue, 05 Apr 2016 10:08:59 +0000
diff --git a/metadata/glsa/glsa-201604-03.xml b/metadata/glsa/glsa-201604-03.xml
new file mode 100644
index 000000000000..f593a0f55709
--- /dev/null
+++ b/metadata/glsa/glsa-201604-03.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201604-03">
+  <title>Xen: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Xen, the worst of which
+    cause a Denial of Service.
+  </synopsis>
+  <product type="ebuild">xen</product>
+  <announced>April 05, 2016</announced>
+  <revised>April 05, 2016: 1</revised>
+  <bug>445254</bug>
+  <bug>513832</bug>
+  <bug>547202</bug>
+  <bug>549200</bug>
+  <bug>549950</bug>
+  <bug>550658</bug>
+  <bug>553664</bug>
+  <bug>553718</bug>
+  <bug>555532</bug>
+  <bug>556304</bug>
+  <bug>561110</bug>
+  <bug>564472</bug>
+  <bug>564932</bug>
+  <bug>566798</bug>
+  <bug>566838</bug>
+  <bug>566842</bug>
+  <bug>567962</bug>
+  <bug>571552</bug>
+  <bug>571556</bug>
+  <bug>574012</bug>
+  <access>local</access>
+  <affected>
+    <package name="app-emulation/xen" auto="yes" arch="*">
+      <unaffected range="ge">4.6.0-r9</unaffected>
+      <unaffected range="rge">4.5.2-r5</unaffected>
+      <vulnerable range="lt">4.6.0-r9</vulnerable>
+    </package>
+    <package name="app-emulation/xen-pvgrub" auto="yes" arch="*">
+      <vulnerable range="lt">4.6.0</vulnerable>
+    </package>
+    <package name="app-emulation/xen-tools" auto="yes" arch="*">
+      <unaffected range="ge">4.6.0-r9</unaffected>
+      <unaffected range="rge">4.5.2-r5</unaffected>
+      <vulnerable range="lt">4.6.0-r9</vulnerable>
+    </package>
+    <package name="app-emulation/pvgrub" auto="yes" arch="*">
+      <unaffected range="ge">4.6.0</unaffected>
+      <unaffected range="rge">4.5.2</unaffected>
+    </package>
+  </affected>
+  <background>
+    <p>Xen is a bare-metal hypervisor.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Xen. Please review the
+      CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A local attacker could possibly cause a Denial of Service condition or
+      obtain sensitive information.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Xen 4.5 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/xen-4.5.2-r5"
+    </code>
+    
+    <p>All Xen 4.6 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/xen-4.6.0-r9"
+    </code>
+    
+    <p>All Xen tools 4.5 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/xen-tools-4.5.2-r5"
+    </code>
+    
+    <p>All Xen tools 4.6 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/xen-tools-4.6.0-r9"
+    </code>
+    
+    <p>All Xen pvgrub users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/xen-pvgrub-4.6.0"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-3494">CVE-2012-3494</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-3495">CVE-2012-3495</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-3496">CVE-2012-3496</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-3497">CVE-2012-3497</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-3498">CVE-2012-3498</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-3515">CVE-2012-3515</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-4411">CVE-2012-4411</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-4535">CVE-2012-4535</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-4536">CVE-2012-4536</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-4537">CVE-2012-4537</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-4538">CVE-2012-4538</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-4539">CVE-2012-4539</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-6030">CVE-2012-6030</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-6031">CVE-2012-6031</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-6032">CVE-2012-6032</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-6033">CVE-2012-6033</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-6034">CVE-2012-6034</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-6035">CVE-2012-6035</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-6036">CVE-2012-6036</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-2151">CVE-2015-2151</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-3209">CVE-2015-3209</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-3259">CVE-2015-3259</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-3340">CVE-2015-3340</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-3456">CVE-2015-3456</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-4103">CVE-2015-4103</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-4104">CVE-2015-4104</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-4105">CVE-2015-4105</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-4106">CVE-2015-4106</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-4163">CVE-2015-4163</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-4164">CVE-2015-4164</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-5154">CVE-2015-5154</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7311">CVE-2015-7311</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7504">CVE-2015-7504</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7812">CVE-2015-7812</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7813">CVE-2015-7813</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7814">CVE-2015-7814</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7835">CVE-2015-7835</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7871">CVE-2015-7871</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7969">CVE-2015-7969</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7970">CVE-2015-7970</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7971">CVE-2015-7971</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7972">CVE-2015-7972</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8339">CVE-2015-8339</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8340">CVE-2015-8340</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8341">CVE-2015-8341</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8550">CVE-2015-8550</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8551">CVE-2015-8551</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8552">CVE-2015-8552</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8554">CVE-2015-8554</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8555">CVE-2015-8555</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-2270">CVE-2016-2270</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-2271">CVE-2016-2271</uri>
+  </references>
+  <metadata tag="requester" timestamp="Thu, 14 May 2015 19:20:02 +0000">K_F</metadata>
+  <metadata tag="submitter" timestamp="Tue, 05 Apr 2016 06:39:26 +0000">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7f1456238f3f..74585ed0241c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 05 Apr 2016 05:09:03 +0000
+Tue, 05 Apr 2016 10:08:59 +0000
diff --git a/metadata/md5-cache/app-admin/logstash-bin-2.2.2-r1 b/metadata/md5-cache/app-admin/logstash-bin-2.2.2-r2
similarity index 90%
rename from metadata/md5-cache/app-admin/logstash-bin-2.2.2-r1
rename to metadata/md5-cache/app-admin/logstash-bin-2.2.2-r2
index c9f02fcabff5..2268c3d8824f 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-2.2.2-r1
+++ b/metadata/md5-cache/app-admin/logstash-bin-2.2.2-r2
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://download.elastic.co/logstash/logstash/logstash-2.2.2.tar.gz
 _eclasses_=user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=8964bf8523630928b21b3d14fabc8d20
+_md5_=e30ee27ade6b955accaedcb172f9c3cc
diff --git a/metadata/md5-cache/app-admin/logstash-bin-2.3.0 b/metadata/md5-cache/app-admin/logstash-bin-2.3.0-r1
similarity index 90%
rename from metadata/md5-cache/app-admin/logstash-bin-2.3.0
rename to metadata/md5-cache/app-admin/logstash-bin-2.3.0-r1
index 46b73326fb04..f316766d74de 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-2.3.0
+++ b/metadata/md5-cache/app-admin/logstash-bin-2.3.0-r1
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://download.elastic.co/logstash/logstash/logstash-2.3.0.tar.gz
 _eclasses_=user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=8964bf8523630928b21b3d14fabc8d20
+_md5_=910bee1818cc93dcee24b90f5d8f62af
diff --git a/metadata/md5-cache/dev-java/commons-launcher-1.1-r2 b/metadata/md5-cache/dev-java/commons-launcher-1.1-r2
new file mode 100644
index 000000000000..c937d92dacd2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-launcher-1.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DESCRIPTION=Commons-launcher eliminates the need for a batch or shell script to launch a Java class
+EAPI=5
+HOMEPAGE=http://commons.apache.org/launcher/
+IUSE=elibc_FreeBSD examples doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=Apache-2.0
+RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/commons/launcher/source/commons-launcher-1.1-src.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f064f1102747e05a0d300b3321a10b50
diff --git a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r1 b/metadata/md5-cache/dev-java/forehead-1.0_beta5-r1
deleted file mode 100644
index 99425836822c..000000000000
--- a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.3 dev-java/ant-core >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A framework to assist in controlling the run-time ClassLoader
-EAPI=0
-HOMEPAGE=http://forehead.werken.com
-IUSE=doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Werken-1.1.1.1
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=mirror://gentoo/forehead-1.0_beta5.tbz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6927a6e07b6de8aeff2c8387b7cc9865
diff --git a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2 b/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
index 34944594e134..3c1440ac8dfe 100644
--- a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
+++ b/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 DESCRIPTION=A framework to assist in controlling the run-time ClassLoader
 EAPI=5
 HOMEPAGE=http://forehead.werken.com
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Werken-1.1.1.1
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
-SRC_URI=mirror://gentoo/forehead-1.0_beta5.tbz2
+SRC_URI=mirror://gentoo/forehead-1.0_beta5.tbz2 -> forehead-1.0_beta5.tbz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=65193548ece1bd6b5d6c3270c07c5b28
+_md5_=b348b583aab8bfc143b4b36b3f229546
diff --git a/metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1 b/metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1
deleted file mode 100644
index 9c13edd13e23..000000000000
--- a/metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Jakarta project for for XML bindings for java
-EAPI=0
-HOMEPAGE=http://xml.apache.org/commons/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~x86-fbsd
-LICENSE=Apache-1.1 public-domain W3C-document W3C
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/xml/commons/xml-commons-1.0.b2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=aac6d964d88e9abb9713396cacd55378
diff --git a/metadata/md5-cache/dev-java/xml-commons-1.4.01 b/metadata/md5-cache/dev-java/xml-commons-1.4.01
index 270984373065..6a4397341a67 100644
--- a/metadata/md5-cache/dev-java/xml-commons-1.4.01
+++ b/metadata/md5-cache/dev-java/xml-commons-1.4.01
@@ -4,11 +4,10 @@ DESCRIPTION=Apache XML Commons
 EAPI=5
 HOMEPAGE=http://xml.apache.org/commons/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=Apache-1.1 public-domain W3C-document W3C
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/xerces/xml-commons/source/xml-commons-external-1.4.01-src.tar.gz -> xml-commons-1.4.01.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=07d7ac56a17e0f68510f011e5917c193
+_md5_=80dd15639213c71cfa1c037d5cd55669
diff --git a/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1 b/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1
deleted file mode 100644
index a4225667082d..000000000000
--- a/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.4 dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=XML Im-/Exporter is a library to assist you in the process of importing and exporting XML
-EAPI=0
-HOMEPAGE=http://xml-im-exporter.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/xml-im-exporter/xml-im-exporter1.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=60a64d44a6fbcc4b947039d18cfdd02d
diff --git a/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r2 b/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r2
index 310ae1a17bf9..b3593257cb19 100644
--- a/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r2
+++ b/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=source? ( app-arch/zip ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 DESCRIPTION=XML Im-/Exporter is a library to assist im/export XML
 EAPI=5
 HOMEPAGE=http://xml-im-exporter.sourceforge.net/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/xml-im-exporter/xml-im-exporter1.1.tgz -> xml-im-exporter-1.1.tgz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f397f70c9b4f8bb27f54347b87aab77c
+_md5_=a00f2dfef9b785bb7776b12a5bfb3b79
diff --git a/metadata/md5-cache/dev-java/xml-writer-0.2-r1 b/metadata/md5-cache/dev-java/xml-writer-0.2-r1
new file mode 100644
index 000000000000..8b086e50e7d7
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xml-writer-0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DESCRIPTION=A simple XML Writer
+EAPI=5
+HOMEPAGE=http://www.megginson.com/downloads/
+IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=public-domain
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=http://www.megginson.com/downloads/xml-writer-0.2.zip
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=411e949393aaa75a4bb04cdfd5a463d4
diff --git a/metadata/md5-cache/dev-python/gevent-1.1.1 b/metadata/md5-cache/dev-python/gevent-1.1.1
new file mode 100644
index 000000000000..1df0fb3d46f0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gevent-1.1.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libev >=net-dns/c-ares-1.10 >=dev-python/greenlet-0.4.9 virtual/python-greenlet[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0=[ssl(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+),threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ssl(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Coroutine-based network library
+EAPI=5
+HOMEPAGE=http://gevent.org/ https://pypi.python.org/pypi/gevent/
+IUSE=doc examples python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-libs/libev >=net-dns/c-ares-1.10 >=dev-python/greenlet-0.4.9 virtual/python-greenlet[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0=[ssl(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+),threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ssl(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/g/gevent/gevent-1.1.1.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb
+_md5_=d4a9b4debad05b62f2bedc94886e5db5
diff --git a/metadata/md5-cache/dev-ruby/factory_girl-4.7.0 b/metadata/md5-cache/dev-ruby/factory_girl-4.7.0
new file mode 100644
index 000000000000..4fdc25855cf4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/factory_girl-4.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby20,sqlite] dev-ruby/bourne[ruby_targets_ruby20] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby20] dev-ruby/rspec-its[ruby_targets_ruby20] dev-ruby/timecop[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby21,sqlite] dev-ruby/bourne[ruby_targets_ruby21] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] dev-ruby/timecop[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby22,sqlite] dev-ruby/bourne[ruby_targets_ruby22] >=dev-ruby/mocha-0.12.8[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] dev-ruby/timecop[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[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=factory_girl provides a framework and DSL for defining and using factories
+EAPI=5
+HOMEPAGE=https://github.com/thoughtbot/factory_girl
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=https://github.com/thoughtbot/factory_girl/archive/v4.7.0.tar.gz -> factory_girl-4.7.0.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c285b2f50bfc564a4fc88bfcb192d180
diff --git a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996 b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996
deleted file mode 100644
index b509f68ef574..000000000000
--- a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~app-text/mecab-0.996 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
-DESCRIPTION=Ruby binding for MeCab
-EAPI=5
-HOMEPAGE=http://mecab.sourceforge.net/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
-RDEPEND=~app-text/mecab-0.996 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=0
-SRC_URI=https://mecab.googlecode.com/files/mecab-ruby-0.996.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4378dd3527b4fa994892f09c44af5603
diff --git a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1 b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
index 081dca481167..702baac8f36c 100644
--- a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
+++ b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby binding for MeCab
 EAPI=5
 HOMEPAGE=http://mecab.sourceforge.net/
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
 RDEPEND=~app-text/mecab-0.996 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://mecab.googlecode.com/files/mecab-ruby-0.996.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2a3337f1aae6312c9348199120496a08
+_md5_=df9cdb31547205e9ffe31486028130c3
diff --git a/metadata/md5-cache/dev-ruby/ox-2.2.4 b/metadata/md5-cache/dev-ruby/ox-2.2.4
deleted file mode 100644
index c83ae954fcdd..000000000000
--- a/metadata/md5-cache/dev-ruby/ox-2.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-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_ruby23? ( dev-lang/ruby:2.3 ) 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_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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=A fast XML parser and Object marshaller
-EAPI=5
-HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD
-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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/ohler55/ox/archive/v2.2.4.tar.gz -> ox-2.2.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ee353fb684f2c466821fd5c9eda20850
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
deleted file mode 100644
index 76f80d2d1c26..000000000000
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] dev-ruby/test-unit:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby20] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby20] dev-ruby/test-unit:2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=Hyphenates various words according to the rules of the language the word is written in
-EAPI=5
-HOMEPAGE=http://rubyforge.org/projects/text-format
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=0
-SRC_URI=mirror://rubygems/text-hyphen-1.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5d9fb490bf599786135fa7838114b02c
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
index 69dce5ba152c..166acbfb3ece 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] dev-ruby/test-unit:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby20] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby20] dev-ruby/test-unit:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby21] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby22] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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=Hyphenates various words according to the rules of the language the word is written in
+DEPEND=ruby_targets_ruby20? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby20] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby20] dev-ruby/test-unit:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby21] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby22] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby23] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) 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 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) 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_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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=Hyphenates words according to the rules of the language the word is written in
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/text-format
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-hyphen-1.4.1.gem
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cc8c796b59fde04c8d34706f38c93ae8
+_md5_=b1a63be596a937d2738a9f2ee753bfca
diff --git a/metadata/md5-cache/dev-util/geany-1.25 b/metadata/md5-cache/dev-util/geany-1.25
index af3db8ad3e49..aad991525e73 100644
--- a/metadata/md5-cache/dev-util/geany-1.25
+++ b/metadata/md5-cache/dev-util/geany-1.25
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ based fast and lightweight IDE
 EAPI=5
 HOMEPAGE=http://www.geany.org
 IUSE=gtk3 +vte
-KEYWORDS=~alpha amd64 arm ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ HPND
 RDEPEND=>=dev-libs/glib-2.28:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) vte? ( x11-libs/vte:0 )
 SLOT=0
 SRC_URI=http://download.geany.org/geany-1.25.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f6d315faea4894c9391ccd9ab2f1aed9
+_md5_=7ea51ed09322e4b8a89a295c2a52d766
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.25 b/metadata/md5-cache/dev-util/geany-plugins-1.25
index c27a17b9a510..df6b78e5e253 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.25
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.25
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of different plugins for Geany
 EAPI=5
 HOMEPAGE=http://plugins.geany.org/geany-plugins
 IUSE=+autoclose +automark +commander ctags debugger +defineformat devhelp enchant git gpg gtkspell lua markdown multiterm nls +overview python scope soup webkit python_targets_python2_7
-KEYWORDS=~alpha amd64 arm ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ia64 ~ppc ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-util/geany-1.25 autoclose? ( x11-libs/gtk+:2 ) commander? ( x11-libs/gtk+:2 ) defineformat? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 dev-util/geany[-gtk3] ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) git? ( <dev-libs/libgit2-0.23.0 ) gtkspell? ( app-text/gtkspell:2 ) lua? ( =dev-lang/lua-5.1*:= ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) scope? ( sys-devel/gdb )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://plugins.geany.org/geany-plugins/geany-plugins-1.25.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	4890219c51da247200223277f993e054	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=416cfbdd391565ed9873763cedc4dd21
+_md5_=14319cd88226fdf5501d203b4b102b43
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.2.3 b/metadata/md5-cache/media-libs/harfbuzz-1.2.5
similarity index 99%
rename from metadata/md5-cache/media-libs/harfbuzz-1.2.3
rename to metadata/md5-cache/media-libs/harfbuzz-1.2.5
index f616db4680a2..0dde508550f3 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-1.2.3
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.2.5
@@ -9,6 +9,6 @@ LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
-SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.2.3.tar.bz2
+SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.2.5.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=07ca87a4615a97451cba67ad35d6af18
diff --git a/metadata/md5-cache/www-apps/kibana-bin-4.5.0 b/metadata/md5-cache/www-apps/kibana-bin-4.5.0
index 8a12b2881479..a6372682332d 100644
--- a/metadata/md5-cache/www-apps/kibana-bin-4.5.0
+++ b/metadata/md5-cache/www-apps/kibana-bin-4.5.0
@@ -8,4 +8,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( https://download.elastic.co/kibana/kibana/kibana-4.5.0-linux-x64.tar.gz ) x86? ( https://download.elastic.co/kibana/kibana/kibana-4.5.0-linux-x86.tar.gz )
 _eclasses_=pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=6c7e273021692d6dd9dc837fcb1209ae
+_md5_=9cd1344588d4695c0031aa7b12f69bee
diff --git a/metadata/md5-cache/www-apps/piwigo-2.8.0 b/metadata/md5-cache/www-apps/piwigo-2.8.0
new file mode 100644
index 000000000000..84cf03e3227c
--- /dev/null
+++ b/metadata/md5-cache/www-apps/piwigo-2.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=a photo gallery software for the web
+EAPI=6
+HOMEPAGE=http://piwigo.org/
+IUSE=+exif +gd imagemagick vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli] >=virtual/mysql-5.0 virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( gd imagemagick )
+SLOT=2.8.0
+SRC_URI=http://piwigo.org/download/dlcounter.php?code=2.8.0 -> piwigo-2.8.0.zip
+_eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
+_md5_=d23a50cad3790727bc81208bcec6f9ba
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7f1456238f3f..74585ed0241c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 05 Apr 2016 05:09:03 +0000
+Tue, 05 Apr 2016 10:08:59 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 0ba0167eed9c..d16e19c9381d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Apr  5 05:08:13 UTC 2016
+Tue Apr  5 10:08:09 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a5487e731b5c..10fa45afe94f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 05 Apr 2016 05:30:01 +0000
+Tue, 05 Apr 2016 10:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6cdf8d316301..e933f099ffd9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1459833002 Tue 05 Apr 2016 05:10:02 AM UTC
+1459851001 Tue 05 Apr 2016 10:10:01 AM UTC
diff --git a/www-apps/kibana-bin/kibana-bin-4.5.0.ebuild b/www-apps/kibana-bin/kibana-bin-4.5.0.ebuild
index b0222d11368f..8a36b2771d81 100644
--- a/www-apps/kibana-bin/kibana-bin-4.5.0.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-4.5.0.ebuild
@@ -58,7 +58,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "This version of Kibana is compatible with Elasticsearch 2.2+"
+	elog "This version of Kibana is compatible with Elasticsearch 2.3+"
 	elog
 	elog "Be sure to point ES_INSTANCE to your Elasticsearch instance"
 	elog "in /etc/conf.d/${MY_PN}."
diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
new file mode 100644
index 000000000000..ad3f2b61a36d
--- /dev/null
+++ b/www-apps/piwigo/Manifest
@@ -0,0 +1 @@
+DIST piwigo-2.8.0.zip 7524556 SHA256 1712c81a5b40faaaff956f08b7a8618119d41336869f9e03e78060fa8d21726b SHA512 13529959235d416e6eaf54394d79d6fae58a2ba3cfc79b11765f600d95fd297be5dff98d84bb0436f9cef8d4811c2de9cf3d8f891e0a11e73534e62d0f511f59 WHIRLPOOL e9e5ff7d970a0b6e0e6027a005e865ff020437bd7645acf452cc9168af1fb3707d403204e7e961b6e084510303a428e68a3557c22ece205daaa3028ac66b7f6a
diff --git a/www-apps/piwigo/metadata.xml b/www-apps/piwigo/metadata.xml
new file mode 100644
index 000000000000..586c819bb3f1
--- /dev/null
+++ b/www-apps/piwigo/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+Piwigo is a photo gallery software for the web that comes with powerful features to publish and manage your collection of pictures.
+
+Started in 2002, the project is now supported by an active community of users and developers.
+It supports numerous galleries of all sizes all over the world, from an individual ten-photos party to the images stock of an agency. This scalability is supported by smart browsing capabilities based on categories, tags and chronological search. Various extensions make Piwigo even more scalable and customizable to suit your own needs and desires.
+
+Piwigo is both web and photo standard compliant. And, icing on the cake, it is free and opensource.
+
+PhpWebGallery became Piwigo on February 15th, 2009.
+	</longdescription>
+</pkgmetadata>
diff --git a/www-apps/piwigo/piwigo-2.8.0.ebuild b/www-apps/piwigo/piwigo-2.8.0.ebuild
new file mode 100644
index 000000000000..4c01a9de70d3
--- /dev/null
+++ b/www-apps/piwigo/piwigo-2.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit webapp
+
+DESCRIPTION="a photo gallery software for the web"
+HOMEPAGE="http://piwigo.org/"
+SRC_URI="http://piwigo.org/download/dlcounter.php?code=${PV} -> ${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+exif +gd imagemagick"
+
+DEPEND=""
+RDEPEND="imagemagick? ( || ( media-gfx/imagemagick
+		media-gfx/graphicsmagick[imagemagick] ) )
+	dev-lang/php[ctype,exif?,gd?,filter,iconv,json,mysqli]
+	>=virtual/mysql-5.0
+	virtual/httpd-php"
+
+REQUIRED_USE="|| ( gd imagemagick )"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Local configuration, and parts that can be updated
+	webapp_serverowned "${MY_HTDOCSDIR}"/_data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/galleries
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/language
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/local
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/plugins
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/template-extension
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/themes
+	webapp_serverowned "${MY_HTDOCSDIR}"/upload
+
+	webapp_src_install
+}