diff --git a/app-crypt/bcwipe/bcwipe-1.9.8.ebuild b/app-crypt/bcwipe/bcwipe-1.9.8.ebuild
index 791fe6542845..f87200eb9566 100644
--- a/app-crypt/bcwipe/bcwipe-1.9.8.ebuild
+++ b/app-crypt/bcwipe/bcwipe-1.9.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.jetico.com/linux/BCWipe-${MY_PV}.tar.gz
LICENSE="bestcrypt"
SLOT="0"
IUSE="doc"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~arm ppc x86"
DEPEND=""
RDEPEND=""
diff --git a/app-i18n/scim-input-pad/Manifest b/app-i18n/scim-input-pad/Manifest
index ea5a8bf7fed7..cb37df3c3ecc 100644
--- a/app-i18n/scim-input-pad/Manifest
+++ b/app-i18n/scim-input-pad/Manifest
@@ -1,3 +1,2 @@
-DIST scim-input-pad-0.1.1.tar.gz 562010 SHA256 f59cea4b42e7e95956415fdb53ae1874244b9b892b7939237654748e48a1669c SHA512 da9b26fb01392b1727f1b192c4f849ca89f92a7b214a4ff5c44a8cd57c3b9d01a04a5ff590144c16cd8b14c9cbff493d78fd76b23b866974770cab20e862a5e0 WHIRLPOOL 09f7851b077da99ca0065450814d7f903fe20b819a66ef9cf82a2d0e40c32ce3fdf0f3e4a93590a5939ea169de09efebdad3e5adf825546bebf3ba3d72919eec
DIST scim-input-pad-0.1.3.1.tar.gz 591478 SHA256 a561c3a256cb045f19c0bc2249b3d36a36df6800fa3479390ce1e693d6caae68 SHA512 864a254814c0afa04c10143a6b0de4a927ff8612e01bed3776d09a910cfb12899c17245a89a0386f4fac59ebdaae9e6fb9dc9ff5981f72dbec952a9da52a413d WHIRLPOOL a516fdd4a8b569d7ced15d3df39cff05ac1d37804164622176eb254bed952b069660c3a986867e63e0bcb8cc13d988c63ef57b359b1ed1f27eaf9966e323442d
DIST scim-input-pad-0.1.3.tar.gz 1362611 SHA256 d2457dcaa9099c553bb1b9878a7f9b9075d520635196b760e9ee4c89f0f2fe75 SHA512 2a7f52c92feb5f882827f8a7240da6dc347be0f34c5b378ee8c26aba39b925d56caff3145ef237c4e0604d65179b755124b8b40c507666b2f76d12715de1103c WHIRLPOOL 5c0dc0cc004ae3276f6311d26a961ff9166b817e01261f2ca9e8f6e692c6864d3b4a71137d68feb132eff54f44227a7ddd97f956128ac709dbd83e8f76abb8c6
diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.1.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.1.ebuild
deleted file mode 100644
index 301cd2eb5d3d..000000000000
--- a/app-i18n/scim-input-pad/scim-input-pad-0.1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="1"
-
-DESCRIPTION="Input pad for SCIM used to input symbols and special characters"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/scim-1.2.0
- >=x11-libs/gtk+-2.6.0:2"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_compile() {
- econf $(use_enable nls) || die "Error: econf failed!"
- emake || die "Error: emake failed!"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Error: install failed!"
- dodoc ChangeLog README TODO
-}
-
-pkg_postinst() {
-
- elog
- elog "The SCIM input pad should be startable from the SCIM (and Skim)"
- elog "systray icon right click menu. You will have to restart SCIM"
- elog "(or Skim) in order for the menu entry to appear (you may simply"
- elog "restart your X server). If you want to use it immediately, just"
- elog "start the SCIM input pad, using the 'scim-input-pad' command."
- elog
- elog "To use, select the text zone you wish to write in, and just"
- elog "click on the wanted character in the right multilevel tabbed"
- elog "table, from the SCIM Input Pad interface."
- elog
- elog "To add new characters to the tables, see the documentation"
- elog "(README file in /usr/share/doc/${PF})."
- elog
-
-}
diff --git a/app-portage/eix/eix-0.30.11.ebuild b/app-portage/eix/eix-0.30.11.ebuild
index 4bb6c63943fd..b7404fcd38ea 100644
--- a/app-portage/eix/eix-0.30.11.ebuild
+++ b/app-portage/eix/eix-0.30.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools"
BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
diff --git a/dev-db/redis/redis-3.0.3.ebuild b/dev-db/redis/redis-3.0.3.ebuild
index 3b193e8523c8..328adcbb44f8 100644
--- a/dev-db/redis/redis-3.0.3.ebuild
+++ b/dev-db/redis/redis-3.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://redis.io/"
SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="+jemalloc tcmalloc test"
SLOT="0"
diff --git a/dev-java/commons-modeler/commons-modeler-2.0.1-r1.ebuild b/dev-java/commons-modeler/commons-modeler-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..719fe61414ac
--- /dev/null
+++ b/dev-java/commons-modeler/commons-modeler-2.0.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 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
+
+DESCRIPTION="A lib to make the setup of Java Management Extensions easier"
+SRC_URI="mirror://apache/commons/modeler/source/${P}-src.tar.gz"
+HOMEPAGE="http://commons.apache.org/modeler/"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# Provides ant tasks for ant to use
+RDEPEND=">=virtual/jre-1.5
+ dev-java/mx4j-core:3.0
+ dev-java/commons-logging:0
+ commons-digester? ( dev-java/commons-digester:3.2 )"
+DEPEND=">=virtual/jdk-1.6
+ source? ( app-arch/zip )
+ test? ( dev-java/junit:0 )"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="commons-digester"
+
+S=${WORKDIR}/${P}-src
+
+java_prepare() {
+ # Setup the build environment
+ use commons-digester && echo "commons-digester.jar=$(java-pkg_getjar commons-digester-3.2 commons-digester.jar)" >> build.properties
+ echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
+ echo "jmx.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j.jar)" >> build.properties
+
+ mkdir dist || die
+}
+
+EANT_BUILD_TARGET="prepare jar"
+
+src_test() {
+ eant test -Djunit.jar=$(java-pkg_getjar --build-only junit junit.jar)
+}
+
+src_install() {
+ java-pkg_dojar dist/${PN}.jar
+ dodoc RELEASE-NOTES.txt || die
+ use doc && java-pkg_dojavadoc dist/docs/api
+ use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/hessian/Manifest b/dev-java/hessian/Manifest
index 5c92f9fe7163..3d783fb298cd 100644
--- a/dev-java/hessian/Manifest
+++ b/dev-java/hessian/Manifest
@@ -1 +1,2 @@
DIST hessian-4.0.3-src.jar 374965 SHA256 1084632007a583c2669e90ec5d72d7ffcb5ab0e14d4209c03adefdd144b252ed SHA512 88185b981f7ba95874899b0ccdddc9e30340e31e43e45c73722a2db8c40cb052d93a98c55aa046a0cc946c722045bfeb618390d2dde8c162916e67a22d68b0fc WHIRLPOOL df8a7aabf2010c6868e0e0a092aebfecaa42c0eec22588dd422177b1ad8524851dd7637f67b15e5b442a2e0c3762222d7ce05851edefdd39cf9885ccd2a2553b
+DIST hessian-4.0.37-src.jar 388678 SHA256 b0365ffcf2a91e5c724878c47882a1649d15db6b495592df491d759ba3c1c760 SHA512 9d03293b596d7e352591a61ad9d464b29502ba6f2f2f9b275b80bfc609aa882a3b7304cdca99ea70c0b011da8acd51ec62e9480e2854a34c7691976e83074aaa WHIRLPOOL a1e5213276a293f4cc219d3bef87b12652a4f18a95b55e19190e3c3070b029ac76ed4d69434b392f6616bfb2540aa85e9858165e510a5274670b136b1978cce0
diff --git a/dev-java/hessian/files/3.0.8-java5.patch b/dev-java/hessian/files/3.0.8-java5.patch
deleted file mode 100644
index 906eb7efca18..000000000000
--- a/dev-java/hessian/files/3.0.8-java5.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -uNr hessian-3.0.8.orig/src/com/caucho/hessian/client/HessianProxyFactory.java hessian-3.0.8/src/com/caucho/hessian/client/HessianProxyFactory.java
---- hessian-3.0.8.orig/src/com/caucho/hessian/client/HessianProxyFactory.java 2006-08-15 10:38:05.000000000 +0200
-+++ hessian-3.0.8/src/com/caucho/hessian/client/HessianProxyFactory.java 2006-08-15 10:40:24.000000000 +0200
-@@ -230,7 +230,7 @@
- {
- HessianProxy handler = new HessianProxy(this, new URL(url));
-
-- return Proxy.newProxyInstance(api.getClassLoader(),
-+ return java.lang.reflect.Proxy.newProxyInstance(api.getClassLoader(),
- new Class[] { api,
- HessianRemoteObject.class },
- handler);
-diff -uNr hessian-3.0.8.orig/src/com/caucho/hessian/client/HessianProxy.java hessian-3.0.8/src/com/caucho/hessian/client/HessianProxy.java
---- hessian-3.0.8.orig/src/com/caucho/hessian/client/HessianProxy.java 2006-08-15 10:38:05.000000000 +0200
-+++ hessian-3.0.8/src/com/caucho/hessian/client/HessianProxy.java 2006-08-15 10:40:06.000000000 +0200
-@@ -94,10 +94,10 @@
- if (methodName.equals("equals") &&
- params.length == 1 && params[0].equals(Object.class)) {
- Object value = args[0];
-- if (value == null || ! Proxy.isProxyClass(value.getClass()))
-+ if (value == null || ! java.lang.reflect.Proxy.isProxyClass(value.getClass()))
- return new Boolean(false);
-
-- HessianProxy handler = (HessianProxy) Proxy.getInvocationHandler(value);
-+ HessianProxy handler = (HessianProxy) java.lang.reflect.Proxy.getInvocationHandler(value);
-
- return new Boolean(_url.equals(handler.getURL()));
- }
diff --git a/dev-java/hessian/files/build-3.0.8.xml b/dev-java/hessian/files/build-3.0.8.xml
deleted file mode 100644
index d3a85de83b8f..000000000000
--- a/dev-java/hessian/files/build-3.0.8.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev-java/hessian/files/build.xml-3.0.20 b/dev-java/hessian/files/build.xml-3.0.20
deleted file mode 100644
index ebef8932b346..000000000000
--- a/dev-java/hessian/files/build.xml-3.0.20
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev-java/hessian/files/build.xml-3.1.6 b/dev-java/hessian/files/build.xml-3.1.6
deleted file mode 100644
index ebef8932b346..000000000000
--- a/dev-java/hessian/files/build.xml-3.1.6
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev-java/hessian/hessian-4.0.37.ebuild b/dev-java/hessian/hessian-4.0.37.ebuild
new file mode 100644
index 000000000000..6cea034a1fdf
--- /dev/null
+++ b/dev-java/hessian/hessian-4.0.37.ebuild
@@ -0,0 +1,29 @@
+# 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
+
+DESCRIPTION="Binary web service protocol"
+HOMEPAGE="http://hessian.caucho.com/"
+SRC_URI="http://hessian.caucho.com/download/${P}-src.jar"
+
+LICENSE="Apache-1.1"
+SLOT="4.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc source"
+
+CDEPEND="java-virtuals/servlet-api:3.0"
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="com"
+JAVA_GENTOO_CLASSPATH="servlet-api-3.0"
diff --git a/dev-java/jpfcodegen/jpfcodegen-0.4-r1.ebuild b/dev-java/jpfcodegen/jpfcodegen-0.4-r1.ebuild
new file mode 100644
index 000000000000..be5b3c127c4e
--- /dev/null
+++ b/dev-java/jpfcodegen/jpfcodegen-0.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Generator of classes for accessing the attributes and extensions of JPF plug-ins"
+HOMEPAGE="http://jabref.sourceforge.net/"
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="LGPL-3"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+CDEPEND="dev-java/velocity:0
+ dev-java/jpf:1.5"
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+# doc target is name="-javadoc" and would need a patch, on demand
+EANT_BUILD_TARGET="jars"
+EANT_GENTOO_CLASSPATH="jpf-1.5,velocity"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_install() {
+ java-pkg_newjar JPFCodeGenerator-${PV}.jar JPFCodeGenerator.jar
+ java-pkg_newjar JPFCodeGenerator-${PV}-rt.jar JPFCodeGenerator-rt.jar
+ dohtml index.html
+}
diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest
index 1a2012b98cc6..c51c7a4e3d6b 100644
--- a/dev-java/jss/Manifest
+++ b/dev-java/jss/Manifest
@@ -1 +1,2 @@
+DIST jss-4.3.2.tar.bz2 435542 SHA256 8bfe94668e8aa1b8fdfaf01fd45b18daa2336e1901f90922c44327116df8a278 SHA512 3296da72f204fc4a0ea58dd889cf2721a4afa0ec7b5406312e64354cc67edcfc370140ad22a24f0dfcf11e438e69ebe9da45a70b5cbaa4026b40fd5fcf96c232 WHIRLPOOL 5f72f6cccb49c40e840472329461475bfd83e6ac98ea60cee63c0194374e210df5dac038fb891635f84625c5643b0b25fa36253c78b3cad4461d647c7a0fcc15
DIST jss-4.3.tar.bz2 421731 SHA256 e82cdcadd6d7acd0d5f9274134dd5a88f26d7e47e7d9d8b059ce68ca413fb54e SHA512 b1ae0f2dc2ca90a30caca97e4e89a471f4d0a0483dd384f242989de8a21fdd3c99dc4c452e5ef7e23bf3de745e5868f276528f76afc8aef7a9e7fe99722e0b4f WHIRLPOOL 77773968499aa7c88ed14ae4ab899a45935d5a6c4a0b6d455428f62e81d24bd379324726bda61e3c84521040cc3439ae2a5d167f32006d6dc97ba2b3ec923f5f
diff --git a/dev-java/jss/files/jss-4.3-javadoc.patch b/dev-java/jss/files/jss-4.3-javadoc.patch
new file mode 100644
index 000000000000..891e1ff93838
--- /dev/null
+++ b/dev-java/jss/files/jss-4.3-javadoc.patch
@@ -0,0 +1,11 @@
+--- security/jss/build_java.pl.orig 2015-10-01 23:04:22.540035573 +0100
++++ security/jss/build_java.pl 2015-10-01 23:11:41.413230402 +0100
+@@ -323,7 +323,7 @@
+ ensure_dir_exists("$dist_dir/jssdoc");
+ my $targets = join(" ", @packages);
+ print "$targets\n";
+- print_do("$javadoc -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets");
++ print_do("$javadoc -Xdoclint:none -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets");
+ print_do("cp $dist_dir/jssdoc/index.html $dist_dir/jssdoc/index.html.bak");
+ print_do("cp $dist_dir/jssdoc/overview-summary.html $dist_dir/jssdoc/index.html");
+ }
diff --git a/dev-java/jss/files/jss-4.3.2-ldflags.patch b/dev-java/jss/files/jss-4.3.2-ldflags.patch
new file mode 100644
index 000000000000..fde2e26bf77c
--- /dev/null
+++ b/dev-java/jss/files/jss-4.3.2-ldflags.patch
@@ -0,0 +1,11 @@
+--- security/coreconf/Linux.mk.orig 2010-01-15 22:19:00.000000000 +0000
++++ security/coreconf/Linux.mk 2015-09-27 22:17:50.102547607 +0100
+@@ -142,7 +142,7 @@
+ ARCH = linux
+
+ DSO_CFLAGS = -fPIC
+-DSO_LDOPTS = -shared $(ARCHFLAG)
++DSO_LDOPTS = $(LDFLAGS) -shared $(ARCHFLAG)
+ # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
+ # incorrectly reports undefined references in the libraries we link with, so
+ # we don't use -z defs there.
diff --git a/dev-java/jss/jss-4.3-r1.ebuild b/dev-java/jss/jss-4.3-r1.ebuild
deleted file mode 100644
index 846e085a58c5..000000000000
--- a/dev-java/jss/jss-4.3-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit base java-pkg-2 linux-info versionator
-
-RTM_NAME="JSS_${PV//./_}_RTM"
-
-DESCRIPTION="Network Security Services for Java (JSS)"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/jss/"
-# To prepare this tarball
-# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \
-# -r JSS_4_3_RTM mozilla/security/coreconf
-# cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export \
-# -r JSS_4_3_RTM mozilla/security/jss
-# tar cvjf jss-4.3.tar.bz2 mozilla
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="MPL-1.1"
-SLOT="3.4"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND=">=dev-libs/nspr-4.7
- >=dev-libs/nss-3.12"
-
-DEPEND=">=virtual/jdk-1.4
- app-arch/zip
- virtual/pkgconfig
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.4
- ${CDEPEND}"
-
-S="${WORKDIR}/mozilla"
-
-java_prepare() {
- epatch "${FILESDIR}"/${PN}-3.4-target_source.patch
- epatch "${FILESDIR}"/${PN}-4.2.5-use_pkg-config.patch
- epatch "${FILESDIR}"/${P}-cflags.patch
- epatch "${FILESDIR}"/${P}-ldflags.patch
- epatch "${FILESDIR}"/${P}-secitem.patch
-}
-
-# See bug 539100.
-pkg_setup() {
- linux-info_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_compile() {
- export JAVA_GENTOO_OPTS="-source $(java-pkg_get-source) -target $(java-pkg_get-target)"
-
- use amd64 && export USE_64=1
-
- cd "${S}/security/coreconf" || die
-
- # Hotfix for kernel 3.x #379283
- get_running_version || die "Failed to determine kernel version"
- if [[ ${KV_MAJOR} -ge 3 ]]; then
- cp Linux2.6.mk Linux${KV_MAJOR}.${KV_MINOR}.mk || die
- fi
-
- emake -j1 BUILD_OPT=1
-
- cd "${S}/security/jss" || die
- emake -j1 BUILD_OPT=1 USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr
-
- if use doc; then
- emake -j1 BUILD_OPT=1 javadoc
- fi
-}
-
-# Investigate why this fails.
-#
-# cp: cannot stat ‘/var/tmp/portage/dev-java/jss-4.3-r1/work/mozilla/dist/Linux3.8_x86_64_glibc_PTH_64_OPT.OBJ//lib/*nssckbi*’: No such file or directory
-# Failed to copy builtins library at security/jss/org/mozilla/jss/tests/all.pl line 453.
-#
-# There is indeed no nssckbi file, investigation needed if that file can be
-# generated or whether we can remove the broken test; possibly inform upstream.
-RESTRICT="test"
-
-src_test() {
- BUILD_OPT=1 perl security/jss/org/mozilla/jss/tests/all.pl dist \
- "${S}"/dist/Linux*.OBJ/
-}
-
-src_install() {
- java-pkg_dojar dist/*.jar
-
- # Use this instead of the one in dist because it is a symlink
- # and doso handles symlinks by just symlinking to the original
- java-pkg_doso ./security/${PN}/lib/*/*.so
-
- use doc && java-pkg_dojavadoc dist/jssdoc
- use source && java-pkg_dosrc ./security/jss/org
- use examples && java-pkg_doexamples ./security/jss/samples
-}
diff --git a/dev-java/jss/jss-4.3.2.ebuild b/dev-java/jss/jss-4.3.2.ebuild
new file mode 100644
index 000000000000..fb3bacf60057
--- /dev/null
+++ b/dev-java/jss/jss-4.3.2.ebuild
@@ -0,0 +1,94 @@
+# 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 multilib toolchain-funcs java-pkg-2
+
+DESCRIPTION="Network Security Services for Java (JSS)"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS"
+# 4.3.2 was released but was seemingly never announced. The binary jar
+# exists on Mozilla's servers but Chewi could only find a source tarball
+# at https://obs.kolabsys.com/package/show/Kolab:3.4/jss. However, you
+# need to register in order to download it, hence he has mirrored it.
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.bz2"
+LICENSE="MPL-1.1"
+SLOT="3.4"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+CDEPEND=">=dev-libs/nspr-4.7.1
+ >=dev-libs/nss-3.12.5"
+
+DEPEND="${CDEPEND}
+ dev-lang/perl
+ >=virtual/jdk-1.6
+ virtual/pkgconfig
+ test? ( dev-libs/nss[utils] )"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}/mozilla"
+
+java_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.4-target_source.patch
+ epatch "${FILESDIR}"/${PN}-4.2.5-use_pkg-config.patch
+ epatch "${FILESDIR}"/${PN}-4.3-cflags.patch
+ epatch "${FILESDIR}"/${PN}-4.3.2-ldflags.patch
+ epatch "${FILESDIR}"/${PN}-4.3-secitem.patch
+
+ if java-pkg_is-vm-version-ge 1.8; then
+ epatch "${FILESDIR}"/${PN}-4.3-javadoc.patch
+ fi
+}
+
+src_compile() {
+ local ARGS=(
+ "CC=$(tc-getCC)"
+ "AR=$(tc-getAR) cr \$@"
+ "OS_RELEASE=2.6"
+ "BUILD_OPT=1"
+ )
+
+ export JAVA_GENTOO_OPTS="$(java-pkg_javac-args)"
+ use amd64 && export USE_64=1
+
+ cd "${S}/security/coreconf" || die
+ emake -j1 "${ARGS[@]}"
+
+ cd "${S}/security/jss" || die
+ emake -j1 "${ARGS[@]}" USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr
+ use doc && emake -j1 "${ARGS[@]}" javadoc
+}
+
+# Chewi has managed to reach a test pass rate of 31/40 (78%) but the
+# remainder fail due to JSS not having kept pace with the ciphersuites
+# in NSS. There's not much we can do about that. The suite also leaves
+# java processes running and exits successfully on failure.
+RESTRICT="test"
+
+src_test() {
+ # Parts of NSS are required for the tests.
+ ln -snf "${EROOT}usr/$(get_libdir)/libnssckbi.so" dist/Linux*.OBJ/lib/ || die
+ ln -snf "${EROOT}usr/bin" dist/Linux*.OBJ/ || die
+
+ # The tests must be run from this directory.
+ cd security/jss/org/mozilla/jss/tests || die
+ BUILD_OPT=1 perl all.pl dist "${S}"/dist/Linux*.OBJ/ || die "tests failed"
+}
+
+src_install() {
+ java-pkg_dojar dist/*.jar
+
+ # Use this instead of the one in dist because it is a symlink
+ # and doso handles symlinks by just symlinking to the original
+ java-pkg_doso ./security/${PN}/lib/*/*.so
+
+ use doc && java-pkg_dojavadoc dist/jssdoc
+ use source && java-pkg_dosrc ./security/jss/org
+ use examples && java-pkg_doexamples ./security/jss/samples
+}
diff --git a/dev-java/msv/Manifest b/dev-java/msv/Manifest
index f79db9d7cd61..447dd637152a 100644
--- a/dev-java/msv/Manifest
+++ b/dev-java/msv/Manifest
@@ -1,2 +1 @@
DIST msv-core-2013.6.1-sources.jar 1011944 SHA256 5a76e0712cb97987b900eb7a7437ff0231abd8db94d3d4edd0d724c11372cffd SHA512 3985451ff52e50957fdc22ef598edcd7b02495b834a53a048018064d1a6063d4554a7cb5d7752c2d265b852d17c7a55787d9b1ec2b580988ad005fcbc9c6eb8a WHIRLPOOL e134144ee1daebb84749b8f6bbfb6646e3415c0de5a2e504e6d1c5257127df7ace79597c2bb216f9cd8dbaa80f394b3b02a872e7f15790932b3950cb591e3c26
-DIST msv.20050627.zip 3791703 SHA256 664759fd048d35ed1eea9dbad15cc04475e3c2c5509050cc85c9cbaf778e7278 SHA512 689d18f8091e7a1a213fb0ea49c89fd04020f4e152964ab6813fefee6b034aac591b3837d162366d9a1f6dc7e0a7d452d400bb7757b1e9488de9d019a212a16b WHIRLPOOL dfa8f07688f116c804c5aaf1b0d54bbeff9f9c4e7f20312a12b2b695c5cd71bc3f13b245825ac62a83146e4ed01776d053f747861cb2e0141bab8ba38397d00f
diff --git a/dev-java/msv/files/build-20050627-r2.xml b/dev-java/msv/files/build-20050627-r2.xml
deleted file mode 100644
index 9d6908ce4bd7..000000000000
--- a/dev-java/msv/files/build-20050627-r2.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev-java/msv/files/build-20050627-r3.xml b/dev-java/msv/files/build-20050627-r3.xml
deleted file mode 100644
index 9d6908ce4bd7..000000000000
--- a/dev-java/msv/files/build-20050627-r3.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev-java/msv/msv-20050627-r2.ebuild b/dev-java/msv/msv-20050627-r2.ebuild
deleted file mode 100644
index 24d24816f600..000000000000
--- a/dev-java/msv/msv-20050627-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 eutils java-ant-2
-
-DESCRIPTION="Multi-Schema XML Validator, a Java tool for validating XML documents"
-HOMEPAGE="http://www.sun.com/software/xml/developers/multischema/ https://msv.dev.java.net/"
-SRC_URI="mirror://gentoo/${PN}.${PV}.zip"
-
-LICENSE="BSD Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
- dev-java/iso-relax:0
- dev-java/relaxng-datatype:0
- dev-java/xml-commons-resolver:0
- dev-java/xerces:2
- dev-java/xsdlib:0"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${RDEPEND}"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- cp -i "${FILESDIR}/build-${PVR}.xml" build.xml || die
- rm -v *.jar || die
-
- mkdir lib && cd lib
- java-pkg_jar-from iso-relax,relaxng-datatype,xerces-2,xml-commons-resolver,xsdlib
-}
-
-EANT_EXTRA_ARGS="-Dproject.name=${PN}"
-
-src_install() {
- java-pkg_dojar dist/${PN}.jar
-
- dodoc README.txt ChangeLog.txt || die
-
- use doc && java-pkg_dojavadoc dist/doc/api
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/msv/msv-20050627-r3.ebuild b/dev-java/msv/msv-20050627-r3.ebuild
deleted file mode 100644
index 5a338e610a1a..000000000000
--- a/dev-java/msv/msv-20050627-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 eutils java-ant-2
-
-DESCRIPTION="Multi-Schema XML Validator, a Java tool for validating XML documents"
-HOMEPAGE="http://www.sun.com/software/xml/developers/multischema/ https://msv.dev.java.net/"
-SRC_URI="mirror://gentoo/${PN}.${PV}.zip"
-
-LICENSE="BSD Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
- dev-java/iso-relax:0
- dev-java/relaxng-datatype:0
- dev-java/xml-commons-resolver:0
- dev-java/xerces:2
- dev-java/xsdlib:0"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${RDEPEND}"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- cp -i "${FILESDIR}/build-${PVR}.xml" build.xml || die
- rm -v *.jar || die
-
- mkdir lib && cd lib
- java-pkg_jar-from iso-relax,relaxng-datatype,xerces-2,xml-commons-resolver,xsdlib
-}
-
-EANT_EXTRA_ARGS="-Dproject.name=${PN}"
-
-src_install() {
- java-pkg_dojar dist/${PN}.jar
- java-pkg_dolauncher msv --main com.sun.msv.driver.textui.Driver
-
- dodoc README.txt ChangeLog.txt || die
-
- use doc && java-pkg_dojavadoc dist/doc/api
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/msv/msv-20130601.ebuild b/dev-java/msv/msv-20130601.ebuild
index d3ceef8970a7..6ad6df962636 100644
--- a/dev-java/msv/msv-20130601.ebuild
+++ b/dev-java/msv/msv-20130601.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://msv.java.net/"
SRC_URI="http://search.maven.org/remotecontent?filepath=net/java/dev/${PN}/${PN}-core/${MY_PV}/${PN}-core-${MY_PV}-sources.jar"
LICENSE="BSD Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
CDEPEND="dev-java/iso-relax:0
dev-java/relaxng-datatype:0
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index 37b1a6392408..7681455b9f54 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -1,3 +1,2 @@
-DIST PDFBox-0.7.3.zip 22769102 SHA256 5c6f6c87cdbf247ff29d0ce691ab977c2e869070d54cf1bd6305e0fd84e7373d SHA512 1d76d5e96be26f89fdb53f68d60320dbfd5ff9c575b8ef076c8dadd3ffac6aa42f69248f9df3532c171de6093e7b5ffc097f40461a33077256f57cf75e41a6b1 WHIRLPOOL 7d0eda7449e3e6bd8d7426ed884b9d6cdeebf03104d4b3dde2bf499595d3a15906d4f26b38dd84434faca7d6d9b150353b6e2e2bb1592d2b4af716a8633d7b1e
DIST pcfi-2010.08.09.jar 6731455 SHA256 a787fb2a842de7bd5ee4fa13c4808aa6793380dde0219560b50054f6ca25c77c SHA512 067394ddac4a48ba8ac94b03f907d0faf98a91be658689a34eb85fdce49515582426f6a1fa433bfa87ca417ce3a6fa3aa89d89126a36176d8e04f3359c36d10b WHIRLPOOL fa9e9b6b2cc45f749101726c8fb7a4c7719d78448122c465b60696cd5be1a2a27bc65f549429d5a74c79bc74aaed39b3c0a8dfe02ec569303b96faa818410e73
DIST pdfbox-1.8.8-src.zip 11339989 SHA256 90d6b9a33682586e29bbce4ffeadf38c12fe0373bfe82441c1a63610a9c4ea8a SHA512 254361d0dcbfdc52bc78a2ed7e121065a2d173d1362a219d6644c3cc8a83a37904744e03f1725e2db67494d5f54f822b6e5a16dd8e791906efb9c348d564552f WHIRLPOOL cd9e71be60ee6d92c34f4affe7d6b074896920491a731a65f2b74e9e09754e836288c632e5d4a24b2d8aba64505dc58d2c3f8d0dd103c33773fce6dcd187e5a3
diff --git a/dev-java/pdfbox/pdfbox-0.7.3-r3.ebuild b/dev-java/pdfbox/pdfbox-0.7.3-r3.ebuild
deleted file mode 100644
index 28f90f16be3e..000000000000
--- a/dev-java/pdfbox/pdfbox-0.7.3-r3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-nodeps"
-inherit java-pkg-2 java-ant-2
-
-MY_PN="PDFBox"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Java library and utilities for working with PDF documents"
-HOMEPAGE="http://www.pdfbox.apache.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
-IUSE=""
-
-CDEPEND="dev-java/fontbox:0
- dev-java/bcprov:1.38
- dev-java/bcmail:1.38
- dev-java/lucene:2.1
- dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.4
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${CDEPEND}"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-S="${WORKDIR}/${MY_P}"
-
-# missing needed files
-RESTRICT="test"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- rm -v external/*.jar lib/*.jar || die
- rm -rf docs/javadoc
-
- # the pdf files used in test cases are not included
- rm -rf src/test
-
- cd external
- java-pkg_jar-from fontbox
- java-pkg_jar-from bcprov-1.38
- java-pkg_jar-from bcmail-1.38
- java-pkg_jar-from lucene-2.1
- java-pkg_jar-from ant-core ant.jar
-}
-
-EANT_BUILD_TARGET="package"
-
-my_launcher() {
- java-pkg_dolauncher ${1} --main org.pdfbox.${2}
- echo "${2} -> ${1}" >> "${T}"/launcher.list
-}
-
-src_install() {
- java-pkg_newjar lib/${MY_P}-dev.jar
-
- my_launcher pdfconvertcolorspace ConvertColorspace
- my_launcher pdfdecrypt Decrypt
- my_launcher pdfencrypt Encrypt
- my_launcher pdfexportfdf ExportFDF
- my_launcher pdfexportxfdf ExportXFDF
- my_launcher pdfextractimages ExtractImages
- my_launcher pdfextracttext ExtractText
- my_launcher pdfimportfdf ImportFDF
- my_launcher pdfimportxfdf ImportXFDF
- my_launcher pdfoverlay Overlay
- my_launcher pdfdebugger PDFDebugger
- my_launcher pdfmerger PDFMerger
- my_launcher pdfreader PDFReader
- my_launcher pdfsplit PDFSplit
- my_launcher pdftoimage PDFToImage
- my_launcher printpdf PrintPDF
- my_launcher texttopdf TextToPDF
-
- if use doc; then
- dohtml -r docs/*
- java-pkg_dojavadoc website/build/site/javadoc
- fi
-
- use source && java-pkg_dosrc src/org
-}
-
-pkg_postinst() {
- elog "This package installs several command line tools for manipulating"
- elog "PDF files. Some of their names were changed from upstream to"
- elog "be less ambigous, and not collide with other packages. For"
- elog "detailed information refer to the html documentation installed with"
- elog "USE=doc, or ${HOMEPAGE}"
-
- while read line
- do
- elog ${line}
- done < "${T}"/launcher.list
-}
diff --git a/dev-java/pdfbox/pdfbox-1.8.8.ebuild b/dev-java/pdfbox/pdfbox-1.8.8.ebuild
index 8cb72f896251..d2a6b39e81e2 100644
--- a/dev-java/pdfbox/pdfbox-1.8.8.ebuild
+++ b/dev-java/pdfbox/pdfbox-1.8.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/${ADOBE_FILES}"
LICENSE="BSD"
SLOT="1.8"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE=""
CDEPEND="dev-java/icu4j:4
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 7f88c33abce6..525299d04809 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,4 +8,5 @@ DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc
DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a WHIRLPOOL 4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
+DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d
DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.27.ebuild
new file mode 100644
index 000000000000..1c1c74f6bb49
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.27.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+ rm -fR */*/build.xml
+ einfo "Removing bundled jars and classes"
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/vecmath/vecmath-1.5.2.ebuild b/dev-java/vecmath/vecmath-1.5.2.ebuild
index 344e98b451fe..5521f8d5286e 100644
--- a/dev-java/vecmath/vecmath-1.5.2.ebuild
+++ b/dev-java/vecmath/vecmath-1.5.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://vecmath.dev.java.net/"
MY_P="${PN}-$(replace_all_version_separators _ ${PV})"
SRC_URI="http://download.java.net/media/java3d/builds/release/${PV}/${MY_P}-src.zip"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
SLOT="0"
LICENSE="GPL-1"
IUSE=""
diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
index bcad8d352c11..1cfcbb419002 100644
--- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
IUSE="redis test"
RDEPEND="
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 84bb34b4d15c..e4428f00d1da 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,3 +1,4 @@
DIST click-2.0.tar.gz 47342 SHA256 33a984fe73aa8c6bf69c38098b69dd38405529db54baf4c8cf64c50b2dee644f SHA512 4c703ab4b5c76e393420b0edf9af9e8ddb301ccfef5f8117d3408eaa8a94abe6b7b5c7a8b61b7774a3b459b153c10438e8934f21ceb73697199828cce2c2887c WHIRLPOOL bf599395245319b31c189df297a1ec35ca69723ed24e2d3e9aa9231a3cfebdb80e1f43a0b010865b6fbecf09f23dc1121cca232aec26f09bdb455f41da5261c4
DIST click-4.0.tar.gz 270183 SHA256 f49e03611f5f2557788ceeb80710b1c67110f97c5e6740b97edf70245eea2409 SHA512 7b3b3e3b57fe74e8d2e3be79c59476fe7830c04068f0e31b39dfee28d879d8a96eed311fbe789bfc6d12c898052ea1c901c3b6f4c995cd4e0ede61b62fe0a39a WHIRLPOOL fd183c6509c3d8a3c582454aac8a18b3d570c16ca4b1cf19dbdd97d8846fde62fadd7d80596eb321a67e48477853b26cb7e5d554c9254061ab1bb74a52d3a05a
DIST click-4.1.tar.gz 274489 SHA256 e339ed09f25e2145314c902a870bc959adcb25653a2bd5cc1b48d9f56edf8ed8 SHA512 fe751406919d06a3ccffc2831992848d8e324f0f0ca566ea3b9ed0be3298c8d1e2039643eadc71eb4dfabd790310396cd5b26a11d7b6f6cdf503f191ce6dd1cd WHIRLPOOL 3005501210fae07d3cbdd5674a22d24b577c02ba20c34fb94f3bf7011ec2d26847b7faca5fe74ca620bdc8a0c4bfaecdf5dbcf4c2f0046de76e8b13628e2910f
+DIST click-5.1.tar.gz 275592 SHA256 678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a SHA512 b860b0227644f5d1cc24d41e66985421ec971f11f3f596fb46508fdc787200b949e7ef29b2035421ebb0115384688da03c3c95a0d6acc58dd3b566b32a2b7c6a WHIRLPOOL 8bda8de886a272972595bf51af3881962063daaa4fc9e104af59b4798008a2f780c3fb4a758d7fe14ef075b92aecc43415b08bb213cbd6ac4ab92a56e405276e
diff --git a/dev-python/click/click-5.1.ebuild b/dev-python/click/click-5.1.ebuild
new file mode 100644
index 000000000000..d3161e0a571b
--- /dev/null
+++ b/dev-python/click/click-5.1.ebuild
@@ -0,0 +1,42 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Prevent un-needed d'loading
+ sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ emake test
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/cloudlib/Manifest b/dev-python/cloudlib/Manifest
index 0f1090245542..c283ff55abea 100644
--- a/dev-python/cloudlib/Manifest
+++ b/dev-python/cloudlib/Manifest
@@ -1 +1,2 @@
DIST cloudlib-0.4.0.tar.gz 117754 SHA256 105e18f1ef52bbc0b5389a33ddd5f649d20ce03b145d3d395acc5e4497a99bc9 SHA512 fcaa65f0215465df09d0f6b53b626fe1d5facd8c173bb5c5a1cfb44f487aa5cb0cbffd6fc5ab6a3a065ff816b16e095b146db65ac201d2b5cd083f8bfb96c926 WHIRLPOOL a5eaed2f977cf6709e5c3872bc9b049dedd34ac966d8b1a06b518ae7dfbf207916268922c3af20a5d54d2c2291570e4cf989ba5c909187311fa65cf77af59182
+DIST cloudlib-0.5.0.tar.gz 117422 SHA256 e4dbd5293254d11c382ce511701be5c3aa81deb1e993be27d0744226fc7335b8 SHA512 fc400b89045706638fddfed5a6bc5e48995106dc02a216bbe8ae32e7a01c1d4d4fd2a22c7aa914a7fdc8197639f82d41cc2d7071873234e171d3fb7f434cdabc WHIRLPOOL 91d0b51f9cf78e34f647f912d1e56561ac1529d8ff598c1dd893fb9d728fdae4cac4bac4b1d01d3b90660a5523834259e8f6a42c834ac7f41e1ad4bf8294bcc7
diff --git a/dev-python/cloudlib/cloudlib-0.5.0.ebuild b/dev-python/cloudlib/cloudlib-0.5.0.ebuild
new file mode 100644
index 000000000000..4de81e3cf124
--- /dev/null
+++ b/dev-python/cloudlib/cloudlib-0.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cloud middleware for in application use."
+HOMEPAGE="https://github.com/cloudnull/cloudlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]"
+
+python_prepare() {
+ sed -i "s/required.append\(\'argparse\'\)/pass/g" setup.py || die
+}
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
index 75160cfe6c9a..dafe8970b629 100644
--- a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
DEPEND=""
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72.ebuild
deleted file mode 100644
index 24e43d29e44e..000000000000
--- a/dev-python/ctypesgen/ctypesgen-0_p72.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Python wrapper generator for ctypes"
-HOMEPAGE="https://github.com/davidjamesca/ctypesgen"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-# 2.4 restricted due to usage of ctypes module.
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-PYTHON_MODNAME="ctypesgencore"
diff --git a/dev-python/pip/pip-7.1.2.ebuild b/dev-python/pip/pip-7.1.2.ebuild
index 2cbeb054a2c3..bff3c34ea91e 100644
--- a/dev-python/pip/pip-7.1.2.ebuild
+++ b/dev-python/pip/pip-7.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
# Check pip/_vendor/vendor.txt for this
diff --git a/dev-python/redis-py/redis-py-2.10.3.ebuild b/dev-python/redis-py/redis-py-2.10.3.ebuild
index 66e9383795dc..0c5d14b6207a 100644
--- a/dev-python/redis-py/redis-py-2.10.3.ebuild
+++ b/dev-python/redis-py/redis-py-2.10.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND=""
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index 22162882dac1..1de29e0bcbad 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -1,2 +1,3 @@
DIST dbf-2.0.10.gem 122880 SHA256 9426c197abf49633f850b2b0e97e6e9352dea050fe5a38b9301844abef3abf92 SHA512 80ede55b9672b831e8d598c269116a93446b966394c63aef1008e1b20b8d0db2cfb52320eb234182c8f841b301f5018ad39ef66589ee614772a68572d1855275 WHIRLPOOL e83f8aeb5f37c4a33815445175707119f5e67b381e9ca2533578433d55c4a5f33b498ef5b17808bbac04f368ff0f3ef36afbc8c3262d99291f8f045b124f30db
+DIST dbf-2.0.11.gem 123392 SHA256 721529cc1a24b99e2563fdb9fb158615930b13b2e2ed67d1f973c33e7205625f SHA512 fa5cbcb64e114e24b0fbd2c8bdfba309238c854cd407798b0d8cd5a717a0d598713b0150055b4507813be59f1d9b8678721f1cca75f0562cdd121e222a52c353 WHIRLPOOL d399a82d6c0281da667e0eec19e337bd6a7e5f20e690dd63b55d111646009c3bd02140d54f82b56ec356b3b3da525e0bb4fea23120c5f8cab2cb115ad2ff0d00
DIST dbf-2.0.8.gem 115712 SHA256 d953117337e3d12720815304b5e584ccdd7d081b65d0a01dd2d825087e1b4f79 SHA512 b2098359f88b5df50113af979d0d95591b1b15db22e8554bced14f4a5190ac3f490971e7f857bb832d4957f82e6f82d5cbcea0332401a54cf41b897bfb1f3b74 WHIRLPOOL 7afdf410cfc43009e407a14ffe5944d1639ec4318d9517314b9d41734341777ce5833033462accf3ea699d26b4fd4a3fb410875ee4b9eda197199cefd3db7836
diff --git a/dev-ruby/dbf/dbf-2.0.11.ebuild b/dev-ruby/dbf/dbf-2.0.11.ebuild
new file mode 100644
index 000000000000..d251e2d76cc4
--- /dev/null
+++ b/dev-ruby/dbf/dbf-2.0.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
+database files"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+ sed -i -e '/fastercsv/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/creduce/creduce-2.4.0.ebuild b/dev-util/creduce/creduce-2.4.0.ebuild
index 5aa21a5cda4f..76098b7b1d2e 100644
--- a/dev-util/creduce/creduce-2.4.0.ebuild
+++ b/dev-util/creduce/creduce-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,7 +24,7 @@ DEPEND="
dev-perl/Sys-CPU
dev-util/astyle
dev-util/indent
- sys-devel/clang:0/3.6
+ sys-devel/clang:0/3.7
sys-devel/llvm:0/3.7.0[clang]"
RDEPEND="${DEPEND}"
diff --git a/dev-util/cwdiff/Manifest b/dev-util/cwdiff/Manifest
index 004e7097a936..de1261608a36 100644
--- a/dev-util/cwdiff/Manifest
+++ b/dev-util/cwdiff/Manifest
@@ -1,2 +1,3 @@
DIST cwdiff-0.2.8.tar.gz 4246 SHA256 cdfd1489420591b36a56370c647b361f87c0c4074fed220e9c09f3e7ea8f2c22 SHA512 bb1fb3790cc2d8f4e5f199e7abc9bf6a999ded0d25fc9e62ca1e003505f1d33b6c8575b0172a2e55128c4e5c853147304c928d0f1094c5b30e6a015b9fbcae09 WHIRLPOOL 7dec074fa079bb1468179efe6f559010b2d8267343ea5c77ad72810301baf49cb63977c7617bdc41321c944fdd067c6202d8a87b6bd5200f561176fac2fc115a
DIST cwdiff-0.3.0.tar.gz 4666 SHA256 32c70aeae4e445a439aeed7f9b01395cc74645033533cc37b6974671cf2cfd9b SHA512 40401a0541209c83cd78ff55c62ce71dd362cf8674b07c1cdd56ad7a505741e818003f07c87fe0303cd2bfd911d99b8f560697612b32b6fee794a7671e7e86f0 WHIRLPOOL aad2e3c5c6d8dc94f70c8b272969598bf134f73bc0fc030d5f4087d341a2074736e5b409afc99c8039f250c2f0154b22d86b153e7ac3e4edc12f4c0642be2e76
+DIST cwdiff-0.3.1.tar.gz 4706 SHA256 c2b7d3a1ba7b6efae217f82773dbfc36a6bda862957ef69c67b2bcfa718c5909 SHA512 ffea1f699d333655eebfe96048dcc96c57408d42915d707e10b9231a27cc7a8803c3b47876227e24da67376ec18f9261739b9fb13889f8b47d336ca048cbfa72 WHIRLPOOL 83e8eb2cd9cf4647c54ecf6306e5f030c7760c8d1ece3fd588805b2b6cf7a302ef58078da176d2ffe1dbb4613d49572c3d7f5765d4e74aeba7599cf9dfa60c2d
diff --git a/dev-util/cwdiff/cwdiff-0.3.1.ebuild b/dev-util/cwdiff/cwdiff-0.3.1.ebuild
new file mode 100644
index 000000000000..eaf721e87f4a
--- /dev/null
+++ b/dev-util/cwdiff/cwdiff-0.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="git://github.com/junghans/${PN}.git https://github.com/junghans/${PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
+fi
+
+DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
+HOMEPAGE="https://github.com/junghans/cwdiff"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="a2ps mercurial"
+
+DEPEND="sys-apps/help2man
+ sys-apps/coreutils"
+RDEPEND="
+ sys-apps/sed
+ app-shells/bash
+ app-text/wdiff
+ sys-apps/diffutils
+ a2ps? ( app-text/a2ps )
+ mercurial? ( dev-vcs/mercurial )
+ "
+
+src_install() {
+ emake DESTDIR="${ED}" $(usex mercurial '' 'HGRCDIR=') install
+ dodoc README.md
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index f9d229c7b3f0..ce9e010215c5 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,4 +1,3 @@
DIST jenkins-bin-1.609.3.war 69019876 SHA256 d5017fc3db8ac118dcd28c33e8414bd036ed236d8011276f683a074422a4c4d0 SHA512 94518086d10a3edc6b3f2e9969cd21a1bdc98cf1ba4bd9bc5fd972afa0ce6aa77831a825e6fd9d6888dada5775b95c0f8a52c72bde34d4c8369434c0f0fb0e59 WHIRLPOOL 7d4164af81cf9c6707b2482cd08eec309f5e5087eb10b42acc5c83ede38eb15818b99c8997e87272ac76fb97f5497d23ced92f65ca62cf4eda5272dd60dcee4a
-DIST jenkins-bin-1.627.war 63251728 SHA256 9fc74aea24d806fb8810e2573793cc280bdcef8c3ac6f0e76dc242290d7773ad SHA512 bf588377ae8910b5cc9db42bc177aaf4d714c9433b851cb8daef3e592844dd8f17ecfbc9f9e6e989d9033feacaaaf05ead3537bf61163335e25001499acfe6d1 WHIRLPOOL 156c9c713a24c373bd5857e68a275a5bb671844181fb62b389a2a0e787a7bd3a1489f3b4b0328bfb6c2b3c040a35068beed389c964c60dcec0ed958de54858bf
-DIST jenkins-bin-1.629.war 63209042 SHA256 b74b1cd5b8873f0605106893e063dd2407afdcd1fd516e7034314385ac67605c SHA512 0a39dbaa4d9772c4e109b4689208829108c1c0aeff9d637c837f69e5be0ee78cbdb77b09b9fc0aa6a71d82dcdbe4f3b20ecf479ffe7b8ad82d0546d7d28900ed WHIRLPOOL c365023f3d935740e12f017987bd8e9ad98febf9e9cc89094c803a0c730eaa0ab94bd9c9f134ec19b5b232ce75651046beae9441577d0479e6c0a0a3c79ee554
DIST jenkins-bin-1.630.war 63209465 SHA256 0b0bb7bb928987a8104c5d6079bff71590a368bab5c17597d66e7a2c113cb618 SHA512 a9922a959a17daf88b0530d92f7a1d3480024f6e4503813cdc29214650a871cccc079ff171b882dc30e3b1fbe3fd39ce106adee46956a8aa8a2fe08146dfeedc WHIRLPOOL 878a281a64398e1d333ed7eb822c65716b4a2bbb29b49d0ab90ada486e6b733e0e4c3b23238ea6009fb67d1ae9c840df4f724049903c8857d625b917a63a1f10
+DIST jenkins-bin-1.631.war 63209930 SHA256 e8eae4caad8f48b5e38480c2a4b0c9acfdbf93eb1218e3fee42a4d3ff62bd02d SHA512 5450638ebe7780691fd9dc931d6b5cc35c449e67d00f35aa64794fd2266f884b98181609b86a3cdbca313e38c5ada871dd3adeadaacb29a8d96ade088d4f3372 WHIRLPOOL 4ccf9f59f7690db9134958952bab187cc4fdc213f345315453e0646a2b7926f64478d198ccf7ea349a5970bec004b3622196f904ebc7899f830e83a6f4d6f990
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.629.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.629.ebuild
deleted file mode 100644
index 37fc08477727..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-1.629.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
- media-libs/freetype
- !dev-util/jenkins-bin:lts
- >=virtual/jre-1.7.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
- enewgroup jenkins
- enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
- keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
- insinto /opt/jenkins
- newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
- newinitd "${FILESDIR}"/${PN}.init2 jenkins
- newconfd "${FILESDIR}"/${PN}.confd jenkins
-
- systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
- fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.627.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.631.ebuild
similarity index 100%
rename from dev-util/jenkins-bin/jenkins-bin-1.627.ebuild
rename to dev-util/jenkins-bin/jenkins-bin-1.631.ebuild
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index fc3b3a27b544..ac298865c57e 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -2,4 +2,4 @@ DIST mercurial-3.3.2.tar.gz 4165131 SHA256 67c617c740ac706f923371a26f02339b27cd6
DIST mercurial-3.3.3.tar.gz 4167447 SHA256 a445367f0dcbaf3a6279bfa743b364e729be0d1f0c852cb6d37f297916ffae13 SHA512 bea215b0bd9e8603ade019f01ae0600dd1d1ad77675b38b5e13d86c43dd2c58b6c86c252517f0fcab6444c171e9f53537e4e170739c991ac08a1111169fe545d WHIRLPOOL e5fd41c6d27d7fce8559a2d15b33e24cf702d9497326e2c1062fe2acd22e7ad16cd6981d3dadb5a7458f12dcd35cc98583f53bc3188d99a9638daddb7d95657b
DIST mercurial-3.4.2.tar.gz 4296407 SHA256 dcc90e4a8476149ecc8af13c08202860b4c9c987a94c4f3c18b28294b6fd8ecd SHA512 f5ef7064a1ac4189fe4db91fec283cdead257b132674d0869f075b80ba5707e0163e28f18545a9d867336ebc6b1cbb8bcf794b6881b8f23f6c067e68c7ae584b WHIRLPOOL db7389c92680f6058efda6fa4cb7747ff3cd78bc361c43464a938c213b9ce46e8a040a57c68975f02342beb35522c27c3ab6250b2fc6e54777ddd20b0bda5443
DIST mercurial-3.5.1.tar.gz 4414284 SHA256 997da45da303e399678c5bccd7be39b0fabf29c7e02fd3c8751c2ff88c8a259d SHA512 2435b3c50753e787577a847c96d3e4515015e02bc7ecdd21848530834d210831bb0690d31d4940626bbbe84cfccb1d245f8c4e1156317cda9469e7b870c042d5 WHIRLPOOL 97a0e6762657c2f560041f30e513fe8d5377bf654e39bf8a218d132952f60b59db63a6c078cdac6b529a8cb49ee766054daad9192951987b3a288e3b43e70ba7
-DIST mercurial-3.5.tar.gz 4403206 SHA256 b50f6978e7d39fe0cb298fa3fa3e9ce41d2356721d155e5288f9c57e5f13e9a7 SHA512 1944521d08b7c1cf6872edd5e394ebfad5f53f931b3bfb6197292c1c0f9e275b27f92284b91cf11bec8a50631468e1447d4e94f18a5b4ac237df61b0a1e5fd5a WHIRLPOOL c19adf7e14596ee7987061dd672d7c1ccfd333de301b539629a0962785aa791a8ddfcbd584bd78fa869d1c9b04e4a73e5083d824f82daeef1fbe28550cad1c1d
+DIST mercurial-3.5.2.tar.gz 4415307 SHA256 23fdc038503911b21dc9e556118803f7b1d4150eb14933d2ea3d0ff0dc60ab5d SHA512 d0a4007763186ab72e7ef6e6f6fa84719fcdc2d16208bc99cc32f44cecdc0ccdf5719e18fbc8a5d0735f6441acc0d82bcac05d7c75fee15966c88ee75e7b6bdd WHIRLPOOL 10ec5dd3d1d2e3487f4a290bc0d32fe2237cc450b54774503e7e9e25b12e895c8065f1c2e27dcaa03deac82d1e10e58dd8ea18e9bacf4f24f58a52a3d5c0fea4
diff --git a/dev-vcs/mercurial/mercurial-3.5.ebuild b/dev-vcs/mercurial/mercurial-3.5.2.ebuild
similarity index 100%
rename from dev-vcs/mercurial/mercurial-3.5.ebuild
rename to dev-vcs/mercurial/mercurial-3.5.2.ebuild
diff --git a/games-arcade/netris/Manifest b/games-arcade/netris/Manifest
index 3400d8f65b11..7cdf2964eb63 100644
--- a/games-arcade/netris/Manifest
+++ b/games-arcade/netris/Manifest
@@ -1,2 +1,3 @@
DIST netris-0.52.tar.gz 33135 SHA256 8bc770ebb2c3ead1611ca7a1a2f3d833e169536c78d53b3fcf49381164ee9706 SHA512 842ad8602394dee929c3c4ba222f9f5ffe628e52348c3faf7c9098bbd5b0b0279fffc7927320f8ee8a5102537c995a8ed605d851f1cd32e4bd8976a7889c84e1 WHIRLPOOL 7bf0356b85107ec871c15afa9e680596e890e22cfb6ba9e72b4487af84c01b5aa4519a0d218c8736f80edaa8ba0c488d49aca07dd67c75dad91054de3a7ea7aa
DIST netris_0.52-7.diff.gz 11586 SHA256 6b4d157768d075d9fedb9318f2583add253af994bab8ed6fe25b65b5086c8cc5 SHA512 2d2fe28dbf886107fa27f631e30534aab8afe027b5a41da3761ff39a16d65d7cf6ff5bf409708d55740638df75e334b5fb1ae4c5304616731fb6498d2cc00ca9 WHIRLPOOL ff1ff01f25b12f809f72682e48f539dd55df8e370151effe1222898b12239abf972e97ff1e8cc768beedf3c085b96e6c3540a309f08205245811ae1b52b51ac2
+DIST netris_0.52-9.diff.gz 14482 SHA256 7364a74dabf43e834a2dc76352191b8794094c1f5f4ab02c64950af61a40261b SHA512 4bed230091ddecf5a0dc043981ec9b0a177bee01262715b9cb9a2af0adefe2db52555416b795a70dd496e6fb0b132586bc7f32d2a480f1cfd6c4d40304076109 WHIRLPOOL 26d51d8cb7b2bbe2b7d754ad707023b796ad4f79d97c0af742b3514dde2f8bf14e165211b23d92aa8665cba324ce85d2272b966123ba56e2d83bd1f31bf40215
diff --git a/games-arcade/netris/netris-0.52-r1.ebuild b/games-arcade/netris/netris-0.52-r1.ebuild
new file mode 100644
index 000000000000..dcc26a47dcbc
--- /dev/null
+++ b/games-arcade/netris/netris-0.52-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DEB_VER=9
+DESCRIPTION='Classic networked version of T*tris'
+HOMEPAGE='http://www.netris.org/'
+SRC_URI="ftp://ftp.netris.org/pub/netris/${P}.tar.gz
+ mirror://debian/pool/main/n/netris/netris_${PV}-${DEB_VER}.diff.gz"
+
+LICENSE='GPL-2'
+SLOT=0
+KEYWORDS='~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd'
+IUSE=''
+
+DEPEND='sys-libs/ncurses:0='
+RDEPEND=${DEPEND}
+
+src_prepare() {
+ epatch "${WORKDIR}"/netris_${PV}-${DEB_VER}.diff
+ epatch netris-0.52/debian/patches/[01]*
+ # bug #185332
+ sed -i \
+ -e '/sys\/time/ i\
+#include \
+#include
+' \
+ -e '/netint2/ s/short/int16_t/' \
+ -e '/netint4/ s/long/int32_t/' \
+ netris.h || die
+ sed -i \
+ -e 's/volatile //g' \
+ -e '/Be more forgiving/d' \
+ -e 's/static myRandSeed/static int myRandSeed/' \
+ util.c || die
+ sed -i \
+ -e 's/\(long pauseTimeLeft\)/\1 = 0/' \
+ game.c || die
+ sed -i \
+ -e '/^CC/d' \
+ -e '/^COPT/d' \
+ -e '/^CFLAGS/d' \
+ -e 's/(LFLAGS)/(LDFLAGS) $(LFLAGS)/' \
+ Configure || die
+}
+
+src_configure() {
+ bash ./Configure -O || die
+}
+
+src_install() {
+ dogamesbin netris sr
+ dodoc FAQ README robot_desc
+ prepgamesdirs
+}
diff --git a/games-emulation/m64py/Manifest b/games-emulation/m64py/Manifest
index ece95c8dc3aa..6e4466e8dac1 100644
--- a/games-emulation/m64py/Manifest
+++ b/games-emulation/m64py/Manifest
@@ -1 +1,2 @@
DIST m64py-0.2.1.tar.gz 304897 SHA256 6461b494291f22c10ccd60cda4d4750da3c1514e1d5bc2354bad95a9f4cc1525 SHA512 02d5bc4a501f3c9a5851f242119ad6436be9a59b832f27483591353cfad6975da677a124e61330a4430f1813259f5a423bc8413423ee43a3570d74239e33b487 WHIRLPOOL 5998dd86de565e09c392cef6a9bb94978c6ebbfb3169fc30ae075d291ded187efc16fcf0d380c3ae7a85ae74f3b333de786a202a17320348a0d75595f7e5c024
+DIST m64py-0.2.3.tar.gz 304241 SHA256 87dccbad9f27ab1eae3fb9957ef039e23379d264e68f8ef7470ec38a523ef020 SHA512 5471d2ce96007c5cb5492f7ba3bc2a8843455dfea811b114c68862fa5c06a636e6dd6a4304e60bf2273377330b0eb01f2dcdc0340d02ec498ae44cdd2ccc01ff WHIRLPOOL 2d7727c56a67f6ca3901eb846d46dea881cf6361fe1bbcec6ef2d10247320d92d42d2ea9e75f247faef482f715b051a2c6394e814b83fa5f0c71bd5d1aabf8ba
diff --git a/games-emulation/m64py/m64py-0.2.3.ebuild b/games-emulation/m64py/m64py-0.2.3.ebuild
new file mode 100644
index 000000000000..18371403589f
--- /dev/null
+++ b/games-emulation/m64py/m64py-0.2.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A frontend for Mupen64Plus"
+HOMEPAGE="http://m64py.sourceforge.net/"
+SRC_URI="mirror://sourceforge/m64py/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# SDL & libmupen64plus are through ctypes, so they rely on specific ABI
+RDEPEND="media-libs/libsdl:0/0[joystick]
+ dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
+ >=games-emulation/mupen64plus-core-2.0-r1:0/2"
+
+python_prepare_all() {
+ # set the correct search path
+ cat >> src/m64py/platform.py <<-_EOF_
+ SEARCH_DIRS = ["/usr/$(get_libdir)/mupen64plus"]
+_EOF_
+
+ # comment out SDL2 support since our mupen64plus uses SDL1
+ sed -e '/from m64py\.SDL2/s:^:#:' \
+ -e '/QT2SDL2\[/s:^:#:' \
+ -e '/KEYCODE2SCANCODE\[/s:^:#:' \
+ -e '/SCANCODE2KEYCODE\[/s:^:#:' \
+ -i src/m64py/frontend/keymap.py || die
+ sed -e '/--sdl2/d' \
+ -e '/SDL2/s:=.*$:= False:' \
+ -i src/m64py/opts.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+ local vr
+ for vr in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 0.2.1-r1 ${vr}; then
+ ewarn
+ ewarn "Starting with mupen64plus-2.0-r1, the plugin install path has changed."
+ ewarn "In order for m64py to find mupen64plus, you will either need to set"
+ ewarn "new paths in configuration dialog or remove your configuration file."
+ ewarn "The new paths are:"
+ ewarn
+ ewarn " Library file: /usr/$(get_libdir)/libmupen64plus.so.2.0.0"
+ ewarn " Plugins directory: /usr/$(get_libdir)/mupen64plus"
+ ewarn " Data directory: /usr/share/mupen64plus"
+ fi
+ done
+
+ if ! type -P rar >/dev/null && ! type -P unrar >/dev/null; then
+ elog
+ elog "In order to gain RAR archive support, please install either app-arch/rar"
+ elog "or app-arch/unrar."
+ fi
+
+ if ! type -P 7z >/dev/null \
+ && ! has_version "dev-python/pylzma[${PYTHON_USEDEP}]"; then
+ elog
+ elog "In order to gain 7z archive support, please install either app-arch/p7zip"
+ elog "or dev-python/pylzma."
+ fi
+}
diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
index e9c57bd4d164..654bb3d17f96 100644
--- a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
media-libs/libpng:0
media-libs/libsdl2[X,opengl,video]
net-libs/enet:1.3
- net-libs/miniupnpc
+ net-libs/miniupnpc:=
net-misc/curl
sys-libs/zlib
virtual/jpeg:62
@@ -57,6 +57,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch "${FILESDIR}"/${P}-miniupnpc14.patch
}
src_configure() {
diff --git a/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch b/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch
new file mode 100644
index 000000000000..ff46685cd3bf
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch
@@ -0,0 +1,14 @@
+Index: ps/trunk/source/network/NetServer.cpp
+===================================================================
+--- ps/trunk/source/network/NetServer.cpp (revision 17090)
++++ ps/trunk/source/network/NetServer.cpp (revision 17091)
+@@ -237,5 +237,9 @@
+ }
+ // No cached URL, or it did not respond. Try getting a valid UPnP device for 10 seconds.
++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 14
++ else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 2, 0)) != NULL)
++#else
+ else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) != NULL)
++#endif
+ {
+ ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress));
diff --git a/media-libs/mesa/mesa-11.0.2.ebuild b/media-libs/mesa/mesa-11.0.2.ebuild
index af7553fe3fda..38d52d0732cd 100644
--- a/media-libs/mesa/mesa-11.0.2.ebuild
+++ b/media-libs/mesa/mesa-11.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-if [[ ${PV} = 9999* ]]; then
+if [[ ${PV} = 9999 ]]; then
GIT_ECLASS="git-r3"
EXPERIMENTAL="true"
fi
@@ -23,15 +23,16 @@ FOLDER="${PV/_rc*/}"
DESCRIPTION="OpenGL-like graphic library for Linux"
HOMEPAGE="http://mesa3d.sourceforge.net/"
-if [[ $PV == 9999* ]]; then
+if [[ $PV == 9999 ]]; then
SRC_URI=""
+ KEYWORDS=""
else
SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
RESTRICT="!bindist? ( bindist )"
INTEL_CARDS="i915 i965 ilo intel"
@@ -110,7 +111,7 @@ RDEPEND="
opencl? (
app-eselect/eselect-opencl
dev-libs/libclc
- !kernel_FreeBSD? ( || (
+ !kernel_FreeBSD? ( || (
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
) )
@@ -158,7 +159,7 @@ DEPEND="${RDEPEND}
>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
"
-[[ ${PV} == "9999" ]] && DEPEND+="
+[[ ${PV} == 9999 ]] && DEPEND+="
sys-devel/bison
sys-devel/flex
${PYTHON_DEPS}
@@ -190,10 +191,7 @@ pkg_setup() {
}
src_prepare() {
- # fix for hardened pax_kernel, bug 240956
- [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
- eautoreconf
+ [[ ${PV} == 9999 ]] && eautoreconf
}
multilib_src_configure() {
@@ -267,11 +265,9 @@ multilib_src_configure() {
fi
fi
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if use pax_kernel; then
- myconf+="
- $(use_enable x86 glx-rts)
- "
+ # x86 hardened pax_kernel needs glx-read-only-text, bug 240956
+ if [[ ${ABI} == x86 ]]; then
+ myconf+="$(use_enable pax_kernel glx-read-only-text)"
fi
# on abi_x86_32 hardened we need to have asm disable
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1ac917fef5b2..45b9dafb25c9 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-if [[ ${PV} = 9999* ]]; then
+if [[ ${PV} = 9999 ]]; then
GIT_ECLASS="git-r3"
EXPERIMENTAL="true"
fi
@@ -23,7 +23,7 @@ FOLDER="${PV/_rc*/}"
DESCRIPTION="OpenGL-like graphic library for Linux"
HOMEPAGE="http://mesa3d.sourceforge.net/"
-if [[ $PV == 9999* ]]; then
+if [[ $PV == 9999 ]]; then
SRC_URI=""
KEYWORDS=""
else
@@ -159,7 +159,7 @@ DEPEND="${RDEPEND}
>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
"
-[[ ${PV} == "9999" ]] && DEPEND+="
+[[ ${PV} == 9999 ]] && DEPEND+="
sys-devel/bison
sys-devel/flex
${PYTHON_DEPS}
@@ -265,9 +265,9 @@ multilib_src_configure() {
fi
fi
- # x86 hardened pax_kernel needs glx-read-only-text, bug 240956
- if use pax_kernel; then
- myconf+="$(use_enable x86 glx-read-only-text)"
+ # x86 hardened pax_kernel needs glx-rts, bug 240956
+ if [[ ${ABI} == x86 ]]; then
+ myconf+="$(use_enable pax_kernel glx-read-only-text)"
fi
# on abi_x86_32 hardened we need to have asm disable
diff --git a/media-sound/lame/files/lame-3.99.5-msse.patch b/media-sound/lame/files/lame-3.99.5-msse.patch
new file mode 100644
index 000000000000..56608f665460
--- /dev/null
+++ b/media-sound/lame/files/lame-3.99.5-msse.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/542192
+
+Description: Build xmm_quantize_sub.c with -msse
+Author: Sebastian Ramacher
+Bug: http://sourceforge.net/p/lame/bugs/443/
+Bug-Debian: https://bugs.debian.org/760047
+Last-Update: 2014-08-31
+
+--- lame-3.99.5+repack1.orig/libmp3lame/vector/Makefile.am
++++ lame-3.99.5+repack1/libmp3lame/vector/Makefile.am
+@@ -20,6 +20,7 @@ xmm_sources = xmm_quantize_sub.c
+
+ if WITH_XMM
+ liblamevectorroutines_la_SOURCES = $(xmm_sources)
++liblamevectorroutines_la_CFLAGS = -msse
+ endif
+
+ noinst_HEADERS = lame_intrin.h
diff --git a/media-sound/lame/lame-3.99.5-r1.ebuild b/media-sound/lame/lame-3.99.5-r1.ebuild
index e14c0304c585..490e597ae57a 100644
--- a/media-sound/lame/lame-3.99.5-r1.ebuild
+++ b/media-sound/lame/lame-3.99.5-r1.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
"${FILESDIR}"/${PN}-3.96-ccc.patch \
"${FILESDIR}"/${PN}-3.98-gtk-path.patch \
"${FILESDIR}"/${PN}-3.99.5-tinfo.patch \
+ "${FILESDIR}"/${PN}-3.99.5-msse.patch \
"${WORKDIR}"/${P}-automake-2.12.patch
mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 8d02c2080d45..c1fcd524037d 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,2 +1,3 @@
+DIST mumble-1.2.10.tar.gz 3195427 SHA256 c6367a63ef54aac8e6d556066297e536a8c288495d53490219a113e43aa85b04 SHA512 d4ff0572fd744cbf3473b25353b2ab8b2fc2d68921179c02f3047460d63c9e388d6d9e04fc4fb4b27eeaa63baf74d8bf3dc098cf24285619aef1b29f636b972e WHIRLPOOL 9aadb47756c7d1939c075079911a5851d619f973359e6346d209e5baaf7db9a80b2d622befd4e6ea10480875b1ea6479d9b4785111d9f88d9d009b17ecbc774a
DIST mumble-1.2.6.tar.gz 3201577 SHA256 876cdecfb89798ab45020cdae0d64bd0fa899a9a97c2c7f4a6e706d4165fb6ff SHA512 cf67d171bb76d30fd0b098552ac1707423cdeb7d04031fd5f6693cad4661f3a2d99b8e8d653686fab00f46e66257f8fb75c819b9ad1d4f514a0d0b04c36a446e WHIRLPOOL 37654990d66fb01fc7265c5757ad8b79e9a10325b669735f3010486b15896e3d191bb705664a1151c4b0eea1cb6c17daef86e45c38247a1463ad72c273019ee7
DIST mumble-1.2.8.tar.gz 3202518 SHA256 4c2fc3dff49687bc1d977905958e8a9c35e109723aeed42c9ea124104febe159 SHA512 9c3534dacce22c6152f3ffa847e98b3b1bab43fd8a92285362333487b1bb9a064699296005350cf09bd44a8070508beaf14d3b518465fad3db94710cd818bc5b WHIRLPOOL 613f2faf233bb8475dcdec97dca46e75d871a1b02d1c783f24a739644c21cf169dedc7b500c1a3a4ef39ff1f22635ed4926fb805ae45ec148ba5b7bfba112451
diff --git a/media-sound/mumble/files/mumble-1.2.8-gcc49.patch b/media-sound/mumble/files/mumble-1.2.8-gcc49.patch
new file mode 100644
index 000000000000..cecb3d3fab84
--- /dev/null
+++ b/media-sound/mumble/files/mumble-1.2.8-gcc49.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/532180
+
+Avoid "jump to label crosses initialization" error.
+
+ Move variable "buffer" into the while loop to avoid a compile error
+ with g++ 4.9.0.
+
+ Although earlier compiler versions did accept the code, jumping into the
+ scope of an variable length array is not allowed:
+ http://gcc.gnu.org/onlinedocs/gcc-4.3.0/gcc/Variable-Length.html
+
+
+--- a/src/mumble/OSS.cpp
++++ b/src/mumble/OSS.cpp
+@@ -243,9 +243,9 @@ void OSSInput::run() {
+ eMicFormat = SampleShort;
+ initializeMixer();
+
+- short buffer[iMicLength];
+-
+ while (bRunning) {
++ short buffer[iMicLength];
++
+ int len = static_cast(iMicLength * iMicChannels * sizeof(short));
+ ssize_t l = read(fd, buffer, len);
+ if (l != len) {
diff --git a/media-sound/mumble/mumble-1.2.10.ebuild b/media-sound/mumble/mumble-1.2.10.ebuild
new file mode 100644
index 000000000000..89dd6fb71ceb
--- /dev/null
+++ b/media-sound/mumble/mumble-1.2.10.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+QT_MINIMAL="4.6"
+
+inherit eutils multilib qt4-r2
+
+MY_P="${PN}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa +dbus debug g15 oss pch portaudio pulseaudio speech zeroconf"
+
+RDEPEND=">=dev-libs/boost-1.41.0
+ >=dev-libs/openssl-1.0.0b
+ >=dev-libs/protobuf-2.2.0
+ >=media-libs/libsndfile-1.0.20[-minimal]
+ >=media-libs/opus-1.0.1
+ >=media-libs/speex-1.2_rc1
+ sys-apps/lsb-release
+ x11-libs/libX11
+ x11-libs/libXi
+ dev-qt/qtcore:4[ssl]
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ dev-qt/qtsql:4[sqlite]
+ dev-qt/qtsvg:4
+ dev-qt/qtxmlpatterns:4
+ x11-proto/inputproto
+ alsa? ( media-libs/alsa-lib )
+ dbus? ( dev-qt/qtdbus:4 )
+ g15? ( app-misc/g15daemon )
+ portaudio? ( media-libs/portaudio )
+ pulseaudio? ( media-sound/pulseaudio )
+ speech? ( app-accessibility/speech-dispatcher )
+ zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ local conf_add
+
+ if has_version '<=sys-devel/gcc-4.2'; then
+ conf_add="${conf_add} no-pch"
+ else
+ use pch || conf_add="${conf_add} no-pch"
+ fi
+
+ use alsa || conf_add="${conf_add} no-alsa"
+ use dbus || conf_add="${conf_add} no-dbus"
+ use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+ use g15 || conf_add="${conf_add} no-g15"
+ use oss || conf_add="${conf_add} no-oss"
+ use portaudio || conf_add="${conf_add} no-portaudio"
+ use pulseaudio || conf_add="${conf_add} no-pulseaudio"
+ use speech || conf_add="${conf_add} no-speechd"
+ use zeroconf || conf_add="${conf_add} no-bonjour"
+
+ eqmake4 "${S}/main.pro" -recursive \
+ CONFIG+="${conf_add} \
+ bundled-celt \
+ no-bundled-opus \
+ no-bundled-speex \
+ no-embed-qt-translations \
+ no-server \
+ no-update" \
+ DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+src_compile() {
+ # parallel make workaround, bug #445960
+ emake -j1
+}
+
+src_install() {
+ newdoc README.Linux README
+ dodoc CHANGES
+
+ local dir
+ if use debug; then
+ dir=debug
+ else
+ dir=release
+ fi
+
+ dobin "${dir}"/mumble
+ dobin scripts/mumble-overlay
+
+ insinto /usr/share/services
+ doins scripts/mumble.protocol
+
+ domenu scripts/mumble.desktop
+
+ insinto /usr/share/icons/hicolor/scalable/apps
+ doins icons/mumble.svg
+
+ doman man/mumble-overlay.1
+ doman man/mumble.1
+
+ insopts -o root -g root -m 0755
+ insinto "/usr/$(get_libdir)/mumble"
+ doins "${dir}"/libmumble.so.${PV}
+ dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
+ doins "${dir}"/libcelt0.so.0.{7,11}.0
+ doins "${dir}"/plugins/lib*.so*
+}
+
+pkg_postinst() {
+ echo
+ elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+ elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+ echo
+}
diff --git a/media-sound/mumble/mumble-1.2.8.ebuild b/media-sound/mumble/mumble-1.2.8.ebuild
index e457a05d5cca..a0282bf6efa2 100644
--- a/media-sound/mumble/mumble-1.2.8.ebuild
+++ b/media-sound/mumble/mumble-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
+ "${FILESDIR}"/${PN}-1.2.8-gcc49.patch
)
S="${WORKDIR}/${MY_P}"
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 650b3ac89d8b..2893e9a87aae 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -1,2 +1,3 @@
+DIST mumble-1.2.10.tar.gz 3195427 SHA256 c6367a63ef54aac8e6d556066297e536a8c288495d53490219a113e43aa85b04 SHA512 d4ff0572fd744cbf3473b25353b2ab8b2fc2d68921179c02f3047460d63c9e388d6d9e04fc4fb4b27eeaa63baf74d8bf3dc098cf24285619aef1b29f636b972e WHIRLPOOL 9aadb47756c7d1939c075079911a5851d619f973359e6346d209e5baaf7db9a80b2d622befd4e6ea10480875b1ea6479d9b4785111d9f88d9d009b17ecbc774a
DIST mumble-1.2.5.tar.gz 3200216 SHA256 915156946f7662c2488e4c40c95cb95c4ff00532789515da7df775a36d544faf SHA512 bc1761f1e2fc833124ff2ff9af994be59dc9ef96a1ed49316d5383d9b5d91c37ddce87bf6afefc99315824a2a52c615162b2e6050c78f90beca591b58229e7b1 WHIRLPOOL 1f4b226c4036d35a73f65beb4ea66ec0c4363c6122320e8d70a52e0f40b0e2e550282206dcf158bf5a4bb1109202c38a9451374c1bbce96bc559c576a18346c3
DIST mumble-1.2.8.tar.gz 3202518 SHA256 4c2fc3dff49687bc1d977905958e8a9c35e109723aeed42c9ea124104febe159 SHA512 9c3534dacce22c6152f3ffa847e98b3b1bab43fd8a92285362333487b1bb9a064699296005350cf09bd44a8070508beaf14d3b518465fad3db94710cd818bc5b WHIRLPOOL 613f2faf233bb8475dcdec97dca46e75d871a1b02d1c783f24a739644c21cf169dedc7b500c1a3a4ef39ff1f22635ed4926fb805ae45ec148ba5b7bfba112451
diff --git a/media-sound/murmur/murmur-1.2.10.ebuild b/media-sound/murmur/murmur-1.2.10.ebuild
new file mode 100644
index 000000000000..d25d6cc7a400
--- /dev/null
+++ b/media-sound/murmur/murmur-1.2.10.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+QT_MINIMAL="4.6"
+
+inherit eutils qt4-r2 systemd user readme.gentoo
+
+MY_P="${PN/murmur/mumble}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="+dbus debug +ice pch zeroconf"
+
+RDEPEND=">=dev-libs/openssl-1.0.0b
+ >=dev-libs/protobuf-2.2.0
+ sys-apps/lsb-release
+ >=sys-libs/libcap-2.15
+ dev-qt/qtcore:4[ssl]
+ || ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
+ dev-qt/qtxmlpatterns:4
+ dbus? ( dev-qt/qtdbus:4 )
+ ice? ( dev-libs/Ice )
+ zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.41.0
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.4-ice-3.5.0-compat.patch
+ "${FILESDIR}"/${PN}-1.2.4-ice-3.5.1-compat.patch
+)
+
+DOC_CONTENTS="
+ Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
+ Please execute:\n
+ murmurd -ini /etc/murmur/murmur.ini -supw \n
+ chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
+ to set the build-in 'SuperUser' password before starting murmur.
+ Please restart dbus before starting murmur, or else dbus
+ registration will fail.
+"
+
+pkg_setup() {
+ enewgroup murmur
+ enewuser murmur -1 -1 /var/lib/murmur murmur
+}
+
+src_prepare() {
+ qt4-r2_src_prepare
+
+ sed \
+ -e 's:mumble-server:murmur:g' \
+ -e 's:/var/run:/run:g' \
+ -i "${S}"/scripts/murmur.{conf,ini.system} || die
+}
+
+src_configure() {
+ local conf_add
+
+ use dbus || conf_add="${conf_add} no-dbus"
+ use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+ use ice || conf_add="${conf_add} no-ice"
+ use pch || conf_add="${conf_add} no-pch"
+ use zeroconf || conf_add="${conf_add} no-bonjour"
+
+ eqmake4 main.pro -recursive \
+ CONFIG+="${conf_add} no-client"
+}
+
+src_compile() {
+ # parallel make workaround, upstream bug #3190498
+ emake -j1
+}
+
+src_install() {
+ dodoc README CHANGES
+
+ docinto scripts
+ dodoc scripts/*.php scripts/*.pl
+
+ local dir
+ if use debug; then
+ dir=debug
+ else
+ dir=release
+ fi
+
+ dobin "${dir}"/murmurd
+
+ insinto /etc/murmur/
+ newins scripts/murmur.ini.system murmur.ini
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}"/murmur.logrotate murmur
+
+ insinto /etc/dbus-1/system.d/
+ doins scripts/murmur.conf
+
+ insinto /usr/share/murmur/
+ doins src/murmur/Murmur.ice
+
+ newinitd "${FILESDIR}"/murmur.initd-r1 murmur
+ newconfd "${FILESDIR}"/murmur.confd murmur
+
+ if use dbus; then
+ systemd_newunit "${FILESDIR}"/murmurd-dbus.service "${PN}".service
+ systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+ else
+ systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service "${PN}".service
+ fi
+
+ keepdir /var/lib/murmur /var/log/murmur
+ fowners -R murmur /var/lib/murmur /var/log/murmur
+ fperms 750 /var/lib/murmur /var/log/murmur
+
+ doman man/murmurd.1
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 797b1a1fabb2..07b335af88fe 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 01 Oct 2015 18:11:20 +0000
+Fri, 02 Oct 2015 09:41:19 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 92f70ceed2c6..07b335af88fe 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 01 Oct 2015 18:11:21 +0000
+Fri, 02 Oct 2015 09:41:19 +0000
diff --git a/metadata/md5-cache/app-crypt/bcwipe-1.9.8 b/metadata/md5-cache/app-crypt/bcwipe-1.9.8
index 02deb15b1256..21324c58385c 100644
--- a/metadata/md5-cache/app-crypt/bcwipe-1.9.8
+++ b/metadata/md5-cache/app-crypt/bcwipe-1.9.8
@@ -3,9 +3,9 @@ DESCRIPTION=Secure file removal utility
EAPI=3
HOMEPAGE=http://www.jetico.com/
IUSE=doc
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ~arm ppc x86
LICENSE=bestcrypt
SLOT=0
SRC_URI=http://www.jetico.com/linux/BCWipe-1.9-8.tar.gz doc? ( http://www.jetico.com/linux/BCWipe.doc.tgz )
_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=06f0ee59e4f764d07415ccb45838309a
+_md5_=de14326811bd5baf1df1e701aff16d27
diff --git a/metadata/md5-cache/app-i18n/scim-input-pad-0.1.1 b/metadata/md5-cache/app-i18n/scim-input-pad-0.1.1
deleted file mode 100644
index b0cfe257468d..000000000000
--- a/metadata/md5-cache/app-i18n/scim-input-pad-0.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2 virtual/pkgconfig
-DESCRIPTION=Input pad for SCIM used to input symbols and special characters
-EAPI=1
-HOMEPAGE=http://www.scim-im.org/
-IUSE=nls
-KEYWORDS=x86
-LICENSE=GPL-2
-RDEPEND=>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2
-SLOT=0
-SRC_URI=mirror://sourceforge/scim/scim-input-pad-0.1.1.tar.gz
-_md5_=1d71967dc21c5ee21b98a5236cfb449f
diff --git a/metadata/md5-cache/app-portage/eix-0.30.11 b/metadata/md5-cache/app-portage/eix-0.30.11
index d744f5e587fd..1ddc5effd84f 100644
--- a/metadata/md5-cache/app-portage/eix-0.30.11
+++ b/metadata/md5-cache/app-portage/eix-0.30.11
@@ -4,10 +4,10 @@ DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlay
EAPI=5
HOMEPAGE=https://github.com/vaeth/eix/
IUSE=debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools linguas_de linguas_ru
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
SLOT=0
SRC_URI=https://github.com/vaeth/eix/releases/download/v0.30.11/eix-0.30.11.tar.bz2
_eclasses_=bash-completion-r1 b1fc4d30333bb528c8abb4332bb70ea6 eutils 43da5163ba106e87d22d2e7d6d67537f l10n 714aaf78929eade946da5eaff7d2001a multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=33a3172d1d813f981ae09a2457a9b0ff
+_md5_=c3c82712405e4e47abc58ee704a4e1ad
diff --git a/metadata/md5-cache/dev-db/redis-3.0.3 b/metadata/md5-cache/dev-db/redis-3.0.3
index f4e2e0d86ecb..f8beb1532d27 100644
--- a/metadata/md5-cache/dev-db/redis-3.0.3
+++ b/metadata/md5-cache/dev-db/redis-3.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
EAPI=5
HOMEPAGE=http://redis.io/
IUSE=+jemalloc tcmalloc test
-KEYWORDS=~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
LICENSE=BSD
RDEPEND=>=dev-lang/lua-5.1:* tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
REQUIRED_USE=?? ( tcmalloc jemalloc )
SLOT=0
SRC_URI=http://download.redis.io/releases/redis-3.0.3.tar.gz
_eclasses_=autotools 542bf3f83917668f3893f4da1ca238ff eutils 43da5163ba106e87d22d2e7d6d67537f flag-o-matic 85dc1eac3c64d8141374490ed64122e5 libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 systemd 6b4f0cefa642270eded7e6ca816fd181 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d user 906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=6e08a09f6476407e6883315fd6761d01
+_md5_=a23c498babe40a98ff89ce7ed1f7722a
diff --git a/metadata/md5-cache/dev-java/commons-modeler-2.0.1-r1 b/metadata/md5-cache/dev-java/commons-modeler-2.0.1-r1
new file mode 100644
index 000000000000..bd4885078f3d
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-modeler-2.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.6 source? ( app-arch/zip ) test? ( dev-java/junit:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A lib to make the setup of Java Management Extensions easier
+EAPI=5
+HOMEPAGE=http://commons.apache.org/modeler/
+IUSE=commons-digester elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.5 dev-java/mx4j-core:3.0 dev-java/commons-logging:0 commons-digester? ( dev-java/commons-digester:3.2 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/commons/modeler/source/commons-modeler-2.0.1-src.tar.gz
+_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-ant-2 e39bd5336f73afdf3e4a15c91a5dad59 java-pkg-2 bb9b8157d2a348d9ec42ce34a107fe0d java-utils-2 3f431421a91b4471894f5616adda4dc7 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c5dc12d54f1eef21524d645b09e3c77f
diff --git a/metadata/md5-cache/dev-java/hessian-4.0.37 b/metadata/md5-cache/dev-java/hessian-4.0.37
new file mode 100644
index 000000000000..46006aa7a3f3
--- /dev/null
+++ b/metadata/md5-cache/dev-java/hessian-4.0.37
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 app-arch/unzip java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DESCRIPTION=Binary web service protocol
+EAPI=5
+HOMEPAGE=http://hessian.caucho.com/
+IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-1.1
+RDEPEND=>=virtual/jre-1.6 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=http://hessian.caucho.com/download/hessian-4.0.37-src.jar
+_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-pkg-2 bb9b8157d2a348d9ec42ce34a107fe0d java-pkg-simple d87e645de7dff9e1bc0aac42b43ca4f4 java-utils-2 3f431421a91b4471894f5616adda4dc7 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d24b95df0fdbcd496c801e1a7d20cf08
diff --git a/metadata/md5-cache/dev-java/jpfcodegen-0.4-r1 b/metadata/md5-cache/dev-java/jpfcodegen-0.4-r1
new file mode 100644
index 000000000000..a40bc9adc2b2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jpfcodegen-0.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/velocity:0 dev-java/jpf:1.5 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Generator of classes for accessing the attributes and extensions of JPF plug-ins
+EAPI=5
+HOMEPAGE=http://jabref.sourceforge.net/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-3
+RDEPEND=>=virtual/jre-1.6 dev-java/velocity:0 dev-java/jpf:1.5 >=dev-java/java-config-2.2.0
+SLOT=0
+SRC_URI=mirror://gentoo/jpfcodegen-0.4.tar.bz2
+_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-ant-2 e39bd5336f73afdf3e4a15c91a5dad59 java-pkg-2 bb9b8157d2a348d9ec42ce34a107fe0d java-utils-2 3f431421a91b4471894f5616adda4dc7 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=93ad51eaad34b53bbe99b7cb92946e97
diff --git a/metadata/md5-cache/dev-java/jss-4.3-r1 b/metadata/md5-cache/dev-java/jss-4.3-r1
deleted file mode 100644
index a7edb12134f5..000000000000
--- a/metadata/md5-cache/dev-java/jss-4.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/zip virtual/pkgconfig >=dev-libs/nspr-4.7 >=dev-libs/nss-3.12 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-DESCRIPTION=Network Security Services for Java (JSS)
-EAPI=5
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/jss/
-IUSE=elibc_FreeBSD doc examples source
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-1.1
-RDEPEND=>=virtual/jre-1.4 >=dev-libs/nspr-4.7 >=dev-libs/nss-3.12 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=3.4
-SRC_URI=mirror://gentoo/jss-4.3.tar.bz2
-_eclasses_=base 84d9f879f57a8316ff02be0373a3d6f9 eutils 43da5163ba106e87d22d2e7d6d67537f java-pkg-2 bb9b8157d2a348d9ec42ce34a107fe0d java-utils-2 3f431421a91b4471894f5616adda4dc7 linux-info 8f92e5ac1a1da684c5450b1b21a1f56a multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cc8e276a3f89a1429f78128099e17a25
diff --git a/metadata/md5-cache/dev-java/jss-4.3.2 b/metadata/md5-cache/dev-java/jss-4.3.2
new file mode 100644
index 000000000000..6a408736eae9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jss-4.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=dev-libs/nspr-4.7.1 >=dev-libs/nss-3.12.5 dev-lang/perl >=virtual/jdk-1.6 virtual/pkgconfig test? ( dev-libs/nss[utils] ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DESCRIPTION=Network Security Services for Java (JSS)
+EAPI=5
+HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS
+IUSE=examples test elibc_FreeBSD doc source
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-1.1
+RDEPEND=>=dev-libs/nspr-4.7.1 >=dev-libs/nss-3.12.5 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=3.4
+SRC_URI=https://dev.gentoo.org/~chewi/distfiles/jss-4.3.2.tar.bz2
+_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-pkg-2 bb9b8157d2a348d9ec42ce34a107fe0d java-utils-2 3f431421a91b4471894f5616adda4dc7 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=770f7d391f7937738fd7df3970a7c41a
diff --git a/metadata/md5-cache/dev-java/msv-20050627-r2 b/metadata/md5-cache/dev-java/msv-20050627-r2
deleted file mode 100644
index 37164deceb01..000000000000
--- a/metadata/md5-cache/dev-java/msv-20050627-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=virtual/jre-1.4 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xml-commons-resolver:0 dev-java/xerces:2 dev-java/xsdlib:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Multi-Schema XML Validator, a Java tool for validating XML documents
-EAPI=1
-HOMEPAGE=http://www.sun.com/software/xml/developers/multischema/ https://msv.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD Apache-1.1
-RDEPEND=>=virtual/jre-1.4 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xml-commons-resolver:0 dev-java/xerces:2 dev-java/xsdlib:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/msv.20050627.zip
-_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-ant-2 e39bd5336f73afdf3e4a15c91a5dad59 java-pkg-2 bb9b8157d2a348d9ec42ce34a107fe0d java-utils-2 3f431421a91b4471894f5616adda4dc7 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7ae50474c36c6a0f16b6ec5d460d26e2
diff --git a/metadata/md5-cache/dev-java/msv-20050627-r3 b/metadata/md5-cache/dev-java/msv-20050627-r3
deleted file mode 100644
index a233d4756e9b..000000000000
--- a/metadata/md5-cache/dev-java/msv-20050627-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=virtual/jre-1.4 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xml-commons-resolver:0 dev-java/xerces:2 dev-java/xsdlib:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Multi-Schema XML Validator, a Java tool for validating XML documents
-EAPI=1
-HOMEPAGE=http://www.sun.com/software/xml/developers/multischema/ https://msv.dev.java.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD Apache-1.1
-RDEPEND=>=virtual/jre-1.4 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xml-commons-resolver:0 dev-java/xerces:2 dev-java/xsdlib:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/msv.20050627.zip
-_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-ant-2 e39bd5336f73afdf3e4a15c91a5dad59 java-pkg-2 bb9b8157d2a348d9ec42ce34a107fe0d java-utils-2 3f431421a91b4471894f5616adda4dc7 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ea29170bb9ea5ac2444854e111417dbd
diff --git a/metadata/md5-cache/dev-java/msv-20130601 b/metadata/md5-cache/dev-java/msv-20130601
index be3893826cdd..990b17e894fa 100644
--- a/metadata/md5-cache/dev-java/msv-20130601
+++ b/metadata/md5-cache/dev-java/msv-20130601
@@ -4,10 +4,10 @@ DESCRIPTION=Multi-Schema XML Validator, a Java tool for validating XML documents
EAPI=5
HOMEPAGE=https://msv.java.net/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD Apache-2.0
RDEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xsdlib:0 dev-java/xerces:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://search.maven.org/remotecontent?filepath=net/java/dev/msv/msv-core/2013.6.1/msv-core-2013.6.1-sources.jar
_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-pkg-2 bb9b8157d2a348d9ec42ce34a107fe0d java-pkg-simple d87e645de7dff9e1bc0aac42b43ca4f4 java-utils-2 3f431421a91b4471894f5616adda4dc7 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=36c896456d279e9c7ae0d086044114cb
+_md5_=4d2c4752e43709bbca36986661927485
diff --git a/metadata/md5-cache/dev-java/pdfbox-0.7.3-r3 b/metadata/md5-cache/dev-java/pdfbox-0.7.3-r3
deleted file mode 100644
index bbfa7e24da85..000000000000
--- a/metadata/md5-cache/dev-java/pdfbox-0.7.3-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/fontbox:0 dev-java/bcprov:1.38 dev-java/bcmail:1.38 dev-java/lucene:2.1 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-nodeps >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java library and utilities for working with PDF documents
-EAPI=1
-HOMEPAGE=http://www.pdfbox.apache.org
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 dev-java/fontbox:0 dev-java/bcprov:1.38 dev-java/bcmail:1.38 dev-java/lucene:2.1 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/pdfbox/PDFBox-0.7.3.zip
-_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-ant-2 e39bd5336f73afdf3e4a15c91a5dad59 java-pkg-2 bb9b8157d2a348d9ec42ce34a107fe0d java-utils-2 3f431421a91b4471894f5616adda4dc7 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5c694c0eaec6ade5904736929ff06401
diff --git a/metadata/md5-cache/dev-java/pdfbox-1.8.8 b/metadata/md5-cache/dev-java/pdfbox-1.8.8
index 986ee967fadc..bff8ca0eb995 100644
--- a/metadata/md5-cache/dev-java/pdfbox-1.8.8
+++ b/metadata/md5-cache/dev-java/pdfbox-1.8.8
@@ -4,11 +4,11 @@ DESCRIPTION=Java library and utilities for working with PDF documents
EAPI=5
HOMEPAGE=http://pdfbox.apache.org/
IUSE=elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=~x86 ~amd64
+KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=>=virtual/jre-1.7 dev-java/icu4j:4 dev-java/junit:4 dev-java/bcprov:1.45 dev-java/bcmail:1.45 >=dev-java/commons-logging-1.1.1:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
RESTRICT=test
SLOT=1.8
SRC_URI=mirror://apache/pdfbox/1.8.8/pdfbox-1.8.8-src.zip http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/pcfi-2010.08.09.jar
_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-ant-2 e39bd5336f73afdf3e4a15c91a5dad59 java-pkg-2 bb9b8157d2a348d9ec42ce34a107fe0d java-utils-2 3f431421a91b4471894f5616adda4dc7 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d1160399141e47264890dd9d61cde3f8
+_md5_=33332051f0872d2d794dc5605689ca4b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.27 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.27
new file mode 100644
index 000000000000..0ea8f136dbc8
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.27
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3 implementation
+EAPI=5
+HOMEPAGE=http://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.27/src/apache-tomcat-8.0.27-src.tar.gz
+_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-ant-2 e39bd5336f73afdf3e4a15c91a5dad59 java-pkg-2 bb9b8157d2a348d9ec42ce34a107fe0d java-utils-2 3f431421a91b4471894f5616adda4dc7 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=06845c03f647d43cd9211bc3a7f7f86f
diff --git a/metadata/md5-cache/dev-java/vecmath-1.5.2 b/metadata/md5-cache/dev-java/vecmath-1.5.2
index 8356f397dad3..2cceafa6abaa 100644
--- a/metadata/md5-cache/dev-java/vecmath-1.5.2
+++ b/metadata/md5-cache/dev-java/vecmath-1.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=Sun J3D: 3D vector math package
EAPI=5
HOMEPAGE=https://vecmath.dev.java.net/
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-1
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://download.java.net/media/java3d/builds/release/1.5.2/vecmath-1_5_2-src.zip
_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-pkg-2 bb9b8157d2a348d9ec42ce34a107fe0d java-pkg-simple d87e645de7dff9e1bc0aac42b43ca4f4 java-utils-2 3f431421a91b4471894f5616adda4dc7 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8b94d9512a566ac9f4d4a5e7d790ee94
+_md5_=71440206b72acbf54d2d58d1c06993af
diff --git a/metadata/md5-cache/dev-python/CacheControl-0.11.5 b/metadata/md5-cache/dev-python/CacheControl-0.11.5
index 6278d41ccfee..e2dfeb63460b 100644
--- a/metadata/md5-cache/dev-python/CacheControl-0.11.5
+++ b/metadata/md5-cache/dev-python/CacheControl-0.11.5
@@ -4,11 +4,11 @@ DESCRIPTION=The httplib2 caching algorithms packaged up for use with requests
EAPI=5
HOMEPAGE=https://github.com/ionrock/cachecontrol https://pypi.python.org/pypi/cachecontrol/
IUSE=redis test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86
LICENSE=MIT
RDEPEND=dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/lockfile-0.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] redis? ( dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
SLOT=0
SRC_URI=mirror://pypi/C/CacheControl/CacheControl-0.11.5.tar.gz
_eclasses_=distutils-r1 46506dd0dd992b3c89b0d00daabfd86c eutils 43da5163ba106e87d22d2e7d6d67537f multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=70604b9950b6e681ee28a70a75fa6538
+_md5_=51ef569ed5a72e61e7817eda5e201d2e
diff --git a/metadata/md5-cache/dev-python/click-5.1 b/metadata/md5-cache/dev-python/click-5.1
new file mode 100644
index 000000000000..cc8b2eb6908f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/click-5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DESCRIPTION=A Python package for creating beautiful command line interfaces
+EAPI=5
+HOMEPAGE=http://click.pocoo.org/ https://pypi.python.org/pypi/click
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
+SLOT=0
+SRC_URI=mirror://pypi/c/click/click-5.1.tar.gz
+_eclasses_=distutils-r1 46506dd0dd992b3c89b0d00daabfd86c eutils 43da5163ba106e87d22d2e7d6d67537f multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
+_md5_=fa2e05d3555f2f95a06e76e4b414308b
diff --git a/metadata/md5-cache/dev-python/cloudlib-0.5.0 b/metadata/md5-cache/dev-python/cloudlib-0.5.0
new file mode 100644
index 000000000000..2ee451997649
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cloudlib-0.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Cloud middleware for in application use.
+EAPI=5
+HOMEPAGE=https://github.com/cloudnull/cloudlib
+IUSE=python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/prettytable-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cloudlib/cloudlib-0.5.0.tar.gz
+_eclasses_=distutils-r1 46506dd0dd992b3c89b0d00daabfd86c eutils 43da5163ba106e87d22d2e7d6d67537f multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
+_md5_=bb2535643a70a9fbcf25ca655b934d46
diff --git a/metadata/md5-cache/dev-python/ctypesgen-0_p72 b/metadata/md5-cache/dev-python/ctypesgen-0_p72
deleted file mode 100644
index f573730307a2..000000000000
--- a/metadata/md5-cache/dev-python/ctypesgen-0_p72
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-DESCRIPTION=Python wrapper generator for ctypes
-EAPI=3
-HOMEPAGE=https://github.com/davidjamesca/ctypesgen
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=mirror://gentoo/ctypesgen-0_p72.tar.bz2
-_eclasses_=distutils def8c8eb435ec28fd9315114640f6c84 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 python 06d7be3e54573292f012e3cc433d8297 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=2c134acd73e32c67968d3160b5c9aa1d
diff --git a/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1 b/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
index af5a9d2be50a..22a9466ae061 100644
--- a/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
+++ b/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python wrapper generator for ctypes
EAPI=5
HOMEPAGE=https://github.com/davidjamesca/ctypesgen
IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=BSD
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://gentoo/ctypesgen-0_p72.tar.bz2
_eclasses_=distutils-r1 46506dd0dd992b3c89b0d00daabfd86c eutils 43da5163ba106e87d22d2e7d6d67537f multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=6c57db12dedcd7e6877c29f420c1821d
+_md5_=0b885485b3d1e8eff40d20c42755fce4
diff --git a/metadata/md5-cache/dev-python/pip-7.1.2 b/metadata/md5-cache/dev-python/pip-7.1.2
index 814423a7abfc..23624e1bf363 100644
--- a/metadata/md5-cache/dev-python/pip-7.1.2
+++ b/metadata/md5-cache/dev-python/pip-7.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Installs python packages -- replacement for easy_install
EAPI=5
HOMEPAGE=https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.com/pypa/pip/
IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=>=dev-python/distlib-0.2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/html5lib-0.999999[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/six-1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/colorama-0.3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/CacheControl-0.11.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/lockfile-0.10.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/progress-1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/ipaddress-1.0.14[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/packaging-15.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/retrying-1.3.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/setuptools-18.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/p/pip/pip-7.1.2.tar.gz
_eclasses_=bash-completion-r1 b1fc4d30333bb528c8abb4332bb70ea6 distutils-r1 46506dd0dd992b3c89b0d00daabfd86c eutils 43da5163ba106e87d22d2e7d6d67537f multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=42ba5d1597c664a163557f18e051d950
+_md5_=cc7072cb1be7935a19689966ae87b5dd
diff --git a/metadata/md5-cache/dev-python/redis-py-2.10.3 b/metadata/md5-cache/dev-python/redis-py-2.10.3
index 175cda4cdb6f..f3033508daa8 100644
--- a/metadata/md5-cache/dev-python/redis-py-2.10.3
+++ b/metadata/md5-cache/dev-python/redis-py-2.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python client for Redis key-value store
EAPI=5
HOMEPAGE=https://github.com/andymccurdy/redis-py
IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=amd64 ~hppa ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ~ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
SLOT=0
SRC_URI=mirror://pypi/r/redis/redis-2.10.3.tar.gz -> redis-py-2.10.3.tar.gz
_eclasses_=distutils-r1 46506dd0dd992b3c89b0d00daabfd86c eutils 43da5163ba106e87d22d2e7d6d67537f multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=dbfac47403d3d27d6b4c79012741f1cc
+_md5_=7de11d4e5b87c23c695148c91f9ccc3d
diff --git a/metadata/md5-cache/dev-ruby/dbf-2.0.11 b/metadata/md5-cache/dev-ruby/dbf-2.0.11
new file mode 100644
index 000000000000..d86158f1e764
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/dbf-2.0.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) 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_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=a small fast library for reading dBase, xBase, Clipper and FoxPro database files
+EAPI=5
+HOMEPAGE=https://github.com/infused/dbf
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64 ~x86
+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 )
+SLOT=0
+SRC_URI=mirror://rubygems/dbf-2.0.11.gem
+_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-utils-2 3f431421a91b4471894f5616adda4dc7 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 ruby-fakegem b34b8f1debda62e461897a3f85df97e4 ruby-ng 12af15f9116c054425934f3eec054899 ruby-utils 97c910cb6b087c64260df641a9b3de0c toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=ad670f8cf7f200b79e96c34118dcd181
diff --git a/metadata/md5-cache/dev-util/creduce-2.4.0 b/metadata/md5-cache/dev-util/creduce-2.4.0
index 5138c35946aa..5bcf05974304 100644
--- a/metadata/md5-cache/dev-util/creduce-2.4.0
+++ b/metadata/md5-cache/dev-util/creduce-2.4.0
@@ -1,11 +1,11 @@
DEFINED_PHASES=-
-DEPEND=>=dev-lang/perl-5.10.0 app-text/delta dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/regexp-common dev-perl/Sys-CPU dev-util/astyle dev-util/indent sys-devel/clang:0/3.6 sys-devel/llvm:0/3.7.0[clang]
+DEPEND=>=dev-lang/perl-5.10.0 app-text/delta dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/regexp-common dev-perl/Sys-CPU dev-util/astyle dev-util/indent sys-devel/clang:0/3.7 sys-devel/llvm:0/3.7.0[clang]
DESCRIPTION=C-Reduce - a plugin-based C program reducer
EAPI=5
HOMEPAGE=http://embed.cs.utah.edu/creduce/
KEYWORDS=~amd64 ~x86
LICENSE=creduce
-RDEPEND=>=dev-lang/perl-5.10.0 app-text/delta dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/regexp-common dev-perl/Sys-CPU dev-util/astyle dev-util/indent sys-devel/clang:0/3.6 sys-devel/llvm:0/3.7.0[clang]
+RDEPEND=>=dev-lang/perl-5.10.0 app-text/delta dev-perl/Benchmark-Timer dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/regexp-common dev-perl/Sys-CPU dev-util/astyle dev-util/indent sys-devel/clang:0/3.7 sys-devel/llvm:0/3.7.0[clang]
SLOT=0
SRC_URI=http://embed.cs.utah.edu/creduce/creduce-2.4.0.tar.gz
-_md5_=cdc3d7389996dfd65f6b137be9ddb9c8
+_md5_=da49615e98448a5c302730cd45994c45
diff --git a/metadata/md5-cache/dev-util/cwdiff-0.3.1 b/metadata/md5-cache/dev-util/cwdiff-0.3.1
new file mode 100644
index 000000000000..135b991384c6
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cwdiff-0.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=sys-apps/help2man sys-apps/coreutils
+DESCRIPTION=A script that wraps wdiff to support directories and colorize the output
+EAPI=5
+HOMEPAGE=https://github.com/junghans/cwdiff
+IUSE=a2ps mercurial
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=sys-apps/sed app-shells/bash app-text/wdiff sys-apps/diffutils a2ps? ( app-text/a2ps ) mercurial? ( dev-vcs/mercurial )
+SLOT=0
+SRC_URI=https://github.com/junghans/cwdiff/archive/v0.3.1.tar.gz -> cwdiff-0.3.1.tar.gz
+_md5_=30ae566199c714bc21ea83dd210e9057
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-1.629 b/metadata/md5-cache/dev-util/jenkins-bin-1.629
deleted file mode 100644
index d947cfcee46d..000000000000
--- a/metadata/md5-cache/dev-util/jenkins-bin-1.629
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Extensible continuous integration server
-EAPI=5
-HOMEPAGE=http://jenkins-ci.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.7.0
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://mirrors.jenkins-ci.org/war/1.629/jenkins.war -> jenkins-bin-1.629.war
-_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f multilib df4e4d5cfd3d137d0c248e1991c0e4d6 systemd 6b4f0cefa642270eded7e6ca816fd181 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d user 906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=62ac3a7dd66a5656502547045548e4ae
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-1.627 b/metadata/md5-cache/dev-util/jenkins-bin-1.631
similarity index 86%
rename from metadata/md5-cache/dev-util/jenkins-bin-1.627
rename to metadata/md5-cache/dev-util/jenkins-bin-1.631
index 59474a0a6747..329d59ffd9c8 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-1.627
+++ b/metadata/md5-cache/dev-util/jenkins-bin-1.631
@@ -8,6 +8,6 @@ LICENSE=MIT
RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.7.0
RESTRICT=mirror
SLOT=0
-SRC_URI=http://mirrors.jenkins-ci.org/war/1.627/jenkins.war -> jenkins-bin-1.627.war
+SRC_URI=http://mirrors.jenkins-ci.org/war/1.631/jenkins.war -> jenkins-bin-1.631.war
_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f multilib df4e4d5cfd3d137d0c248e1991c0e4d6 systemd 6b4f0cefa642270eded7e6ca816fd181 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d user 906f3c8eb3a2350a4f1191a89baa3e46
_md5_=62ac3a7dd66a5656502547045548e4ae
diff --git a/metadata/md5-cache/dev-vcs/mercurial-3.5 b/metadata/md5-cache/dev-vcs/mercurial-3.5.2
similarity index 96%
rename from metadata/md5-cache/dev-vcs/mercurial-3.5
rename to metadata/md5-cache/dev-vcs/mercurial-3.5.2
index f2292e06ba5a..4064ac936014 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-3.5
+++ b/metadata/md5-cache/dev-vcs/mercurial-3.5.2
@@ -9,6 +9,6 @@ LICENSE=GPL-2
RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
-SRC_URI=http://mercurial.selenic.com/release/mercurial-3.5.tar.gz
+SRC_URI=http://mercurial.selenic.com/release/mercurial-3.5.2.tar.gz
_eclasses_=bash-completion-r1 b1fc4d30333bb528c8abb4332bb70ea6 distutils-r1 46506dd0dd992b3c89b0d00daabfd86c elisp-common 73c48c11ad6a6494eda0d0cca848c8fa eutils 43da5163ba106e87d22d2e7d6d67537f flag-o-matic 85dc1eac3c64d8141374490ed64122e5 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
_md5_=e422944db233ffd57955d7ed7b1944d9
diff --git a/metadata/md5-cache/games-arcade/netris-0.52-r1 b/metadata/md5-cache/games-arcade/netris-0.52-r1
new file mode 100644
index 000000000000..ff565ad2f4cf
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/netris-0.52-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=Classic networked version of T*tris
+EAPI=5
+HOMEPAGE=http://www.netris.org/
+KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= games-misc/games-envd
+SLOT=0
+SRC_URI=ftp://ftp.netris.org/pub/netris/netris-0.52.tar.gz mirror://debian/pool/main/n/netris/netris_0.52-9.diff.gz
+_eclasses_=base 84d9f879f57a8316ff02be0373a3d6f9 eutils 43da5163ba106e87d22d2e7d6d67537f games ce18d731b1dfae17561d847a24ca08c2 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d user 906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=bed2542975daf4d0daa0059e8e02bb8e
diff --git a/metadata/md5-cache/games-emulation/m64py-0.2.3 b/metadata/md5-cache/games-emulation/m64py-0.2.3
new file mode 100644
index 000000000000..ebc5c5967170
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/m64py-0.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+DESCRIPTION=A frontend for Mupen64Plus
+EAPI=5
+HOMEPAGE=http://m64py.sourceforge.net/
+IUSE=python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0
+RDEPEND=media-libs/libsdl:0/0[joystick] dev-python/PyQt5[opengl,python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=games-emulation/mupen64plus-core-2.0-r1:0/2 python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://sourceforge/m64py/m64py-0.2.3.tar.gz
+_eclasses_=distutils-r1 46506dd0dd992b3c89b0d00daabfd86c eutils 43da5163ba106e87d22d2e7d6d67537f multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
+_md5_=6cf25bbc030af7189385643d39790e80
diff --git a/metadata/md5-cache/games-strategy/0ad-0.0.18_alpha-r2 b/metadata/md5-cache/games-strategy/0ad-0.0.18_alpha-r2
index 27267541ad64..c67ebe5b5285 100644
--- a/metadata/md5-cache/games-strategy/0ad-0.0.18_alpha-r2
+++ b/metadata/md5-cache/games-strategy/0ad-0.0.18_alpha-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/boost dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.18_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] net-libs/enet:1.3 net-libs/miniupnpc net-misc/curl sys-libs/zlib virtual/jpeg:62 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:2.8[X,opengl] ) lobby? ( net-libs/gloox ) nvtt? ( media-gfx/nvidia-texture-tools ) sound? ( media-libs/libvorbis media-libs/openal ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl] ) virtual/pkgconfig test? ( dev-lang/perl ) >=sys-apps/sed-4
+DEPEND=dev-libs/boost dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.18_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:62 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:2.8[X,opengl] ) lobby? ( net-libs/gloox ) nvtt? ( media-gfx/nvidia-texture-tools ) sound? ( media-libs/libvorbis media-libs/openal ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl] ) virtual/pkgconfig test? ( dev-lang/perl ) >=sys-apps/sed-4
DESCRIPTION=A free, real-time strategy game
EAPI=5
HOMEPAGE=http://play0ad.com/
IUSE=editor +lobby nvtt pch sound test
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB
-RDEPEND=dev-libs/boost dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.18_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] net-libs/enet:1.3 net-libs/miniupnpc net-misc/curl sys-libs/zlib virtual/jpeg:62 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:2.8[X,opengl] ) lobby? ( net-libs/gloox ) nvtt? ( media-gfx/nvidia-texture-tools ) sound? ( media-libs/libvorbis media-libs/openal ) games-misc/games-envd
+RDEPEND=dev-libs/boost dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.18_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:62 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:2.8[X,opengl] ) lobby? ( net-libs/gloox ) nvtt? ( media-gfx/nvidia-texture-tools ) sound? ( media-libs/libvorbis media-libs/openal ) games-misc/games-envd
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/zero-ad/0ad-0.0.18-alpha-unix-build.tar.xz
_eclasses_=base 84d9f879f57a8316ff02be0373a3d6f9 eutils 43da5163ba106e87d22d2e7d6d67537f games ce18d731b1dfae17561d847a24ca08c2 gnome2-utils 44555579e85afa5c035d2bd5428252da multilib df4e4d5cfd3d137d0c248e1991c0e4d6 python-any-r1 b81ab4852d108e3d9c940fa03bce80e1 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d user 906f3c8eb3a2350a4f1191a89baa3e46 wxwidgets e0c7fd61275cea7156be4143ba8c673a
-_md5_=8bb7fd9ac7e43084728d809d0733cb96
+_md5_=b1e9cdb81cdd30c7faaa09704e7b9a3f
diff --git a/metadata/md5-cache/media-libs/mesa-11.0.2 b/metadata/md5-cache/media-libs/mesa-11.0.2
index 391d2d43292a..aca79dc70bb8 100644
--- a/metadata/md5-cache/media-libs/mesa-11.0.2
+++ b/metadata/md5-cache/media-libs/mesa-11.0.2
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
SLOT=0
SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/11.0.2/mesa-11.0.2.tar.xz
_eclasses_=autotools 542bf3f83917668f3893f4da1ca238ff eutils 43da5163ba106e87d22d2e7d6d67537f libtool 7f78cd7d403808a350c9ae23f5821fb4 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multilib-build c47eec09e82c8a750127ff2abf0745b1 multilib-minimal a93a9b4153a5f1c746bdd3b20ef9d834 pax-utils 4f1280c0d4dcd8340f731827007c0a53 python-any-r1 b81ab4852d108e3d9c940fa03bce80e1 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=c695224846d060955795145ba3ff7244
+_md5_=85dacee7d5f08785f0a0a18fc3255c23
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index fa896a3e6e19..44d5e59976bf 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) o
RESTRICT=!bindist? ( bindist )
SLOT=0
_eclasses_=autotools 542bf3f83917668f3893f4da1ca238ff eutils 43da5163ba106e87d22d2e7d6d67537f git-r3 1502b9838d043db47700b8120083e637 libtool 7f78cd7d403808a350c9ae23f5821fb4 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multilib-build c47eec09e82c8a750127ff2abf0745b1 multilib-minimal a93a9b4153a5f1c746bdd3b20ef9d834 pax-utils 4f1280c0d4dcd8340f731827007c0a53 python-any-r1 b81ab4852d108e3d9c940fa03bce80e1 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=f48afc6b56e7ceb77a5f21b3c589f311
+_md5_=0e3ce7dcfce77d1419cf7034bfab7a48
diff --git a/metadata/md5-cache/media-sound/lame-3.99.5-r1 b/metadata/md5-cache/media-sound/lame-3.99.5-r1
index 09f5d47e86d6..57e56b11babf 100644
--- a/metadata/md5-cache/media-sound/lame-3.99.5-r1
+++ b/metadata/md5-cache/media-sound/lame-3.99.5-r1
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.7-r7:0= sndfile? ( >=media-libs/libsndfile-1.0.2 )
SLOT=0
SRC_URI=mirror://sourceforge/lame/lame-3.99.5.tar.gz mirror://gentoo/lame-3.99.5-automake-2.12.patch.gz
_eclasses_=autotools 542bf3f83917668f3893f4da1ca238ff eutils 43da5163ba106e87d22d2e7d6d67537f libtool 7f78cd7d403808a350c9ae23f5821fb4 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multilib-build c47eec09e82c8a750127ff2abf0745b1 multilib-minimal a93a9b4153a5f1c746bdd3b20ef9d834 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=19099f93d6b6b017070f20be73f3d5d9
+_md5_=25b2de5515b303cf235dac20577c7a43
diff --git a/metadata/md5-cache/media-sound/mumble-1.2.10 b/metadata/md5-cache/media-sound/mumble-1.2.10
new file mode 100644
index 000000000000..7182ec892861
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mumble-1.2.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=>=dev-libs/boost-1.41.0 >=dev-libs/openssl-1.0.0b >=dev-libs/protobuf-2.2.0 >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/opus-1.0.1 >=media-libs/speex-1.2_rc1 sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4[sqlite] dev-qt/qtsvg:4 dev-qt/qtxmlpatterns:4 x11-proto/inputproto alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:4 ) g15? ( app-misc/g15daemon ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( app-accessibility/speech-dispatcher ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) virtual/pkgconfig
+DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
+EAPI=5
+HOMEPAGE=http://mumble.sourceforge.net/
+IUSE=+alsa +dbus debug g15 oss pch portaudio pulseaudio speech zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD MIT
+RDEPEND=>=dev-libs/boost-1.41.0 >=dev-libs/openssl-1.0.0b >=dev-libs/protobuf-2.2.0 >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/opus-1.0.1 >=media-libs/speex-1.2_rc1 sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4[sqlite] dev-qt/qtsvg:4 dev-qt/qtxmlpatterns:4 x11-proto/inputproto alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:4 ) g15? ( app-misc/g15daemon ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( app-accessibility/speech-dispatcher ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+SLOT=0
+SRC_URI=http://mumble.info/snapshot/mumble-1.2.10.tar.gz
+_eclasses_=base 84d9f879f57a8316ff02be0373a3d6f9 eutils 43da5163ba106e87d22d2e7d6d67537f multilib df4e4d5cfd3d137d0c248e1991c0e4d6 qmake-utils 05b63bb5c708c5903a9de5c58c8e43c8 qt4-r2 cb2cb5856695b300266b425da70e82d8 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
+_md5_=e8868f4b9f521fc663a9974e5371e812
diff --git a/metadata/md5-cache/media-sound/mumble-1.2.8 b/metadata/md5-cache/media-sound/mumble-1.2.8
index 1cdfda726353..b93bdaca38ab 100644
--- a/metadata/md5-cache/media-sound/mumble-1.2.8
+++ b/metadata/md5-cache/media-sound/mumble-1.2.8
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/boost-1.41.0 >=dev-libs/openssl-1.0.0b >=dev-libs/protobuf-2.
SLOT=0
SRC_URI=http://mumble.info/snapshot/mumble-1.2.8.tar.gz
_eclasses_=base 84d9f879f57a8316ff02be0373a3d6f9 eutils 43da5163ba106e87d22d2e7d6d67537f multilib df4e4d5cfd3d137d0c248e1991c0e4d6 qmake-utils 05b63bb5c708c5903a9de5c58c8e43c8 qt4-r2 cb2cb5856695b300266b425da70e82d8 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=4fdb17c0c911cebc51a4ce13a3660c9a
+_md5_=3f886949ad7782d1d2ca5d8820567603
diff --git a/metadata/md5-cache/media-sound/murmur-1.2.10 b/metadata/md5-cache/media-sound/murmur-1.2.10
new file mode 100644
index 000000000000..038a6c24161c
--- /dev/null
+++ b/metadata/md5-cache/media-sound/murmur-1.2.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=>=dev-libs/openssl-1.0.0b >=dev-libs/protobuf-2.2.0 sys-apps/lsb-release >=sys-libs/libcap-2.15 dev-qt/qtcore:4[ssl] || ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] ) dev-qt/qtxmlpatterns:4 dbus? ( dev-qt/qtdbus:4 ) ice? ( dev-libs/Ice ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-libs/boost-1.41.0 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
+EAPI=5
+HOMEPAGE=http://mumble.sourceforge.net/
+IUSE=+dbus debug +ice pch zeroconf
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/openssl-1.0.0b >=dev-libs/protobuf-2.2.0 sys-apps/lsb-release >=sys-libs/libcap-2.15 dev-qt/qtcore:4[ssl] || ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] ) dev-qt/qtxmlpatterns:4 dbus? ( dev-qt/qtdbus:4 ) ice? ( dev-libs/Ice ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+SLOT=0
+SRC_URI=http://mumble.info/snapshot/mumble-1.2.10.tar.gz
+_eclasses_=base 84d9f879f57a8316ff02be0373a3d6f9 eutils 43da5163ba106e87d22d2e7d6d67537f multilib df4e4d5cfd3d137d0c248e1991c0e4d6 qmake-utils 05b63bb5c708c5903a9de5c58c8e43c8 qt4-r2 cb2cb5856695b300266b425da70e82d8 readme.gentoo e37aea783a61ae55fab947df247eebea systemd 6b4f0cefa642270eded7e6ca816fd181 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d user 906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=1f6c2e9eb591189457c2f0a40c11fa41
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-3.7.3 b/metadata/md5-cache/net-dns/pdns-recursor-3.7.3
index de59caa60a55..807cc4f4784a 100644
--- a/metadata/md5-cache/net-dns/pdns-recursor-3.7.3
+++ b/metadata/md5-cache/net-dns/pdns-recursor-3.7.3
@@ -4,10 +4,10 @@ DESCRIPTION=The PowerDNS Recursor
EAPI=4
HOMEPAGE=http://www.powerdns.com/
IUSE=lua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
RDEPEND=lua? ( >=dev-lang/lua-5.1 ) !=net-misc/curl-7.25.0-r1[ssl] ) )
+DESCRIPTION=A small C library that makes it easy to run an HTTP server as part of another application
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
+IUSE=epoll messages ssl static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
+SLOT=0
+SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz
+_md5_=b5a653073d8638ac2514e3ae1d58e8a3
diff --git a/metadata/md5-cache/net-libs/miniupnpc-1.9.20150917 b/metadata/md5-cache/net-libs/miniupnpc-1.9.20150917-r1
similarity index 93%
rename from metadata/md5-cache/net-libs/miniupnpc-1.9.20150917
rename to metadata/md5-cache/net-libs/miniupnpc-1.9.20150917-r1
index 776ab44d6659..c498125db514 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-1.9.20150917
+++ b/metadata/md5-cache/net-libs/miniupnpc-1.9.20150917-r1
@@ -9,4 +9,4 @@ LICENSE=BSD
SLOT=0/14
SRC_URI=http://miniupnp.free.fr/files/miniupnpc-1.9.20150917.tar.gz
_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=473138589922f55b32d9a60c26ba42e7
+_md5_=6e86113d3913c08ac285e725f5e5e9a5
diff --git a/metadata/md5-cache/net-misc/autoupnp-0.4.7 b/metadata/md5-cache/net-misc/autoupnp-0.4.7
new file mode 100644
index 000000000000..25d392ab2c54
--- /dev/null
+++ b/metadata/md5-cache/net-misc/autoupnp-0.4.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=net-libs/miniupnpc:0= libnotify? ( x11-libs/libtinynotify:0= )
+DESCRIPTION=Automatic open port forwarder using UPnP
+EAPI=5
+HOMEPAGE=https://bitbucket.org/mgorny/autoupnp/
+IUSE=libnotify
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=net-libs/miniupnpc:0= libnotify? ( x11-libs/libtinynotify:0= )
+SLOT=0
+SRC_URI=https://www.bitbucket.org/mgorny/autoupnp/downloads/autoupnp-0.4.7.tar.bz2
+_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
+_md5_=7a6a729bf2c1d02f38bf6069575fcf36
diff --git a/metadata/md5-cache/net-misc/autoupnp-9999 b/metadata/md5-cache/net-misc/autoupnp-9999
index 2e67b72430d8..bdb928e28c09 100644
--- a/metadata/md5-cache/net-misc/autoupnp-9999
+++ b/metadata/md5-cache/net-misc/autoupnp-9999
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/miniupnpc:0= libnotify? ( x11-libs/libtinynotify:0= ) >=dev-vcs/git-1.8.2.1 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=net-libs/miniupnpc:0= libnotify? ( x11-libs/libtinynotify:0= ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
DESCRIPTION=Automatic open port forwarder using UPnP
EAPI=5
HOMEPAGE=https://bitbucket.org/mgorny/autoupnp/
@@ -7,5 +7,5 @@ IUSE=libnotify
LICENSE=BSD
RDEPEND=net-libs/miniupnpc:0= libnotify? ( x11-libs/libtinynotify:0= )
SLOT=0
-_eclasses_=autotools 542bf3f83917668f3893f4da1ca238ff autotools-utils 0bf099a6e3dfeaf20a7a94504d8dd896 eutils 43da5163ba106e87d22d2e7d6d67537f git-r3 1502b9838d043db47700b8120083e637 libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=6674073302a7a1d601827ebc73a9b60f
+_eclasses_=autotools 542bf3f83917668f3893f4da1ca238ff eutils 43da5163ba106e87d22d2e7d6d67537f git-r3 1502b9838d043db47700b8120083e637 libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
+_md5_=112fb5dcb02078c9342b860bb451acad
diff --git a/metadata/md5-cache/net-misc/openconnect-7.06-r1 b/metadata/md5-cache/net-misc/openconnect-7.06-r1
index b196927badea..c64dd4717193 100644
--- a/metadata/md5-cache/net-misc/openconnect-7.06-r1
+++ b/metadata/md5-cache/net-misc/openconnect-7.06-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
EAPI=5
HOMEPAGE=http://www.infradead.org/openconnect.html
IUSE=doc +gnutls gssapi java libproxy nls static-libs linguas_ar linguas_cs linguas_de linguas_el linguas_en_GB linguas_en_US linguas_es linguas_eu linguas_fi linguas_fr linguas_gl linguas_id linguas_lt linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_sk linguas_sl linguas_tg linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ppc64 x86
LICENSE=LGPL-2.1 GPL-2
RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) sys-apps/iproute2 !=dev-java/java-config-2.2.0 )
SLOT=0/5
SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.06.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20140806.tar.gz
_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-pkg-opt-2 4a567b4a22dd2dc61b77c056d29353a5 java-utils-2 3f431421a91b4471894f5616adda4dc7 linux-info 8f92e5ac1a1da684c5450b1b21a1f56a multilib df4e4d5cfd3d137d0c248e1991c0e4d6 python-any-r1 b81ab4852d108e3d9c940fa03bce80e1 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 readme.gentoo e37aea783a61ae55fab947df247eebea toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=12fe980c8437d1375533ef1a7f65e13b
+_md5_=3dbaff8d487939fdea51722f7cfef4ad
diff --git a/metadata/md5-cache/net-misc/spiped-1.5.0 b/metadata/md5-cache/net-misc/spiped-1.5.0
deleted file mode 100644
index b546b6221930..000000000000
--- a/metadata/md5-cache/net-misc/spiped-1.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=dev-libs/openssl:*
-DESCRIPTION=secure pipe daemon
-EAPI=5
-HOMEPAGE=http://www.tarsnap.com/spiped.html
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:*
-SLOT=0
-SRC_URI=http://www.tarsnap.com/spiped/spiped-1.5.0.tgz
-_md5_=67b21d773292355f7b01c5a5f9f9dbfd
diff --git a/metadata/md5-cache/net-wireless/bluez-5.33 b/metadata/md5-cache/net-wireless/bluez-5.33
index 3b913bf0524c..e574d8d62fe0 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.33
+++ b/metadata/md5-cache/net-wireless/bluez-5.33
@@ -4,10 +4,10 @@ DESCRIPTION=Bluetooth Tools and System Daemons for Linux
EAPI=5
HOMEPAGE=http://www.bluez.org
IUSE=cups debug +obex +readline selinux systemd test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86
+KEYWORDS=amd64 arm hppa ~mips ppc ppc64 x86
LICENSE=GPL-2+ LGPL-2.1+
RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.6:= >=sys-apps/hwids-20121202.2 cups? ( net-print/cups:= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) abi_x86_32? ( !=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) static-analyzer? ( dev-lang/perl:* python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) xml? ( dev-libs/libxml2: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(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) ocaml? ( dev-lang/ocaml:0= dev-ml/findlib dev-ml/ocaml-ctypes ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( sys-libs/libcxx ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-util/ninja >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) static-analyzer? ( dev-lang/perl:* python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) xml? ( dev-libs/libxml2: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(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) ocaml? ( dev-lang/ocaml:0= dev-ml/findlib dev-ml/ocaml-ctypes ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( sys-libs/libcxx ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-util/ninja >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
DESCRIPTION=Low Level Virtual Machine
EAPI=5
HOMEPAGE=http://llvm.org/
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) lldb? ( clang )
SLOT=0/3.7.0
SRC_URI=http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz clang? ( http://llvm.org/releases/3.7.0/compiler-rt-3.7.0.src.tar.xz http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz http://llvm.org/releases/3.7.0/clang-tools-extra-3.7.0.src.tar.xz ) lldb? ( http://llvm.org/releases/3.7.0/lldb-3.7.0.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.7.0-manpages.tar.bz2 )
_eclasses_=check-reqs 4f43fb72bc73bd58d75ec601713fae20 cmake-utils f474224ef49d530640a43a04ae94928e eutils 43da5163ba106e87d22d2e7d6d67537f flag-o-matic 85dc1eac3c64d8141374490ed64122e5 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multilib-build c47eec09e82c8a750127ff2abf0745b1 multilib-minimal a93a9b4153a5f1c746bdd3b20ef9d834 pax-utils 4f1280c0d4dcd8340f731827007c0a53 python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=412d0b14442ca271c6d60bd22737b959
+_md5_=b4edd569d0a9e8c5f968d63800cb3f42
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.5.2 b/metadata/md5-cache/sys-fs/zfs-0.6.5.2-r1
similarity index 97%
rename from metadata/md5-cache/sys-fs/zfs-0.6.5.2
rename to metadata/md5-cache/sys-fs/zfs-0.6.5.2-r1
index 4229f899b924..26cdbb8e600f 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.5.2
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.5.2-r1
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.5.2.tar.gz
_eclasses_=autotools 542bf3f83917668f3893f4da1ca238ff autotools-utils 0bf099a6e3dfeaf20a7a94504d8dd896 bash-completion-r1 b1fc4d30333bb528c8abb4332bb70ea6 eutils 43da5163ba106e87d22d2e7d6d67537f flag-o-matic 85dc1eac3c64d8141374490ed64122e5 libtool 7f78cd7d403808a350c9ae23f5821fb4 linux-info 8f92e5ac1a1da684c5450b1b21a1f56a multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 python-r1 32b376cbb100a3a8083b3a0de023e117 python-utils-r1 39c6b012a0512678e698e712b5b7ecc2 systemd 6b4f0cefa642270eded7e6ca816fd181 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d udev 37ef89be271b9ae8aa64be024ddb39b5 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=368ac1887737171a394545b6f0af15aa
+_md5_=e68784f88991474f99c9b757f4ae018a
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.25.1-r1 b/metadata/md5-cache/sys-libs/binutils-libs-2.25.1-r1
index 32e0167d025f..691ce00222cb 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.25.1-r1
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.25.1-r1
@@ -10,4 +10,4 @@ RDEPEND=zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_
SLOT=0/2.25.1
SRC_URI=mirror://gnu/binutils/binutils-2.25.1.tar.bz2 mirror://gentoo/binutils-2.25.1-patches-1.1.tar.xz
_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 multilib-build c47eec09e82c8a750127ff2abf0745b1 multilib-minimal a93a9b4153a5f1c746bdd3b20ef9d834 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=c6b1d9762499d5d5d49c963d82402a99
+_md5_=c0ad18611a92205a1f356e309759b904
diff --git a/metadata/md5-cache/sys-process/schedtool-1.3.0-r1 b/metadata/md5-cache/sys-process/schedtool-1.3.0-r1
index 7c92ec337bff..2a84fb30c15f 100644
--- a/metadata/md5-cache/sys-process/schedtool-1.3.0-r1
+++ b/metadata/md5-cache/sys-process/schedtool-1.3.0-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=A tool to query or alter a process' scheduling policy
EAPI=4
HOMEPAGE=http://freequaos.host.sk/schedtool
-KEYWORDS=amd64 ~mips ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~mips ppc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
SLOT=0
SRC_URI=http://freequaos.host.sk/schedtool/schedtool-1.3.0.tar.bz2
_eclasses_=multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=205e3b163e0e7bba1c9dde77770587e8
+_md5_=a7dcd048e2de4fc961e858aa3261db25
diff --git a/metadata/md5-cache/www-client/opera-beta-32.0.1948.12 b/metadata/md5-cache/www-client/opera-beta-33.0.1990.11
similarity index 94%
rename from metadata/md5-cache/www-client/opera-beta-32.0.1948.12
rename to metadata/md5-cache/www-client/opera-beta-33.0.1990.11
index 98bb6419c3d8..9db3496cf55d 100644
--- a/metadata/md5-cache/www-client/opera-beta-32.0.1948.12
+++ b/metadata/md5-cache/www-client/opera-beta-33.0.1990.11
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
LICENSE=OPERA-2014
RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
SLOT=0
-SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-beta/32.0.1948.12/linux/opera-beta_32.0.1948.12_amd64.deb )
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-beta/33.0.1990.11/linux/opera-beta_33.0.1990.11_amd64.deb )
_eclasses_=chromium f828dac97fd266c59459737299f9659d eutils 43da5163ba106e87d22d2e7d6d67537f fdo-mime 92d07846ea8ea54172f8c0112a47ae3d gnome2-utils 44555579e85afa5c035d2bd5428252da linux-info 8f92e5ac1a1da684c5450b1b21a1f56a multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d unpacker 1d149d9bda7723e740cfd28118f27813 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=27e1457da9e75734b305171e453bd00b
diff --git a/metadata/md5-cache/www-client/vivaldi-1.0.279.3_p1 b/metadata/md5-cache/www-client/vivaldi-1.0.288.3_p1
similarity index 94%
rename from metadata/md5-cache/www-client/vivaldi-1.0.279.3_p1
rename to metadata/md5-cache/www-client/vivaldi-1.0.288.3_p1
index d1e310b571ac..68f1841d84ef 100644
--- a/metadata/md5-cache/www-client/vivaldi-1.0.279.3_p1
+++ b/metadata/md5-cache/www-client/vivaldi-1.0.288.3_p1
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
RESTRICT=bindist mirror
SLOT=0
-SRC_URI=amd64? ( http://vivaldi.com/download/snapshot/vivaldi-snapshot_1.0.279.3-1_amd64.deb -> vivaldi-1.0.279.3_p1-amd64.deb ) x86? ( http://vivaldi.com/download/snapshot/vivaldi-snapshot_1.0.279.3-1_i386.deb -> vivaldi-1.0.279.3_p1-i386.deb )
+SRC_URI=amd64? ( http://vivaldi.com/download/snapshot/vivaldi-snapshot_1.0.288.3-1_amd64.deb -> vivaldi-1.0.288.3_p1-amd64.deb ) x86? ( http://vivaldi.com/download/snapshot/vivaldi-snapshot_1.0.288.3-1_i386.deb -> vivaldi-1.0.288.3_p1-i386.deb )
_eclasses_=chromium f828dac97fd266c59459737299f9659d eutils 43da5163ba106e87d22d2e7d6d67537f fdo-mime 92d07846ea8ea54172f8c0112a47ae3d gnome2-utils 44555579e85afa5c035d2bd5428252da linux-info 8f92e5ac1a1da684c5450b1b21a1f56a multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d unpacker 1d149d9bda7723e740cfd28118f27813 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=18d88d1535936271a7d351c23dab638e
diff --git a/metadata/md5-cache/www-servers/blogc-runserver-0.1 b/metadata/md5-cache/www-servers/blogc-runserver-0.1
new file mode 100644
index 000000000000..e64a8133b2e4
--- /dev/null
+++ b/metadata/md5-cache/www-servers/blogc-runserver-0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/libevent sys-apps/file
+DESCRIPTION=A simple HTTP server to test blogc websites
+EAPI=5
+HOMEPAGE=https://github.com/blogc/blogc-runserver
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libevent sys-apps/file
+SLOT=0
+SRC_URI=https://github.com/blogc/blogc-runserver/releases/download/v0.1/blogc-runserver-0.1.tar.xz
+_md5_=f8fc8e7d33323d16b2c293c6ff836d04
diff --git a/metadata/md5-cache/www-servers/blogc-runserver-9999 b/metadata/md5-cache/www-servers/blogc-runserver-9999
new file mode 100644
index 000000000000..2e1883620af7
--- /dev/null
+++ b/metadata/md5-cache/www-servers/blogc-runserver-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare unpack
+DEPEND=dev-libs/libevent sys-apps/file >=dev-vcs/git-1.8.2.1 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A simple HTTP server to test blogc websites
+EAPI=5
+HOMEPAGE=https://github.com/blogc/blogc-runserver
+LICENSE=BSD
+RDEPEND=dev-libs/libevent sys-apps/file
+SLOT=0
+_eclasses_=autotools 542bf3f83917668f3893f4da1ca238ff eutils 43da5163ba106e87d22d2e7d6d67537f git-r3 1502b9838d043db47700b8120083e637 libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
+_md5_=f8fc8e7d33323d16b2c293c6ff836d04
diff --git a/metadata/md5-cache/www-servers/pshs-0.3 b/metadata/md5-cache/www-servers/pshs-0.3
new file mode 100644
index 000000000000..1b098736f83a
--- /dev/null
+++ b/metadata/md5-cache/www-servers/pshs-0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=>=dev-libs/libevent-2:0= magic? ( sys-apps/file:0= ) qrcode? ( media-gfx/qrencode:0= ) ssl? ( >=dev-libs/libevent-2.1:0=[ssl] dev-libs/openssl:0= ) upnp? ( net-libs/miniupnpc:0= ) netlink? ( sys-apps/iproute2 >=sys-kernel/linux-headers-2.6.27 )
+DESCRIPTION=Pretty small HTTP server -- a command-line tool to share files
+EAPI=5
+HOMEPAGE=https://bitbucket.org/mgorny/pshs/
+IUSE=+magic +netlink qrcode ssl upnp
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/libevent-2:0= magic? ( sys-apps/file:0= ) qrcode? ( media-gfx/qrencode:0= ) ssl? ( >=dev-libs/libevent-2.1:0=[ssl] dev-libs/openssl:0= ) upnp? ( net-libs/miniupnpc:0= )
+SLOT=0
+SRC_URI=https://www.bitbucket.org/mgorny/pshs/downloads/pshs-0.3.tar.bz2
+_md5_=5f5e380fb670751c1bcc073fc50073b8
diff --git a/metadata/md5-cache/www-servers/pshs-9999 b/metadata/md5-cache/www-servers/pshs-9999
index feca59ba0ce1..1349f1232c95 100644
--- a/metadata/md5-cache/www-servers/pshs-9999
+++ b/metadata/md5-cache/www-servers/pshs-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libevent-2:0= magic? ( sys-apps/file:0= ) qrcode? ( media-gfx/qrencode:0= ) ssl? ( >=dev-libs/libevent-2.1:0=[ssl] dev-libs/openssl:0= ) upnp? ( net-libs/miniupnpc:0= ) netlink? ( sys-apps/iproute2 >=sys-kernel/linux-headers-2.6.27 ) >=dev-vcs/git-1.8.2.1 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Pretty small HTTP server - a command-line tool to share files
+DEFINED_PHASES=configure prepare unpack
+DEPEND=>=dev-libs/libevent-2:0= magic? ( sys-apps/file:0= ) qrcode? ( media-gfx/qrencode:0= ) ssl? ( >=dev-libs/libevent-2.1:0=[ssl] dev-libs/openssl:0= ) upnp? ( net-libs/miniupnpc:0= ) netlink? ( sys-apps/iproute2 >=sys-kernel/linux-headers-2.6.27 ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Pretty small HTTP server -- a command-line tool to share files
EAPI=5
HOMEPAGE=https://bitbucket.org/mgorny/pshs/
IUSE=+magic +netlink qrcode ssl upnp
LICENSE=BSD
RDEPEND=>=dev-libs/libevent-2:0= magic? ( sys-apps/file:0= ) qrcode? ( media-gfx/qrencode:0= ) ssl? ( >=dev-libs/libevent-2.1:0=[ssl] dev-libs/openssl:0= ) upnp? ( net-libs/miniupnpc:0= )
SLOT=0
-_eclasses_=autotools 542bf3f83917668f3893f4da1ca238ff autotools-utils 0bf099a6e3dfeaf20a7a94504d8dd896 eutils 43da5163ba106e87d22d2e7d6d67537f git-r3 1502b9838d043db47700b8120083e637 libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
-_md5_=1bbfc7fdc2869893bb6c56e1f815d674
+_eclasses_=autotools 542bf3f83917668f3893f4da1ca238ff eutils 43da5163ba106e87d22d2e7d6d67537f git-r3 1502b9838d043db47700b8120083e637 libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d
+_md5_=e0b9d15b2840abe70f029128b43c5057
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.27 b/metadata/md5-cache/www-servers/tomcat-8.0.27
new file mode 100644
index 000000000000..a881b54a8d9d
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.27
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.4 dev-java/oracle-javamail:0 dev-java/tomcat-servlet-api:3.1 >=virtual/jdk-1.7 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3 Container
+EAPI=5
+HOMEPAGE=http://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.4 dev-java/oracle-javamail:0 dev-java/tomcat-servlet-api:3.1 !=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=8
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.27/src/apache-tomcat-8.0.27-src.tar.gz
+_eclasses_=eutils 43da5163ba106e87d22d2e7d6d67537f java-ant-2 e39bd5336f73afdf3e4a15c91a5dad59 java-pkg-2 bb9b8157d2a348d9ec42ce34a107fe0d java-utils-2 3f431421a91b4471894f5616adda4dc7 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 prefix e7f2b9c6e57342e5d25eac22fce23062 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=2dbfd652b61d377551f38564ccb16283
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 92f70ceed2c6..56c61ab055ad 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 01 Oct 2015 18:11:21 +0000
+Fri, 02 Oct 2015 09:41:20 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ce3c49fd98f1..029afff20b7f 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Oct 1 18:11:20 UTC 2015
+Fri Oct 2 09:41:19 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7d97d246ec4a..af4956140efe 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 01 Oct 2015 18:30:01 +0000
+Fri, 02 Oct 2015 10:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index dc2fe2d9351f..c911871c29de 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1443723001 Thu 01 Oct 2015 06:10:01 PM UTC
+1443778801 Fri 02 Oct 2015 09:40:01 AM UTC
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.7.3.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.7.3.ebuild
index 5b5d2c80a043..0e2287543976 100644
--- a/net-dns/pdns-recursor/pdns-recursor-3.7.3.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-3.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="lua"
DEPEND="lua? ( >=dev-lang/lua-5.1 )"
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index b52117effb9d..45108a01361e 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,2 +1,3 @@
DIST libmicrohttpd-0.9.39.tar.gz 1205722 SHA256 4f937b6065c366d776be86b1d24b8fc400ebc7ea006a9d77c49a8f2f0cd7e373 SHA512 f7a526803fd5bbd28c817836340f91569542c3f8db6f04ffc8e60cf794cd5a7f1da3beda782fa80b2f6c07bb48cd09454c5bbcae1ad81b00f0df2985740a927a WHIRLPOOL a2dc5f2303bf7fd042d9f5ca58f946e0e506232870b00d7a7cb65127cc1769fdbc9a5b12145d47d7ab4d32d48ab6b311f320c350adbc071d18aae810156073c0
DIST libmicrohttpd-0.9.42.tar.gz 1232516 SHA256 00352073367003da40607319e4090a6a8308748b59246ae80e9871f34dad7d5b SHA512 6516f545a5b81aa23bb0d22582f6d7e7f028069d94e0d33d9d6f929e111a3c0e0432eb43b26b4eec87860e8b9f50de38f1b5e6e20cd8faf30512e4891f29b9f3 WHIRLPOOL 9d42c08ee37042debf2e16ddd244c91375e4cecb9843e08d58581a9838677148d90d469bcd4890d4a0680a62e691c659394067da1c7060f7c4e49b309be4417c
+DIST libmicrohttpd-0.9.44.tar.gz 1244988 SHA256 f2739cc05112dc00a5ebe1a470174970ca3a3fd71dcd67fb7539af9d83b8411e SHA512 4f8e679e70e95411f762615593fcf2271df542ffab2ddd89f2c435215590ffe375c8e8c1e09cc2d21389d335cad2062944d65591b9478ea26e65123ed5dd56d9 WHIRLPOOL 8cfce79be2c8c6683a8c1b5f1c2d749a6a598346b032726e4f045dda86074fc3a4b44083385a9117eab9a1f85104962aefa2c8e805bb16104e18f6e3c0646cdf
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.ebuild
new file mode 100644
index 000000000000..738da03aaeb6
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="${P/_/}"
+
+DESCRIPTION="A small C library that makes it easy to run an HTTP server as part of another application"
+HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="epoll messages ssl static-libs test"
+
+RDEPEND="ssl? (
+ dev-libs/libgcrypt:0=
+ net-libs/gnutls
+ )"
+
+DEPEND="${RDEPEND}
+ test? (
+ ssl? ( >=net-misc/curl-7.25.0-r1[ssl] )
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS NEWS README ChangeLog"
+
+src_configure() {
+ econf \
+ --enable-bauth \
+ --enable-dauth \
+ --disable-examples \
+ --disable-spdy \
+ --enable-postprocessor \
+ $(use_enable epoll) \
+ $(use_enable test curl) \
+ $(use_enable messages) \
+ $(use_enable ssl https) \
+ $(use_with ssl gnutls) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/miniupnpc/miniupnpc-1.9.20150917.ebuild b/net-libs/miniupnpc/miniupnpc-1.9.20150917-r1.ebuild
similarity index 89%
rename from net-libs/miniupnpc/miniupnpc-1.9.20150917.ebuild
rename to net-libs/miniupnpc/miniupnpc-1.9.20150917-r1.ebuild
index 5aa860c22d13..0b88b59c1889 100644
--- a/net-libs/miniupnpc/miniupnpc-1.9.20150917.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-1.9.20150917-r1.ebuild
@@ -50,5 +50,10 @@ src_install() {
INSTALLDIRLIB="${D}usr/$(get_libdir)" \
install
+ # oh no, a missing header! fixed upstream:
+ # https://github.com/miniupnp/miniupnp/commit/1315c473539d03
+ insinto /usr/include/miniupnpc
+ doins upnpdev.h
+
dodoc README Changelog.txt
}
diff --git a/net-misc/autoupnp/Manifest b/net-misc/autoupnp/Manifest
index 2633bf042912..8a8b485ebcb1 100644
--- a/net-misc/autoupnp/Manifest
+++ b/net-misc/autoupnp/Manifest
@@ -1 +1,2 @@
DIST autoupnp-0.4.6.tar.bz2 240257 SHA256 a8d0a207074fafdb322510fd29a25eb4bf62da9468ea3dc45e7c9740faeccab7 SHA512 570ae76d940879a375e9336cb62cce8b2e007c57df6cbebee5878cf6a71d1fe5853218166ba0ee794586fa20a7c62b158aae9242b30880f6fe110c9bb1502ba1 WHIRLPOOL 4b2d848f36e3f2848e6f08f71296b5cf3fe7794bdfc9e6495428b3b3ae9283ed15e81de0bec2fdf0b36173d59a4c7dbec5dbef30bf3a0ba24e320de313cb20ab
+DIST autoupnp-0.4.7.tar.bz2 264916 SHA256 f68c80ae6e8061417bef2fb2ad554d49f0bf4b5ef2def84600a4b67fa756c703 SHA512 2c6bb3421fecbffea2a63ea1e930b7c789459d4626a0f281abe0e9bb62e5efc772475d4bf0c9f13fe2e9e13417940c6eb17408e6aae28bc24a4fc2e16d4dc8de WHIRLPOOL d08f6011d286f37d70d206cabe148a95e02b71bf9fdc13852da038bb87f4dde99fb206382e12879d81bff3dd5f133aae0b4bfb4c4168f8b76a4a0a2d4fbc4168
diff --git a/net-misc/autoupnp/autoupnp-0.4.7.ebuild b/net-misc/autoupnp/autoupnp-0.4.7.ebuild
new file mode 100644
index 000000000000..b7f066586cb7
--- /dev/null
+++ b/net-misc/autoupnp/autoupnp-0.4.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Automatic open port forwarder using UPnP"
+HOMEPAGE="https://bitbucket.org/mgorny/autoupnp/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="net-libs/miniupnpc:0=
+ libnotify? ( x11-libs/libtinynotify:0= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local myconf=(
+ $(use_with libnotify)
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ prune_libtool_files --all
+}
diff --git a/net-misc/autoupnp/autoupnp-9999.ebuild b/net-misc/autoupnp/autoupnp-9999.ebuild
index be3f1f8a8c9b..0dc42eeb1d46 100644
--- a/net-misc/autoupnp/autoupnp-9999.ebuild
+++ b/net-misc/autoupnp/autoupnp-9999.ebuild
@@ -5,17 +5,16 @@
EAPI=5
#if LIVE
-AUTOTOOLS_AUTORECONF=yes
EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-inherit git-r3
+inherit autotools git-r3
#endif
-inherit autotools-utils
+inherit eutils
DESCRIPTION="Automatic open port forwarder using UPnP"
HOMEPAGE="https://bitbucket.org/mgorny/autoupnp/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/${P}.tar.bz2"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
@@ -29,12 +28,19 @@ DEPEND="${RDEPEND}"
#if LIVE
KEYWORDS=
SRC_URI=
+
+src_prepare() { eautoreconf; }
#endif
src_configure() {
- myeconfargs=(
+ local myconf=(
$(use_with libnotify)
)
- autotools-utils_src_configure
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ prune_libtool_files --all
}
diff --git a/net-misc/openconnect/openconnect-7.06-r1.ebuild b/net-misc/openconnect/openconnect-7.06-r1.ebuild
index 05cc3f0dd29c..ec6630a4f6a2 100644
--- a/net-misc/openconnect/openconnect-7.06-r1.ebuild
+++ b/net-misc/openconnect/openconnect-7.06-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
LICENSE="LGPL-2.1 GPL-2"
SLOT="0/5"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86"
IUSE="doc +gnutls gssapi java libproxy nls static-libs"
ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW"
for lang in $ILINGUAS; do
diff --git a/net-misc/spiped/spiped-1.5.0.ebuild b/net-misc/spiped/spiped-1.5.0.ebuild
deleted file mode 100644
index 9a62bf2bb7e1..000000000000
--- a/net-misc/spiped/spiped-1.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="secure pipe daemon"
-HOMEPAGE="http://www.tarsnap.com/spiped.html"
-SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl:*"
-RDEPEND="${DEPEND}"
-
-src_install() {
- dobin spipe/spipe
- dosbin spiped/spiped
-
- doman spipe/spipe.1 spiped/spiped.1
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
- dodir etc/spiped
-}
-
-pkg_postinst() {
- elog
- elog "You will need to configure spiped via its"
- elog "configuration file located in /etc/conf.d/."
- elog
- elog "Please have a look at this file prior to starting up spiped!"
- elog
-}
diff --git a/net-wireless/bluez/bluez-5.33.ebuild b/net-wireless/bluez/bluez-5.33.ebuild
index 29b7eede0eab..a646ea7d42a2 100644
--- a/net-wireless/bluez/bluez-5.33.ebuild
+++ b/net-wireless/bluez/bluez-5.33.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0/3"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86"
IUSE="cups debug +obex +readline selinux systemd test +udev"
CDEPEND="
diff --git a/profiles/package.mask b/profiles/package.mask
index 90e036e7bfcb..25d9a65977e5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,11 @@
#--- END OF EXAMPLES ---
+# Michał Górny (1 Oct 2015)
+# Thoroughly broken for me since the switch to Python 3 / PyQt5. Masking
+# to account for opt-in testing.
+=games-emulation/m64py-0.2.3
+
# Patrice Clement (1 Oct 2015)
# Project is over 10 years old and seems to have stalled.
# Masked for removal in 30 days. See bug 561954.
diff --git a/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild b/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild
index 5b20afa310d2..633eadd415e2 100644
--- a/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild
+++ b/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE=""
src_prepare() {
diff --git a/sys-devel/llvm/llvm-3.7.0-r1.ebuild b/sys-devel/llvm/llvm-3.7.0-r1.ebuild
index 068f1b80eaae..910b6e17e8f5 100644
--- a/sys-devel/llvm/llvm-3.7.0-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.7.0-r1.ebuild
@@ -56,6 +56,7 @@ DEPEND="${COMMON_DEPEND}
kernel_Darwin? ( sys-libs/libcxx )
clang? ( xml? ( virtual/pkgconfig ) )
doc? ( dev-python/sphinx )
+ gold? ( sys-libs/binutils-libs )
libffi? ( virtual/pkgconfig )
lldb? ( dev-lang/swig )
!!
+Date: Sat Sep 19 22:00:36 2015 -0400
+
+ zfs-import: Perform verbatim import using cache file
+
+ This change modifies the import service to use the default cache file
+ to perform a verbatim import of pools at boot. This fixes code that
+ searches all devices and imported all visible pools.
+
+ Using the cache file is in keeping with the way ZFS has always worked,
+ how Solaris, Illumos, FreeBSD, and systemd performs imports, and is how
+ it is written in the man page (zpool(1M,8)):
+
+ All pools in this cache are automatically imported when the
+ system boots.
+
+ Importantly, the cache contains important information for importing
+ multipath devices, and helps control which pools get imported in more
+ dynamic environments like SANs, which may have thousands of visible
+ and constantly changing pools, which the ZFS_POOL_EXCEPTIONS variable
+ is not equipped to handle. Verbatim imports prevent rogue pools from
+ being automatically imported and mounted where they shouldn't be.
+
+ The change also stops the service from exporting pools at shutdown.
+ Exporting pools is only meant to be performed explicitly by the
+ administrator of the system.
+
+ The old behavior of searching and importing all visible pools is
+ preserved and can be switched on by heeding the warning and toggling
+ the ZPOOL_IMPORT_ALL_VISIBLE variable in /etc/default/zfs.
+
+ Closes #3777
+ Closes #3526
+
+diff --git a/etc/init.d/zfs-import.in b/etc/init.d/zfs-import.in
+index 5e21929..2258638 100755
+--- a/etc/init.d/zfs-import.in
++++ b/etc/init.d/zfs-import.in
+@@ -1,11 +1,10 @@
+ #!@SHELL@
+ #
+-# zfs-import This script will import/export zfs pools.
++# zfs-import This script will import ZFS pools
+ #
+ # chkconfig: 2345 01 99
+-# description: This script will import/export zfs pools during system
+-# boot/shutdown.
+-# It is also responsible for all userspace zfs services.
++# description: This script will perform a verbatim import of ZFS pools
++# during system boot.
+ # probe: true
+ #
+ ### BEGIN INIT INFO
+@@ -17,7 +16,7 @@
+ # X-Start-Before: checkfs
+ # X-Stop-After: zfs-mount
+ # Short-Description: Import ZFS pools
+-# Description: Run the `zpool import` or `zpool export` commands.
++# Description: Run the `zpool import` command.
+ ### END INIT INFO
+ #
+ # NOTE: Not having '$local_fs' on Required-Start but only on Required-Stop
+@@ -43,6 +42,16 @@ do_depend()
+ keyword -lxc -openvz -prefix -vserver
+ }
+
++# Use the zpool cache file to import pools
++do_verbatim_import()
++{
++ if [ -f "$ZPOOL_CACHE" ]
++ then
++ zfs_action "Importing ZFS pool(s)" \
++ "$ZPOOL" import -c "$ZPOOL_CACHE" -N -a
++ fi
++}
++
+ # Support function to get a list of all pools, separated with ';'
+ find_pools()
+ {
+@@ -60,8 +69,8 @@ find_pools()
+ echo "${pools%%;}" # Return without the last ';'.
+ }
+
+-# Import all pools
+-do_import()
++# Find and import all visible pools, even exported ones
++do_import_all_visible()
+ {
+ local already_imported available_pools pool npools
+ local exception dir ZPOOL_IMPORT_PATH RET=0 r=1
+@@ -109,7 +118,7 @@ do_import()
+ fi
+ fi
+
+- # Filter out any exceptions...
++ # Filter out any exceptions...
+ if [ -n "$ZFS_POOL_EXCEPTIONS" ]
+ then
+ local found=""
+@@ -249,41 +258,15 @@ do_import()
+ return "$RET"
+ }
+
+-# Export all pools
+-do_export()
++do_import()
+ {
+- local already_imported pool root_pool RET r
+- RET=0
+-
+- root_pool=$(get_root_pool)
+-
+- [ -n "$init" ] && zfs_log_begin_msg "Exporting ZFS pool(s)"
+-
+- # Find list of already imported pools.
+- already_imported=$(find_pools "$ZPOOL" list -H -oname)
+-
+- OLD_IFS="$IFS" ; IFS=";"
+- for pool in $already_imported; do
+- [ "$pool" = "$root_pool" ] && continue
+-
+- if [ -z "$init" ]
+- then
+- # Interactive - one 'Importing ...' line per pool
+- zfs_log_begin_msg "Exporting ZFS pool $pool"
+- else
+- # Not interactive - a dot for each pool.
+- zfs_log_progress_msg "."
+- fi
+-
+- "$ZPOOL" export "$pool"
+- r="$?" ; RET=$((RET + r))
+- [ -z "$init" ] && zfs_log_end_msg "$r"
+- done
+- IFS="$OLD_IFS"
+-
+- [ -n "$init" ] && zfs_log_end_msg "$RET"
+-
+- return "$RET"
++ if check_boolean "$ZPOOL_IMPORT_ALL_VISIBLE"
++ then
++ do_import_all_visible
++ else
++ # This is the default option
++ do_verbatim_import
++ fi
+ }
+
+ # Output the status and list of pools
+@@ -323,14 +306,6 @@ do_start()
+ fi
+ }
+
+-do_stop()
+-{
+- # Check to see if the module is even loaded.
+- check_module_loaded "zfs" || exit 0
+-
+- do_export
+-}
+-
+ # ----------------------------------------------------
+
+ if [ ! -e /etc/gentoo-release ]
+@@ -340,7 +315,7 @@ then
+ do_start
+ ;;
+ stop)
+- do_stop
++ # no-op
+ ;;
+ status)
+ do_status
+@@ -350,7 +325,7 @@ then
+ ;;
+ *)
+ [ -n "$1" ] && echo "Error: Unknown command $1."
+- echo "Usage: $0 {start|stop|status}"
++ echo "Usage: $0 {start|status}"
+ exit 3
+ ;;
+ esac
+@@ -360,6 +335,5 @@ else
+ # Create wrapper functions since Gentoo don't use the case part.
+ depend() { do_depend; }
+ start() { do_start; }
+- stop() { do_stop; }
+ status() { do_status; }
+ fi
+diff --git a/etc/init.d/zfs.in b/etc/init.d/zfs.in
+index eabb7e4..d81ef22 100644
+--- a/etc/init.d/zfs.in
++++ b/etc/init.d/zfs.in
+@@ -16,6 +16,24 @@ ZFS_SHARE='yes'
+ # Run `zfs unshare -a` during system stop?
+ ZFS_UNSHARE='yes'
+
++# By default, a verbatim import of all pools is performed at boot based on the
++# contents of the default zpool cache file. The contents of the cache are
++# managed automatically by the 'zpool import' and 'zpool export' commands.
++#
++# By setting this to 'yes', the system will instead search all devices for
++# pools and attempt to import them all at boot, even those that have been
++# exported. Under this mode, the search path can be controlled by the
++# ZPOOL_IMPORT_PATH variable and a list of pools that should not be imported
++# can be listed in the ZFS_POOL_EXCEPTIONS variable.
++#
++# Note that importing all visible pools may include pools that you don't
++# expect, such as those on removable devices and SANs, and those pools may
++# proceed to mount themselves in places you do not want them to. The results
++# can be unpredictable and possibly dangerous. Only enable this option if you
++# understand this risk and have complete physical control over your system and
++# SAN to prevent the insertion of malicious pools.
++ZPOOL_IMPORT_ALL_VISIBLE='no'
++
+ # Specify specific path(s) to look for device nodes and/or links for the
+ # pool import(s). See zpool(8) for more information about this variable.
+ # It supersedes the old USE_DISK_BY_ID which indicated that it would only
+@@ -23,6 +41,18 @@ ZFS_UNSHARE='yes'
+ # The old variable will still work in the code, but is deprecated.
+ #ZPOOL_IMPORT_PATH="/dev/disk/by-vdev:/dev/disk/by-id"
+
++# List of pools that should NOT be imported at boot
++# when ZPOOL_IMPORT_ALL_VISIBLE is 'yes'.
++# This is a space separated list.
++#ZFS_POOL_EXCEPTIONS="test2"
++
++# List of pools that SHOULD be imported at boot by the initramfs
++# instead of trying to import all available pools. If this is set
++# then ZFS_POOL_EXCEPTIONS is ignored.
++# Only applicable for Debian GNU/Linux {dkms,initramfs}.
++# This is a semi-colon separated list.
++#ZFS_POOL_IMPORT="pool1;pool2"
++
+ # Should the datasets be mounted verbosely?
+ # A mount counter will be used when mounting if set to 'yes'.
+ VERBOSE_MOUNT='no'
+@@ -97,17 +127,6 @@ ZFS_INITRD_POST_MODPROBE_SLEEP='0'
+ # Example: If root FS is 'rpool/ROOT/rootfs', this would make sense.
+ #ZFS_INITRD_ADDITIONAL_DATASETS="rpool/ROOT/usr rpool/ROOT/var"
+
+-# List of pools that should NOT be imported at boot?
+-# This is a space separated list.
+-#ZFS_POOL_EXCEPTIONS="test2"
+-
+-# List of pools to import?
+-# If this variable is set, there will be NO auto-import of ANY other
+-# pool. In essence, there will be no auto detection of availible pools.
+-# This is a semi-colon separated list.
+-# Makes the variable ZFS_POOL_EXCEPTIONS above redundant (won't be checked).
+-#ZFS_POOL_IMPORT="pool1;pool2"
+-
+ # Optional arguments for the ZFS Event Daemon (ZED).
+ # See zed(8) for more information on available options.
+ #ZED_ARGS="-M"
diff --git a/sys-fs/zfs/zfs-0.6.5.2.ebuild b/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild
similarity index 97%
rename from sys-fs/zfs/zfs-0.6.5.2.ebuild
rename to sys-fs/zfs/zfs-0.6.5.2-r1.ebuild
index 54dd3410ffc3..83049e7f4ec0 100644
--- a/sys-fs/zfs/zfs-0.6.5.2.ebuild
+++ b/sys-fs/zfs/zfs-0.6.5.2-r1.ebuild
@@ -86,6 +86,12 @@ pkg_setup() {
}
src_prepare() {
+if [ ${PV} != "9999" ]
+ then
+ # Fix OpenRC scripts
+ epatch "${FILESDIR}/zfs-0.6.5-fix-openrc-scripts.patch"
+ fi
+
# Update paths
sed -e "s|/sbin/lsmod|/bin/lsmod|" \
-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
diff --git a/sys-libs/binutils-libs/binutils-libs-2.25.1-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.25.1-r1.ebuild
index 399dfc16b900..e5bd03a34f2b 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.25.1-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.25.1-r1.ebuild
@@ -32,6 +32,10 @@ RDEPEND="${COMMON_DEPEND}
S="${WORKDIR}/${MY_P}"
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/bfd.h
+)
+
src_prepare() {
EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
}
diff --git a/sys-process/schedtool/schedtool-1.3.0-r1.ebuild b/sys-process/schedtool/schedtool-1.3.0-r1.ebuild
index 2d5866c9d105..6a2503b6fdfa 100644
--- a/sys-process/schedtool/schedtool-1.3.0-r1.ebuild
+++ b/sys-process/schedtool/schedtool-1.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://freequaos.host.sk/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT=0
-KEYWORDS="amd64 ~mips ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~mips ppc x86 ~amd64-linux ~x86-linux"
IUSE=""
src_prepare() {
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index f33b8c3c0e4d..05b2b8725100 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,2 +1,2 @@
-DIST opera-beta_32.0.1948.12_amd64.deb 42068042 SHA256 48a1f9f694fa5a494fd9d494be1d5f69aaeae4d646892596f88a71851bdbaf4a SHA512 d391683fc93c3b81117ac087801465ec49a0586214e0458bf3539371f1e3f97f7d91f10052bbc97378862225f7bb1c1882bd59bce3fa7f437c7d27fee8a4036d WHIRLPOOL 9bb4990d80a931accb77ce59b0c02a1de3e9d414cbf1a6c7a61ec6950ee64a50aca77b7246ad6e91c010b5a3b60f29114232051f48f4577fe9badb01cc7b0ae7
DIST opera-beta_32.0.1948.19_amd64.deb 43093322 SHA256 1ddcf1f7aba8ba04ec990c1d1c7ca3a3c9d6c58e2c18fb36d24d87178c5088f0 SHA512 c3ff5db796fc8f6ecb4ab2f56a6a7821f5267af3b29081f65b94523804abadf40dc8c77f33e9db0078a578644e836c381a4d1e99765e5864ab7c09a556a0ec62 WHIRLPOOL 9259681db8d6bf6956fc8c2caf4b60d9bffef8c28a9634e2c420cef71a22af7305c30240e9ce04c6ca4999f7118abec5c9743e4c9294fcb2efa4b71c6c414128
+DIST opera-beta_33.0.1990.11_amd64.deb 43800862 SHA256 17f69d837046eed24d6e2e63fee2dda01863134cbb85e98b4363d45a53164ea3 SHA512 4f46bd72ae004c241b809482c7fb69561c1084c072114a30df7bf8399bc7828c9b4230ca0ab45bcd63784dc2c4f0fa82375f554e63784b8dd41f8ecca10fe1cd WHIRLPOOL f51436a5e4374fd018e843dbb5fe34180795b022d82ccf51440332727fe9e90c1b0b690e6f32f88d5d0ea810acd00ecc65622d7adb15fffdb0d5fbafbd70057e
diff --git a/www-client/opera-beta/opera-beta-32.0.1948.12.ebuild b/www-client/opera-beta/opera-beta-33.0.1990.11.ebuild
similarity index 100%
rename from www-client/opera-beta/opera-beta-32.0.1948.12.ebuild
rename to www-client/opera-beta/opera-beta-33.0.1990.11.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 8ec1080a824a..7bcc0f04984f 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,4 +1,4 @@
-DIST vivaldi-1.0.279.3_p1-amd64.deb 40947354 SHA256 04388447549d7a4db649021e91ed1db189b92de41b941045bcdd1ab502f372a5 SHA512 ecf02ea846ef0dbcd3c90cf5e103118f36d365c51f7f3536d86bc1dbdbc3e40768005d75d73809001c6fce2397180a5daa34c5432d78826c120445017b38a67a WHIRLPOOL b2d68a4936b3df7d7a7fadd72ec930a730961f89072ce47346cb295e111da90b28ead07dd3b4e500c869f2b57e100d27c798f90ee95b1b7367f65786b097de4a
-DIST vivaldi-1.0.279.3_p1-i386.deb 41178560 SHA256 fb4e89920f06d4cc48a7b88c67af51b72a2c045464bcf33320fff63c753f3e56 SHA512 012ecbb34ffe8f12988ad9821d57921f0a1699a2e120d6492b5d3a6c2cd433c21814c2f82fdb4ecae950d50ddc66a4305b3aba3bb1cf0c821fb908d006e5043a WHIRLPOOL d243d387875dcebb612177783234fbc15020c56655421e05272d77f9490c2be270a6b7543259a21b2197da3672815e49b1c08c17250362d5b27322490e6c8d7a
DIST vivaldi-1.0.283.8_p1-amd64.deb 39888582 SHA256 a96efd48782b70ba0888230cc05f4cae11d82f0ec6e1737a2d4a5ca15e38b5fe SHA512 fb6126d3860d920da361c52a15e35c81b0211ec24ea139848a4b1f8299630dd79251563fcd4f0358ad1b7d2f5b2cb43354981a92f6943960ad7988e6b35d5939 WHIRLPOOL b924ce90b2a73e2b85330226919d19c33282818a0f1728582a326590649b9218735f92e9213796cf36aadade9fdb8fc7248871d177baffcf32c1fd5ef132b859
DIST vivaldi-1.0.283.8_p1-i386.deb 40037526 SHA256 23ed900371afea966b1c7fd9b6fc4f27d72fae1a2481627105b37fada0b93171 SHA512 c45d229c1b569a0f48704a5b7035a30cc381749680011463e623e3fc0c149bd11ac13262e91b1bc8dbe7b5b84d565721b0524f8dd5f85c59fa8e5f4dc061c881 WHIRLPOOL a2da0f5c7d2cd12fbe8a509757b7d852ffc9deb16aea5df2cfb03d6f471775d775d1329c1657020bf9f50daae48f940b3e3d83ab914fc0c8e9ad190da52840d0
+DIST vivaldi-1.0.288.3_p1-amd64.deb 39924644 SHA256 86bee895601dbee6f3808b8846e65d2f6a786d2d0ea213c6767fdbea561c3480 SHA512 55919c588391d548f1623fdea43997da297e58f708bad742e8e3334945044dc8734729fbb3f5985c4ee5ccd8e3d8a07d8e94efffbabb16adada03beabb769465 WHIRLPOOL 06ff1132aeade8d1b1c2036be8d7e0a303196020bb75651a978a741cc72aa2531bb57030495f0fab06a7c7a880e26afaddcfdbc9fcb1e384518aa94cca4c4855
+DIST vivaldi-1.0.288.3_p1-i386.deb 40121952 SHA256 27f323d6c138cba6095dfa4dc17672096f421b02161c09d16394a70440242347 SHA512 4813f36cbe999a6d7a801667cb6093d2bb6289ba8c1221e427bd3ec459f07e44949494b3f9c1d41b013fb459dc07d5f641ad6f16423714d98d4b24de94bac013 WHIRLPOOL 7d01912f6f2f64285cfe6ebc330da68467996e387ed7373b814e77248ddf6d167b2b126836cf41c25f47dc0d4eb2986d4edacf994894d17c0993bf10f0978b02
diff --git a/www-client/vivaldi/vivaldi-1.0.279.3_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.288.3_p1.ebuild
similarity index 100%
rename from www-client/vivaldi/vivaldi-1.0.279.3_p1.ebuild
rename to www-client/vivaldi/vivaldi-1.0.288.3_p1.ebuild
diff --git a/www-servers/blogc-runserver/Manifest b/www-servers/blogc-runserver/Manifest
new file mode 100644
index 000000000000..6c57198ade89
--- /dev/null
+++ b/www-servers/blogc-runserver/Manifest
@@ -0,0 +1 @@
+DIST blogc-runserver-0.1.tar.xz 70840 SHA256 b88306f89087fdbd6af7f7590026b94b5cb5b065bbe4d8ea424545c127c5eb69 SHA512 232e291ce722000df978a16688e5626408292cea4577f6306dcc66af346d2903d9a8443d3b0c927d3f8ab427dffc979fe4d8940d3d9d547fa57520d500a9712d WHIRLPOOL a5ffba1b04cd1cfc8060a1089a5e19829fbc44343e1334544afa86de60692593c8e26a65320e97755d8524e1c5bef1d3a523602351d4ade4c02c900b1bc4880f
diff --git a/www-servers/blogc-runserver/blogc-runserver-0.1.ebuild b/www-servers/blogc-runserver/blogc-runserver-0.1.ebuild
new file mode 100644
index 000000000000..2b8a73cdf6d4
--- /dev/null
+++ b/www-servers/blogc-runserver/blogc-runserver-0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://github.com/blogc/blogc-runserver.git
+ https://github.com/blogc/blogc-runserver.git"
+ inherit git-r3 autotools
+fi
+
+DESCRIPTION="A simple HTTP server to test blogc websites"
+HOMEPAGE="https://github.com/blogc/blogc-runserver"
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/beta/beta.}"
+
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/blogc/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/libevent
+ sys-apps/file"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ [[ ${PV} = *9999* ]] && eautoreconf
+ default
+}
diff --git a/www-servers/blogc-runserver/blogc-runserver-9999.ebuild b/www-servers/blogc-runserver/blogc-runserver-9999.ebuild
new file mode 100644
index 000000000000..2b8a73cdf6d4
--- /dev/null
+++ b/www-servers/blogc-runserver/blogc-runserver-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://github.com/blogc/blogc-runserver.git
+ https://github.com/blogc/blogc-runserver.git"
+ inherit git-r3 autotools
+fi
+
+DESCRIPTION="A simple HTTP server to test blogc websites"
+HOMEPAGE="https://github.com/blogc/blogc-runserver"
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/beta/beta.}"
+
+MY_P="${PN}-${MY_PV}"
+
+SRC_URI="https://github.com/blogc/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/libevent
+ sys-apps/file"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ [[ ${PV} = *9999* ]] && eautoreconf
+ default
+}
diff --git a/www-servers/blogc-runserver/metadata.xml b/www-servers/blogc-runserver/metadata.xml
new file mode 100644
index 000000000000..3c9a0d4c617c
--- /dev/null
+++ b/www-servers/blogc-runserver/metadata.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ rafaelmartins@gentoo.org
+ Rafael G. Martins
+
+
+ A simple HTTP server to test blogc websites.
+
+
+
+ rafael@rafaelmartins.eng.br
+ Rafael G. Martins
+
+ blogc/blogc-runserver
+
+
diff --git a/www-servers/pshs/Manifest b/www-servers/pshs/Manifest
index ecfcecdf7166..83f18e6098ac 100644
--- a/www-servers/pshs/Manifest
+++ b/www-servers/pshs/Manifest
@@ -1 +1,2 @@
DIST pshs-0.2.6.tar.bz2 82150 SHA256 8f3cf95e82de21ae6ffee1b50a1517ef5a63475a70bc2f01af124b6ea52e1459 SHA512 d61addeb3ff1b347d333f0a625ff11c99ae8d2b6d47f980e2983847b85cdc0ac827bdc5a6f9044030016df4104b00a63eebc491b01e630f4f242154d064ec1d6 WHIRLPOOL b11a7c2533895c9a9006562fb87018462498346c7ddb748804ca84891a2bdc643de27e30ff041169d5782b52199375675933222f3aa01cb2e92f5c0e555382c4
+DIST pshs-0.3.tar.bz2 81622 SHA256 c3c4d2abc7f3ee9ef80eff2dd4811d542ab5b4b229e3a0615c50ae2a530d7e63 SHA512 17dd21603ea36ecbe69923a2c476f6f41fea026b654a9d4819132047bad67f60a797cd0008afc85ab27ed3538681cfe8d79f9f33fc60823fd425337138723d45 WHIRLPOOL 515e551f41aee68729594f00bad4a9b48974103897d3e9a31e9ac77fe5dec62284cedac78759513b198d3638c3529842e517a903ee09b1aabb265dce6eeb92d2
diff --git a/www-servers/pshs/pshs-0.3.ebuild b/www-servers/pshs/pshs-0.3.ebuild
new file mode 100644
index 000000000000..d195a4c03573
--- /dev/null
+++ b/www-servers/pshs/pshs-0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
+HOMEPAGE="https://bitbucket.org/mgorny/pshs/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+magic +netlink qrcode ssl upnp"
+
+RDEPEND=">=dev-libs/libevent-2:0=
+ magic? ( sys-apps/file:0= )
+ qrcode? ( media-gfx/qrencode:0= )
+ ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
+ dev-libs/openssl:0= )
+ upnp? ( net-libs/miniupnpc:0= )"
+DEPEND="${RDEPEND}
+ netlink? ( sys-apps/iproute2
+ >=sys-kernel/linux-headers-2.6.27 )"
+# libnetlink is static only ATM
+
+src_configure() {
+ local myconf=(
+ $(use_enable magic libmagic)
+ $(use_enable netlink)
+ $(use_enable qrcode qrencode)
+ $(use_enable ssl)
+ $(use_enable upnp)
+ )
+
+ econf "${myconf[@]}"
+}
diff --git a/www-servers/pshs/pshs-9999.ebuild b/www-servers/pshs/pshs-9999.ebuild
index 892184e3cdbc..6d71ea0c59aa 100644
--- a/www-servers/pshs/pshs-9999.ebuild
+++ b/www-servers/pshs/pshs-9999.ebuild
@@ -5,15 +5,12 @@
EAPI=5
#if LIVE
-AUTOTOOLS_AUTORECONF=yes
EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-inherit git-r3
+inherit autotools git-r3
#endif
-inherit autotools-utils
-
-DESCRIPTION="Pretty small HTTP server - a command-line tool to share files"
+DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
HOMEPAGE="https://bitbucket.org/mgorny/pshs/"
SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
@@ -36,10 +33,12 @@ DEPEND="${RDEPEND}
#if LIVE
KEYWORDS=
SRC_URI=
+
+src_prepare() { eautoreconf; }
#endif
src_configure() {
- myeconfargs=(
+ local myconf=(
$(use_enable magic libmagic)
$(use_enable netlink)
$(use_enable qrcode qrencode)
@@ -47,5 +46,5 @@ src_configure() {
$(use_enable upnp)
)
- autotools-utils_src_configure
+ econf "${myconf[@]}"
}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7f85a7499a83..93e7f82041ef 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -3,3 +3,4 @@ DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e
DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c WHIRLPOOL a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
+DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d
diff --git a/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch
new file mode 100644
index 000000000000..1923d23ba50b
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.27-build.xml.patch
@@ -0,0 +1,265 @@
+diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
+--- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
++++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
+@@ -697,24 +697,29 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+
++
+
++
+
+
++
+
+
+
+-
++
+
+
+
+@@ -1049,7 +1054,7 @@
+
+
+
+-
++
+
+
+
+@@ -1083,7 +1088,7 @@
+
+
+
+-
++
+
+
+
+
+
+-
++
+
+
+
+
++
+
+@@ -1542,7 +1548,7 @@
+
+
++ description="Prepare to build web services extras package" unless="noget">
+
+
+
+@@ -1681,7 +1687,7 @@
+
+
++ description="Prepare to build web services extras package" unless="noget">
+
+
+
+@@ -1882,6 +1888,7 @@
+
+
++
+
++ maxmemory="512m" >
+
+
+
+
+
++
+
+
+
+@@ -2739,7 +2749,7 @@
+
+
+
++ description="Download (and build) components necessary to compile" unless="noget">
+
+
+
+@@ -2773,7 +2783,7 @@
+
+
+
++ description="Download additional components for the tests" unless="noget">
+
+
+
+@@ -2819,7 +2829,7 @@
+
+
+
++ description="Download additional components for a distribution" unless="noget">
+
+
+
+@@ -2845,18 +2855,18 @@
+
+
+
+-
++
+
+
+
+
+-
++
+
+
+
+
+-
++
+
+
+
+@@ -2868,7 +2878,7 @@
+
+
+
+-
++
+
+
+
+@@ -2887,7 +2897,7 @@
+
+
+
+-
++
+
+
+
+@@ -2898,7 +2908,7 @@
+
+
+
+-
++
+
+
+
+@@ -2916,7 +2926,7 @@
+
+
+
+-
++
+
+
+
+@@ -2926,7 +2936,7 @@
+
+
+
+-
++
+
+
+
+@@ -2949,7 +2959,7 @@
+
+
+
+-
++
+
+
+
+@@ -2960,7 +2970,7 @@
+
+
+
+-
++
+
+
+
+@@ -2971,7 +2981,7 @@
+
+
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+
+
diff --git a/www-servers/tomcat/tomcat-8.0.27.ebuild b/www-servers/tomcat/tomcat-8.0.27.ebuild
new file mode 100644
index 000000000000..3074dfa43e93
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.27.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.4"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/oracle-javamail:0
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled javamail, servlet-api
+ rm -rv java/javax/{el,mail,servlet} || die
+
+ epatch "${FILESDIR}/${P}-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}