Merge remote-tracking branch 'remotes/hydrapolic/logstash'

Version bump. rm old

Pull request: https://github.com/gentoo/gentoo/pull/443

52 files changed, 576 insertions, 581 deletions

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 6e4440eb2f9d..6eed22e80256 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,3 +1,3 @@
-DIST logstash-1.4.5.tar.gz 73896488 SHA256 ddb6fd2d26e87b13d87fa1495492a7346d45267df46eed29503df08d3e5d8a13 SHA512 b71b818dfb681459cc7cdd39d241b46c8bc905b4f26af377058feb78c9b9f3528059d136605685f24e7af1f2c190fa93557b0876765d78fc1f7cce32640a2593 WHIRLPOOL 7fa1189120fbfac487471261ae1a10e55986bee924df8356169d88ee37ef578607323316156ecbaa64e7e4f9fe9c1a70f475529f61f9977ac9287a484d2321cb
-DIST logstash-1.5.4.tar.gz 91956015 SHA256 f03075ee534ce6e7667679447f56543ce05cebbdb7b65a9396a5e538bf3e9fa8 SHA512 b20a8de5e22f82e6ddc03bae16d6ca01ab1fbff695a7fd0148feee9f8903c3805c45f296bceada6688fbcc86b8e318daaebcb6d67c2a6cd8d0cc3bdd8a3bf757 WHIRLPOOL 470e0a29b928690187ef17297393e702fc015c6a476e75b28d1abddc4082e0da0bd27f0fca5c2f81a207aeb0303e78ff6761126e08a800b3eb989710486f717c
 DIST logstash-1.5.5.tar.gz 89853616 SHA256 511c604ef096e6486cfbde83468cabad8f132401d32ae8f269c9144c959dd66e SHA512 badd0f78f3f48abc0d55c390e031b43a399301421b00f40d0a291629c49b58feb13ac292b567f334699194f4d035aec3d296ab4b95a375a1bda249d7a100f9a5 WHIRLPOOL 0f7bf4b26acabfba7e217b260a243e3c8455fbc876567b2c74372857db66cf4afd9c3a9033c82afa1ea4e0f635dbe33de8d1771fa7d470963584792651b70cc0
+DIST logstash-2.1.0.tar.gz 73512846 SHA256 1f132e0fc9fc46ebe836951bb44c5cd1a5f8e3f653bb44bded55300cc6c892dc SHA512 218355af77957a050bff262c1f0f9b516a9c8223a22a768d1c1a3c222c4d9e3ac67871608e6f34787a1926ac2ad2374ca0280a8a122a93b4e846c780c517984a WHIRLPOOL c22840cfadbc63490ee8e0a9ed101dcd9f3c06eca4d7b3359ae84073da6d9bb5712af1599357ff875b67eb55ad5d3e6e39634266e7e57024b4f97c23667e3b4a
+DIST logstash-all-plugins-2.1.0.tar.gz 126053307 SHA256 090cca8b1d7584ed7f3a60abd4e5f4329cf36f41481de80982fee709e2febf58 SHA512 31232bdac13b8d342ac5d688c2fe0f60e6eede71e70c97d0a1e08527e1283ef348666f87d86f37e0c3208f56dc08595af18c924642fa94911f6fd19a39dab7f0 WHIRLPOOL 532676042bee4c120fdaf60c3d6cc528d6f9960d0c770bebfba773dd422663532c3f7de7b28baa085d3faaacd830a74e1f73f5020a5a9b7d48998dbdf931c117
diff --git a/app-admin/logstash-bin/files/agent.conf.sample-r2 b/app-admin/logstash-bin/files/agent.conf.sample-r2
new file mode 100644
index 000000000000..96781bd3327b
--- /dev/null
+++ b/app-admin/logstash-bin/files/agent.conf.sample-r2
@@ -0,0 +1,20 @@
+input {
+    stdin {
+        type => "stdin"
+    }
+
+    file {
+        type => "syslog"
+        path => [ "/var/log/*.log", "/var/log/debug", "/var/log/messages", "/var/log/syslog" ]
+    }
+}
+
+output {
+    stdout {
+        codec => rubydebug
+    }
+  
+    elasticsearch {
+        hosts => localhost
+    }
+}
diff --git a/app-admin/logstash-bin/files/logstash.confd b/app-admin/logstash-bin/files/logstash.confd
deleted file mode 100644
index 29f4d1c016ae..000000000000
--- a/app-admin/logstash-bin/files/logstash.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-#LOGSTASH_USER=""
-#LOGSTASH_GROUP=""
diff --git a/app-admin/logstash-bin/files/logstash.confd-r2 b/app-admin/logstash-bin/files/logstash.confd-r2
new file mode 100644
index 000000000000..cb6839569537
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.confd-r2
@@ -0,0 +1,9 @@
+#LS_USER="root"
+#LS_GROUP="root"
+#LS_CONFDIR="/etc/logstash/conf.d"
+#LS_LOGFILE="/var/log/logstash/logstash.log"
+#LS_PIDFILE="/run/logstash/logstash.pid"
+#LS_HEAP_SIZE="500m"
+#LS_NICE=19
+#LS_OPEN_FILES=16384
+#LS_OPTS=""
diff --git a/app-admin/logstash-bin/files/logstash.initd b/app-admin/logstash-bin/files/logstash.initd
deleted file mode 100644
index 08b063fe7044..000000000000
--- a/app-admin/logstash-bin/files/logstash.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-LOGSTASH_USER=${LOGSTASH_USER:-root}
-LOGSTASH_GROUP=${LOGSTASH_GROUP:-root}
-LOGFILE="/var/log/logstash/logstash.log"
-
-command="/opt/logstash/bin/logstash"
-command_args="agent --config /etc/logstash/conf.d/*.conf --log ${LOGFILE}"
-extra_commands="checkconfig"
-command_background="true"
-start_stop_daemon_args="--user=\"${LOGSTASH_USER}\""
-pidfile="/run/logstash/logstash.pid"
-
-depend() {
-	use net
-	after elasticsearch
-}
-
-checkconfig() {
-	ebegin "Checking your configuration"
-	${command} ${command_args} --configtest
-	eend $? "Configuration error. Please fix your configuration files."
-}
-
-start_pre() {
-	checkconfig || return 1
-
-	checkpath -d -o "${LOGSTASH_USER}":"${LOGSTASH_GROUP}" -m750 "$(dirname "${pidfile}")"
-	checkpath -d -o "${LOGSTASH_USER}":"${LOGSTASH_GROUP}" -m750 "$(dirname "${LOGFILE}")"
-	checkpath -f -o "${LOGSTASH_USER}":"${LOGSTASH_GROUP}" -m640 "${LOGFILE}"
-}
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..e4abf59b0fa0
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd-r2
@@ -0,0 +1,49 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LS_USER="${LS_USER:-root}"
+LS_GROUP="${LS_GROUP:-root}"
+LS_CONFDIR="${LS_CONFDIR:-/etc/logstash/conf.d}"
+LS_LOGFILE="${LS_LOGFILE:-/var/log/logstash/logstash.log}"
+LS_PIDFILE="${LS_PIDFILE:-/run/logstash/logstash.pid}"
+LS_NICE="${LS_NICE:-19}"
+LS_OPEN_FILES="${LS_OPEN_FILES:-16384}"
+LS_HEAP_SIZE="${LS_HEAP_SIZE:-500m}"
+
+command="/opt/logstash/bin/logstash"
+command_args="agent --config ${LS_CONFDIR}/*.conf --log ${LS_LOGFILE} ${LS_OPTS}"
+extra_commands="checkconfig"
+command_background="true"
+start_stop_daemon_args="--nicelevel ${LS_NICE} \
+	--user ${LS_USER}:${LS_GROUP} \
+	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}"
+pidfile="${LS_PIDFILE}"
+
+depend() {
+	use net
+	after elasticsearch
+}
+
+checkconfig() {
+	ebegin "Checking your configuration"
+	${command} ${command_args} --configtest
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_PIDFILE}")"
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOGFILE}")"
+	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOGFILE}"
+
+	rc_ulimit="-n ${LS_OPEN_FILES}"
+}
+
+stop() {
+	ebegin "Stopping logstash"
+	start-stop-daemon --stop \
+		--pidfile="${LS_PIDFILE}" \
+		--retry=TERM/5/KILL/5
+}
diff --git a/app-admin/logstash-bin/logstash-bin-1.4.5.ebuild b/app-admin/logstash-bin/logstash-bin-1.4.5.ebuild
deleted file mode 100644
index 027faae0d39d..000000000000
--- a/app-admin/logstash-bin/logstash-bin-1.4.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/etc/${MY_PN}/conf.d"
-	doins "${FILESDIR}/agent.conf.sample"
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}"
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}/${MY_PN}.logrotate"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
-}
-
-pkg_postinst() {
-	einfo "Getting started with logstash:"
-	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
-	einfo ""
-	einfo "Packages that might be interesting:"
-	einfo "  app-misc/elasticsearch"
-	einfo "  dev-python/elasticsearch-curator"
-	einfo "  www-apps/kibana-bin"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-1.5.4.ebuild b/app-admin/logstash-bin/logstash-bin-2.1.0.ebuild
index 18df7a31ce3f..f165b2a1a9de 100644
--- a/app-admin/logstash-bin/logstash-bin-1.5.4.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.1.0.ebuild
@@ -9,12 +9,13 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tool for managing events and logs"
 HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="standard? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz )
+	all-plugins? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-all-plugins-${PV}.tar.gz )"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="+standard all-plugins"
 
 RESTRICT="strip"
 QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
@@ -24,22 +25,28 @@ RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if use standard && use all-plugins; then
+		die "Both standard and all-plugins USE selected, please pick just one."
+	fi
+}
+
 src_install() {
 	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
 	keepdir "/var/log/${MY_PN}"
 
 	insinto "/etc/${MY_PN}/conf.d"
-	doins "${FILESDIR}/agent.conf.sample"
+	newins "${FILESDIR}/agent.conf.sample-r2" agent.conf.sample
 
 	insinto "/opt/${MY_PN}"
 	doins -r .
 	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
 
 	insinto /etc/logrotate.d
-	doins "${FILESDIR}/${MY_PN}.logrotate"
+	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
 
-	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" ${MY_PN}
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${MY_PN}
 }
 
 pkg_postinst() {
diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
index df4f52042dae..f82fc0180ff6 100644
--- a/app-admin/logstash-bin/metadata.xml
+++ b/app-admin/logstash-bin/metadata.xml
@@ -5,10 +5,14 @@
 	<maintainer>
 		<email>idella4@gentoo.org</email>
 		<name>Ian Delaney</name>
-        </maintainer>
-        <maintainer>
-                <email>hydrapolic@gmail.com</email>
-                <name>Tomas Mozes</name>
-                <description>Proxy maintainer</description>
-        </maintainer>
+	</maintainer>
+	<maintainer>
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomas Mozes</name>
+		<description>Proxy maintainer</description>
+	</maintainer>
+	<use>
+		<flag name="standard">standard distribution package</flag>
+		<flag name="all-plugins">contains the standard distribution package plus all plugins</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index c3edcc51108f..2c09619dfc4f 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
diff --git a/app-portage/ufed/ufed-0.92.ebuild b/app-portage/ufed/ufed-0.92.ebuild
index 8524bb0348f4..5b9425529f48 100644
--- a/app-portage/ufed/ufed-0.92.ebuild
+++ b/app-portage/ufed/ufed-0.92.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND="sys-libs/ncurses:0="
diff --git a/dev-java/jacl/jacl-1.4.1-r1.ebuild b/dev-java/jacl/jacl-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..ec050ff11460
--- /dev/null
+++ b/dev-java/jacl/jacl-1.4.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${P//-}"
+
+DESCRIPTION="Jacl is an implementation of Tcl written in Java"
+HOMEPAGE="http://tcljava.sourceforge.net"
+SRC_URI="mirror://sourceforge/tcljava/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+CDEPEND=">=dev-lang/tcl-8.4.5:*"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CRDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	rm -rf src/{Test.java,empty,tests} || die
+	java-pkg-simple_src_compile
+	mv src/jacl/tcl src/ || die
+	java-pkg_addres "${PN}.jar" src/ -name "*.tcl"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher jaclsh --main tcl.lang.Shell
+	dodoc README ChangeLog known_issues.txt || die
+}
diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild
new file mode 100644
index 000000000000..5da8d1a232f9
--- /dev/null
+++ b/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Wrapper for java-config"
+HOMEPAGE="https://www.gentoo.org/proj/en/java"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="!<dev-java/java-config-1.3"
+RDEPEND="app-portage/portage-utils"
+
+src_install() {
+	dobin src/shell/* || die
+	dodoc AUTHORS || die
+}
diff --git a/dev-java/jcommon/Manifest b/dev-java/jcommon/Manifest
index c648bf84e2c6..19b7cb50fb73 100644
--- a/dev-java/jcommon/Manifest
+++ b/dev-java/jcommon/Manifest
@@ -1,2 +1 @@
-DIST jcommon-1.0.18.tar.gz 1133961 SHA256 a4daf9ed40712bfe9564dcd6eb8392711325aec78fa7c03e57c195f63413e3fd SHA512 83a4dfe7c7f631ee251cd1c133726060d8d380366ba0b39b043327c20e8128fd882b7374448738dcad3e1b6eadc0221242588c15c6feaa3c06101beafe2e79bb WHIRLPOOL cae9c1ff0d3658199378baf2ce58d25710aac17b7bca4d5e31136133868ebb41c6a71fd384a3ba1da2e800d364dd0bf5e70ef768148bbb56d440c78b8fe1e6d4
 DIST jcommon-1.0.23.zip 1373666 SHA256 6351512b94fc2228034a5c43da52d9ef8ecb7781dcecdeba733441de7d7e18f1 SHA512 c358239da8b1ddf53ce94bebb00b6518456aa921dd3aa84fc6a23144d499f14a85ba421cd71f3880e8d10153a6ab816f54c1fa872a4ab694ce3c7b8d69bc2a4b WHIRLPOOL 467d7400a7009c38b86041977dd59f8a309f7a8ecf02226b80112d12aa3d472c9a42a9cc3e5620b64b0333d44f497f85d95a2184603df9eb21ad66a51ca7fa6c
diff --git a/dev-java/jcommon/jcommon-1.0.18.ebuild b/dev-java/jcommon/jcommon-1.0.18.ebuild
deleted file mode 100644
index c209a85a505e..000000000000
--- a/dev-java/jcommon/jcommon-1.0.18.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_P=${PN}-$(replace_version_separator 3 -)
-DESCRIPTION="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects"
-HOMEPAGE="http://www.jfree.org/jcommon"
-SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="1.0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	>=virtual/jdk-1.4"
-DEPEND="
-	>=virtual/jdk-1.4
-	test? ( dev-java/junit:4 )"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-	find "${WORKDIR}" -name '*.jar' -print -delete || die
-}
-
-src_compile() {
-	if ! use debug; then
-		antflags="-Dbuild.debug=false -Dbuild.optimize=true"
-	fi
-	eant -f ant/build.xml compile $(use_doc) $antflags
-}
-
-src_test() {
-	java-pkg_jar-from --into lib junit-4
-	eant -f ant/build.xml compile-junit-tests
-	ejunit4 -cp "./lib/jcommon-${PV}-junit.jar:$(java-pkg_getjars junit-4)" \
-		org.jfree.junit.JCommonTestSuite
-}
-
-src_install() {
-	java-pkg_newjar ${P}.jar ${PN}.jar
-	dodoc README.txt
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc source/com source/org
-}
diff --git a/dev-java/jcommon/jcommon-1.0.23.ebuild b/dev-java/jcommon/jcommon-1.0.23.ebuild
index 827b3f1788aa..592fe937423d 100644
--- a/dev-java/jcommon/jcommon-1.0.23.ebuild
+++ b/dev-java/jcommon/jcommon-1.0.23.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.zip"
 
 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/dev-java/jettison/Manifest b/dev-java/jettison/Manifest
index e8bf7be54d6f..85fa811adcc6 100644
--- a/dev-java/jettison/Manifest
+++ b/dev-java/jettison/Manifest
@@ -1,2 +1 @@
-DIST jettison-1.0-sources.jar 54344 SHA256 4e52b63e8c84718ed6e7ab75618825e970df3169fb999f38ea54ea8a8d88e23b SHA512 f5eacfd15e43de61462413c6e7fde713c7baf632e26cd1c686818c9b992ac6734e4813ec5ad0ba6810e66bdd59d4007c73ad132e15c1ca0ae23a328916aa645c WHIRLPOOL a8fda2a165e06e39f87b7b6b8587f421451ca66334852844d81eb9c25cbe8d47a323fd2a6aee2a24d119fd35ed66fa5d815f0e8985681da23f8f6bacf08f00c0
 DIST jettison-1.3.7.tar.gz 63200 SHA256 0fdf66e0607cc3ea130b4072d4f2b03dfa6e71248069c5232fea6deebb77b065 SHA512 c669d0c1c4605c683d1d726ea7eea0f0079cd5fdddc40f4bc4e08b20b7ef7df414f4b2265fd91e1c34e30809c78f9e8690382c51a1ba6653a6fd688b22c07cd4 WHIRLPOOL 638fe310d82cbc2daa3e655e0c3ac7e4ac912e7827d94fac8ba93da8ba231d18b53afc86a39896c724bfd16142c714bfd4e4ed8044a3bf624d4737ad1715cb03
diff --git a/dev-java/jettison/files/build.xml b/dev-java/jettison/files/build.xml
deleted file mode 100644
index b6b95dff7a2a..000000000000
--- a/dev-java/jettison/files/build.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="jettison" default="jar" basedir=".">
-	<!-- some properties -->
-	<property name="src.dir" value="org/codehaus/jettison" />
-	<property name="build.dir" value="build" />
-	<property name="docs.dir" value="docs" />
-	<property name="lib.dir" value="lib"/>
-	<property name="dist.dir" value="dist" />
-	<property name="jarfile" value="${dist.dir}/jettison.jar" />
-	<property name="pkg" value="${package.name}"/>
-	<property name="target.jdk" value="1.5" />
-
-
-	<available file="${lib}" type="dir" property="libdir.exists"/>
-
-
-	<!-- init -->
-	<target name="init">		
-		<tstamp/>
-		<mkdir dir="${dist.dir}" />
-		<mkdir dir="${build.dir}" />
-		<mkdir dir="${docs.dir}" />
-  	</target>
-
-	<!-- compile everything -->
-	<target name="compile" depends="init">
-		<mkdir dir="${build.dir}" />
-		<javac srcdir="${src.dir}" 
-			destdir="${build.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}"
-			classpath="${gentoo.classpath}">
-		</javac>
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar" depends="compile">
-		<jar jarfile="${jarfile}" basedir="${build.dir}" />
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="javadoc" depends="compile">
-		<javadoc packagenames="org.*"
-			sourcepath="${src.dir}"
-			defaultexcludes="yes"
-			destdir="./${docs.dir}"
-           		author="true"
-           		version="true"
-           		use="true"
-			windowtitle="${ant.project.name} API" >
-			<fileset dir="${src.dir}"/>
-		</javadoc>	
-	</target>
-	
-	<!-- clean up -->
-	<target name="clean">
-		<delete dir="${build.dir}" />
-		<delete dir="${docs.dir}" />
-		<delete dir="${dist.dir}" />
-	</target>
-
-</project>
diff --git a/dev-java/jettison/jettison-1.0.ebuild b/dev-java/jettison/jettison-1.0.ebuild
deleted file mode 100644
index e526e90468b0..000000000000
--- a/dev-java/jettison/jettison-1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A JSON StAX implementation"
-HOMEPAGE="http://jettison.codehaus.org/"
-SRC_URI="http://repository.codehaus.org/org/codehaus/${PN}/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-IUSE=""
-
-COMMON_DEP="java-virtuals/jaxp-virtual"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-#Don't need to make one
-S="${WORKDIR}"
-
-src_prepare(){
-	#no supplied Build file
-	cp -v "${FILESDIR}"/build.xml "${S}/build.xml" || die
-}
-
-EANT_GENTOO_CLASSPATH="jaxp-virtual"
-
-src_install() {
-	java-pkg_dojar dist/"${PN}.jar"
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/jettison/jettison-1.3.7.ebuild b/dev-java/jettison/jettison-1.3.7.ebuild
index 01b414bcdba2..15bbbb51b4c1 100644
--- a/dev-java/jettison/jettison-1.3.7.ebuild
+++ b/dev-java/jettison/jettison-1.3.7.ebuild
@@ -3,7 +3,6 @@
 # $Id$
 
 EAPI=5
-
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
@@ -13,7 +12,7 @@ HOMEPAGE="https://github.com/codehaus/jettison"
 SRC_URI="https://github.com/codehaus/${PN}/archive/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jfreechart/Manifest b/dev-java/jfreechart/Manifest
index 7c0cd27b6cb3..1faed668633a 100644
--- a/dev-java/jfreechart/Manifest
+++ b/dev-java/jfreechart/Manifest
@@ -1,3 +1 @@
-DIST jfreechart-1.0.13.tar.gz 6306139 SHA256 8b8286cc86d898961f307bcba1f8b6f6471bd0e921562adf573f2758b090c175 SHA512 6b4e2079fa4eb4cebec709a95e7b1bff4d7233dbdd26c7e3173e75fc29facc9accc64039a62e5d89c83c3aedbd9cd9bc42d5de79f77de08d7027dba8ba9a4d68 WHIRLPOOL 0dbf55f4b53687eb31116c9ba6ab556296a7f915ffc859ddda739ca2bf633e31da6c692289a08859a315e7cb53e571c54fa117d666ed9ca3f789c891597444b6
-DIST jfreechart-1.0.14.tar.gz 6376551 SHA256 9250d0ab465fed67aa6f48090854258d9d0053f519ca534e267a8bb84a6727f2 SHA512 4d2344553032aa138143d88ad91942ffc66385d90b3d8f279f4257ef2273012580e99a60107baffefa3ea4e33cb0bad9e656a42747a4d0132642d5b9cb27da7b WHIRLPOOL 13cd39d4f287291eed725ba0229f44187b63466348c347c7acb0e6137d3c638136d1d973e8fdac31c7aec32793bf3864cc339df01abf0588763a77052a351e4d
 DIST jfreechart-1.0.19.zip 8050676 SHA256 bfe8d38fd48250dc04a3ff1aff477f2d226f49ba1ec2732ded981a3fccfc66f2 SHA512 6345e6a6b4a82862f3908794efb70a6f5413f313ba5bcff1dfb713d21948034d80c743a0cea61be81921c62736b07209ed4b942fedca0c76226b1202a4596b31 WHIRLPOOL 69a5d4c1851fd613a70cdc49904671f22cd7edd25b956c67cdcda5f5960228bfa0932907f0f4432685d4310851ffcd4e1e7283d2f2187a06666b296e84606cc0
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.13-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.13-build.xml.patch
deleted file mode 100644
index 8665a15aa0e2..000000000000
--- a/dev-java/jfreechart/files/jfreechart-1.0.13-build.xml.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nur jfreechart-1.0.13/ant/build.xml jfreechart-1.0.13_patched/ant/build.xml
---- jfreechart-1.0.13/ant/build.xml	2009-04-20 11:23:40.000000000 +0300
-+++ jfreechart-1.0.13_patched/ant/build.xml	2009-05-11 23:36:27.000000000 +0300
-@@ -40,11 +40,9 @@
-         <available classname="java.lang.Annotation" property="src.version" value="1.5"/>
-         <available classname="java.lang.Annotation" property="target.version" value="1.5"/>
-         <path id="build.classpath">
--            <fileset dir="${basedir}/lib/">
--                <include name="${jcommon.name}-${jcommon.version}.jar"/>
--                <include name="servlet.jar"/>
--                <include name="gnujaxp.jar" unless="JDK1.4+"/>
--            </fileset>
-+            <pathelement location="${jcommon.jar}"/>
-+            <pathelement location="${servlet.jar}"/>
-+            <pathelement location="${gnujaxp.jar}"/>
-         </path>
- 
-     </target>
-@@ -324,7 +322,7 @@
- 
-     <!-- COMPILE THE JUNIT TESTS. -->  
-     <target name="compile-tests" 
--            depends="compile,compile-experimental"
-+            depends="initialise"
-             description="Compile the test code">
-         
-         <mkdir dir="${basedir}/build-tests"/>
-@@ -338,8 +336,8 @@
-             <classpath>
-                 <path refid="build.classpath"/>
-                 <pathelement location="${junit.jar}"/>
--                <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"/>
--                <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
-+                <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}.jar"/>
-+                <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
-                 <pathelement location="${basedir}/build-tests"/>
-             </classpath>
-         </javac>
-@@ -357,7 +355,7 @@
-         <junit printSummary="yes" 
-                haltonerror="true" 
-                haltonfailure="true"
--               fork="true" 
-+               fork="false" 
-                dir=".">
-             
-             <sysproperty key="basedir" value="."/>
-@@ -365,8 +363,8 @@
-             <classpath>
-                 <path refid="build.classpath"/>
-                 <pathelement location="${junit.jar}"/>
--                <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"/>
--                <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
-+                <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}.jar"/>
-+                <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
-                 <pathelement location="${basedir}/build-tests"/>
-             </classpath>
-             <batchtest todir="${basedir}/build-tests-reports">
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch
deleted file mode 100644
index f07e5be5df41..000000000000
--- a/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/ant/build.xml	2011-11-20 22:40:13.000000000 +0100
-+++ b/ant/build.xml	2013-03-09 14:10:53.987970148 +0100
-@@ -40,11 +40,9 @@
-         <available classname="java.lang.Annotation" property="src.version" value="1.5"/>
-         <available classname="java.lang.Annotation" property="target.version" value="1.5"/>
-         <path id="build.classpath">
--            <fileset dir="${basedir}/lib/">
--                <include name="${jcommon.name}-${jcommon.version}.jar"/>
--                <include name="servlet.jar"/>
--                <include name="gnujaxp.jar" unless="JDK1.4+"/>
--            </fileset>
-+            <pathelement location="${jcommon.jar}"/>
-+            <pathelement location="${servlet.jar}"/>
-+            <pathelement location="${gnujaxp.jar}"/>
-         </path>
- 
-     </target>
-@@ -321,7 +319,7 @@
- 
-     <!-- COMPILE THE JUNIT TESTS. -->
-     <target name="compile-tests"
--            depends="compile,compile-experimental"
-+            depends="initialise"
-             description="Compile the test code">
- 
-         <mkdir dir="${basedir}/build-tests"/>
-@@ -354,7 +352,7 @@
-         <junit printSummary="yes"
-                haltonerror="true"
-                haltonfailure="true"
--               fork="true"
-+               fork="false"
-                dir=".">
- 
-             <sysproperty key="basedir" value="."/>
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch b/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch
deleted file mode 100644
index b932d863bf83..000000000000
--- a/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tests/org/jfree/data/time/junit/TimeSeriesCollectionTests.java	2011-11-20 22:40:13.000000000 +0100
-+++ b/tests/org/jfree/data/time/junit/TimeSeriesCollectionTests.java	2013-05-21 00:18:03.840041846 +0200
-@@ -339,6 +339,10 @@
-      * java.util.List, boolean)} method.
-      */
-     public void testFindDomainBounds() {
-+        // store the current time zone
-+        TimeZone saved = TimeZone.getDefault();
-+        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
-+
-         TimeSeriesCollection dataset = new TimeSeriesCollection();
-         List visibleSeriesKeys = new java.util.ArrayList();
-         Range r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys,
-@@ -351,10 +355,6 @@
-         r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true);
-         assertNull(r);
- 
--        // store the current time zone
--        TimeZone saved = TimeZone.getDefault();
--        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
--
-         s1.add(new Year(2008), 8.0);
-         r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true);
-         assertEquals(1199142000000.0, r.getLowerBound(), EPSILON);
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.4-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.4-build.xml.patch
deleted file mode 100644
index cf4c9ada537f..000000000000
--- a/dev-java/jfreechart/files/jfreechart-1.0.4-build.xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ant/build.xml.original	2007-02-09 23:44:42.000000000 +0100
-+++ ant/build.xml	2007-02-09 23:45:01.000000000 +0100
-@@ -338,7 +338,7 @@
-         <junit printSummary="yes" 
-                haltonerror="true" 
-                haltonfailure="true"
--               fork="true" 
-+               fork="false" 
-                dir=".">
-             
-             <sysproperty key="basedir" value="."/>
diff --git a/dev-java/jfreechart/jfreechart-1.0.13.ebuild b/dev-java/jfreechart/jfreechart-1.0.13.ebuild
deleted file mode 100644
index b2e51e4ff9a8..000000000000
--- a/dev-java/jfreechart/jfreechart-1.0.13.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JFreeChart is a free Java class library for generating charts"
-HOMEPAGE="http://www.jfree.org/jfreechart"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-COMMON_DEPEND="
-	>=dev-java/itext-1.4.6:0
-	dev-java/jcommon:1.0
-	java-virtuals/servlet-api:2.3"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPEND}
-	test? ( dev-java/ant-junit:0 )"
-RDEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPEND}"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	rm -v *.jar lib/*.jar || die
-}
-
-src_compile() {
-	# Note that compile-experimental depends on compile so it is sufficient to run
-	# just compile-experimental
-	eant -f ant/build.xml compile-experimental $(use_doc) $(get_jars)
-}
-
-src_test() {
-	# X11 tests are disabled using java.awt.headless=true
-	ANT_TASKS="ant-junit" \
-	ANT_OPTS="-Djava.awt.headless=true -Duser.timezone=UTC" \
-		eant -f ant/build.xml test $(get_jars)
-}
-
-src_install() {
-	java-pkg_newjar lib/${P}.jar ${PN}.jar
-	java-pkg_newjar lib/${P}-experimental.jar ${PN}-experimental.jar
-	dodoc README.txt ChangeLog NEWS || die
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc source/org
-}
-
-get_jars() {
-	local antflags="
-		-Ditext.jar=$(java-pkg_getjar itext iText.jar) \
-		-Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar) \
-		-Dservlet.jar=$(java-pkg_getjars servlet-api-2.3)"
-	use test && antflags="${antflags} \
-		-Djunit.jar=$(java-pkg_getjars --build-only junit)"
-	echo "${antflags}"
-}
diff --git a/dev-java/jfreechart/jfreechart-1.0.14.ebuild b/dev-java/jfreechart/jfreechart-1.0.14.ebuild
deleted file mode 100644
index 360f185d4333..000000000000
--- a/dev-java/jfreechart/jfreechart-1.0.14.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JFreeChart is a free Java class library for generating charts"
-HOMEPAGE="http://www.jfree.org/jfreechart"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="+servlet test"
-
-COMMON_DEPEND="
-	>=dev-java/itext-2.1.5:0
-	>=dev-java/jcommon-1.0.17:1.0
-	servlet? ( java-virtuals/servlet-api:2.3 )"
-
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPEND}
-	test? ( dev-java/ant-junit:0 )"
-
-RDEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPEND}"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	# Fix test failure, obtained from
-	# http://sourceforge.net/p/jfreechart/bugs/1100/
-	epatch "${FILESDIR}/${P}-fix-TimeSeriesCollectionTests.patch"
-
-	rm -v *.jar lib/*.jar || die
-
-	if ! use servlet; then
-		rm -rf source/org/jfree/chart/servlet || die
-	fi
-}
-
-src_compile() {
-	# Note that compile-experimental depends on compile so it is sufficient to run
-	# just compile-experimental
-	eant -f ant/build.xml compile-experimental $(use_doc) $(get_jars)
-}
-
-src_test() {
-	# X11 tests are disabled using java.awt.headless=true
-	ANT_TASKS="ant-junit" \
-	ANT_OPTS="-Djava.awt.headless=true -Duser.timezone=UTC" \
-		eant -f ant/build.xml test $(get_jars)
-}
-
-src_install() {
-	java-pkg_newjar lib/${P}.jar ${PN}.jar
-	java-pkg_newjar lib/${P}-experimental.jar ${PN}-experimental.jar
-
-	dodoc README.txt ChangeLog NEWS
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc source/org
-}
-
-get_jars() {
-	local antflags="
-		-Ditext.jar=$(java-pkg_getjar itext iText.jar) \
-		-Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar)"
-
-	use servlet && antflags="${antflags} \
-		-Dservlet.jar=$(java-pkg_getjars servlet-api-2.3)"
-
-	use test && antflags="${antflags} \
-		-Djunit.jar=$(java-pkg_getjars --build-only junit)"
-
-	echo "${antflags}"
-}
diff --git a/dev-java/jfreechart/jfreechart-1.0.19.ebuild b/dev-java/jfreechart/jfreechart-1.0.19.ebuild
index 01e0668935b7..7317a59125e2 100644
--- a/dev-java/jfreechart/jfreechart-1.0.19.ebuild
+++ b/dev-java/jfreechart/jfreechart-1.0.19.ebuild
@@ -3,7 +3,6 @@
 # $Id$
 
 EAPI=5
-
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
@@ -14,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="+servlet test"
 
 CDEPEND=">=dev-java/jcommon-1.0.23:1.0
diff --git a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
index ea0116cb082d..ec538dabb3ab 100644
--- a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
+++ b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
@@ -14,12 +14,12 @@ SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="2.1"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
-DEPEND=">=virtual/jdk-1.7
+DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.7"
+RDEPEND=">=virtual/jre-1.6"
 
 java_prepare() {
 	find "${WORKDIR}" -name '*.jar' -print -delete || die
diff --git a/dev-java/jfreesvg/jfreesvg-3.0.ebuild b/dev-java/jfreesvg/jfreesvg-3.0.ebuild
index 527cda860757..30dcdd289f1f 100644
--- a/dev-java/jfreesvg/jfreesvg-3.0.ebuild
+++ b/dev-java/jfreesvg/jfreesvg-3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
 DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
index 6e33966cff63..1324c46043d8 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -12,8 +12,8 @@ HOMEPAGE="http://www.json.org/java/"
 SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
+KEYWORDS="amd64 x86"
+IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
 RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild b/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
index 3897edd8c3cd..5e1ae78f1603 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0.9.8"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/openssl/openssl-1.0.2e.ebuild b/dev-libs/openssl/openssl-1.0.2e.ebuild
index 28f8d530ce74..90cb5c622474 100644
--- a/dev-libs/openssl/openssl-1.0.2e.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2e.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild b/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild
index ca9daec85a1b..65805dc76bdb 100644
--- a/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php5-5 php5-6 php5-4"
 
 inherit base php-ext-pecl-r2
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DESCRIPTION="PHP extension for interfacing with memcached via libmemcached library"
 LICENSE="PHP-3"
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 7eeef3918196..09210fd87429 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -4,3 +4,4 @@ DIST kombu-3.0.24.tar.gz 374539 SHA256 b9ff0437607113aea701fd5122c2afa40c05dff6f
 DIST kombu-3.0.26.tar.gz 375553 SHA256 1f565abd44c4b7dfaa4dd543d52f982d2f006aba0a2b3830542b4d25a801fe09 SHA512 71656cc8f44101700c5489e0b0a66918a00cf8ff39e65feab1090865e3c8d50b6dd2458f95d48fb58cc4387de954530fe27a5713838509d51123bac7009631a2 WHIRLPOOL d706dcd752e24eebc3a1091a8a2ba91a0b6adf30fa9be4d9d1a95b5c008f8036eb518f03ccb1d3393502488120c9ad2ad2f2e01c41b59beb3576389b3f9c000f
 DIST kombu-3.0.28.tar.gz 377706 SHA256 c22af35c4e7bbb7441b789b9b8c1baf73a8c481eaa93d00a63fa85bddc6b1ab1 SHA512 1409966edef345565f371cfa705fc643ca9b0e5ef46426f4b41859461f1c326e2c6c754ff51c337f42c42039af678d3dda0b333a2d70bbbcaa5e6c050a4d1ce9 WHIRLPOOL 780233337a574fafc187f9b4d68f17c9e68ee6e9fa7276ece859081573ace3b981dcbed2ff89b885bd7e0f8995dab42e0c34d6f47b6c0fb7dd053505a6f78d31
 DIST kombu-3.0.29.tar.gz 378270 SHA256 970a55ec65e668403c3e6ef4aa2213362568387885f5cc0ff8429abd44a6dca8 SHA512 1093826ec4ba8234f8f8a1082252df20e600f0b58fc46c5c5b3ee6ef3b2582e2c986f997edfa13d4c85b9473236f3cca902375109266a809d33fd76c6eb45c35 WHIRLPOOL 9e4909c02ed2be14235861d2838278d71ab90da20f59c4b02123d9ce84212c0e93cc8b162e2ef8df45d224ed0166c022fca849a6cb39143fd6554e6a00b71893
+DIST kombu-3.0.30.tar.gz 380706 SHA256 b902fe768ea49173c7c26b117bf6c51d258f822d00d753e543b7e2285540f85a SHA512 91d43c7bf9902fe58b2a06f81286be81945c751ca4677a7ab9c78287e006726908b143510efcb4abf91b584f2fa0be7828df5631f552665fb3bbd9806f703075 WHIRLPOOL 75d62e8e395205157e1d018b6e20cc7f2b5ba0a7dd7ec40cfc21e0341aa9108eafd811277a0a9ed0fa6f1f41b9e96b7d1e8e4c32674e6db601b418afe6e70e3e
diff --git a/dev-python/kombu/kombu-3.0.30.ebuild b/dev-python/kombu/kombu-3.0.30.ebuild
new file mode 100644
index 000000000000..373244c2322a
--- /dev/null
+++ b/dev-python/kombu/kombu-3.0.30.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="amqplib doc examples msgpack sqs test"
+
+# couchdb backend support possible via dev-python/couchdb-python
+# ditto dev-python/kazoo(>=1.3.1) and dev-python/beanstalkc
+PY27_GEN_USEDEP=$(python_gen_usedep python2_7)
+PYPY_GEN_USEDEP=$(python_gen_usedep python2_7 pypy)
+RDEPEND="
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/py-amqp-1.4.7[${PYTHON_USEDEP}]
+	<dev-python/py-amqp-2.0[${PYTHON_USEDEP}]
+	dev-python/pyro:4[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4})
+	amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )
+	sqs? ( >=dev-python/boto-2.13.3[${PY27_GEN_USEDEP}] )
+	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )"
+# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-0.7[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/unittest2-0.5.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-0.7.0[${PYPY_GEN_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		>=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/beanstalkc[${PY27_GEN_USEDEP}]
+		dev-python/couchdb-python[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )"
+
+# kazoo and sqlalchemy are optional packages for tests.
+# Refrain for now, no established demand for it from users
+
+# Req'd for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PY27_REQUSE="$(python_gen_useflags 'python2.7')"
+REQUIRED_USE="
+	sqs? ( ${PY27_REQUSE} )
+	doc? ( ${PY27_REQUSE} amqplib sqs )"	# 2 deps in doc build are py2 capable only
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-NA-tests-fix.patch
+	)
+
+python_prepare_all() {
+	https://github.com/celery/kombu/issues/246
+	sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# Doc build must be done by py2.7
+	# Doc build misses and skips only content re librabbitmq which is not in portage
+	if use doc; then
+		emake -C docs html || die "kombu docs failed installation"
+	fi
+}
+
+python_test() {
+	export DJANGO_SETTINGS_MODULE="django.conf"
+	# https://github.com/celery/kombu/issues/474
+	# tests need </pymongo-3.0; known to cause some breakage
+	if python_is_python3; then
+		2to3 --no-diffs -w build/lib/kombu/transport/
+		nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}"
+	else
+		nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}"
+		# funtests appears to be coded only for py2, a kind of 2nd tier. pypy fails 6.
+		# https://github.com/celery/kombu/issues/411
+		# Fix to https://github.com/celery/kombu/issues/474 breaks the 
+		# funtests under >=dev-python/pymongo-3.0.2
+#		if [[ "${EPYTHON}" == python2.7 ]]; then
+#			pushd funtests > /dev/null
+#			esetup.py test
+#			popd > /dev/null
+#		fi
+	fi
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ldap3/Manifest b/dev-python/ldap3/Manifest
index 79c56da68e6c..89d212454d37 100644
--- a/dev-python/ldap3/Manifest
+++ b/dev-python/ldap3/Manifest
@@ -1,3 +1,4 @@
 DIST ldap3-0.9.9.1.tar.gz 286623 SHA256 55812eff14919ddc9e53273c09846a0fd3e0d27a2c4b8a110427e58beeadd03d SHA512 f289e86fbc6bb36e7260592cb7f3423c593dcdb75ba43fa418f1367e48967ab175a27073b7c2b3cbee6ef8526f35c96c7fb90e1768e2da27829087abf9104d9c WHIRLPOOL 2325af48ead118577c6d5137d95fca5eec39e119b6ae2759f1a571f78a040bc7ccbd17c5e4760c2d232520a5252129f032c26d814c3c84d1f390222561253692
 DIST ldap3-0.9.9.2.tar.gz 290242 SHA256 867e448822d91f8ef351bf3dcf8dce43a36312d454db1cb114a3298e3aac6ba4 SHA512 6533bb0e3b958622ac8207ccc12d0817a3b9562ccb5cc911751d73e7b3419f9ae6cf87ffebc5df7b27cd82fc43b9570260a04cb15a5caa97e75f98aa6359f7e5 WHIRLPOOL 6998ddf71445aa5183a9cdf5e523f515dc99f6d4f0bdf562c0537431dffe4f073bf224b4b37a096a06b1a8d0d967cd8af7e81e097a430c036db5110a77ccd2b8
 DIST ldap3-0.9.9.tar.gz 285775 SHA256 4555b78ecf3ef8ce7fb854c1e863d8f8ffce5f49fa599d04c161749a8fdd16e6 SHA512 ce149629e49add9704fa853c6e7b644e1b4192bee378be757ff6911c5dce89b8532e22d208248475f1531d433d168b806151082179b45c5ea9f57df90203333e WHIRLPOOL 917095ad6f4f477bf2834c4e7da8c6909561c705f36df5598e48269dd2505c66720369a6846e9614feeda5c9b2a6d4317489da2143d6c87584df13ae02ba3fc6
+DIST ldap3-1.0.1.tar.gz 293221 SHA256 2bd84b146f12990e20a9894e46e03010fd62728b6bc644544ed0f488a7639d6e SHA512 441ddbcb3c971f35ff742733e47bf1f42aaf126cff61409ab9ba21f46c88773ba9ead1e12d161eed469cab03bb2f423bb6c72af3a8e984d6ce2d5ccdbd92755e WHIRLPOOL 8ee95140d540b4023dfe0c20f4dfedd537f1649562b53d55f30aa07b02cf42636eb1907365a82abf33f6d5beefa561cc3b1023b880e3f2dc8a937f82331bd4a9
diff --git a/dev-python/ldap3/ldap3-1.0.1.ebuild b/dev-python/ldap3/ldap3-1.0.1.ebuild
new file mode 100644
index 000000000000..700d8ef8deaf
--- /dev/null
+++ b/dev-python/ldap3/ldap3-1.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
+HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v -s test || die
+}
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index c26067d713bc..aafecbaeccb5 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,3 +1,4 @@
 DIST amqp-1.4.5.tar.gz 77748 SHA256 534c807c0081ce9c2d517615e724cb6e9df17f79cd6cd4929653ea1ea60edb60 SHA512 33cc0df95786afbd7861585a5fad4c9ec3d28709aaafdba6a7b2b8e2b36b79a129e320ce945ef59f87ccb4e83bdf68ca9bf54b4759dc2e6ba2f131777398d702 WHIRLPOOL 471731462bfa2104f0abbffbe870f47420813e8f1a20ec901414313f34105d1a5e2e9e2ef990b1e7ce09a3442af6fd6b4a4e25f293ae3d834f9953e63caab630
 DIST amqp-1.4.6.tar.gz 77902 SHA256 ebcfc867de5a68f9f5ba14d11dbad88e6aff8435a8d39339d5ceb0e5b06de640 SHA512 fe5cd7cafd9d6a4b8c1ab88a2757db440cd7b415b29c608f51052662d4c7d9e3fae81895ea09ec88f74e83ae9615c5f60b5857417b5d645086f88fc93527758c WHIRLPOOL 599dac45d24ac56407f9fbc1e00cc49884fa3717c3cbf8f7a9b59cfb78a5d9506341169f174cb7a1278e8e6745ae04aa14b6448a5250e5c40843a50f82d01d95
 DIST amqp-1.4.7.tar.gz 79189 SHA256 1781884b53e01209eeced13ca1d941f1a7026088974edb6fb62728638bd02dda SHA512 e8bcd61bd331a12965c83e62d458c5fefae41f4765fb3a816aca3c8bdd373c8a96ee24f3aef45a53d9eca2f5ae226ab259db92e3308e624420bc221509d1d8d1 WHIRLPOOL c7bd339fe7c44abe226c4ae59f424584794831d7306e2eb5c0657696fb8048604be181c0cb1c5eccef049a5b92ce97cc6a07f1a8bde6ce8ef44cf2189a8c6e4a
+DIST amqp-1.4.8.tar.gz 79249 SHA256 3a5b358ef81fa12927d1ec84f5107c59b6fc3be681c325e7cc690cffd5956879 SHA512 de7093e1f5061fab3d5799f525a71dd6976d4af7fea3ff0274fae7a4606baa75a85dcad7790475d1cbf6eeefe81f42348a6e7c65202e01ab7cb1534974c82781 WHIRLPOOL 83b4f9eda252e9f18b1714911f54b210cbea41b312306659e37b1914e41b77df3b431dfa2bf08914928e49c8ec0b0e4705fe3d9f408e1bc8479f691803f283e1
diff --git a/dev-python/py-amqp/py-amqp-1.4.8.ebuild b/dev-python/py-amqp/py-amqp-1.4.8.ebuild
new file mode 100644
index 000000000000..8dbfd8353dc8
--- /dev/null
+++ b/dev-python/py-amqp/py-amqp-1.4.8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="amqp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
+HOMEPAGE="https://github.com/celery/py-amqp https://pypi.python.org/pypi/amqp/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples extras test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+# Same tests from before require a socket connection
+PATCHES=( "${FILESDIR}"/${PN}-1.3.3-disable_socket_tests.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cp -r -l funtests "${BUILD_DIR}"/lib/ || die
+	cd "${BUILD_DIR}"/lib || die
+	if [[ ${EPYTHON:6:1} == 3 ]]; then
+		#   -n causes Python to write into hardlinked files
+		2to3 --no-diffs -w funtests || die
+	fi
+	"${PYTHON}" funtests/run_all.py || die "Tests failed under ${EPYTHON}"
+	rm -rf funtests/ || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( demo/. )
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	if use extras; then
+		insinto /usr/share/${PF}/extras
+		doins -r extra
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index 5d27ed984a8f..8a6ee88a70b9 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,6 +9,21 @@
 # Original author: Martin Schlemmer <azarah@gentoo.org>
 # @BLURB: This eclass can be used for packages that needs a working X environment to build.
 
+if [[ ! ${_VIRTUAL_X} ]]; then
+
+case "${EAPI:-0}" in
+	0|1)
+		die "virtualx.eclass: EAPI ${EAPI} is too old."
+		;;
+	2|3|4|5|6)
+		;;
+	*)
+		die "virtualx.eclass: EAPI ${EAPI} is not supported yet."
+		;;
+esac
+
+[[ ${EAPI} == [2345] ]] && inherit eutils
+
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
 # Variable specifying the dependency on xorg-server and xhost.
@@ -35,8 +50,6 @@ VIRTUALX_DEPEND="${VIRTUALX_DEPEND}
 # (within virtualmake function).
 : ${VIRTUALX_COMMAND:="emake"}
 
-has "${EAPI:-0}" 0 1 && die "virtualx eclass require EAPI=2 or newer."
-
 case ${VIRTUALX_REQUIRED} in
 	manual)
 		;;
@@ -45,16 +58,18 @@ case ${VIRTUALX_REQUIRED} in
 		RDEPEND=""
 		;;
 	optional|tests)
+		[[ ${EAPI} == [2345] ]] \
+			|| die 'Values "optional" and "tests" for VIRTUALX_REQUIRED are banned in EAPI > 5'
 		# deprecated section YAY.
-		ewarn "QA: VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated."
-		ewarn "QA: You can drop the variable definition completely from ebuild,"
-		ewarn "QA: because it is default behaviour."
+		eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated."
+		eqawarn "You can drop the variable definition completely from ebuild,"
+		eqawarn "because it is default behaviour."
 
 		if [[ -n ${VIRTUALX_USE} ]]; then
 			# so they like to specify the useflag
-			ewarn "QA: VIRTUALX_USE variable is deprecated."
-			ewarn "QA: Please read eclass manpage to find out how to use VIRTUALX_REQUIRED"
-			ewarn "QA: to achieve the same behaviour."
+			eqawarn "VIRTUALX_USE variable is deprecated."
+			eqawarn "Please read eclass manpage to find out how to use VIRTUALX_REQUIRED"
+			eqawarn "to achieve the same behaviour."
 		fi
 
 		[[ -z ${VIRTUALX_USE} ]] && VIRTUALX_USE="test"
@@ -76,21 +91,52 @@ esac
 virtualmake() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	local i=0
-	local retval=0
-	local OLD_SANDBOX_ON="${SANDBOX_ON}"
-	local XVFB=$(type -p Xvfb)
-	local XHOST=$(type -p xhost)
-	local xvfbargs="-screen 0 1280x1024x24"
+	[[ ${EAPI} == [2345] ]] \
+		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use virtx"
 
 	# backcompat for maketype
 	if [[ -n ${maketype} ]]; then
-		ewarn "QA: ebuild is exporting \$maketype=${maketype}"
-		ewarn "QA: Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead."
-		ewarn "QA: Setting VIRTUALX_COMMAND to \$maketype conveniently for now."
+		[[ ${EAPI} == [2345] ]] || die "maketype is banned in EAPI > 5"
+		eqawarn "ebuild is exporting \$maketype=${maketype}"
+		eqawarn "Ebuild should be migrated to use 'virtx command' instead."
 		VIRTUALX_COMMAND=${maketype}
 	fi
 
+	virtx "${VIRTUALX_COMMAND}" "${@}"
+}
+
+
+# @FUNCTION: virtx
+# @USAGE: <command> [command arguments]
+# @DESCRIPTION:
+# Start new Xvfb session and run commands in it.
+#
+# Example:
+#
+# @CODE
+# src_test() {
+# 	virtx default
+# }
+# @CODE
+#
+# @CODE
+# python_test() {
+# 	virtx py.test --verbose
+# }
+# @CODE
+virtx() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+
+	local i=0
+	local retval=0
+	local OLD_SANDBOX_ON="${SANDBOX_ON}"
+	local XVFB XHOST XDISPLAY
+	local xvfbargs="-screen 0 1280x1024x24"
+	XVFB=$(type -p Xvfb) || die
+	XHOST=$(type -p xhost) || die
+
 	debug-print "${FUNCNAME}: running Xvfb hack"
 	export XAUTHORITY=
 	# The following is derived from Mandrake's hack to allow
@@ -140,10 +186,10 @@ virtualmake() {
 	# to kill Xvfb
 	debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\""
 	if has "${EAPI}" 2 3; then
-		${VIRTUALX_COMMAND} "$@"
+		"$@"
 		retval=$?
 	else
-		nonfatal ${VIRTUALX_COMMAND} "$@"
+		nonfatal "$@"
 		retval=$?
 	fi
 
@@ -163,8 +209,11 @@ virtualmake() {
 Xmake() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	ewarn "QA: you should not execute make directly"
-	ewarn "QA: rather execute Xemake -j1 if you have issues with parallel make"
+	[[ ${EAPI} == [2345] ]] \
+		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake -j1 ....'"
+
+	eqawarn "you should not execute make directly"
+	eqawarn "rather execute Xemake -j1 if you have issues with parallel make"
 	VIRTUALX_COMMAND="emake -j1" virtualmake "$@"
 }
 
@@ -174,6 +223,9 @@ Xmake() {
 Xemake() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	[[ ${EAPI} == [2345] ]] \
+		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake ....'"
+
 	VIRTUALX_COMMAND="emake" virtualmake "$@"
 }
 
@@ -183,5 +235,11 @@ Xemake() {
 Xeconf() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	[[ ${EAPI} == [2345] ]] \
+		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx econf ....'"
+
 	VIRTUALX_COMMAND="econf" virtualmake "$@"
 }
+
+_VIRTUAL_X=1
+fi
diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
index 9cd076a14a16..463c15951964 100644
--- a/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
+++ b/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="gog? ( ${GOG_FILE} )"
 
 LICENSE="DUKE3D gog? ( GOG-EULA )"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~x86"
+KEYWORDS="amd64 hppa ~ppc ~x86"
 IUSE="gog"
 REQUIRED_USE="^^ ( cdinstall gog )"
 RESTRICT="mirror bindist gog? ( fetch )"
diff --git a/games-fps/rott/rott-1.1.2.ebuild b/games-fps/rott/rott-1.1.2.ebuild
index dbf50112c886..8dba97c9ca4a 100644
--- a/games-fps/rott/rott-1.1.2.ebuild
+++ b/games-fps/rott/rott-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.icculus.org/rott/releases/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="demo"
 
 RDEPEND="media-libs/libsdl[sound,joystick,video]
diff --git a/games-roguelike/angband/angband-4.0.3.ebuild b/games-roguelike/angband/angband-4.0.3.ebuild
index a8a4ff6d2d8c..841ba0a261f1 100644
--- a/games-roguelike/angband/angband-4.0.3.ebuild
+++ b/games-roguelike/angband/angband-4.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="ncurses sdl +sound X"
 
 RDEPEND="X? ( x11-libs/libX11 )
diff --git a/games-strategy/hedgewars/hedgewars-0.9.22.ebuild b/games-strategy/hedgewars/hedgewars-0.9.22.ebuild
index 6f2c43b980eb..09e19d87b63c 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.22.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.22.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://download.gna.org/hedgewars/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 Apache-2.0 FDL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 QA_FLAGS_IGNORED=${GAMES_BINDIR}/hwengine # pascal sucks
 QA_PRESTRIPPED=${GAMES_BINDIR}/hwengine # pascal sucks
diff --git a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
index 080e59e17445..9727e0fd0e6f 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="dbus dedicated doc fribidi nls server"
 
 RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
diff --git a/media-gfx/darktable/darktable-1.6.9.ebuild b/media-gfx/darktable/darktable-1.6.9.ebuild
index 9bf8f076ffef..f0e7fe1a743c 100644
--- a/media-gfx/darktable/darktable-1.6.9.ebuild
+++ b/media-gfx/darktable/darktable-1.6.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LANGS=" ca cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 89bbc9247957..d1570a79736b 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1 +1,2 @@
+DIST accel-ppp-1.10.0.tar.bz2 1585702 SHA256 c990cc195e286d3c0f8063881489608e14f3f826d25ca4c0a4812c261fd9ef14 SHA512 140ff3cf9fb684624c1419946010701d902125ba02a1e931fd5a0083d706ffd32a88d491400e82661a17bd4aacfa07ad620acea0cf4f49816c1060ae184f1084 WHIRLPOOL 749b821e1fc3189f4e2a6979e3ee6e00890a3b72311502a42142f75d5f5afe7c913d2ac7b7bcff39de2b4e3c451c783d42a04be72fe37bec8803f8159845f4e2
 DIST accel-ppp-1.8.0.tar.bz2 1566401 SHA256 a90becf1d8a579b55a95d927a35f6f83ce9a3ee1f6a6d67128a29b2fa4fd71b7 SHA512 d78c0ed4a3c51ae5f07c580b813694376fc42484a907d65164bb14409392365e2d8a876b16b15e55a7a7178cf9e573d42e578e6739f1fe9d62887e7316c816c0 WHIRLPOOL cfeb6807e2b8734a263ad3450dce07859e12783015d6f315e09d6868c06dc8680da55df8e06a4b5ddb3c014f8423ca0b08b877f465a2649167955b7c4790f648
diff --git a/net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild b/net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild
new file mode 100644
index 000000000000..99772b58e979
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils linux-info linux-mod multilib
+
+DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
+HOMEPAGE="http://accel-ppp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
+
+RDEPEND="postgres? ( dev-db/postgresql:* )
+	snmp? ( net-analyzer/net-snmp )
+	dev-libs/libpcre
+	dev-libs/openssl:0"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+PDEPEND="net-dialup/ppp-scripts"
+
+DOCS=( README )
+
+CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
+
+REQUIRED_USE="valgrind? ( debug )"
+
+pkg_setup() {
+	if use ipoe; then
+		linux-mod_pkg_setup
+		set_arch_to_kernel
+	else
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i  -e "/mkdir/d" \
+		-e "/echo/d" \
+		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
+
+	epatch_user
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
+	local mycmakeargs=(
+		-DLIB_PATH_SUFFIX="${libdir#lib}"
+		-DBUILD_PPTP_DRIVER=FALSE
+		-DCRYPTO=OPENSSL
+		$(cmake-utils_use debug MEMDEBUG)
+		$(cmake-utils_use ipoe BUILD_IPOE_DRIVER)
+		$(cmake-utils_use postgres LOG_PGSQL)
+		$(cmake-utils_use radius RADIUS)
+		$(cmake-utils_use shaper SHAPER)
+		$(cmake-utils_use snmp NETSNMP)
+		$(cmake-utils_use valgrind VALGRIND)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use doc && dodoc -r rfc
+
+	if use snmp; then
+		insinto /usr/share/snmp/mibs
+		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
+
+	dodir /var/log/accel-ppp
+}
diff --git a/net-dialup/accel-ppp/metadata.xml b/net-dialup/accel-ppp/metadata.xml
index 6890878e999f..3b02d59255ab 100644
--- a/net-dialup/accel-ppp/metadata.xml
+++ b/net-dialup/accel-ppp/metadata.xml
@@ -7,6 +7,7 @@
 		<name>Sergey Popov</name>
 	</maintainer>
 	<use>
+		<flag name="ipoe">Build IPoE kernel module</flag>
 		<flag name="shaper">Support for traffic shaping</flag>
 		<flag name="valgrind">Compile in valgrind hints</flag>
 	</use>
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 53762031eeed..f28df2ff97a7 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,6 +5,10 @@
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Sergey Popov <pinkbyte@gentoo.org> (7 Dec 2015)
+# IPoE driver does not build properly
+net-dialup/accel-ppp ipoe
+
 # Michael Palimaka <kensington@gentoo.org> (6 Dev 2015)
 # Requires unreleased dependencies
 =kde-apps/gwenview-15.08* kipi raw
diff --git a/sys-apps/portage/portage-2.2.24.ebuild b/sys-apps/portage/portage-2.2.24.ebuild
index 261ac96780f0..86cf894821af 100644
--- a/sys-apps/portage/portage-2.2.24.ebuild
+++ b/sys-apps/portage/portage-2.2.24.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru selinux xattr"