diff --git a/app-admin/killproc/killproc-2.13-r1.ebuild b/app-admin/killproc/killproc-2.13-r1.ebuild
index c46fcf47c21c..ae3f5d543616 100644
--- a/app-admin/killproc/killproc-2.13-r1.ebuild
+++ b/app-admin/killproc/killproc-2.13-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-2.13-r1.ebuild,v 1.12 2015/05/21 19:53:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-2.13-r1.ebuild,v 1.13 2015/07/11 14:02:41 klausman Exp $
EAPI=5
inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.suse.com/pub/projects/init/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
src_prepare() {
epatch "${FILESDIR}/${P}-makefile.patch"
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index f8287c5018d8..87de785af50d 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,3 +1,4 @@
DIST mksh-R50d.tgz 374014 SHA256 a2268826a1463959ff7b7979fbf9176f1298400ecc24ae13d6337eee5c63f982 SHA512 1bb545d00e3ce5783541c88e1fea47cbd01e2103c60be7d6f5b8bf02d30576d543c4e9f6786b8d14785554c11ca1123364297a2cce0c5c3a5901b6e717594bd8 WHIRLPOOL 899b3feed7610328971b17195701dedf732507c52cd35c69bc2f3778243b344f7c8546871b7b728d122c99aa38c9b525aedeb8f5be8cd90ee2c74b32cb2ce64b
DIST mksh-R50e.tgz 376013 SHA256 ad3c148769d08cf934a96be2837599ba9db355f38a8f49c7bc8876b80d2e08da SHA512 70d904eb4dfdaf28ee5858d1abec296d69e428e3a81e5802640bc4b95a4c77e08ad8f301b29063f329081428e4b9583f0203e9b509263e8e7b9a705ac63acde5 WHIRLPOOL 1b6d6e0c4413eac44f033945fc2fbe2891623821c1f1a5ceea0084dc834d8754f2582ffac72567138f337e7fdf069f19a79644fc3987fd6cb971c74bde5c209f
DIST mksh-R50f.tgz 377797 SHA256 74e051ce92ece9555d91505b956572f64668fc88c5ccabee742099e7f29a2bcb SHA512 ca0b5d986727afc8b295b4a81c84e0048f1650c4ea3c45dcc05cabcc474bca4ab4719a063b708f3ddee08d65f35651652c0938b4279f6d706182d46ea5566cc1 WHIRLPOOL a5845cf4fa89b91f076e6eb7af5a176e98dd766a9dc3840acb832f3305c1b7b4f5e01871684a33b0491e34f841a5f6d75f34fba78f99be4852634f337b2054b4
+DIST mksh-R51.tgz 382169 SHA256 9feeaa5ff33d8199c0123675dec29785943ffc67152d58d431802bc20765dadf SHA512 dea2dea283959c0564cb6e9dbb9eecf004365cd01d83f1a8bbaff319c8ebefc4eb5e85898e207c7ce0577af525be0563e7c6b5f4b3449a2439e93f3f8bfd43ea WHIRLPOOL e626b4ffe5f637486a75a4008e51ddd3dd4c9c739dcb6b1502ee0b04f9ade20e55856497dacb5e7228d5b16af015e55fd33753b1d092c8aa7adcd5dd5e30681a
diff --git a/app-shells/mksh/mksh-51.ebuild b/app-shells/mksh/mksh-51.ebuild
new file mode 100644
index 000000000000..fcb2e10991bf
--- /dev/null
+++ b/app-shells/mksh/mksh-51.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-51.ebuild,v 1.1 2015/07/11 08:33:20 patrick Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="MirBSD KSH Shell"
+HOMEPAGE="http://mirbsd.de/mksh"
+SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+DEPEND="static? ( dev-libs/klibc )"
+RDEPEND=""
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+ tc-export CC
+ # we want to build static with klibc
+ if use static ; then
+ unset CC
+ export CC="/usr/bin/klcc"
+ export LDSTATIC="-static"
+ fi
+ export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+ # we can't assume lto existing/enabled, so we add a fallback
+ sh Build.sh -r -c lto || sh Rebuild.sh || die
+}
+
+src_install() {
+ exeinto /bin
+ doexe mksh
+ doman mksh.1
+ dodoc dot.mkshrc
+}
+
+src_test() {
+ ./test.sh || die
+}
+
+pkg_postinst() {
+ ebegin "Updating /etc/shells"
+ ( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
+ mv -f "${T}"/shells "${ROOT}"etc/shells
+ eend $?
+}
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild
index f16be68dad06..382367fa2474 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild,v 1.8 2014/08/13 09:34:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild,v 1.9 2015/07/11 09:19:55 chewi Exp $
EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
CDEPEND="
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild
deleted file mode 100644
index 3fcdf9714668..000000000000
--- a/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.3.ebuild,v 1.8 2014/08/10 19:59:56 slyfox Exp $
-
-EAPI=4
-JAVA_PKG_IUSE="doc source test"
-inherit eutils user versionator java-pkg-2 java-ant-2
-
-MY_PV=$(replace_all_version_separators _ )
-MY_P="${PN}_${MY_PV}"
-
-DESCRIPTION="The leading SQL relational database engine written in Java"
-HOMEPAGE="http://hsqldb.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos ~x64-solaris ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="java-virtuals/servlet-api:2.3"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND="virtual/jdk:1.6
- test? ( dev-java/junit:0 )
- app-arch/unzip
- ${CDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
-HSQLDB_HOME=/var/lib/hsqldb
-
-pkg_setup() {
- enewgroup hsqldb
- enewuser hsqldb -1 /bin/sh /dev/null hsqldb
-
- java-pkg-2_pkg_setup
-}
-
-src_prepare() {
- rm -v lib/*.jar || die
- java-pkg_jar-from --virtual --into lib servlet-api-2.3
-
- sed -i -r \
- -e "s#/etc/sysconfig#${EPREFIX}/etc/conf.d#g" \
- bin/hsqldb || die
-
- java-pkg_filter-compiler jikes
-
- eant -q -f "${EANT_BUILD_XML}" cleanall > /dev/null
-
- epatch "${FILESDIR}/resolve-config-softlinks.patch"
-
- mkdir conf
- sed -e "s/^HSQLDB_JAR_PATH=.*$/HSQLDB_JAR_PATH=${EPREFIX//\//\\/}${HSQLDB_JAR//\//\\/}/g" \
- -e "s/^SERVER_HOME=.*$/SERVER_HOME=${EPREFIX//\//\\/}\/var\/lib\/hsqldb/g" \
- -e "s/^HSQLDB_OWNER=.*$/HSQLDB_OWNER=hsqldb/g" \
- -e 's/^#AUTH_FILE=.*$/AUTH_FILE=${SERVER_HOME}\/sqltool.rc/g' \
- src/org/hsqldb/sample/sample-hsqldb.cfg > conf/hsqldb || die
- cp "${FILESDIR}/server.properties" conf/ || die
- cp "${FILESDIR}/sqltool.rc" conf/ || die
-
- # Missing source file - needed for tests
- # http://hsqldb.cvs.sourceforge.net/*checkout*/hsqldb/hsqldb-dev/src/org/hsqldb/lib/StringComparator.java?revision=1.1&pathrev=hsqldb_1_8_0_10
- # http://sourceforge.net/tracker/index.php?func=detail&aid=2008754&group_id=23316&atid=378131
- cp "${FILESDIR}/StringComparator.java" src/org/hsqldb/lib || die
- cp "${FILESDIR}/TestBug1191815.java" src/org/hsqldb/test/ || die
-}
-
-# EANT_BUILD_XML used also in src_unpack
-EANT_BUILD_XML="build/build.xml"
-EANT_BUILD_TARGET="jar jarclient jarsqltool jarutil"
-EANT_DOC_TARGET="javadocdev"
-
-src_test() {
- java-pkg_jar-from --into lib junit
- eant -f ${EANT_BUILD_XML} jartest
- cd testrun/hsqldb || die
- ./runTest.sh TestSelf || die "TestSelf hsqldb tests failed"
- # TODO. These fail. Investigate why.
- #cd "${S}/testrun/sqltool" || die
- #CLASSPATH="${S}/lib/hsqldb.jar" ./runtests.bash || die "sqltool test failed"
-}
-
-src_install() {
- java-pkg_dojar lib/hsql*.jar
-
- if use doc; then
- dodoc doc/*.txt
- dohtml -r doc/zaurus
- dohtml -r doc/src
- fi
- use source && java-pkg_dosrc src/*
-
- echo "CONFIG_PROTECT=\"${HSQLDB_HOME}\"" > "${T}"/35hsqldb || die
- doenvd "${T}"/35hsqldb
-
- # Put init, configuration and authorization files in /etc
- doinitd "${FILESDIR}/hsqldb"
- doconfd conf/hsqldb
- dodir /etc/hsqldb
- insinto /etc/hsqldb
- # Change the ownership of server.properties and sqltool.rc
- # files to hsqldb:hsqldb. (resolves Bug #111963)
- use prefix || insopts -m0600 -o hsqldb -g hsqldb
- doins conf/server.properties
- use prefix || insopts -m0600 -o hsqldb -g hsqldb
- doins conf/sqltool.rc
-
- # Install init script
- dodir "${HSQLDB_HOME}/bin"
- keepdir "${HSQLDB_HOME}"
- exeinto "${HSQLDB_HOME}/bin"
- doexe bin/hsqldb
-
- # Make sure that files have correct permissions
- use prefix || chown -R hsqldb:hsqldb "${ED}${HSQLDB_HOME}"
- chmod o-rwx "${ED}${HSQLDB_HOME}"
-
- # Create symlinks to authorization files in the server home dir
- # (required by the hqldb init script)
- insinto "${HSQLDB_HOME}"
- dosym /etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties"
- dosym /etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc"
-}
-
-pkg_postinst() {
- ewarn "If you intend to run Hsqldb in Server mode and you want to create"
- ewarn "additional databases, remember to put correct information in both"
- ewarn "'server.properties' and 'sqltool.rc' files."
- ewarn "(read the 'Init script Setup Procedure' section of the 'Chapter 3."
- ewarn "UNIX Quick Start' in the Hsqldb docs for more information)"
- echo
- elog "Example:"
- echo
- elog "${EPREFIX}/etc/hsqldb/server.properties"
- elog "============================="
- elog "server.database.1=file:xdb/xdb"
- elog "server.dbname.1=xdb"
- elog "server.urlid.1=xdb"
- elog
- elog "${EPREFIX}/etc/hsqldb/sqltool.rc"
- elog "======================"
- elog "urlid xdb"
- elog "url jdbc:hsqldb:hsql://localhost/xdb"
- elog "username sa"
- elog "password "
- echo
- elog "Also note that each hsqldb server can serve only up to 10"
- elog "different databases simultaneously (with consecutive {0-9}"
- elog "suffixes in the 'server.properties' file)."
- echo
- ewarn "For data manipulation use:"
- ewarn
- ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManager"
- ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.DatabaseManagerSwing"
- ewarn "# java -classpath ${EPREFIX}${HSQLDB_JAR} org.hsqldb.util.SqlTool \\"
- ewarn " --rcFile ${EPREFIX}/var/lib/hsqldb/sqltool.rc "
- echo
- elog "The Hsqldb can be run in multiple modes - read 'Chapter 1. Running'"
- elog "and Using Hsqldb' in the Hsqldb docs at:"
- elog " http://hsqldb.org/web/hsqlDocsFrame.html"
- elog "If you intend to run it in the Server mode, it is suggested to add the"
- elog "init script to your start-up scripts, this should be done like this:"
- elog " \`rc-update add hsqldb default\`"
- echo
-}
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2.ebuild
index 190476007e28..0ed2db57579b 100644
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2.ebuild
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2.ebuild,v 1.6 2013/10/20 16:31:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2.ebuild,v 1.7 2015/07/11 09:20:52 chewi Exp $
EAPI="5"
@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="xalan"
inherit ant-tasks
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="dev-java/xalan"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
index 17c0d20d5ee5..61cb9056e7c1 100644
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.9.2.ebuild,v 1.9 2015/05/23 22:48:44 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.9.2.ebuild,v 1.10 2015/07/11 09:20:53 chewi Exp $
EAPI="5"
@@ -22,7 +22,7 @@ SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk )
!dev-java/ant-tasks
diff --git a/dev-java/ant-junit/ant-junit-1.9.2.ebuild b/dev-java/ant-junit/ant-junit-1.9.2.ebuild
index 31db476bab62..50ff7330a3f3 100644
--- a/dev-java/ant-junit/ant-junit-1.9.2.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.9.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ant-junit-1.9.2.ebuild,v 1.6 2013/10/20 16:32:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-junit/ant-junit-1.9.2.ebuild,v 1.7 2015/07/11 09:20:53 chewi Exp $
EAPI="5"
inherit ant-tasks
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="dev-java/junit:4"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
index c4c4c3a46204..2742d661e55e 100644
--- a/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
+++ b/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild,v 1.5 2013/10/20 16:32:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild,v 1.6 2015/07/11 09:20:53 chewi Exp $
EAPI="5"
@@ -10,7 +10,7 @@ ANT_TASK_DISABLE_VM_DEPS="true"
inherit ant-tasks
DESCRIPTION="Formerly Ant's optional tasks w/o external deps, now compat empty jar"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Dependency needed for jar.
DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
index 476e71002b49..f7ab891adf7c 100644
--- a/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
+++ b/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild,v 1.5 2013/12/24 12:41:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-owanttask/ant-owanttask-1.3.2.ebuild,v 1.6 2015/07/11 09:21:05 chewi Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_${PV}.zip
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
COMMON_DEP="dev-java/xalan"
DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/ant-trax/ant-trax-1.9.2.ebuild b/dev-java/ant-trax/ant-trax-1.9.2.ebuild
index c6039146e7af..2ddef79227ad 100644
--- a/dev-java/ant-trax/ant-trax-1.9.2.ebuild
+++ b/dev-java/ant-trax/ant-trax-1.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ant-trax-1.9.2.ebuild,v 1.6 2013/10/20 16:32:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-trax/ant-trax-1.9.2.ebuild,v 1.7 2015/07/11 09:21:07 chewi Exp $
EAPI="5"
@@ -10,7 +10,7 @@ ANT_TASK_DISABLE_VM_DEPS="true"
inherit ant-tasks
DESCRIPTION="Apache Ant .jar with optional tasks depending on XML transformer (Deprecated!)"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Dependency needed for jar.
DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/antlr/antlr-2.7.7-r2.ebuild b/dev-java/antlr/antlr-2.7.7-r2.ebuild
deleted file mode 100644
index 04a6fc1b6d07..000000000000
--- a/dev-java/antlr/antlr-2.7.7-r2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r2.ebuild,v 1.10 2015/03/21 15:08:20 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-
-inherit base java-pkg-2 mono distutils multilib toolchain-funcs versionator
-
-DESCRIPTION="A parser generator for C++, C#, Java, and Python"
-HOMEPAGE="http://www.antlr2.org/"
-SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc debug examples mono +cxx +java python script source static-libs"
-
-# TODO do we actually need jdk at runtime?
-RDEPEND=">=virtual/jdk-1.3
- mono? ( dev-lang/mono )"
-DEPEND="${RDEPEND}
- script? ( !dev-util/pccts )
- source? ( app-arch/zip )"
-
-PATCHES=( "${FILESDIR}/2.7.7-gcc-4.3.patch" "${FILESDIR}/2.7.7-gcc-4.4.patch" "${FILESDIR}/2.7.7-makefixes.patch" )
-
-make_shared_lib() {
- local soname=$(basename "${1%.a}").so.$(get_major_version)
- einfo "Making ${soname}"
- ${2:-$(tc-getCC)} ${LDFLAGS} \
- -shared -Wl,-soname="${soname}" \
- -Wl,--whole-archive "${1}" -Wl,--no-whole-archive \
- -o $(dirname "${1}")/"${soname}" || return 1
-}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
-
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- base_src_prepare
- sed -i \
- -e 's/install:.*this-install/install:/' \
- lib/cpp/src/Makefile.in || die
-}
-
-src_configure() {
- # don't ask why, but this is needed for stuff to get built properly
- # across the various JDKs
- JAVACFLAGS="+ ${JAVACFLAGS}"
-
- # mcs for https://bugs.gentoo.org/show_bug.cgi?id=172104
- CSHARPC="mcs" econf $(use_enable java) \
- $(use_enable python) \
- $(use_enable mono csharp) \
- $(use_enable debug) \
- $(use_enable examples) \
- $(use_enable cxx) \
- --enable-verbose
-}
-
-src_compile() {
- emake CXXFLAGS="${CXXFLAGS} -fPIC" || die "compile failed"
- if use cxx; then
- pushd lib/cpp/src > /dev/null
- make_shared_lib libantlr.a || die
- if use static-libs; then
- make clean
- emake || die "compile static failed"
- fi
- popd > /dev/null
- fi
- sed -e "s|@prefix@|/usr/|" \
- -e 's|@exec_prefix@|${prefix}|' \
- -e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \
- -e 's|@libs@|-r:\$\{libdir\}/antlr.astframe.dll -r:\$\{libdir\}/antlr.runtime.dll|' \
- -e "s|@VERSION@|${PV}|" \
- "${FILESDIR}"/antlr.pc.in > "${S}"/antlr.pc
-}
-
-src_install() {
- dobin "${S}"/scripts/antlr-config
-
- if use cxx ; then
- cd "${S}"/lib/cpp
- einstall || die "failed to install C++ files"
- dolib.so src/libantlr.so* || die
- dosym libantlr.so.$(get_major_version) /usr/$(get_libdir)/libantlr.so
- use static-libs && dolib.a src/libantlr.a
- fi
-
- if use java ; then
- java-pkg_dojar "${S}"/antlr/antlr.jar
-
- use script && java-pkg_dolauncher antlr --main antlr.Tool
-
- use source && java-pkg_dosrc "${S}"/antlr
- use doc && java-pkg_dohtml -r "${S}"/doc/*
- fi
-
- if use mono ; then
- cd "${S}"/lib
-
- dodir /usr/$(get_libdir)/antlr/
- insinto /usr/$(get_libdir)/antlr/
-
- doins antlr.astframe.dll
- doins antlr.runtime.dll
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins "${S}"/antlr.pc
- fi
-
- if use python ; then
- cd "${S}"/lib/python
- distutils_src_install
- fi
-
- if use examples ; then
- find "${S}"/examples -iname Makefile\* -exec rm \{\} \;
-
- dodir /usr/share/doc/${PF}/examples
- insinto /usr/share/doc/${PF}/examples
-
- use cxx && doins -r "${S}"/examples/cpp
- use java && doins -r "${S}"/examples/java
- use mono && doins -r "${S}"/examples/csharp
- use python && doins -r "${S}"/examples/python
- fi
-
- newdoc "${S}"/README.txt README || die
-}
-
-pkg_postinst() {
- use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
- use python && distutils_pkg_postrm
-}
diff --git a/dev-java/antlr/antlr-2.7.7-r5.ebuild b/dev-java/antlr/antlr-2.7.7-r5.ebuild
index dd265d3ad538..acdb3eaad4a8 100644
--- a/dev-java/antlr/antlr-2.7.7-r5.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.15 2015/05/27 11:28:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.16 2015/07/11 09:19:56 chewi Exp $
EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc debug examples mono +cxx +java python script source static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-java/antlr/antlr-3.1.3-r3.ebuild b/dev-java/antlr/antlr-3.1.3-r3.ebuild
index 95a74d21dc45..aa28f33db1e3 100644
--- a/dev-java/antlr/antlr-3.1.3-r3.ebuild
+++ b/dev-java/antlr/antlr-3.1.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-3.1.3-r3.ebuild,v 1.1 2013/09/03 21:01:33 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-3.1.3-r3.ebuild,v 1.2 2015/07/11 09:19:56 chewi Exp $
EAPI="2"
JAVA_PKG_IUSE="source"
@@ -14,7 +14,7 @@ SRC_URI="http://www.antlr.org/download/${P}.tar.gz
mirror://gentoo/${P}-generated.tar.bz2"
LICENSE="BSD"
SLOT="3"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="gunit"
COMMON_DEPEND=">=dev-java/stringtemplate-3.2:0
diff --git a/dev-java/antlr/antlr-4.4.ebuild b/dev-java/antlr/antlr-4.4.ebuild
index 3b5b8a767d95..ab48369794a2 100644
--- a/dev-java/antlr/antlr-4.4.ebuild
+++ b/dev-java/antlr/antlr-4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-4.4.ebuild,v 1.8 2015/06/16 08:58:33 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-4.4.ebuild,v 1.9 2015/07/11 09:19:56 chewi Exp $
EAPI="5"
@@ -18,7 +18,7 @@ http://www.antlr3.org/download/${JAR_LIST[0]}
http://www.antlr.org/download/${JAR_LIST[1]}"
LICENSE="BSD"
SLOT="4"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="gunit"
CDEPEND="
diff --git a/dev-java/asm/asm-2.0-r1.ebuild b/dev-java/asm/asm-2.0-r1.ebuild
index ee21a3941d53..3a24ea001a32 100644
--- a/dev-java/asm/asm-2.0-r1.ebuild
+++ b/dev-java/asm/asm-2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-2.0-r1.ebuild,v 1.15 2013/06/14 19:43:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-2.0-r1.ebuild,v 1.16 2015/07/11 09:21:08 chewi Exp $
EAPI=4
inherit java-pkg-2 java-ant-2
@@ -10,7 +10,7 @@ HOMEPAGE="http://asm.objectweb.org"
SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="2"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
IUSE="doc source"
DEPEND=">=virtual/jdk-1.3
dev-java/ant-core
diff --git a/dev-java/asm/asm-2.2.3-r1.ebuild b/dev-java/asm/asm-2.2.3-r1.ebuild
index c3122af513b9..1f14526a5371 100644
--- a/dev-java/asm/asm-2.2.3-r1.ebuild
+++ b/dev-java/asm/asm-2.2.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-2.2.3-r1.ebuild,v 1.12 2013/02/05 06:42:56 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-2.2.3-r1.ebuild,v 1.13 2015/07/11 09:21:08 chewi Exp $
inherit java-pkg-2 java-ant-2
@@ -9,7 +9,7 @@ HOMEPAGE="http://asm.objectweb.org"
SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="2.2"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="doc source"
DEPEND=">=virtual/jdk-1.4
dev-java/ant-core
diff --git a/dev-java/asm/asm-3.3.1.ebuild b/dev-java/asm/asm-3.3.1.ebuild
index bdbf259e7044..937b18c0248d 100644
--- a/dev-java/asm/asm-3.3.1.ebuild
+++ b/dev-java/asm/asm-3.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-3.3.1.ebuild,v 1.7 2014/01/19 10:16:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-3.3.1.ebuild,v 1.8 2015/07/11 09:21:08 chewi Exp $
WANT_ANT_TASKS="ant-owanttask"
JAVA_PKG_IUSE="doc source"
@@ -13,7 +13,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="3"
IUSE=""
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.5"
RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/bcel/bcel-5.2-r2.ebuild b/dev-java/bcel/bcel-5.2-r2.ebuild
index 73911b4432dd..55323c4a9759 100644
--- a/dev-java/bcel/bcel-5.2-r2.ebuild
+++ b/dev-java/bcel/bcel-5.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/bcel-5.2-r2.ebuild,v 1.11 2013/06/14 19:27:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/bcel-5.2-r2.ebuild,v 1.12 2015/07/11 09:21:08 chewi Exp $
EAPI=2
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/jakarta/${PN}/source/${P}-src.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="-findbugs"
RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/bcel/bcel-6.0_rc3.ebuild b/dev-java/bcel/bcel-6.0_rc3.ebuild
index 8c57422f71e9..5dfd1039b61a 100644
--- a/dev-java/bcel/bcel-6.0_rc3.ebuild
+++ b/dev-java/bcel/bcel-6.0_rc3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/bcel-6.0_rc3.ebuild,v 1.1 2015/03/14 14:51:12 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/bcel-6.0_rc3.ebuild,v 1.2 2015/07/11 09:21:08 chewi Exp $
EAPI=5
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/commons-${PN}/archive/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
deleted file mode 100644
index c9073ca971b2..000000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r5.ebuild,v 1.1 2015/06/17 02:36:39 patrick Exp $
-
-EAPI=5
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java library for working with XML"
-HOMEPAGE="http://dom4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz
- mirror://gentoo/${P}-java5.patch.bz2"
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="~ia64"
-IUSE=""
-RDEPEND=">=virtual/jre-1.4
- dev-java/jaxme:0
- dev-java/jsr173:0
- >=dev-java/msv-20050627-r2:0
- dev-java/xpp2:0
- dev-java/xpp3:0
- dev-java/relaxng-datatype:0
- dev-java/xerces:2
- >=dev-java/xsdlib-20050627-r2:0
- dev-java/xml-commons-external:1.3"
-DEPEND="
- >=virtual/jdk-1.4
- test? (
- dev-java/ant-junit:0
- dev-java/xalan:0
- dev-java/junitperf:0
- )
- ${RDEPEND}"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_prepare() {
- # Add missing methods to compile on Java 5
- # see bug #137970
- epatch "${WORKDIR}/${P}-java5.patch"
-
- # Needs X11
- rm -v ./src/test/org/dom4j/bean/BeansTest.java || die
- # fails with a 1.6 JDK for some reason
- rm -v src/test/org/dom4j/io/StaxTest.java || die
- rm -v *.jar || die
- cd "${S}/lib"
- #circular deps with jaxen
- rm -f $(echo *.jar | sed 's/jaxen[^ ]\+//')
- java-pkg_jar-from jaxme
- java-pkg_jar-from jsr173
- java-pkg_jar-from msv
- java-pkg_jar-from xpp2
- java-pkg_jar-from xpp3
- java-pkg_jar-from relaxng-datatype
- java-pkg_jar-from xsdlib
- java-pkg_jar-from xml-commons-external-1.3
-
- cd "${S}/lib/endorsed"
- rm -v *.jar || die
- java-pkg_jar-from xerces-2 || die
-
- rm -vr "${S}"/lib/test/* || die
- if use test; then
- java-pkg_jar-from --build-only xalan,junitperf,junit
- fi
- rm -vr "${S}"/lib/tools/* || die
-
- java-pkg-2_src_prepare
-}
-
-EANT_BUILD_TARGET="clean package"
-EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
-
-src_install() {
- java-pkg_dojar build/${PN}.jar
- use doc && java-pkg_dojavadoc build/doc/api
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
index b19d434e876a..e96bfa1aae6f 100644
--- a/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild,v 1.3 2015/06/20 23:17:10 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild,v 1.4 2015/07/11 09:21:21 chewi Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-
LICENSE="EPL-1.0"
SLOT="3.5"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="+native"
RDEPEND="sys-devel/gcc:*[gcj]
diff --git a/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
index 9415ae3d8ab0..43c2a1f4dd2b 100644
--- a/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild,v 1.3 2015/06/20 23:17:10 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild,v 1.4 2015/07/11 09:21:21 chewi Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-
LICENSE="EPL-1.0"
SLOT="3.6"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="+native"
RDEPEND="sys-devel/gcc:*[gcj]
diff --git a/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
index 4235498cf144..c3385b8d9b81 100644
--- a/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild,v 1.3 2015/06/20 23:17:10 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild,v 1.4 2015/07/11 09:21:21 chewi Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src
LICENSE="EPL-1.0"
SLOT="4.2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="+native"
RDEPEND="sys-devel/gcc:*[gcj]
diff --git a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
index 9f3f6a5eda1b..b9878498c073 100644
--- a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild,v 1.4 2015/06/20 23:17:10 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild,v 1.5 2015/07/11 09:21:21 chewi Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src
LICENSE="EPL-1.0"
SLOT="4.4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="+native"
RDEPEND="sys-devel/gcc:*[gcj]
diff --git a/dev-java/fop/files/fop-2.0-build.xml.patch b/dev-java/fop/files/fop-2.0-build.xml.patch
deleted file mode 100644
index 7638516f1d83..000000000000
--- a/dev-java/fop/files/fop-2.0-build.xml.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- build.xml.orig 2015-07-05 20:34:00.099000000 +0000
-+++ build.xml 2015-07-05 20:34:38.194000000 +0000
-@@ -355,18 +355,6 @@
-
-
-
--
--
--
--
--
--
--
--
--
--
--
--
-
-
-
diff --git a/dev-java/fop/fop-2.0.ebuild b/dev-java/fop/fop-2.0.ebuild
index 0094f5e7ef81..73c6483a1a97 100644
--- a/dev-java/fop/fop-2.0.ebuild
+++ b/dev-java/fop/fop-2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.10 2015/07/05 21:51:08 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.11 2015/07/11 17:58:30 monsieurp Exp $
# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
# be built as it needs forrest which we do not have
@@ -67,19 +67,28 @@ EANT_GENTOO_CLASSPATH="
"
TARGETS=(
+ resourcegen
jar-hyphenation
jar-sandbox
jar-main
)
java_prepare() {
- epatch "${FILESDIR}"/${P}-build.xml.patch
-
- find "${S}"/lib -type f -name \*.jar | xargs rm -v
+ find "${S}"/lib -type f | xargs rm -v
}
src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only qdox-1.12)"
+ # https://bugs.gentoo.org/show_bug.cgi?id=554386
+ # http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
+ java-pkg_jar-from --into lib qdox-1.12 qdox.jar
+ java-pkg_jar-from --into lib xmlgraphics-commons-2 xmlgraphics-commons.jar
+ java-pkg_jar-from --into lib commons-logging commons-logging.jar
+ java-pkg_jar-from --into lib commons-io-1 commons-io.jar
+ java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
+ java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
+ java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
+ java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
+ java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
for target in ${TARGETS[@]}; do
EANT_BUILD_TARGET="${target}" \
@@ -91,7 +100,6 @@ src_compile() {
EANT_BUILD_TARGET="javadocs" \
java-pkg-2_src_compile
fi
-
}
src_install() {
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild
deleted file mode 100644
index ba7808501d62..000000000000
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.3-r1.ebuild,v 1.1 2014/07/14 18:45:53 sera Exp $
-
-EAPI="5"
-
-inherit java-vm-2 multilib
-
-DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
-SLOT="0"
-IUSE="X"
-
-ECJ_GCJ_SLOT="3.6"
-API_DIFF_PV="4.8.2"
-
-# perl is needed for javac wrapper
-RDEPEND="
- dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
- dev-lang/perl
- ~sys-devel/gcc-${PV}[gcj]
- X? ( ~sys-devel/gcc-${PV}[awt] )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
- # jre lib paths ...
- local libarch="$(get_system_arch)"
- local gcc_version=${PV}
- local gccbin=$(gcc-config -B ${gcc_version})
- gccbin=${gccbin#"${EPREFIX}"}
- local gcclib=$(gcc-config -L ${gcc_version} | cut -d':' -f1)
- gcclib=${gcclib#"${EPREFIX}"}
- local gcjhome="/usr/$(get_libdir)/${P}"
- local gccchost="${CHOST}"
- local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
- gcjlibdir=${gcjlibdir#"${EPREFIX}"}
-
- # links
- dodir ${gcjhome}/bin
- dodir ${gcjhome}/jre/bin
- dosym ${gccbin}/gij ${gcjhome}/bin/java
- dosym ${gccbin}/gij ${gcjhome}/jre/bin/java
- dosym ${gccbin}/gjar ${gcjhome}/bin/jar
- dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
- dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
- dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
- dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
- dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer
- dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner
- dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry
- dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry
- dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool
- dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool
- dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii
- dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd
- dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd
- dosym ${gccbin}/grmid ${gcjhome}/bin/rmid
- dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid
- dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver
- dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
- dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
-
- dodir ${gcjhome}/jre/lib/${libarch}/client
- dodir ${gcjhome}/jre/lib/${libarch}/server
- dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
- dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
- use X && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
-
- dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
- ${gcjhome}/jre/lib/rt.jar
- dodir ${gcjhome}/lib
- dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \
- ${gcjhome}/lib/tools.jar
- dosym ${gcclib}/include ${gcjhome}/include
-
- local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
- exeinto ${gcjhome}/bin
- sed -e "s#@JAVA@#${gcjhome}/bin/java#" \
- -e "s#@ECJ_JAR@#${ecj_jar}#" \
- -e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \
- -e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \
- "${FILESDIR}"/javac.in \
- | newexe - javac
- assert
-
- set_java_env
-}
-
-pkg_postinst() {
- # Do not set as system VM (see below)
- # java-vm-2_pkg_postinst
-
- ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs."
- ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${API_DIFF_PV}.html"
- ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${API_DIFF_PV}.html"
- ewarn "Check for existing bugs relating to missing APIs and file"
- ewarn "new ones at http://gcc.gnu.org/bugzilla/"
- ewarn
- ewarn "Due to this and limited manpower, we currently cannot support"
- ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap"
- ewarn "IcedTea without prior binary VM installation. To do that, execute:"
- ewarn
- ewarn "emerge -o icedtea && emerge icedtea"
-}
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild
index ce8672f760ec..410f89807b9e 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild,v 1.1 2014/07/14 18:45:53 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.4.ebuild,v 1.2 2015/07/11 09:19:56 chewi Exp $
EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gentoo.org/"
SRC_URI=""
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-linux"
SLOT="0"
IUSE="X"
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r2.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r2.ebuild
index 47fe442819e4..18656820bd60 100644
--- a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r2.ebuild
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-regexp/gnu-regexp-1.1.4-r2.ebuild,v 1.15 2013/06/14 19:24:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-regexp/gnu-regexp-1.1.4-r2.ebuild,v 1.16 2015/07/11 09:21:22 chewi Exp $
inherit java-pkg-2 eutils
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.tralfamadore.com/pub/java/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="1"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc source"
DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1.ebuild
index ac516b87a901..ebcec648b04c 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-core/hamcrest-core-1.1.ebuild,v 1.15 2014/08/10 20:14:08 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-core/hamcrest-core-1.1.ebuild,v 1.16 2015/07/11 09:21:22 chewi Exp $
JAVA_PKG_IUSE="source"
@@ -14,7 +14,7 @@ HOMEPAGE="http://code.google.com/p/${MY_PN}/"
SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos ~x64-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
index b072e745ec53..999a03de92b5 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild,v 1.1 2014/02/28 17:34:39 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild,v 1.2 2015/07/11 09:21:24 chewi Exp $
EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
CDEPEND="dev-java/qdox:1.6"
diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.2.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.2.ebuild
index 51c79d57abb7..376b212c7164 100644
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.2.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-generator/hamcrest-generator-1.2.ebuild,v 1.2 2013/06/27 22:04:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-generator/hamcrest-generator-1.2.ebuild,v 1.3 2015/07/11 09:21:24 chewi Exp $
EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
LICENSE="BSD-2"
SLOT="${PV}"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
CDEPEND="dev-java/qdox:1.6"
diff --git a/dev-java/hp-jdk-bin/Manifest b/dev-java/hp-jdk-bin/Manifest
index 810fc6c20dac..cfda34385af0 100644
--- a/dev-java/hp-jdk-bin/Manifest
+++ b/dev-java/hp-jdk-bin/Manifest
@@ -1,2 +1,2 @@
-DIST jdk6_16005_ia.depot 138004480 RMD160 bec50792609af4dfe7b186cea1425dfab1fb7943 SHA1 caae778144c346801a0705a087018faaa17161fe SHA256 2ce897f22aa9db11ff1cdda14475f36b5b761e0c024cbbd9313e5f2da44e067f
-DIST jdk6_16005_pa.depot 99102720 RMD160 9047d0845915189af57f3f4a2f207c8a6659952b SHA1 70d7a5c9a59b95d4d5d67f28be565dce8b0aaa26 SHA256 4ed271f34d28194f83ca7271d91ca1731502c93811c9fb052aa102539c3da7f5
+DIST jdk6_16005_ia.depot 138004480 SHA256 2ce897f22aa9db11ff1cdda14475f36b5b761e0c024cbbd9313e5f2da44e067f
+DIST jdk6_16005_pa.depot 99102720 SHA256 4ed271f34d28194f83ca7271d91ca1731502c93811c9fb052aa102539c3da7f5
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 46ffeb1bcdbe..a3fb6839c64d 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,13 +1,3 @@
-DIST icedtea-2.4-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
-DIST icedtea-2.4-corba-58b31c5bf14e.tar.gz 1442392 SHA256 d42baf4a2d8529e0c7bafd9e0cce4a8f7463e06f4ab0736fb2c97411a5933560 SHA512 57f4339e483952b294c2f4100a7e3daf91b0a1e021515160ac88b92ed6175ae2e26b37560ab16055a3af3bb4d8fc6f16641daea9416daba7460a3bafdbbadca9 WHIRLPOOL c5e1f4f1cf730b60da5340e75ab5bbc486c8dd04f38c6803139956d1c8429bab89713f7bbaf34d83dc1a25e4863633deb0ecde066a1d5cccee24dde864cb139b
-DIST icedtea-2.4-hotspot-6f93cec20d27.tar.gz 9738397 SHA256 4b62772cbd751d6a060e05caee842ec510fc5e210ac23b9a1c0a1418979ab655 SHA512 3d237d786d9a4f8ff21d6ce072207bb21d07b57025051b52574fcaefcef9eebf32569f26330cf1be48225ed3860d19896d17f2ba94535aeaf10c408dee508a4a WHIRLPOOL f4af2c91edb61f66258dba24c4ed4eae25bf6a62c54f364910894c9e5ca12fc02e612c4af7b98d203ff589e11c5f6ff2d04a99c5cc26000da5b634cbbd9b1236
-DIST icedtea-2.4-jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz 316422 SHA256 4662da1fe3e0e11d8fa685c7f2fc748576b9f3d3e37dc56b798dd6a5bd6b61e7 SHA512 a8132ce0f97f5ba090b12aad847072861f8913fe1fdc3a540e9e353b0d9ddc564a96ab2bcbfa27a7068bba606428d7dc9de4f7ad668e546151657f9ddcfc28ad WHIRLPOOL 8e274825bec5c47787eda0e25a0bc4a586a8938c1fa3c4f0c4f7c04e679d28458a61f45bfa62b255a630a4ca3a5c5d1aa3436086cba92ee7a43d3a2b8684e330
-DIST icedtea-2.4-jaxp-95d394340fda.tar.gz 3884205 SHA256 5b52e6c45bcf439d77e207f188c55a0b906c7d10078551bb606d278822dbdc5d SHA512 e04235a3cce9ee6e0630e3310d1bfb67a1b6ed2458c1255ae687a04c2cf1a5622a28e9c812aa11a9b7f993b04e251fb1cd688ab160838165cedcc717c5683752 WHIRLPOOL 65a21bb2c357ebad6e029b0d271451f98fe0efd8fbbbcf882293fc4215e1cbd4a8b5f049199430cf039e5959d6fead120c9fe43f5babdd4d16cf1d02fd953fc1
-DIST icedtea-2.4-jaxws-bce4362b2996.tar.gz 2780021 SHA256 f612dbff32c60afff28d4d75b90246b355b13521020bdb6ea2020c78d08cefba SHA512 a82aed28e24b5f4f2563c6024493cee5dca4a9a94709d6f3186b9bcbbc88e025f208d53af2d90c079f797ccf92625054d3e10a31994fe841682f950e17d409a0 WHIRLPOOL fbc2b14d97814c3598ef756e1af471233fbf9988f73a3b5e5b509a402e8bd909f60f6f6bda91e02f40e7e7f037480d0225e996ec43b8db4b9fb0c4efd418cfc6
-DIST icedtea-2.4-jdk-22d79652f370.tar.gz 39990304 SHA256 6659f1b95120f88eec03beaabc7fe2df409522902b7a64689cfb82a959510e49 SHA512 0894dab1f8a5d72bfb02c224d9068b4fb49c095f99c8ca38cf4bc58ed1851bf07350109ba966c40ca45a2e3751f0c334f5084ebdd3a84e022a2edb77b0b31d11 WHIRLPOOL 855b651744bd3dd3e802398e9ff77ffe35575b05c3a7e2f0043618cf0521ae1f1730b87a5e1da639219c8f6c388e8ea0f7cd52b91a125966fc8928facde0a2d3
-DIST icedtea-2.4-langtools-43cdaf529543.tar.gz 2300798 SHA256 3f69ad8add8036854cf5846689410b99a44b2dbd0d2e625316bdd895c3e7f853 SHA512 be3d6d6f8b5e64ceaaefa731e00e7f217b5f972786a4f15eb0b4d25dc2c7feb15e0f183ef84dd7794fed71bfdabea86d6a8b0620992cd9af47dc945142cab60a WHIRLPOOL 04963c0b081b2467925cfe9eccd9faec6d173cb12cdd7439a0dca4219289af28dcfec63c9805f1df598a89518bab28210d1306eeee1759e8d729cf33df6621fe
-DIST icedtea-2.4-openjdk-2b38d8f0e43f.tar.gz 138484 SHA256 0911ac258e606dbe20206d5e0d37e997b804f90e8269762242d333b07e7932b4 SHA512 e08c9592dec819b20633174cb0d6f955f4a32ad51d76b9754b6b0f79b8c989c64c332499328462d9a8394f81a65fee69adfd04b6bad22337bf9f894c75c75540 WHIRLPOOL f286bb36c69ace3e5a413f677519f17c3cf0c8c299938a4e98e9938c8f3933ed73b1ddae75070ce44baac6a07e8cec4a4f0f3ab0476be0a7845011124437b8b2
-DIST icedtea-2.4.8.tar.xz 3428080 SHA256 3fa64e2e92b08fb69eaec72a85ee3322efb1cfacc65e15b5b7fdef4abbdd17a2 SHA512 ad2e153884b9bf5edb03e5c0bf5606923e51a6eb58648c93de3bbc9be2db1cc5589bd7800e2104161cd506d488db32b9995400f70dc0bee4f5942e4d948bfec1 WHIRLPOOL 8cec14d8cba26a808e986abc211841065036cdcfadb9da327b3191937e4f3fd2c94e98b1dab989f30a3d494eeb692a6fff24c756dfec2b2a6a2a4f5da7822ead
DIST icedtea-2.5-aarch64-1939c010fd37.tar.bz2 8151626 SHA256 ac35bd6620553478700aaf8c825e373a7329d66473899f7184eb5a317f3db97f SHA512 b594b384bfeb18c1a1b493de7a73fef91e646769ef737009d4326922e1ba70bb0cbcd8a21b4fd352ea6155342eda7de25dddc781c3751e2a19aea07ad9dd04e0 WHIRLPOOL 853098684b5b3db7eb1a32c360c12d45c7c5e4ea877e598f466531efd1d80f90cee28cd8321fd90b044ba27e4fc142e808112bdcb603fc5d7a0c23d08be748e7
DIST icedtea-2.5-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba
DIST icedtea-2.5-corba-52db6f325d61.tar.bz2 1069991 SHA256 f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51 SHA512 22da9802c9354a96ba1440568d698ae5fec14db89668d665e169a571d26627f7343f1a42bdbb84d4d647d4694380bb49a987ce2cf190507614b76493bc2cbd06 WHIRLPOOL 62586a018ca3856e2d1e918385d9044dfebe45fd20bb7cbd28aa5fabf2bbb7c814790911b8bac6f7459ff333fd2fa25854d538bb49b22e656ee1239839513f27
diff --git a/dev-java/icedtea/icedtea-6.1.13.5.ebuild b/dev-java/icedtea/icedtea-6.1.13.5.ebuild
index d0094e93e90f..00ae1ba0a206 100644
--- a/dev-java/icedtea/icedtea-6.1.13.5.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.5.ebuild,v 1.3 2015/05/07 12:17:28 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.5.ebuild,v 1.4 2015/07/11 09:19:57 chewi Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -34,7 +34,7 @@ SRC_URI="
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
SLOT="6"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap kerberos +nsplugin
+nss pax_kernel pulseaudio selinux +source systemtap test +webstart"
diff --git a/dev-java/icedtea/icedtea-7.2.4.8.ebuild b/dev-java/icedtea/icedtea-7.2.4.8.ebuild
deleted file mode 100644
index 11dd5881cc87..000000000000
--- a/dev-java/icedtea/icedtea-7.2.4.8.ebuild
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.8.ebuild,v 1.4 2015/05/07 12:17:28 chewi Exp $
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-
-inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-CORBA_TARBALL="58b31c5bf14e.tar.gz"
-JAXP_TARBALL="95d394340fda.tar.gz"
-JAXWS_TARBALL="bce4362b2996.tar.gz"
-JDK_TARBALL="22d79652f370.tar.gz"
-LANGTOOLS_TARBALL="43cdaf529543.tar.gz"
-OPENJDK_TARBALL="2b38d8f0e43f.tar.gz"
-HOTSPOT_TARBALL="6f93cec20d27.tar.gz"
-CACAO_TARBALL="e215e36be9fc.tar.gz"
-JAMVM_TARBALL="jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
- http://icedtea.classpath.org/download/source/${SRC_PKG}
- http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
- -> ${OPENJDK_GENTOO_TARBALL}
- http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
- -> ${CORBA_GENTOO_TARBALL}
- http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
- -> ${JAXP_GENTOO_TARBALL}
- http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
- -> ${JAXWS_GENTOO_TARBALL}
- http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
- -> ${JDK_GENTOO_TARBALL}
- http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
- -> ${HOTSPOT_GENTOO_TARBALL}
- http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
- -> ${LANGTOOLS_GENTOO_TARBALL}
- http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
- http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="7"
-KEYWORDS="~amd64 ~ia64 ~x86"
-
-IUSE="+X +alsa cacao cjk +cups debug doc examples jamvm javascript +jbootstrap kerberos +nsplugin
- +nss pax_kernel pulseaudio selinux +source test zero +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
- >=net-print/cups-1.2.12"
-X_COMMON_DEP="
- >=dev-libs/atk-1.30.0
- >=dev-libs/glib-2.26
- media-libs/fontconfig
- >=media-libs/freetype-2.3.5:2=
- >=x11-libs/cairo-1.8.8:=
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.8:2=
- >=x11-libs/libX11-1.1.3
- >=x11-libs/libXext-1.1.1
- >=x11-libs/libXi-1.1.3
- >=x11-libs/libXrender-0.9.4
- >=x11-libs/libXtst-1.0.3
- x11-libs/libXt
- >=x11-libs/pango-1.24.5"
-X_DEPEND="
- >=x11-libs/libXau-1.0.3
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXinerama-1.0.2
- x11-proto/inputproto
- >=x11-proto/xextproto-7.1.1
- x11-proto/xineramaproto
- x11-proto/xproto"
-
-COMMON_DEP="
- >=media-libs/giflib-4.1.6:=
- >=media-libs/lcms-2.5
- >=media-libs/libpng-1.2:0=
- >=sys-libs/zlib-1.2.3:=
- virtual/jpeg:0=
- javascript? ( dev-java/rhino:1.6 )
- nss? ( >=dev-libs/nss-3.12.5-r1 )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= )
- kerberos? ( virtual/krb5 )
- >=dev-util/systemtap-1"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
- !dev-java/icedtea:0
- X? (
- ${CUPS_COMMON_DEP}
- ${X_COMMON_DEP}
- media-fonts/dejavu
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- )
- alsa? ( ${ALSA_COMMON_DEP} )
- cups? ( ${CUPS_COMMON_DEP} )
- selinux? ( sec-policy/selinux-java )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
- || (
- >=dev-java/gcj-jdk-4.3
- dev-java/icedtea-bin:7
- dev-java/icedtea-bin:6
- dev-java/icedtea:7
- dev-java/icedtea:6
- )
- app-arch/cpio
- app-arch/unzip
- app-arch/zip
- app-misc/ca-certificates
- >=dev-java/ant-core-1.8.2
- dev-lang/perl
- >=dev-libs/libxslt-1.1.26
- dev-libs/openssl
- virtual/pkgconfig
- sys-apps/attr
- sys-apps/lsb-release
- ${X_DEPEND}
- pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( || (
- dev-java/icedtea-web:0[icedtea7]
- >=dev-java/icedtea-web-1.3.2:7
- ) )
- nsplugin? ( || (
- dev-java/icedtea-web:0[icedtea7,nsplugin]
- >=dev-java/icedtea-web-1.3.2:7[nsplugin]
- ) )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
- local CHECKREQS_DISK_BUILD
-
- if use doc; then
- CHECKREQS_DISK_BUILD="9000M"
- else
- CHECKREQS_DISK_BUILD="8500M"
- fi
-
- check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- icedtea_check_requirements
-}
-
-pkg_setup() {
- icedtea_check_requirements
-
- JAVA_PKG_WANT_BUILD_VM="
- icedtea-7 icedtea-bin-7 icedtea7
- icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
- gcj-jdk"
- JAVA_PKG_WANT_SOURCE="1.5"
- JAVA_PKG_WANT_TARGET="1.5"
-
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${SRC_PKG}
-}
-
-java_prepare() {
- # For bootstrap builds as the sandbox control file might not yet exist.
- addpredict /proc/self/coredump_filter
-
- # icedtea doesn't like some locales. #330433 #389717
- export LANG="C" LC_ALL="C"
-}
-
-src_configure() {
- local bootstrap cacao_config config use_cacao use_zero zero_config
- local vm=$(java-pkg_get-current-vm)
-
- # Whether to bootstrap
- bootstrap="disable"
- if use jbootstrap; then
- bootstrap="enable"
- fi
-
- if has "${vm}" gcj-jdk; then
- # gcj-jdk ensures ecj is present.
- use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
- bootstrap="enable"
- local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
- config+=" --with-ecj-jar=${ecj_jar}"
- fi
-
- config+=" --${bootstrap}-bootstrap"
-
- # Use Zero if requested
- if use zero; then
- use_zero="yes"
- fi
-
- # Use CACAO if requested
- if use cacao; then
- use_cacao="yes"
- fi
-
- # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
- # Otherwise use CACAO
- if ! has "${ARCH}" amd64 sparc x86 ; then
- if has "${ARCH}" ppc ppc64 arm ; then
- use_cacao="yes"
- else
- use_zero="yes"
- fi
- fi
-
- # Turn on CACAO if needed (non-HS archs) or requested
- if test "x${use_cacao}" = "xyes"; then
- cacao_config="--enable-cacao"
- fi
-
- # Turn on Zero if needed (non-HS/CACAO archs) or requested
- if test "x${use_zero}" = "xyes"; then
- zero_config="--enable-zero"
- fi
-
- config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
- if use javascript ; then
- config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
- else
- config+=" --without-rhino"
- fi
-
- unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
- econf ${config} \
- --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
- --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
- --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
- --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
- --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
- --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
- --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
- --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
- --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
- --with-jdk-home="$(java-config -O)" \
- --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
- --disable-downloading --disable-Werror \
- --enable-system-lcms \
- $(use_enable !debug optimizations) \
- $(use_enable doc docs) \
- $(use_enable nss) \
- $(use_enable pulseaudio pulse-java) \
- $(use_enable jamvm) \
- $(use_enable kerberos system-kerberos) \
- $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
- ${zero_config} ${cacao_config}
-}
-
-src_compile() {
- # Would use GENTOO_VM otherwise.
- export ANT_RESPECT_JAVA_HOME=TRUE
-
- # With ant >=1.8.2 all required tasks are part of ant-core
- export ANT_TASKS="none"
-
- emake
-}
-
-src_test() {
- # Use Xvfb for tests
- unset DISPLAY
-
- Xemake check
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/icedtea${SLOT}"
- local ddest="${ED}/${dest}"
- dodir "${dest}"
-
- dodoc README NEWS AUTHORS
- dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
- cd openjdk.build/j2sdk-image || die
-
- # Ensures HeadlessGraphicsEnvironment is used.
- if ! use X; then
- rm -r jre/lib/$(get_system_arch)/xawt || die
- fi
-
- # Don't hide classes
- rm lib/ct.sym || die
-
- #402507
- mkdir jre/.systemPrefs || die
- touch jre/.systemPrefs/.system.lock || die
- touch jre/.systemPrefs/.systemRootModFile || die
-
- # doins can't handle symlinks.
- cp -vRP bin include jre lib man "${ddest}" || die
-
- dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
- if use doc; then
- # java-pkg_dohtml needed for package-list #302654
- java-pkg_dohtml -A dtd -r ../docs/* || die
- fi
-
- if use examples; then
- dodir "${dest}/share"
- cp -vRP demo sample "${ddest}/share/" || die
- fi
-
- if use source; then
- cp src.zip "${ddest}" || die
- fi
-
- # Fix the permissions.
- find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
- # Needs to be done before generating cacerts
- java-vm_set-pax-markings "${ddest}"
-
- # We need to generate keystore - bug #273306
- einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
- mkdir "${T}/certgen" && cd "${T}/certgen" || die
- cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
- for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
- openssl x509 -text -in "${c}" >> all.crt || die
- done
- ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
- cp -vRP cacerts "${ddest}/jre/lib/security/" || die
- chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
- # OpenJDK7 should be able to use fontconfig instead, but wont hurt to
- # install it anyway. Bug 390663
- cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
- eprefixify "${T}"/fontconfig.Gentoo.properties
- insinto "${dest}"/jre/lib
- doins "${T}"/fontconfig.Gentoo.properties
-
- set_java_env "${FILESDIR}/icedtea.env"
- if ! use X || ! use alsa || ! use cups; then
- java-vm_revdep-mask "${dest}"
- fi
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
- if has_version "<=dev-java/icedtea-7.2.0:7"; then
- # portage would preserve the symlink otherwise, related to bug #384397
- rm -f "${EROOT}/usr/lib/jvm/icedtea7"
- elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
- elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
- elog "If you had icedtea7 as system VM, the change should be automatic, however"
- elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
- elog "and the same holds for any user VM settings. Sorry for the inconvenience."
- fi
-}
diff --git a/dev-java/iso-relax/iso-relax-20050331-r2.ebuild b/dev-java/iso-relax/iso-relax-20050331-r2.ebuild
index 9cbe15fee2b1..e4482e75e6b2 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r2.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/iso-relax/iso-relax-20050331-r2.ebuild,v 1.6 2012/04/15 18:37:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/iso-relax/iso-relax-20050331-r2.ebuild,v 1.7 2015/07/11 09:21:36 chewi Exp $
EAPI="2"
JAVA_PKG_IUSE="source"
@@ -20,7 +20,7 @@ SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~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"
IUSE=""
DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jarjar/jarjar-0.9.ebuild b/dev-java/jarjar/jarjar-0.9.ebuild
index 52c8f94898c8..7c0b975d9c6a 100644
--- a/dev-java/jarjar/jarjar-0.9.ebuild
+++ b/dev-java/jarjar/jarjar-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-0.9.ebuild,v 1.22 2014/08/10 20:16:22 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-0.9.ebuild,v 1.23 2015/07/11 09:21:37 chewi Exp $
JAVA_PKG_IUSE="doc source test"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/jarjar/${PN}-src-${PV}.zip"
HOMEPAGE="http://jarjar.sourceforge.net"
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE=""
COMMON_DEP="
=dev-java/asm-2.0*
diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild
index 750c3dcee6e1..7e283e377804 100644
--- a/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild
+++ b/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild,v 1.8 2012/05/10 18:34:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild,v 1.9 2015/07/11 09:21:41 chewi Exp $
DESCRIPTION="Wrapper for java-config"
HOMEPAGE="http://www.gentoo.org/proj/en/java"
@@ -8,7 +8,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
DEPEND="!=virtual/jdk-1.4
- dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- mv gnu/getopt/buildx.xml build.xml || die
-}
-
-src_install() {
- java-pkg_dojar build/lib/gnu.getopt.jar
- dodoc gnu/getopt/COPYING.LIB gnu/getopt/ChangeLog gnu/getopt/README || die
- use doc && java-pkg_dojavadoc build/api
- use source && java-pkg_dosrc gnu
-}
diff --git a/dev-java/java-getopt/java-getopt-1.0.14.ebuild b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
index 767d68eac799..9c1ee5b11c34 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-getopt/java-getopt-1.0.14.ebuild,v 1.5 2015/05/17 20:09:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-getopt/java-getopt-1.0.14.ebuild,v 1.6 2015/07/11 09:20:18 chewi Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.urbanophile.com/arenn/hacking/getopt/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="1"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest
index 744c802c23cf..dcd27d65020f 100644
--- a/dev-java/javacup/Manifest
+++ b/dev-java/javacup/Manifest
@@ -1,2 +1 @@
-DIST java_cup_v10k.tar.gz 190843 SHA256 7e6dc5be74ae56c7e86e69ad0ad88dae3b2847afa9e73a76635918a6b1eb75cd SHA512 8c60db01b2b05832bb5fc5c27774f5037415e87587b5a3e61d64c337a5d663f86511cdee3a54e5d0016a935aa088a47a1c01a5509b09288bff135973dc1440e4 WHIRLPOOL ad26020144b3ccc3f9aaf393eccd17c89b0e99d81a4d7964204df11c1d6cd3bda0ca66cea66af779c7f3fe0b498cae40cc735fd012f1a47ce6b7ca91e8023719
DIST javacup-0.11a_beta20060608.tar.bz2 285727 SHA256 cb3ad4951d734bd1e5a6ff835018dea26a47564f820ae0a925f9c30f2fb7e1ff SHA512 383172f7d9cb127ad5d1d6de561eaf53b057bf7511f6f8c353fc03860daabb023e11330e0518b9c390e255a643c9c1e609b5fbdfd3c2e92dd68dc2d2354a931f WHIRLPOOL 6480219de3a997eb9a942ce816f9868dc13d06b8c0553521e9cf37fe568265cf752efcd36d9b64ea424d225d4823fce0652c9b0d7e1c853e38cd9f00fb12ce30
diff --git a/dev-java/javacup/javacup-0.10k-r1.ebuild b/dev-java/javacup/javacup-0.10k-r1.ebuild
deleted file mode 100644
index 8335a95c07a1..000000000000
--- a/dev-java/javacup/javacup-0.10k-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.10k-r1.ebuild,v 1.11 2012/01/02 07:47:03 sera Exp $
-
-inherit java-pkg-2
-
-DESCRIPTION="CUP Parser Generator for Java"
-
-HOMEPAGE="http://www2.cs.tum.edu/projects/cup/"
-SRC_URI="http://www.cs.princeton.edu/~appel/modern/java/CUP/java_cup_v10k.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="source"
-DEPEND=">=virtual/jdk-1.3
- source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- find . -name "*.class" -exec rm -f {} \;
-}
-
-src_compile() {
- ejavac java_cup/*.java java_cup/runtime/*.java
- find java_cup -name "*.class" | xargs jar -cvf ${PN}.jar
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
- dodoc CHANGELOG README || die
- dohtml manual.html || die
- use source && java-pkg_dosrc java_cup
-}
diff --git a/dev-java/javacup/javacup-0.11a_beta20060608.ebuild b/dev-java/javacup/javacup-0.11a_beta20060608.ebuild
index 64e56cf14af4..7aebf0b7dfd6 100644
--- a/dev-java/javacup/javacup-0.11a_beta20060608.ebuild
+++ b/dev-java/javacup/javacup-0.11a_beta20060608.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11a_beta20060608.ebuild,v 1.15 2013/06/14 19:29:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacup/javacup-0.11a_beta20060608.ebuild,v 1.16 2015/07/11 09:20:21 chewi Exp $
JAVA_PKG_IUSE="source doc"
@@ -18,7 +18,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="userland_BSD"
# find for bug #214664
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
index fa4794378863..95abc64de70f 100644
--- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild,v 1.10 2015/06/14 19:29:57 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild,v 1.11 2015/07/11 09:21:52 chewi Exp $
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 sparc ~ia64 ~arm ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
python_prepare_all() {
diff --git a/dev-java/jaxen/jaxen-1.1.1.ebuild b/dev-java/jaxen/jaxen-1.1.1.ebuild
index b455832d5c62..89b36633b40c 100644
--- a/dev-java/jaxen/jaxen-1.1.1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1.1.ebuild,v 1.13 2014/03/09 01:33:38 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1.1.ebuild,v 1.14 2015/07/11 09:21:51 chewi Exp $
JAVA_PKG_IUSE="doc examples source test"
@@ -13,7 +13,7 @@ SRC_URI="http://dist.codehaus.org/${PN}/distributions/${MY_P}-src.tar.gz"
LICENSE="JDOM"
SLOT="1.1"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc source test"
COMMON_DEP="~dev-java/jdom-1.0
diff --git a/dev-java/jaxen/jaxen-1.1.4.ebuild b/dev-java/jaxen/jaxen-1.1.4.ebuild
index c1cc5168fc60..ca6168e0411d 100644
--- a/dev-java/jaxen/jaxen-1.1.4.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1.4.ebuild,v 1.6 2014/03/09 01:33:38 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1.4.ebuild,v 1.7 2015/07/11 09:21:51 chewi Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
LICENSE="JDOM"
SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
COMMON_DEP="
diff --git a/dev-java/jaxme/jaxme-0.5.2-r1.ebuild b/dev-java/jaxme/jaxme-0.5.2-r1.ebuild
index 8193aca4e12f..9a24c54168e2 100644
--- a/dev-java/jaxme/jaxme-0.5.2-r1.ebuild
+++ b/dev-java/jaxme/jaxme-0.5.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2-r1.ebuild,v 1.2 2014/08/10 20:17:17 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2-r1.ebuild,v 1.3 2015/07/11 09:21:56 chewi Exp $
EAPI="2"
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/ws/${PN}/source/${MY_P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
COMMON_DEP="dev-java/antlr:0[java]
diff --git a/dev-java/jaxme/jaxme-0.5.2.ebuild b/dev-java/jaxme/jaxme-0.5.2.ebuild
index 947e10be098f..4cdfcdece864 100644
--- a/dev-java/jaxme/jaxme-0.5.2.ebuild
+++ b/dev-java/jaxme/jaxme-0.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2.ebuild,v 1.16 2014/08/10 20:17:17 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.5.2.ebuild,v 1.17 2015/07/11 09:21:56 chewi Exp $
EAPI="2"
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/ws/${PN}/source/${MY_P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
COMMON_DEP="dev-java/antlr:0[java]
diff --git a/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild b/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild
index e19845cf9710..f86856759cc9 100644
--- a/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild
+++ b/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild,v 1.15 2014/08/10 20:18:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild,v 1.16 2015/07/11 09:25:27 chewi Exp $
JAVA_PKG_IUSE=""
@@ -14,7 +14,7 @@ SRC_URI="http://www.jdom.org/dist/source/${MY_PN}-${PV}.tar.gz"
LICENSE="JDOM"
SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
diff --git a/dev-java/jdom/jdom-1.0-r4.ebuild b/dev-java/jdom/jdom-1.0-r4.ebuild
index 989a1b8a49e7..34c23b7d08c0 100644
--- a/dev-java/jdom/jdom-1.0-r4.ebuild
+++ b/dev-java/jdom/jdom-1.0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0-r4.ebuild,v 1.14 2013/07/28 09:43:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0-r4.ebuild,v 1.15 2015/07/11 09:22:02 chewi Exp $
JAVA_PKG_IUSE="doc examples source"
@@ -11,7 +11,7 @@ SRC_URI="http://www.jdom.org/dist/source/archive/${P}.tar.gz"
HOMEPAGE="http://www.jdom.org"
LICENSE="JDOM"
SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
COMMON_DEP="dev-java/saxpath
>=dev-java/xerces-2.7"
RDEPEND=">=virtual/jre-1.4
diff --git a/dev-java/jsr173/jsr173-1.0-r1.ebuild b/dev-java/jsr173/jsr173-1.0-r1.ebuild
index 43ee5edfbe05..0254c9893a8a 100644
--- a/dev-java/jsr173/jsr173-1.0-r1.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr173/jsr173-1.0-r1.ebuild,v 1.15 2013/11/07 03:58:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr173/jsr173-1.0-r1.ebuild,v 1.16 2015/07/11 09:22:05 chewi Exp $
JAVA_PKG_IUSE="doc source"
@@ -12,7 +12,7 @@ SRC_URI="http://ftpna2.bea.com/pub/downloads/${PN}.jar"
LICENSE="bea.ri.jsr173"
SLOT="0"
-KEYWORDS="amd64 ~ia64 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"
IUSE=""
RDEPEND=">=virtual/jre-1.3
diff --git a/dev-java/junit/files/junit-4.12-build.xml b/dev-java/junit/files/junit-4.12-build.xml
index 0bf70c314614..ad246aa708fe 100644
--- a/dev-java/junit/files/junit-4.12-build.xml
+++ b/dev-java/junit/files/junit-4.12-build.xml
@@ -222,8 +222,7 @@
charset="ISO-8859-1"
linksource="true"
breakiterator="false"
- maxmemory="128m"
- additionalparam="-Xdoclint:accessibility -Xdoclint:reference"/>
+ maxmemory="128m" />
diff --git a/dev-java/junit/junit-3.8.2-r1.ebuild b/dev-java/junit/junit-3.8.2-r1.ebuild
index 1a05f25f8317..581e0310879f 100644
--- a/dev-java/junit/junit-3.8.2-r1.ebuild
+++ b/dev-java/junit/junit-3.8.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.2-r1.ebuild,v 1.12 2013/02/05 05:50:17 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.2-r1.ebuild,v 1.13 2015/07/11 09:20:21 chewi Exp $
JAVA_PKG_IUSE="doc source"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
HOMEPAGE="http://www.junit.org/"
LICENSE="CPL-1.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.4
app-arch/unzip"
diff --git a/dev-java/junit/junit-4.6.ebuild b/dev-java/junit/junit-4.6.ebuild
deleted file mode 100644
index 6e1662d14953..000000000000
--- a/dev-java/junit/junit-4.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.6.ebuild,v 1.9 2012/01/01 22:39:29 sera Exp $
-
-# WARNING: JUNIT.JAR IS _NOT_ SYMLINKED TO ANT-CORE LIB FOLDER AS JUNIT3 IS
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P=${P/-/}
-DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-HOMEPAGE="http://www.junit.org/"
-LICENSE="CPL-1.0"
-SLOT="4"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="=dev-java/hamcrest-core-1.1*"
-RDEPEND=">=virtual/jre-1.5
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
- userland_GNU? ( >=sys-apps/findutils-4.3 )
- app-arch/unzip
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- mkdir -p src/main/java src/test/java || die
- unzip -qq -d src/main/java ${P}-src.jar || die "unzip failed"
-
- # fix javadoc compilation
- if use doc ; then
- cp "${S}"/javadoc/stylesheet.css "${S}" || die
- fi
-
- rm -rf javadoc temp.hamcrest.source *.jar || die
- find . -name "*.class" -delete || die
-}
-
-src_compile() {
- eant build jars -Dhamcrestlib=$(java-pkg_getjars hamcrest-core) $(use_doc javadoc)
-}
-
-src_test() {
- mkdir classes || die
- cd junit/tests || die
- local cp=$(java-pkg_getjars hamcrest-core):${S}/${PN}${PV}/${PN}-dep-${PV}.jar
- ejavac -sourcepath java -classpath ${cp} -d "${S}"/classes $(find . -name "*.java")
-
- cd "${S}"/classes || die
- for FILE in $(find . -name "AllTests\.class"); do
- local CLASS=$(echo ${FILE} | sed -e "s/\.class//" | sed -e "s%/%.%g" | sed -e "s/\.\.//")
- java -classpath .:${cp} org.junit.runner.JUnitCore ${CLASS} || die "Test ${CLASS} failed"
- done
-}
-
-src_install() {
- java-pkg_newjar ${PN}${PV}/${PN}-dep-${PV}.jar
- dodoc README.html doc/ReleaseNotes${PV}.txt || die
-
- use examples && java-pkg_doexamples org/junit/samples
- use source && java-pkg_dosrc src/main/java/org src/main/java/junit
-
- if use doc; then
- dohtml -r doc/*
- java-pkg_dojavadoc ${PN}${PV}/javadoc
- fi
-}
diff --git a/dev-java/junit/junit-4.8.2-r1.ebuild b/dev-java/junit/junit-4.8.2-r1.ebuild
deleted file mode 100644
index 4b6c76b91104..000000000000
--- a/dev-java/junit/junit-4.8.2-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.8.2-r1.ebuild,v 1.12 2013/02/05 06:48:08 zerochaos Exp $
-
-# WARNING: JUNIT.JAR IS _NOT_ SYMLINKED TO ANT-CORE LIB FOLDER AS JUNIT3 IS
-
-EAPI="3"
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="mirror://github/KentBeck/${PN}/${PN}${PV}.zip"
-HOMEPAGE="http://www.junit.org/"
-LICENSE="CPL-1.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="dev-java/hamcrest-core:0"
-RDEPEND=">=virtual/jre-1.5
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
- userland_GNU? ( >=sys-apps/findutils-4.3 )
- ${CDEPEND}"
-
-S="${WORKDIR}/${PN}${PV}"
-
-EANT_BUILD_TARGET="jars"
-
-src_unpack() {
- default
-
- # Unpack source JAR
- mkdir -p "${S}/src/main/java" "${S}/src/test/java" \
- || die "Unable to create source directories"
- pushd "${S}/src/main/java" >/dev/null
- jar xf "${S}/${P}-src.jar" || die "Unable to unpack sources."
- popd >/dev/null
-
- # copy Gentoo manifest to working directory
- cp "${FILESDIR}/gentoo-manifest.mf" "${S}" || die
-}
-
-java_prepare() {
- # fix javadoc compilation
- if use doc ; then
- cp "${S}"/javadoc/stylesheet.css "${S}" \
- || die "Unable to copy Javdoc stylesheet"
- fi
-
- # remove binary and other generated files
- rm -rf javadoc temp.hamcrest.source *.jar \
- || die "Unable to clean generated files."
- find . -name "*.class" -delete \
- || die "Unable to remove distributed class files"
-
- # Let Ant know where its hamcrest went
- EANT_EXTRA_ARGS="-Dhamcrestlib=$(java-pkg_getjars hamcrest-core)"
-
- # Add Gentoo manifest information to generated JAR files
- java-ant_xml-rewrite -f build.xml -c \
- -e jar -a manifest -v "gentoo-manifest.mf"
-}
-
-src_test() {
- mkdir classes || die "Unable to create build directory for tests"
-
- local cp=$(java-pkg_getjars hamcrest-core):${S}/${PN}${PV}/${PN}-dep-${PV}.jar
- ejavac -classpath ${cp} -d classes $(find junit/tests -name "*.java")
-
- java -classpath ${cp}:classes org.junit.runner.JUnitCore junit.tests.AllTests \
- || die "Tests failed."
-}
-
-src_install() {
- java-pkg_newjar ${PN}${PV}/${PN}-dep-${PV}.jar
- dodoc README.html doc/ReleaseNotes${PV}.txt || die
-
- use examples && java-pkg_doexamples org/junit/samples
- use source && java-pkg_dosrc src/main/java/org src/main/java/junit
-
- if use doc; then
- dohtml -r doc/*
- java-pkg_dojavadoc ${PN}${PV}/javadoc
- fi
-}
diff --git a/dev-java/junitperf/junitperf-1.9.1-r1.ebuild b/dev-java/junitperf/junitperf-1.9.1-r1.ebuild
index ae61d0df18a3..ad02d1ef5000 100644
--- a/dev-java/junitperf/junitperf-1.9.1-r1.ebuild
+++ b/dev-java/junitperf/junitperf-1.9.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/junitperf-1.9.1-r1.ebuild,v 1.19 2013/06/27 21:54:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/junitperf-1.9.1-r1.ebuild,v 1.20 2015/07/11 09:22:10 chewi Exp $
JAVA_PKG_IUSE="doc test source"
@@ -11,7 +11,7 @@ SRC_URI="http://www.clarkware.com/software/${P}.zip"
HOMEPAGE="http://www.clarkware.com/software/JUnitPerf.html"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE=""
diff --git a/dev-java/log4j/log4j-1.2.16.ebuild b/dev-java/log4j/log4j-1.2.16.ebuild
index 3a9d53ed045a..13b6c4867700 100644
--- a/dev-java/log4j/log4j-1.2.16.ebuild
+++ b/dev-java/log4j/log4j-1.2.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.16.ebuild,v 1.11 2013/06/27 21:35:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.16.ebuild,v 1.12 2015/07/11 09:22:15 chewi Exp $
EAPI=4
JAVA_PKG_IUSE="doc javamail jms jmx source"
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_P}.tar.gz"
HOMEPAGE="http://logging.apache.org/log4j/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
# jikes support disabled: bug #108819
IUSE="doc javamail jms jmx source"
diff --git a/dev-java/log4j/log4j-1.2.17.ebuild b/dev-java/log4j/log4j-1.2.17.ebuild
index 79691a048775..9ab008b01807 100644
--- a/dev-java/log4j/log4j-1.2.17.ebuild
+++ b/dev-java/log4j/log4j-1.2.17.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.17.ebuild,v 1.1 2015/04/04 00:46:30 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.17.ebuild,v 1.2 2015/07/11 09:22:15 chewi Exp $
EAPI=5
JAVA_PKG_IUSE="doc javamail jms jmx source"
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
HOMEPAGE="http://logging.apache.org/log4j/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="doc javamail jms jmx source"
CDEPEND="javamail? (
diff --git a/dev-java/msv/msv-20050627-r3.ebuild b/dev-java/msv/msv-20050627-r3.ebuild
index 2e662748129d..1a6333dc40fd 100644
--- a/dev-java/msv/msv-20050627-r3.ebuild
+++ b/dev-java/msv/msv-20050627-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/msv/msv-20050627-r3.ebuild,v 1.5 2012/04/15 18:39:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/msv/msv-20050627-r3.ebuild,v 1.6 2015/07/11 09:22:17 chewi Exp $
EAPI=1
JAVA_PKG_IUSE="doc source"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${PN}.${PV}.zip"
LICENSE="BSD Apache-1.1"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~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"
IUSE=""
RDEPEND=">=virtual/jre-1.4
diff --git a/dev-java/offo-hyphenation/Manifest b/dev-java/offo-hyphenation/Manifest
index 104fa2d7d30c..07c0ef95e269 100644
--- a/dev-java/offo-hyphenation/Manifest
+++ b/dev-java/offo-hyphenation/Manifest
@@ -1,2 +1 @@
DIST offo-hyphenation_v1.2.zip 378809 SHA256 026c3605416e921cdc5b24ba486fef306d1a4863ba95295f689b7190885e5c5a SHA512 ef0cb0aa7020bedd6c59f6d4cec95274f18fc5a7d19d24d1a05014c7c20b70c8e515aa7b7db4852a0c1bb87f594f638a906b5b61c0443804902cc9876d35d934 WHIRLPOOL 1a644a55a1769a866fa47e654310b942ef176396c3c2070c7b69f3e5e82e69156f42535363a127733753488bcddfee5b41b505ba512b4a0126f37fec96b6c98a
-HrSY+dv/B3pxJSPaDIST/qTRzPfSW+8B4ZTDGyNc/wz/h1rLFKD3xTTDTkDS/D7J
diff --git a/dev-java/offo-hyphenation/offo-hyphenation-1.2.ebuild b/dev-java/offo-hyphenation/offo-hyphenation-1.2.ebuild
index 60bc5efd9b48..99726977dfd9 100644
--- a/dev-java/offo-hyphenation/offo-hyphenation-1.2.ebuild
+++ b/dev-java/offo-hyphenation/offo-hyphenation-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/offo-hyphenation/offo-hyphenation-1.2.ebuild,v 1.4 2009/07/19 14:09:20 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/offo-hyphenation/offo-hyphenation-1.2.ebuild,v 1.5 2015/07/11 09:22:19 chewi Exp $
DESCRIPTION="Hyphenation patterns for Apache Fop"
HOMEPAGE="http://offo.sourceforge.net"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/offo/${PN}_v${PV}.zip"
# review this upon update!
LICENSE="GPL-2 Apache-2.0 LPPL-1.3b TeX"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
+KEYWORDS=" amd64 ppc ppc64 x86"
IUSE="doc"
RDEPEND=""
diff --git a/dev-java/qdox/qdox-1.6.3.ebuild b/dev-java/qdox/qdox-1.6.3.ebuild
index 41f1f9e73b85..1b70cde08c60 100644
--- a/dev-java/qdox/qdox-1.6.3.ebuild
+++ b/dev-java/qdox/qdox-1.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qdox/qdox-1.6.3.ebuild,v 1.17 2013/09/01 09:32:41 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qdox/qdox-1.6.3.ebuild,v 1.18 2015/07/11 09:22:21 chewi Exp $
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
@@ -9,7 +9,7 @@ HOMEPAGE="http://qdox.codehaus.org/"
SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar"
LICENSE="Apache-2.0"
SLOT="1.6"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE=""
CDEPEND="dev-java/ant-core
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild
index 131fc60cfbd0..e31fab8cd2e1 100644
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild,v 1.18 2013/06/27 21:17:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/relaxng-datatype/relaxng-datatype-1.0-r1.ebuild,v 1.19 2015/07/11 09:22:23 chewi Exp $
JAVA_PKG_IUSE="doc source"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS=" amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/saxpath/saxpath-1.0-r2.ebuild b/dev-java/saxpath/saxpath-1.0-r2.ebuild
index 8b289eca9c1c..f956e3d35e91 100644
--- a/dev-java/saxpath/saxpath-1.0-r2.ebuild
+++ b/dev-java/saxpath/saxpath-1.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/saxpath-1.0-r2.ebuild,v 1.20 2014/08/10 20:23:30 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxpath/saxpath-1.0-r2.ebuild,v 1.21 2015/07/11 09:22:29 chewi Exp $
JAVA_PKG_IUSE="doc source test"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/saxpath/${P}.tar.gz"
LICENSE="JDOM"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
RDEPEND=">=virtual/jre-1.4"
# doc needs ant-trax
diff --git a/dev-java/servletapi/servletapi-2.4-r5.ebuild b/dev-java/servletapi/servletapi-2.4-r5.ebuild
index f927297a9935..47c007f05a90 100644
--- a/dev-java/servletapi/servletapi-2.4-r5.ebuild
+++ b/dev-java/servletapi/servletapi-2.4-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.4-r5.ebuild,v 1.12 2012/04/15 18:20:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.4-r5.ebuild,v 1.13 2015/07/11 09:22:30 chewi Exp $
inherit eutils java-pkg-2 java-ant-2
@@ -11,7 +11,7 @@ SRC_URI="http://archive.apache.org/dist/tomcat/tomcat-5/v${TC_VERSION}/src/apach
LICENSE="Apache-1.1"
SLOT="2.4"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc source"
DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild
index 79dcd6563c90..b096b865ae4c 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild,v 1.4 2013/02/05 07:00:10 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild,v 1.5 2015/07/11 09:22:33 chewi Exp $
EAPI="2"
JAVA_PKG_IUSE="doc source test"
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.stringtemplate.org/"
SRC_URI="http://www.stringtemplate.org/download/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
COMMON_DEPEND=">=dev-java/antlr-2.7.7:0[java]"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index c915ee2a4802..0daa64dc159a 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -3,6 +3,5 @@ DIST apache-tomcat-5.5.27-src.tar.gz 7382057 SHA256 90bc8abcddda604e855c37035653
DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b39f99b80683b0ee43c72751390e88dcd6114d SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519 WHIRLPOOL 25e987b58af5535914b666a5bb8691146d68b2287796ba25b8a5f792df08f55901a7ea3f419602207f7a8168302b080592bde5f4aeb67b58f40e5da00b8049ad
DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
-DIST apache-tomcat-8.0.22-src.tar.gz 4862888 SHA256 a7f1e511e10019217ec2ae91705886092ab5487e6e1c0d709023a472996ccb2b SHA512 7f6a0df1f2718021e0ece8034dad43286c0c2b3a83dfa125de78e4de8f576b0bfa7ebf67d31c5b8bac451a6b09144632283f499adac9b10aadcab634502c8b9a WHIRLPOOL e74dd5df9dabe5b2277901dd4507c4404f5fce63b0ed6c2069646c386a0fde7879293affe35997f27666c9e256d1d0b0b6e8fca5b78441306285649d80b27b71
DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
index d31ec1b8b52e..3d4e5f7221da 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild,v 1.12 2014/02/19 13:14:56 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild,v 1.13 2015/07/11 09:20:21 chewi Exp $
JAVA_PKG_IUSE="doc source"
@@ -15,7 +15,7 @@ DEPEND=">=virtual/jdk-1.4"
RDEPEND=">=virtual/jre-1.4"
LICENSE="Apache-1.1"
SLOT="2.2"
-KEYWORDS="amd64 ~ia64 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"
IUSE=""
S="${WORKDIR}/${MY_PN}"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
index 217af6e3af78..3a464ec3982c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild,v 1.12 2012/09/29 17:58:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild,v 1.13 2015/07/11 09:20:21 chewi Exp $
JAVA_PKG_IUSE="doc source"
@@ -14,7 +14,7 @@ DEPEND=">=virtual/jdk-1.4"
RDEPEND=">=virtual/jre-1.4"
LICENSE="Apache-2.0"
SLOT="2.3"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
S="${WORKDIR}/${MY_P}/servletapi"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
index 7e50e5abe235..2bda55a1adb9 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild,v 1.6 2012/04/15 18:52:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild,v 1.7 2015/07/11 09:20:21 chewi Exp $
inherit eutils java-pkg-2 java-ant-2 java-osgi
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2.4"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc source"
DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
index b06c6ec83cda..c8d0338ad709 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild,v 1.3 2013/02/05 07:28:11 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild,v 1.4 2015/07/11 09:20:21 chewi Exp $
inherit eutils java-pkg-2 java-ant-2 java-osgi
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2.4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS=" ~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc source"
DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild
index 52d4a0e481bf..6f53611a3ce1 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild,v 1.2 2015/06/03 16:28:19 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild,v 1.3 2015/07/11 09:20:21 chewi Exp $
EAPI="5"
JAVA_PKG_IUSE="source"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2.5"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild
index 0e2d84a37269..90af42b15415 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild,v 1.2 2015/06/03 16:28:19 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.59.ebuild,v 1.3 2015/07/11 09:20:21 chewi Exp $
EAPI="5"
JAVA_PKG_IUSE="source"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.22.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.22.ebuild
deleted file mode 100644
index 0ab379816e12..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.22.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.22.ebuild,v 1.1 2015/05/07 16:58:04 fordfrog Exp $
-
-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 ~ia64 ~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/tomcat-servlet-api/tomcat-servlet-api-8.0.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.23.ebuild
index 12f8e5c5fe0e..09f18b551278 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.23.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.23.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.23.ebuild,v 1.2 2015/06/03 16:28:19 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.23.ebuild,v 1.3 2015/07/11 09:20:21 chewi Exp $
EAPI="5"
JAVA_PKG_IUSE="source"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.1"
-KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.1.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.1.ebuild
index 82d65c89c6d6..9a89d95bb6ca 100644
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.1.ebuild
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan-serializer/xalan-serializer-2.7.1.ebuild,v 1.11 2013/06/14 19:35:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan-serializer/xalan-serializer-2.7.1.ebuild,v 1.12 2015/07/11 09:22:42 chewi Exp $
JAVA_PKG_IUSE="doc source"
@@ -14,7 +14,7 @@ HOMEPAGE="http://xml.apache.org/xalan-j/index.html"
SRC_URI="mirror://apache/xml/${MY_PN}/source/${MY_P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
COMMON_DEP="=dev-java/xml-commons-external-1.3*"
diff --git a/dev-java/xalan/xalan-2.7.1.ebuild b/dev-java/xalan/xalan-2.7.1.ebuild
index 2d5c1c8f1be9..d9b4b6b33d8e 100644
--- a/dev-java/xalan/xalan-2.7.1.ebuild
+++ b/dev-java/xalan/xalan-2.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.1.ebuild,v 1.12 2014/08/10 20:26:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.1.ebuild,v 1.13 2015/07/11 09:22:38 chewi Exp $
EAPI=1
JAVA_PKG_IUSE="doc source"
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/xml/${MY_PN}/source/${SRC_DIST}
doc? ( mirror://apache/xml/${MY_PN}/binaries/${BIN_DIST} )"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
COMMON_DEP="
dev-java/javacup:0
diff --git a/dev-java/xerces/xerces-2.11.0.ebuild b/dev-java/xerces/xerces-2.11.0.ebuild
index 4a0967c31769..dea6f2e91360 100644
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ b/dev-java/xerces/xerces-2.11.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.11.0.ebuild,v 1.9 2014/07/14 14:22:30 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.11.0.ebuild,v 1.10 2015/07/11 09:22:43 chewi Exp $
EAPI=4
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# they are missing from the upstream tarball"
diff --git a/dev-java/xjavac/xjavac-20110814.ebuild b/dev-java/xjavac/xjavac-20110814.ebuild
index a728dbba8990..821099cc4269 100644
--- a/dev-java/xjavac/xjavac-20110814.ebuild
+++ b/dev-java/xjavac/xjavac-20110814.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/xjavac-20110814.ebuild,v 1.10 2014/07/04 14:21:13 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/xjavac-20110814.ebuild,v 1.11 2015/07/11 09:22:46 chewi Exp $
EAPI="2"
inherit java-pkg-2 java-ant-2
@@ -12,7 +12,7 @@ IUSE=""
HOMEPAGE="http://cvs.apache.org/viewcvs.cgi/xml-xerces/java/tools/src/XJavac.java"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.4"
RDEPEND=">=virtual/jdk-1.4
>=dev-java/ant-core-1.7"
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
index 9ae5bd4769ce..57cc168260f2 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild,v 1.16 2014/08/10 20:26:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild,v 1.17 2015/07/11 09:22:47 chewi Exp $
JAVA_PKG_IUSE="doc source"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1.3"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
index 2bab294c6b0d..7f2ae4f4c670 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild,v 1.9 2014/08/10 20:26:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild,v 1.10 2015/07/11 09:22:47 chewi Exp $
EAPI=4
@@ -18,7 +18,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1.4"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild
index e0d434e6fce0..690fd3a2138e 100644
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild,v 1.15 2014/07/04 14:15:41 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild,v 1.16 2015/07/11 09:22:52 chewi Exp $
JAVA_PKG_IUSE="doc source"
@@ -13,7 +13,7 @@ DEPEND=">=virtual/jdk-1.3"
RDEPEND=">=virtual/jre-1.3"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
JAVA_PKG_BSFIX_NAME="resolver.xml"
diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
index 228f2a962db8..87709171a6ad 100644
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild,v 1.3 2013/07/28 09:41:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild,v 1.4 2015/07/11 09:22:56 chewi Exp $
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
COMMON_DEPEND="
diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.ebuild
index 9b4c82ca23e8..1bb4a88085d9 100644
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.ebuild
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.ebuild,v 1.7 2013/02/05 07:30:30 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217.ebuild,v 1.8 2015/07/11 09:22:56 chewi Exp $
JAVA_PKG_IUSE="doc source"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=virtual/jre-1.4
diff --git a/dev-java/xmldb/xmldb-20011111-r1.ebuild b/dev-java/xmldb/xmldb-20011111-r1.ebuild
index f2c60e4b830d..bf94222c461b 100644
--- a/dev-java/xmldb/xmldb-20011111-r1.ebuild
+++ b/dev-java/xmldb/xmldb-20011111-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmldb/xmldb-20011111-r1.ebuild,v 1.22 2014/08/10 20:27:20 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmldb/xmldb-20011111-r1.ebuild,v 1.23 2015/07/11 09:22:55 chewi Exp $
JAVA_PKG_IUSE="doc source"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/xmldb-org/${MY_P}.tar.gz"
LICENSE="Apache-1.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# TODO please make compiling the junit tests optional
diff --git a/dev-java/xom/xom-1.2.10.ebuild b/dev-java/xom/xom-1.2.10.ebuild
index 8a693305a6e8..3332796603d1 100644
--- a/dev-java/xom/xom-1.2.10.ebuild
+++ b/dev-java/xom/xom-1.2.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.2.10.ebuild,v 1.7 2014/08/10 20:27:59 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.2.10.ebuild,v 1.8 2015/07/11 09:22:59 chewi Exp $
EAPI="5"
@@ -19,7 +19,7 @@ SRC_URI="http://cafeconleche.org/XOM/${P}.tar.gz
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
COMMON_DEPEND="dev-java/xerces:2
dev-java/xml-commons-external:1.3
diff --git a/dev-java/xpp2/xpp2-2.1.10-r1.ebuild b/dev-java/xpp2/xpp2-2.1.10-r1.ebuild
index 3db5b0146f60..f84b8300127e 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r1.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/xpp2-2.1.10-r1.ebuild,v 1.22 2013/06/27 21:40:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/xpp2-2.1.10-r1.ebuild,v 1.23 2015/07/11 09:23:01 chewi Exp $
EAPI=1
JAVA_PKG_IUSE="doc source"
@@ -15,7 +15,7 @@ SRC_URI="http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/${MY_PN}2/${MY_P
LICENSE="Apache-1.1 IBM"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
S="${WORKDIR}/${MY_P}"
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild
index 463f5cc6c301..9f3783c2a816 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild,v 1.16 2014/08/10 20:28:10 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild,v 1.17 2015/07/11 09:23:05 chewi Exp $
JAVA_PKG_IUSE="doc source"
@@ -15,7 +15,7 @@ SRC_URI="http://www.extreme.indiana.edu/dist/java-repository/${PN}/distributions
LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/xsdlib/xsdlib-20090415.ebuild b/dev-java/xsdlib/xsdlib-20090415.ebuild
index 10dfaff1f068..f932413147a4 100644
--- a/dev-java/xsdlib/xsdlib-20090415.ebuild
+++ b/dev-java/xsdlib/xsdlib-20090415.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xsdlib/xsdlib-20090415.ebuild,v 1.9 2013/06/27 21:41:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xsdlib/xsdlib-20090415.ebuild,v 1.10 2015/07/11 09:23:07 chewi Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="http://java.net/downloads/msv/releases/${PN}.${PV}.zip"
LICENSE="BSD Apache-1.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
COMMON_DEP="
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 9015deb62b25..31c3213e7f54 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,16 +1,11 @@
-DIST php-5.4.39.tar.bz2 12271717 SHA256 7ceb76538e709c74533210ae41148d5c01c330ac8a73220954bbc4fcae69d77e SHA512 b944517b754fbdfc0b50dd18d2644edc9abe3a66ac9806c748b7b98f5c5c07eeaabdf7990799bb39ebf716b90b4e8b34e5fedb3379c1b05bce5530d3cdf4e42d WHIRLPOOL 28fdea55684c99b53545c83fffa686a76714846d2a0af0fa514f450fdf86faa3541f752113a51189a0ec7786a5d55171eaa7be3a8d0418b60fe920be552fcf22
-DIST php-5.4.40.tar.bz2 12272787 SHA256 4898ffe8ac3ccb2d8cc94f7d76a9ea0414d954f5d4479895ddfccdc2e158a51a SHA512 23fc43a310d8f05078c5a0fdc574a49d7037385f6c6fb154c1cb900d87b9f356d2fe8a708d7f20cb1304c4715f1c5bdd64063049f4d7fe157621e36e83cf7535 WHIRLPOOL b74c868e5991562ff0a019f438bc52d228fb17de95e252a7f1e2c323c0cf21da0be8a72f7f44f18051d7bb295974fc1ee605415658e2d5657eddb1e3726a233d
DIST php-5.4.41.tar.bz2 12487089 SHA256 5bc4b45a1280ff80a3cf5b8563716f325cfd0121d7fd25aa54d56ff38b3b8272 SHA512 3034adab5e47bd4dedb207d305fcbbdc9ca5bc0869fa1c55c43841101c54e8fd73d36b9ac80a84f74c71f2a23ad390cda7bf60e2347570e542b1db8c3aefa2f7 WHIRLPOOL 68af528ef069c7b6cb3bdc07e25b9bdd2af31dc248ad023a3f7948bfc49886bc7a803e9656fa12e860dd6338da1817fd3d8ca91b066e4e329e255626434e2016
DIST php-5.4.42.tar.bz2 12708394 SHA256 6285b2e64bfaa69e5d983d7d981b4f254f5259ad3fd591ca832722a4cc1ae0f9 SHA512 74ff03081321418f9afa1e2275198c86a5a6bf2fa923eb414e02256b8228f0b26b67bb818ccfac46a0658d2bd0f5f4113549c8e515e97992b9b646ec215b4744 WHIRLPOOL 21e925aedea63f234cf4269bff44469345a3f34c5d99b95a2c6f2d7ff86f7746ab5321f7b4306294b33952cfe5b2959221874eede09b83dadaea69ed46a1d49b
-DIST php-5.5.22.tar.bz2 13305486 SHA256 c218c184bef2905bc79fcdda6040f3d1738261395fb706396935d1c6f6e162bb SHA512 3eabd6fa2cd10e83fc3c00fb43313feefbb8c2772778dc6f176612fcb449761e22b55053e5b0b7f6954c0c141ab6c799f08bdca1851078511b7ef9376dadefac WHIRLPOOL 7c36ba90ed40d315475d721a3827065ee0e8748315f100383d4481b8ff1fb9af2b2a25f4dec5f3c5d8f378ff2213ce80fdc4c624c8a51cc312d51d505118b514
-DIST php-5.5.23.tar.bz2 13308115 SHA256 a99ab264dcd40181baa9defeaa4b21eb2c20d4e9316b904cc05f628762e6ada7 SHA512 b72f74d91afa9d9cc2d7b24468a37382cce47d337c63cd6a4abeea0a1c1d4d4df4245fe085a685a16cc0197fb342211653d41007ff1a4439a664ee33a1525896 WHIRLPOOL b6668a847d4d8b984c2fae8187d81206af010d8334df46f99978a4ad59854f3909dbd8d462d2ad4d52b290abdeb77562cec691aa21432aefbd88474d9b4584a9
-DIST php-5.5.24.tar.bz2 13337043 SHA256 801b5cf2e0c01b07314d4ac3c8a7c28d524bdd8263ebdd0e33a99008251316a2 SHA512 c43f03a93d0199cc174f1b00b4a34717a82500d5f2cd408d8e39f31cff171f8a2019f31beed044524a795e54fab344e55c41f5d1f3b9e9fea98e2cd04aba6152 WHIRLPOOL 8179016a5d6ebf4993137433bd92a01f162880b373b165be7b1702c5a3ddedd11c308e0e4c0c0b64f84a3cc9083e7e0647d2488997c59ebb126c4bff59d216de
+DIST php-5.4.43.tar.bz2 12708452 SHA256 25d7724fb00ad1b520f5bad2173717031153d0a8e3de2c75e7a084c76f8ecd6b SHA512 8fcf8a5b8a1f51fcbce19498b693eba0d772fc33fed07934f75f1b28de0c9ef25ab74d989f455c67b8d36f301b1808dbab324f9c5931ea9cd9d88560373d75b1 WHIRLPOOL 844f44aaa955cedff71940a76ee28d3efaf4e530bdc2e66697471afc85f4ec8e257be50a79efba7be87e2be4c45dad19fbff29bcdf100327290ac77b6d82e13e
DIST php-5.5.25.tar.bz2 13422002 SHA256 68df37e725ddd05675c0df906041038127938ecc52113a54d10e1e4029262c63 SHA512 961e1c48c591bf3c4c6068b2dca9f3cab41925b0845e4886128e75272622ee6e24ca94e2f4cd18874e27d61de7ad7aa238c6040d57c6696f62b77ffa33fec26a WHIRLPOOL efddc221988eb9e46adf2301cc1f1a39740efb27f7a5ba9673b9021d6fd6ee2b894cfe38c3d3af2098afa3f0c92fb9ab31f7cd8abebbacfb3180406f11b48e9a
DIST php-5.5.26.tar.bz2 13671379 SHA256 816afffdb03ff4c542bc172a2f77f9c69b817df82d60cce05c1b4f578c2c926e SHA512 eaea4160cbf6970d4fcd8b4dd897fc1c8d32397ecd613a39b3a8657e339b9e60dca25afcdf76598a5f763520aa7cdacb1f8338dc3fee5400b28ca27d19205132 WHIRLPOOL e0f63d93bda0d0cefb7309f7f6afe2ee0b8e46ec2005684628803f2c5ed460e577281b6e10f26b999711c061eb40160ef628cd80cb9545b7715c385ee37ae4d0
+DIST php-5.5.27.tar.bz2 13692811 SHA256 c4b4c6a534c0ca67a9ae39bec4f51e52d13e820135dd016eae230e15337e1f70 SHA512 b73eb13000048cb94da186ca505a51bca9d10694b1d4a07a282b9c3d9833138d1e45dd47e9d6acb628b8150e4aeab18f56f6e698251db8ee66a7f88df3816255 WHIRLPOOL 57e11bd9e63d6174f2c19cc283ed52c06487af0ea61827fc345482262e57defc64ec4942c46b3d71c18f53f1b93a22dd3c2d80f00547d9578582f6a6ab50bd00
DIST php-5.6.10.tar.bz2 14080915 SHA256 0a579c81c724ea41815eee0caa8ea7d8eeb302458519d8cc4fc5b055577c8c45 SHA512 c2a0d4d7a2d20224591e7e7f3617ed4e6c49d6284797b092a0352c86d3cd88b8c5ec5092e4b97134c06a504a0df31963b191e1ca66b4fc395987bfb0d5ca4643 WHIRLPOOL 7f17e7da5ae70d817e25cdbd87e3cfff83d91a421ac9a0bfbf6f10f3796bd3d34de209da8b9bcc59c80f8573d2685cf9266a2fb3af89870cac90d13324e82e74
-DIST php-5.6.7.tar.bz2 13697400 SHA256 02954fb74c61a7879d48ebdcd4ecb78aa0056f4215ca9b096232de28eb8f17bc SHA512 594b306cd2bb1dd2034a39b13d3642d957869b305c5e169e6020472b659feb6d1a7a1d1a75bf71965335450caf4762d9a0db2585d68e95606e34e9d03580830f WHIRLPOOL a6155be31975d9e0af039e3974ede650c920dcfef9bd4224f1f997c190762838541bf9f3747ce52516aee40860833babf31f1fdadf86f81531ce6877cbbd0d9b
-DIST php-5.6.8.tar.bz2 13724681 SHA256 0af0045745d61eeb74a3ea744529a2481b27cb689da720e6c0250675043724e4 SHA512 1d2466411b3704db8af5db5ed6b0a073510fbeda3c01036fda2b0f9cf6c8ccfb2039ea9ea2ff51769d228c06f9c43ad83c080d164c6981df46d48904e767e939 WHIRLPOOL 27600e85ece76e923b405c8402ebd54bcb738e23e0d646b13c1c656f24d724bc51e062fba0d307e88b0160ff357d0b29c8d4384695e11492b1cb04589d2c1fee
+DIST php-5.6.11.tar.bz2 14081292 SHA256 bd6b260816764c267244749ead07482120dbf8d1920ebbbb0dcb2aa411033866 SHA512 c6319939882a7e736cc4311470ff4802439452e45785f57c18f57e7ffaa2bce1df90221e5f44a9f0b778f56ed5fe3d86248bfd44df7537fd9f2151c09a2442e3 WHIRLPOOL 10e7973b8124b1dd3c7ef1d83a74f210b61de2d4979bf0b2f1b1eb3823be9e20bef976c9e028b27d625590db489849475a418747c0e26d3ce5560c390ad938d4
DIST php-5.6.9.tar.bz2 14037070 SHA256 19d3b87b7b8bba3be24cf6d757d16b723a98881c3af8d15469fd25501e9abcb9 SHA512 c00e0fdfc60a84e0a9ebe4702907b86b86a65efc72c26fa86abc1ed79afa21fb1eb10052c1fc2326f5cb9858878f62e1a39c1cd02ea2a96fb8f14c515b26389e WHIRLPOOL e561f0c183314e05ffb34f633eac0f638d1f81d6d0a1445390ffde7baad9ce8798605bdd9a51b1227177e6b0849f752cb342d7168cc94a465406149bfad45947
-DIST php-7.0.0alpha1.tar.bz2 14446845 SHA256 18b415652b5bb15512142de3887a366d43611cb08da149bd7a3132d3ff1ee7d0 SHA512 a922d58863aff0240902278fcf30e5c1545acc770f069b2d0256e98bfb26583ca3911bf401058cb9fba860c2468041696a21c14536ee79284fd076dd3f211ffb WHIRLPOOL c14037264c4e76700e6596a17adb4c41add20825875ea5863cc1806e00bd91c270070a8a8acc648d662e91d38259b3ae472ffccf0fb6ffbb4d82536edcd12528
-DIST php-7.0.0alpha2.tar.bz2 14435433 SHA256 779aa6ab9ef23aa3bdb5e9a17ea015afed402566cb4c973daa504d2f03a2561c SHA512 c377639e3ed304f056ea15b857cf367ee702c5fcdc7a639e55e7023e407c93506a14f1d55d54332f1733237bbcc66d3aee0c0c13bf9c93104f06c53fcbe5f40c WHIRLPOOL b4a92feb7ca768d5b5da3afefa50844a32bbabdb6d7ed93db59e0e3ebbc4b37e40d48c2430de36bcad4b83a927d55e5f3cc872ad7e8f8b8418aca1a898379ff6
+DIST php-7.0.0beta1.tar.bz2 14642405 SHA256 04a556a1d9108119c661f6f50ab71f94ad9fb61be3ee08cec8e2710d9df643de SHA512 496388128d5cff5c86bebb253f08e55c6b5957ed33abf96060818c31c3f8b81dd989fc437556b8071b6ba0ebb30e6b251f2b2c3326b204891467ae73c4967d9f WHIRLPOOL 0b33f5bc8df641d04f11c0e8e8a9c6f511521f9bd092392ea2bf25983539f84d1bf636cb90719672032ebdec5c64dc0b9cefe1dbdbb5e28d2c68aab72e950370
DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
diff --git a/dev-lang/php/php-5.4.40.ebuild b/dev-lang/php/php-5.4.40.ebuild
deleted file mode 100644
index 2c1b7d0bc8ef..000000000000
--- a/dev-lang/php/php-5.4.40.ebuild
+++ /dev/null
@@ -1,802 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.40.ebuild,v 1.9 2015/05/27 13:05:46 ago Exp $
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
- case "${1}" in
- "php-pre")
- echo "http://downloads.php.net/stas/${2}"
- ;;
- "php")
- echo "http://www.php.net/distributions/${2}"
- ;;
- "olemarkus")
- echo "http://dev.gentoo.org/~olemarkus/php/${2}"
- ;;
- "gentoo")
- echo "mirror://gentoo/${2}"
- ;;
- *)
- die "unhandled case in php_get_uri"
- ;;
- esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_PATCHSET_LOC="olemarkus"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="2"
-PHP_PATCHSET_URI="
- $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
-
-PHP_FPM_INIT_VER="4"
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="
- ${PHP_SRC_URI}
- ${PHP_PATCHSET_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
- crypt +ctype curl curlwrappers debug
- enchant exif +fileinfo +filter firebird
- flatfile ftp gd gdbm gmp +hash +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
- mssql mysql mysqlnd mysqli nls
- oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
- readline recode selinux +session sharedmem
- +simplexml snmp soap sockets spell sqlite ssl
- sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
- >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
- >=dev-libs/libpcre-8.32[unicode]
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
- =dev-libs/libmcrypt-2.4 )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( app-text/enchant )
- exif? ( !gd? (
- virtual/jpeg:0
- media-libs/libpng:0=
- sys-libs/zlib
- ) )
- firebird? ( dev-db/firebird )
- gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
- gmp? ( >=dev-libs/gmp-4.1.2 )
- iconv? ( virtual/libiconv )
- imap? ( virtual/imap-c-client[ssl=] )
- intl? ( dev-libs/icu:= )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
- libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
- mssql? ( dev-db/freetds[mssql] )
- !mysqlnd? (
- mysql? ( virtual/mysql )
- mysqli? ( >=virtual/mysql-4.1 )
- )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( dev-db/postgresql )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline )
- recode? ( app-text/recode )
- sharedmem? ( dev-libs/mm )
- simplexml? ( >=dev-libs/libxml2-2.6.8 )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- soap? ( >=dev-libs/libxml2-2.6.8 )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? ( >=dev-libs/openssl-0.9.7 )
- sybase-ct? ( dev-db/freetds )
- tidy? ( app-text/htmltidy )
- truetype? (
- =media-libs/freetype-2*
- >=media-libs/t1lib-5.0.0
- !gd? (
- virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
- )
- unicode? ( dev-libs/oniguruma )
- wddx? ( >=dev-libs/libxml2-2.6.8 )
- xml? ( >=dev-libs/libxml2-2.6.8 )
- xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
- xmlreader? ( >=dev-libs/libxml2-2.6.8 )
- xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? (
- x11-libs/libXpm
- virtual/jpeg:0
- media-libs/libpng:0= sys-libs/zlib
- )
- xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
- zip? ( sys-libs/zlib )
- zlib? ( sys-libs/zlib )
- virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
- truetype? ( gd )
- cjk? ( gd )
- exif? ( gd )
-
- xpm? ( gd )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- wddx? ( xml )
- xmlrpc? ( || ( xml iconv ) )
- xmlreader? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- mhash? ( hash )
- phar? ( hash )
- mysqlnd? ( || (
- mysql
- mysqli
- pdo
- ) )
-
- qdbm? ( !gdbm )
- readline? ( !libedit )
- recode? ( !imap !mysql !mysqli )
- sharedmem? ( !threads )
-
- !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
- sys-devel/flex
- >=sys-devel/m4-1.4.3
- >=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
- production|development)
- ;;
- *)
- PHP_INI_VERSION="development"
- ;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
- depend.apache_pkg_setup
-}
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
- cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
- if use_if_iuse opcache; then
- elog "Adding opcache to ${phpinisrc}"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
- fi
-
- dodir "${PHP_INI_DIR#${EPREFIX}}"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" "${PHP_INI_FILE}"
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- # SAPI-specific handling
-
- if [[ "${sapi}" == "fpm" ]] ; then
- [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
- einfo "Installing FPM CGI config file php-fpm.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
- # Remove bogus /etc/php-fpm.conf.default (bug 359906)
- [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
- fi
-
- # Install PHP ini files into /usr/share/php
-
- dodoc php.ini-development
- dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
- # ([empty session.save_path]/session_mm_[sapi][gid].sem)
- # there is no easy way to circumvent that, all php calls during
- # install use -n, so no php.ini file will be used.
- # As such, this is the easiest way to get around
- addpredict /session_mm_cli250.sem
- addpredict /session_mm_cli0.sem
-
- # Change PHP branding
- # Get the alpha/beta/rc version
- sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
- -i configure.in || die "Unable to change PHP branding"
-
- # Patch PHP to show Gentoo as the server platform
- sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
- -i configure.in || die "Failed to fix server platform name"
-
- # Prevent PHP from activating the Apache config,
- # as we will do that ourselves
- sed -i \
- -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
- -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
- configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
- # Patch PHP to support heimdal instead of mit-krb5
- if has_version "app-crypt/heimdal" ; then
- sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
- || die "Failed to fix heimdal libname"
- sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
- || die "Failed to fix heimdal crypt library reference"
- fi
-
- #Add user patches #357637
- epatch_user
-
- #force rebuilding aclocal.m4
- rm aclocal.m4
- eautoreconf
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # http://bugs.php.net/bug.php?id=48795, bug #343481
- sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
- fi
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # This is a global variable and should be in caps. It isn't because the
- # phpconfutils eclass relies on exactly this name...
- # for --with-libdir see bug #327025
- my_conf="
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}"/man
- --infodir="${PHP_DESTDIR}"/info
- --libdir="${PHP_DESTDIR}"/lib
- --with-libdir=$(get_libdir)
- --without-pear
- $(use_enable threads maintainer-zts)"
-
- # extension USE flag shared
- my_conf+="
- $(use_enable bcmath bcmath )
- $(use_with bzip2 bz2 "${EPREFIX}"/usr)
- $(use_enable calendar calendar )
- $(use_enable ctype ctype )
- $(use_with curl curl "${EPREFIX}"/usr)
- $(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
- $(use_enable xml dom )
- $(use_with enchant enchant "${EPREFIX}"/usr)
- $(use_enable exif exif )
- $(use_enable fileinfo fileinfo )
- $(use_enable filter filter )
- $(use_enable ftp ftp )
- $(use_with nls gettext "${EPREFIX}"/usr)
- $(use_with gmp gmp "${EPREFIX}"/usr)
- $(use_enable hash hash )
- $(use_with mhash mhash "${EPREFIX}"/usr)
- $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
- $(use_enable intl intl )
- $(use_enable ipv6 ipv6 )
- $(use_enable json json )
- $(use_with kerberos kerberos "${EPREFIX}"/usr)
- $(use_enable xml libxml )
- $(use_with xml libxml-dir "${EPREFIX}"/usr)
- $(use_enable unicode mbstring )
- $(use_with crypt mcrypt "${EPREFIX}"/usr)
- $(use_with mssql mssql "${EPREFIX}"/usr)
- $(use_with unicode onig "${EPREFIX}"/usr)
- $(use_with ssl openssl "${EPREFIX}"/usr)
- $(use_with ssl openssl-dir "${EPREFIX}"/usr)
- $(use_enable pcntl pcntl )
- $(use_enable phar phar )
- $(use_enable pdo pdo )
- $(use_with postgres pgsql "${EPREFIX}"/usr)
- $(use_enable posix posix )
- $(use_with spell pspell "${EPREFIX}"/usr)
- $(use_with recode recode "${EPREFIX}"/usr)
- $(use_enable simplexml simplexml )
- $(use_enable sharedmem shmop )
- $(use_with snmp snmp "${EPREFIX}"/usr)
- $(use_enable soap soap )
- $(use_enable sockets sockets )
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr)
- $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
- $(use_enable sysvipc sysvmsg )
- $(use_enable sysvipc sysvsem )
- $(use_enable sysvipc sysvshm )
- $(use_with systemd fpm-systemd)
- $(use_with tidy tidy "${EPREFIX}"/usr)
- $(use_enable tokenizer tokenizer )
- $(use_enable wddx wddx )
- $(use_enable xml xml )
- $(use_enable xmlreader xmlreader )
- $(use_enable xmlwriter xmlwriter )
- $(use_with xmlrpc xmlrpc)
- $(use_with xslt xsl "${EPREFIX}"/usr)
- $(use_enable zip zip )
- $(use_with zlib zlib "${EPREFIX}"/usr)
- $(use_enable debug debug )"
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm ; then
- my_conf="${my_conf} --enable-dba${shared}"
- fi
-
- # DBA drivers support
- my_conf+="
- $(use_with cdb cdb)
- $(use_with berkdb db4 ${EPREFIX}/usr)
- $(use_enable flatfile flatfile )
- $(use_with gdbm gdbm ${EPREFIX}/usr)
- $(use_enable inifile inifile )
- $(use_with qdbm qdbm ${EPREFIX}/usr)"
-
- # Support for the GD graphics library
- my_conf+="
- $(use_with truetype freetype-dir ${EPREFIX}/usr)
- $(use_with truetype t1lib ${EPREFIX}/usr)
- $(use_enable cjk gd-jis-conv )
- $(use_with gd jpeg-dir ${EPREFIX}/usr)
- $(use_with gd png-dir ${EPREFIX}/usr)
- $(use_with xpm xpm-dir ${EPREFIX}/usr)"
- # enable gd last, so configure can pick up the previous settings
- my_conf+="
- $(use_with gd gd)"
-
- # IMAP support
- if use imap ; then
- my_conf+="
- $(use_with imap imap ${EPREFIX}/usr)
- $(use_with ssl imap-ssl ${EPREFIX}/usr)"
- fi
-
- # Interbase/firebird support
-
- if use firebird ; then
- my_conf+="
- $(use_with firebird interbase ${EPREFIX}/usr)"
- fi
-
- # LDAP support
- if use ldap ; then
- my_conf+="
- $(use_with ldap ldap ${EPREFIX}/usr)
- $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
- fi
-
- # MySQL support
- if use mysql ; then
- if use mysqlnd ; then
- my_conf+="
- $(use_with mysql mysql mysqlnd)"
- else
- my_conf+="
- $(use_with mysql mysql ${EPREFIX}/usr)"
- fi
- my_conf+="
- $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
- fi
-
- # MySQLi support
- if use mysqlnd ; then
- my_conf+="
- $(use_with mysqli mysqli mysqlnd)"
- else
- my_conf+="
- $(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
- fi
-
- # ODBC support
- if use odbc ; then
- my_conf+="
- $(use_with odbc unixODBC ${EPREFIX}/usr)"
- fi
-
- if use iodbc ; then
- my_conf+="
- $(use_with iodbc iodbc ${EPREFIX}/usr)"
- fi
-
- # Oracle support
- if use oci8-instant-client ; then
- my_conf+="
- $(use_with oci8-instant-client oci8)"
- fi
-
- # PDO support
- if use pdo ; then
- my_conf+="
- $(use_with mssql pdo-dblib )"
- if use mysqlnd ; then
- my_conf+="
- $(use_with mysqlnd pdo-mysql mysqlnd)"
- else
- my_conf+="
- $(use_with mysql pdo-mysql ${EPREFIX}/usr)"
- fi
- my_conf+="
- $(use_with postgres pdo-pgsql )
- $(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
- $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
- if use oci8-instant-client ; then
- my_conf+="
- $(use_with oci8-instant-client pdo-oci)"
- fi
- fi
-
- # readline/libedit support
- my_conf+="
- $(use_with readline readline ${EPREFIX}/usr)
- $(use_with libedit libedit ${EPREFIX}/usr)"
-
- # Session support
- if use session ; then
- my_conf+="
- $(use_with sharedmem mm ${EPREFIX}/usr)"
- else
- my_conf+="
- $(use_enable session session )"
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- my_conf="${my_conf} --with-pic"
-
- # we use the system copy of pcre
- # --with-pcre-regex affects ext/pcre
- # --with-pcre-dir affects ext/filter and ext/zip
- my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Support user-passed configuration parameters
- my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- mkdir -p "${WORKDIR}/sapis-build"
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
- cd "${WORKDIR}/sapis-build/${one_sapi}"
-
- sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
- --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --enable-${sapi}"
- else
- sapi_conf="${sapi_conf} --disable-${sapi}"
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
- else
- sapi_conf="${sapi_conf} --without-apxs2"
- fi
- ;;
- esac
- done
-
- econf ${sapi_conf}
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake || die "emake failed"
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi"
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs \
- || die "emake install failed"
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir /usr/share/php${PHP_MV}
-
- local sapi="", file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}"
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}" || die "Unable to install ${sapi} sapi"
- else
- dobin "${source}" || die "Unable to install ${sapi} sapi"
- local name="$(basename ${source})"
- dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use_if_iuse opcache ; then
- dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" \
- "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i \
- "${ED}/etc/env.d/20php${SLOT}"
- sed -e "s|php5|php${SLOT}|g" -i \
- "${ED}/etc/env.d/20php${SLOT}"
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- APACHE2_MOD_DEFINE="PHP5"
- APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php
- apache-module_pkg_postinst
- fi
-
- # Create the symlinks for php
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT}
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
- elog "to compile extensions for the ${SLOT} ABI"
- elog
- if ! use readline && use cli ; then
- ewarn "Note that in order to use php interactivly, you need to enable"
- ewarn "the readline USE flag or php -a will hang"
- fi
- elog
- elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
- elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
- elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
- elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
- elog
- elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
- elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
- elog
-}
-
-pkg_prerm() {
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.4.39.ebuild b/dev-lang/php/php-5.4.43.ebuild
similarity index 98%
rename from dev-lang/php/php-5.4.39.ebuild
rename to dev-lang/php/php-5.4.43.ebuild
index 36c9173baf08..9c2488461bf4 100644
--- a/dev-lang/php/php-5.4.39.ebuild
+++ b/dev-lang/php/php-5.4.43.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.39.ebuild,v 1.12 2015/04/17 09:46:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.43.ebuild,v 1.1 2015/07/11 10:59:01 olemarkus Exp $
EAPI=5
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
function php_get_uri ()
{
diff --git a/dev-lang/php/php-5.5.22.ebuild b/dev-lang/php/php-5.5.22.ebuild
deleted file mode 100644
index bf3e88816edf..000000000000
--- a/dev-lang/php/php-5.5.22.ebuild
+++ /dev/null
@@ -1,784 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.22.ebuild,v 1.10 2015/04/05 22:15:41 sping Exp $
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
- case "${1}" in
- "php-pre")
- echo "http://downloads.php.net/dsp/${2}"
- ;;
- "php")
- echo "http://www.php.net/distributions/${2}"
- ;;
- "olemarkus")
- echo "http://dev.gentoo.org/~olemarkus/php/${2}"
- ;;
- "gentoo")
- echo "mirror://gentoo/${2}"
- ;;
- *)
- die "unhandled case in php_get_uri"
- ;;
- esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
- crypt +ctype curl debug
- enchant exif frontbase +fileinfo +filter firebird
- flatfile ftp gd gdbm gmp +hash +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
- mssql mysql libmysqlclient mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline recode selinux +session sharedmem
- +simplexml snmp soap sockets spell sqlite ssl
- sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
- >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
- >=dev-libs/libpcre-8.32[unicode]
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
- =dev-libs/libmcrypt-2.4 )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( app-text/enchant )
- exif? ( !gd? (
- virtual/jpeg:0
- media-libs/libpng:0=
- sys-libs/zlib
- ) )
- firebird? ( dev-db/firebird )
- gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
- gmp? ( >=dev-libs/gmp-4.1.2 )
- iconv? ( virtual/libiconv )
- imap? ( virtual/imap-c-client[ssl=] )
- intl? ( dev-libs/icu:= )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
- libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
- mssql? ( dev-db/freetds[mssql] )
- libmysqlclient? (
- mysql? ( virtual/mysql )
- mysqli? ( >=virtual/mysql-4.1 )
- )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( dev-db/postgresql )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline )
- recode? ( app-text/recode )
- sharedmem? ( dev-libs/mm )
- simplexml? ( >=dev-libs/libxml2-2.6.8 )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- soap? ( >=dev-libs/libxml2-2.6.8 )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? ( >=dev-libs/openssl-0.9.7 )
- sybase-ct? ( dev-db/freetds )
- tidy? ( app-text/htmltidy )
- truetype? (
- =media-libs/freetype-2*
- >=media-libs/t1lib-5.0.0
- !gd? (
- virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
- )
- unicode? ( dev-libs/oniguruma )
- vpx? ( media-libs/libvpx )
- wddx? ( >=dev-libs/libxml2-2.6.8 )
- xml? ( >=dev-libs/libxml2-2.6.8 )
- xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
- xmlreader? ( >=dev-libs/libxml2-2.6.8 )
- xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? (
- x11-libs/libXpm
- virtual/jpeg:0
- media-libs/libpng:0= sys-libs/zlib
- )
- xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
- zip? ( sys-libs/zlib )
- zlib? ( sys-libs/zlib )
- virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
- truetype? ( gd )
- vpx? ( gd )
- cjk? ( gd )
- exif? ( gd )
-
- xpm? ( gd )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- wddx? ( xml )
- xmlrpc? ( || ( xml iconv ) )
- xmlreader? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- mhash? ( hash )
- phar? ( hash )
- libmysqlclient? ( || (
- mysql
- mysqli
- pdo
- ) )
-
- qdbm? ( !gdbm )
- readline? ( !libedit )
- recode? ( !imap !mysql !mysqli )
- sharedmem? ( !threads )
-
- !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
- sys-devel/flex
- >=sys-devel/m4-1.4.3
- >=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
- production|development)
- ;;
- *)
- PHP_INI_VERSION="development"
- ;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
- depend.apache_pkg_setup
-}
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
- cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
- dodir "${PHP_INI_DIR#${EPREFIX}}"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" "${PHP_INI_FILE}"
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use_if_iuse opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
-
- if [[ "${sapi}" == "fpm" ]] ; then
- [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
- einfo "Installing FPM CGI config file php-fpm.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
- # Remove bogus /etc/php-fpm.conf.default (bug 359906)
- [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
- fi
-
- # Install PHP ini files into /usr/share/php
-
- dodoc php.ini-development
- dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
- # ([empty session.save_path]/session_mm_[sapi][gid].sem)
- # there is no easy way to circumvent that, all php calls during
- # install use -n, so no php.ini file will be used.
- # As such, this is the easiest way to get around
- addpredict /session_mm_cli250.sem
- addpredict /session_mm_cli0.sem
-
- # Change PHP branding
- # Get the alpha/beta/rc version
- sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
- -i configure.in || die "Unable to change PHP branding"
-
- # Patch PHP to show Gentoo as the server platform
- sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
- -i configure.in || die "Failed to fix server platform name"
-
- # Prevent PHP from activating the Apache config,
- # as we will do that ourselves
- sed -i \
- -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
- -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
- configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
- # Patch PHP to support heimdal instead of mit-krb5
- if has_version "app-crypt/heimdal" ; then
- sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
- || die "Failed to fix heimdal libname"
- sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
- || die "Failed to fix heimdal crypt library reference"
- fi
-
- #Add user patches #357637
- epatch_user
-
- #force rebuilding aclocal.m4
- rm aclocal.m4
- eautoreconf
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # http://bugs.php.net/bug.php?id=48795, bug #343481
- sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
- fi
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # This is a global variable and should be in caps. It isn't because the
- # phpconfutils eclass relies on exactly this name...
- # for --with-libdir see bug #327025
- my_conf="
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}"/man
- --infodir="${PHP_DESTDIR}"/info
- --libdir="${PHP_DESTDIR}"/lib
- --with-libdir=$(get_libdir)
- --without-pear
- $(use_enable threads maintainer-zts)"
-
- # extension USE flag shared
- my_conf+="
- $(use_enable bcmath bcmath )
- $(use_with bzip2 bz2 "${EPREFIX}"/usr)
- $(use_enable calendar calendar )
- $(use_enable ctype ctype )
- $(use_with curl curl "${EPREFIX}"/usr)
- $(use_enable xml dom )
- $(use_with enchant enchant "${EPREFIX}"/usr)
- $(use_enable exif exif )
- $(use_enable fileinfo fileinfo )
- $(use_enable filter filter )
- $(use_enable ftp ftp )
- $(use_with nls gettext "${EPREFIX}"/usr)
- $(use_with gmp gmp "${EPREFIX}"/usr)
- $(use_enable hash hash )
- $(use_with mhash mhash "${EPREFIX}"/usr)
- $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
- $(use_enable intl intl )
- $(use_enable ipv6 ipv6 )
- $(use_enable json json )
- $(use_with kerberos kerberos "${EPREFIX}"/usr)
- $(use_enable xml libxml )
- $(use_with xml libxml-dir "${EPREFIX}"/usr)
- $(use_enable unicode mbstring )
- $(use_with crypt mcrypt "${EPREFIX}"/usr)
- $(use_with mssql mssql "${EPREFIX}"/usr)
- $(use_with unicode onig "${EPREFIX}"/usr)
- $(use_with ssl openssl "${EPREFIX}"/usr)
- $(use_with ssl openssl-dir "${EPREFIX}"/usr)
- $(use_enable pcntl pcntl )
- $(use_enable phar phar )
- $(use_enable pdo pdo )
- $(use_enable opcache opcache )
- $(use_with postgres pgsql "${EPREFIX}"/usr)
- $(use_enable posix posix )
- $(use_with spell pspell "${EPREFIX}"/usr)
- $(use_with recode recode "${EPREFIX}"/usr)
- $(use_enable simplexml simplexml )
- $(use_enable sharedmem shmop )
- $(use_with snmp snmp "${EPREFIX}"/usr)
- $(use_enable soap soap )
- $(use_enable sockets sockets )
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr)
- $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
- $(use_enable sysvipc sysvmsg )
- $(use_enable sysvipc sysvsem )
- $(use_enable sysvipc sysvshm )
- $(use_with systemd fpm-systemd)
- $(use_with tidy tidy "${EPREFIX}"/usr)
- $(use_enable tokenizer tokenizer )
- $(use_enable wddx wddx )
- $(use_enable xml xml )
- $(use_enable xmlreader xmlreader )
- $(use_enable xmlwriter xmlwriter )
- $(use_with xmlrpc xmlrpc)
- $(use_with xslt xsl "${EPREFIX}"/usr)
- $(use_enable zip zip )
- $(use_with zlib zlib "${EPREFIX}"/usr)
- $(use_enable debug debug )"
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm ; then
- my_conf="${my_conf} --enable-dba${shared}"
- fi
-
- # DBA drivers support
- my_conf+="
- $(use_with cdb cdb)
- $(use_with berkdb db4 ${EPREFIX}/usr)
- $(use_enable flatfile flatfile )
- $(use_with gdbm gdbm ${EPREFIX}/usr)
- $(use_enable inifile inifile )
- $(use_with qdbm qdbm ${EPREFIX}/usr)"
-
- # Support for the GD graphics library
- my_conf+="
- $(use_with truetype freetype-dir ${EPREFIX}/usr)
- $(use_with truetype t1lib ${EPREFIX}/usr)
- $(use_enable cjk gd-jis-conv )
- $(use_with gd jpeg-dir ${EPREFIX}/usr)
- $(use_with gd png-dir ${EPREFIX}/usr)
- $(use_with xpm xpm-dir ${EPREFIX}/usr)
- $(use_with vpx vpx-dir ${EPREFIX}/usr)"
- # enable gd last, so configure can pick up the previous settings
- my_conf+="
- $(use_with gd gd)"
-
- # IMAP support
- if use imap ; then
- my_conf+="
- $(use_with imap imap ${EPREFIX}/usr)
- $(use_with ssl imap-ssl ${EPREFIX}/usr)"
- fi
-
- # Interbase/firebird support
-
- if use firebird ; then
- my_conf+="
- $(use_with firebird interbase ${EPREFIX}/usr)"
- fi
-
- # LDAP support
- if use ldap ; then
- my_conf+="
- $(use_with ldap ldap ${EPREFIX}/usr)
- $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
- use libmysqlclient && mysqllib="${EPREFIX}/usr"
- use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
- my_conf+=" $(use_with mysql mysql $mysqllib)"
- my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
- local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
- if use mysql ; then
- my_conf+="${mysqlsock}"
- elif use mysqli ; then
- my_conf+="${mysqlsock}"
- fi
-
- # ODBC support
- if use odbc ; then
- my_conf+="
- $(use_with odbc unixODBC ${EPREFIX}/usr)"
- fi
-
- if use iodbc ; then
- my_conf+="
- $(use_with iodbc iodbc ${EPREFIX}/usr)"
- fi
-
- # Oracle support
- if use oci8-instant-client ; then
- my_conf+="
- $(use_with oci8-instant-client oci8)"
- fi
-
- # PDO support
- if use pdo ; then
- my_conf+="
- $(use_with mssql pdo-dblib )
- $(use_with mysql pdo-mysql ${mysqllib})
- $(use_with postgres pdo-pgsql )
- $(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
- $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
- if use oci8-instant-client ; then
- my_conf+="
- $(use_with oci8-instant-client pdo-oci)"
- fi
- fi
-
- # readline/libedit support
- my_conf+="
- $(use_with readline readline ${EPREFIX}/usr)
- $(use_with libedit libedit ${EPREFIX}/usr)"
-
- # Session support
- if use session ; then
- my_conf+="
- $(use_with sharedmem mm ${EPREFIX}/usr)"
- else
- my_conf+="
- $(use_enable session session )"
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- my_conf="${my_conf} --with-pic"
-
- # we use the system copy of pcre
- # --with-pcre-regex affects ext/pcre
- # --with-pcre-dir affects ext/filter and ext/zip
- my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Support user-passed configuration parameters
- my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- mkdir -p "${WORKDIR}/sapis-build"
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
- cd "${WORKDIR}/sapis-build/${one_sapi}"
-
- sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
- --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --enable-${sapi}"
- else
- sapi_conf="${sapi_conf} --disable-${sapi}"
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
- else
- sapi_conf="${sapi_conf} --without-apxs2"
- fi
- ;;
- esac
- done
-
- econf ${sapi_conf}
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake || die "emake failed"
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi"
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs \
- || die "emake install failed"
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir /usr/share/php${PHP_MV}
-
- local sapi="", file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}"
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}" || die "Unable to install ${sapi} sapi"
- else
- dobin "${source}" || die "Unable to install ${sapi} sapi"
- local name="$(basename ${source})"
- dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use_if_iuse opcache ; then
- dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" \
- "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i \
- "${ED}/etc/env.d/20php${SLOT}"
- sed -e "s|php5|php${SLOT}|g" -i \
- "${ED}/etc/env.d/20php${SLOT}"
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- APACHE2_MOD_DEFINE="PHP5"
- APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php
- apache-module_pkg_postinst
- fi
-
- # Create the symlinks for php
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT}
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
- elog "to compile extensions for the ${SLOT} ABI"
- elog
- if ! use readline && use cli ; then
- ewarn "Note that in order to use php interactivly, you need to enable"
- ewarn "the readline USE flag or php -a will hang"
- fi
- elog
- elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
- elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
- elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
- elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
- elog
- elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
- elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
- elog
-}
-
-pkg_prerm() {
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.5.23.ebuild b/dev-lang/php/php-5.5.23.ebuild
deleted file mode 100644
index 6c8d77d675b4..000000000000
--- a/dev-lang/php/php-5.5.23.ebuild
+++ /dev/null
@@ -1,784 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.23.ebuild,v 1.12 2015/04/17 09:46:51 ago Exp $
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
- case "${1}" in
- "php-pre")
- echo "http://downloads.php.net/dsp/${2}"
- ;;
- "php")
- echo "http://www.php.net/distributions/${2}"
- ;;
- "olemarkus")
- echo "http://dev.gentoo.org/~olemarkus/php/${2}"
- ;;
- "gentoo")
- echo "mirror://gentoo/${2}"
- ;;
- *)
- die "unhandled case in php_get_uri"
- ;;
- esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
- crypt +ctype curl debug
- enchant exif frontbase +fileinfo +filter firebird
- flatfile ftp gd gdbm gmp +hash +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
- mssql mysql libmysqlclient mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline recode selinux +session sharedmem
- +simplexml snmp soap sockets spell sqlite ssl
- sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
- >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
- >=dev-libs/libpcre-8.32[unicode]
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
- =dev-libs/libmcrypt-2.4 )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( app-text/enchant )
- exif? ( !gd? (
- virtual/jpeg:0
- media-libs/libpng:0=
- sys-libs/zlib
- ) )
- firebird? ( dev-db/firebird )
- gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
- gmp? ( >=dev-libs/gmp-4.1.2 )
- iconv? ( virtual/libiconv )
- imap? ( virtual/imap-c-client[ssl=] )
- intl? ( dev-libs/icu:= )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
- libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
- mssql? ( dev-db/freetds[mssql] )
- libmysqlclient? (
- mysql? ( virtual/mysql )
- mysqli? ( >=virtual/mysql-4.1 )
- )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( dev-db/postgresql )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline )
- recode? ( app-text/recode )
- sharedmem? ( dev-libs/mm )
- simplexml? ( >=dev-libs/libxml2-2.6.8 )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- soap? ( >=dev-libs/libxml2-2.6.8 )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? ( >=dev-libs/openssl-0.9.7 )
- sybase-ct? ( dev-db/freetds )
- tidy? ( app-text/htmltidy )
- truetype? (
- =media-libs/freetype-2*
- >=media-libs/t1lib-5.0.0
- !gd? (
- virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
- )
- unicode? ( dev-libs/oniguruma )
- vpx? ( media-libs/libvpx )
- wddx? ( >=dev-libs/libxml2-2.6.8 )
- xml? ( >=dev-libs/libxml2-2.6.8 )
- xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
- xmlreader? ( >=dev-libs/libxml2-2.6.8 )
- xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? (
- x11-libs/libXpm
- virtual/jpeg:0
- media-libs/libpng:0= sys-libs/zlib
- )
- xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
- zip? ( sys-libs/zlib )
- zlib? ( sys-libs/zlib )
- virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
- truetype? ( gd )
- vpx? ( gd )
- cjk? ( gd )
- exif? ( gd )
-
- xpm? ( gd )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- wddx? ( xml )
- xmlrpc? ( || ( xml iconv ) )
- xmlreader? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- mhash? ( hash )
- phar? ( hash )
- libmysqlclient? ( || (
- mysql
- mysqli
- pdo
- ) )
-
- qdbm? ( !gdbm )
- readline? ( !libedit )
- recode? ( !imap !mysql !mysqli )
- sharedmem? ( !threads )
-
- !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
- sys-devel/flex
- >=sys-devel/m4-1.4.3
- >=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
- production|development)
- ;;
- *)
- PHP_INI_VERSION="development"
- ;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
- depend.apache_pkg_setup
-}
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
- cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
- dodir "${PHP_INI_DIR#${EPREFIX}}"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" "${PHP_INI_FILE}"
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use_if_iuse opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
-
- if [[ "${sapi}" == "fpm" ]] ; then
- [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
- einfo "Installing FPM CGI config file php-fpm.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
- # Remove bogus /etc/php-fpm.conf.default (bug 359906)
- [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
- fi
-
- # Install PHP ini files into /usr/share/php
-
- dodoc php.ini-development
- dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
- # ([empty session.save_path]/session_mm_[sapi][gid].sem)
- # there is no easy way to circumvent that, all php calls during
- # install use -n, so no php.ini file will be used.
- # As such, this is the easiest way to get around
- addpredict /session_mm_cli250.sem
- addpredict /session_mm_cli0.sem
-
- # Change PHP branding
- # Get the alpha/beta/rc version
- sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
- -i configure.in || die "Unable to change PHP branding"
-
- # Patch PHP to show Gentoo as the server platform
- sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
- -i configure.in || die "Failed to fix server platform name"
-
- # Prevent PHP from activating the Apache config,
- # as we will do that ourselves
- sed -i \
- -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
- -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
- configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
- # Patch PHP to support heimdal instead of mit-krb5
- if has_version "app-crypt/heimdal" ; then
- sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
- || die "Failed to fix heimdal libname"
- sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
- || die "Failed to fix heimdal crypt library reference"
- fi
-
- #Add user patches #357637
- epatch_user
-
- #force rebuilding aclocal.m4
- rm aclocal.m4
- eautoreconf
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # http://bugs.php.net/bug.php?id=48795, bug #343481
- sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
- fi
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # This is a global variable and should be in caps. It isn't because the
- # phpconfutils eclass relies on exactly this name...
- # for --with-libdir see bug #327025
- my_conf="
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}"/man
- --infodir="${PHP_DESTDIR}"/info
- --libdir="${PHP_DESTDIR}"/lib
- --with-libdir=$(get_libdir)
- --without-pear
- $(use_enable threads maintainer-zts)"
-
- # extension USE flag shared
- my_conf+="
- $(use_enable bcmath bcmath )
- $(use_with bzip2 bz2 "${EPREFIX}"/usr)
- $(use_enable calendar calendar )
- $(use_enable ctype ctype )
- $(use_with curl curl "${EPREFIX}"/usr)
- $(use_enable xml dom )
- $(use_with enchant enchant "${EPREFIX}"/usr)
- $(use_enable exif exif )
- $(use_enable fileinfo fileinfo )
- $(use_enable filter filter )
- $(use_enable ftp ftp )
- $(use_with nls gettext "${EPREFIX}"/usr)
- $(use_with gmp gmp "${EPREFIX}"/usr)
- $(use_enable hash hash )
- $(use_with mhash mhash "${EPREFIX}"/usr)
- $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
- $(use_enable intl intl )
- $(use_enable ipv6 ipv6 )
- $(use_enable json json )
- $(use_with kerberos kerberos "${EPREFIX}"/usr)
- $(use_enable xml libxml )
- $(use_with xml libxml-dir "${EPREFIX}"/usr)
- $(use_enable unicode mbstring )
- $(use_with crypt mcrypt "${EPREFIX}"/usr)
- $(use_with mssql mssql "${EPREFIX}"/usr)
- $(use_with unicode onig "${EPREFIX}"/usr)
- $(use_with ssl openssl "${EPREFIX}"/usr)
- $(use_with ssl openssl-dir "${EPREFIX}"/usr)
- $(use_enable pcntl pcntl )
- $(use_enable phar phar )
- $(use_enable pdo pdo )
- $(use_enable opcache opcache )
- $(use_with postgres pgsql "${EPREFIX}"/usr)
- $(use_enable posix posix )
- $(use_with spell pspell "${EPREFIX}"/usr)
- $(use_with recode recode "${EPREFIX}"/usr)
- $(use_enable simplexml simplexml )
- $(use_enable sharedmem shmop )
- $(use_with snmp snmp "${EPREFIX}"/usr)
- $(use_enable soap soap )
- $(use_enable sockets sockets )
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr)
- $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
- $(use_enable sysvipc sysvmsg )
- $(use_enable sysvipc sysvsem )
- $(use_enable sysvipc sysvshm )
- $(use_with systemd fpm-systemd)
- $(use_with tidy tidy "${EPREFIX}"/usr)
- $(use_enable tokenizer tokenizer )
- $(use_enable wddx wddx )
- $(use_enable xml xml )
- $(use_enable xmlreader xmlreader )
- $(use_enable xmlwriter xmlwriter )
- $(use_with xmlrpc xmlrpc)
- $(use_with xslt xsl "${EPREFIX}"/usr)
- $(use_enable zip zip )
- $(use_with zlib zlib "${EPREFIX}"/usr)
- $(use_enable debug debug )"
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm ; then
- my_conf="${my_conf} --enable-dba${shared}"
- fi
-
- # DBA drivers support
- my_conf+="
- $(use_with cdb cdb)
- $(use_with berkdb db4 ${EPREFIX}/usr)
- $(use_enable flatfile flatfile )
- $(use_with gdbm gdbm ${EPREFIX}/usr)
- $(use_enable inifile inifile )
- $(use_with qdbm qdbm ${EPREFIX}/usr)"
-
- # Support for the GD graphics library
- my_conf+="
- $(use_with truetype freetype-dir ${EPREFIX}/usr)
- $(use_with truetype t1lib ${EPREFIX}/usr)
- $(use_enable cjk gd-jis-conv )
- $(use_with gd jpeg-dir ${EPREFIX}/usr)
- $(use_with gd png-dir ${EPREFIX}/usr)
- $(use_with xpm xpm-dir ${EPREFIX}/usr)
- $(use_with vpx vpx-dir ${EPREFIX}/usr)"
- # enable gd last, so configure can pick up the previous settings
- my_conf+="
- $(use_with gd gd)"
-
- # IMAP support
- if use imap ; then
- my_conf+="
- $(use_with imap imap ${EPREFIX}/usr)
- $(use_with ssl imap-ssl ${EPREFIX}/usr)"
- fi
-
- # Interbase/firebird support
-
- if use firebird ; then
- my_conf+="
- $(use_with firebird interbase ${EPREFIX}/usr)"
- fi
-
- # LDAP support
- if use ldap ; then
- my_conf+="
- $(use_with ldap ldap ${EPREFIX}/usr)
- $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
- use libmysqlclient && mysqllib="${EPREFIX}/usr"
- use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
- my_conf+=" $(use_with mysql mysql $mysqllib)"
- my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
- local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
- if use mysql ; then
- my_conf+="${mysqlsock}"
- elif use mysqli ; then
- my_conf+="${mysqlsock}"
- fi
-
- # ODBC support
- if use odbc ; then
- my_conf+="
- $(use_with odbc unixODBC ${EPREFIX}/usr)"
- fi
-
- if use iodbc ; then
- my_conf+="
- $(use_with iodbc iodbc ${EPREFIX}/usr)"
- fi
-
- # Oracle support
- if use oci8-instant-client ; then
- my_conf+="
- $(use_with oci8-instant-client oci8)"
- fi
-
- # PDO support
- if use pdo ; then
- my_conf+="
- $(use_with mssql pdo-dblib )
- $(use_with mysql pdo-mysql ${mysqllib})
- $(use_with postgres pdo-pgsql )
- $(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
- $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
- if use oci8-instant-client ; then
- my_conf+="
- $(use_with oci8-instant-client pdo-oci)"
- fi
- fi
-
- # readline/libedit support
- my_conf+="
- $(use_with readline readline ${EPREFIX}/usr)
- $(use_with libedit libedit ${EPREFIX}/usr)"
-
- # Session support
- if use session ; then
- my_conf+="
- $(use_with sharedmem mm ${EPREFIX}/usr)"
- else
- my_conf+="
- $(use_enable session session )"
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- my_conf="${my_conf} --with-pic"
-
- # we use the system copy of pcre
- # --with-pcre-regex affects ext/pcre
- # --with-pcre-dir affects ext/filter and ext/zip
- my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Support user-passed configuration parameters
- my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- mkdir -p "${WORKDIR}/sapis-build"
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
- cd "${WORKDIR}/sapis-build/${one_sapi}"
-
- sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
- --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --enable-${sapi}"
- else
- sapi_conf="${sapi_conf} --disable-${sapi}"
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
- else
- sapi_conf="${sapi_conf} --without-apxs2"
- fi
- ;;
- esac
- done
-
- econf ${sapi_conf}
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake || die "emake failed"
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi"
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs \
- || die "emake install failed"
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir /usr/share/php${PHP_MV}
-
- local sapi="", file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}"
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}" || die "Unable to install ${sapi} sapi"
- else
- dobin "${source}" || die "Unable to install ${sapi} sapi"
- local name="$(basename ${source})"
- dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use_if_iuse opcache ; then
- dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" \
- "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i \
- "${ED}/etc/env.d/20php${SLOT}"
- sed -e "s|php5|php${SLOT}|g" -i \
- "${ED}/etc/env.d/20php${SLOT}"
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- APACHE2_MOD_DEFINE="PHP5"
- APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php
- apache-module_pkg_postinst
- fi
-
- # Create the symlinks for php
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT}
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
- elog "to compile extensions for the ${SLOT} ABI"
- elog
- if ! use readline && use cli ; then
- ewarn "Note that in order to use php interactivly, you need to enable"
- ewarn "the readline USE flag or php -a will hang"
- fi
- elog
- elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
- elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
- elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
- elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
- elog
- elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
- elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
- elog
-}
-
-pkg_prerm() {
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.5.24.ebuild b/dev-lang/php/php-5.5.24.ebuild
deleted file mode 100644
index 66723934f957..000000000000
--- a/dev-lang/php/php-5.5.24.ebuild
+++ /dev/null
@@ -1,784 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.24.ebuild,v 1.9 2015/05/27 13:05:46 ago Exp $
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
- case "${1}" in
- "php-pre")
- echo "http://downloads.php.net/dsp/${2}"
- ;;
- "php")
- echo "http://www.php.net/distributions/${2}"
- ;;
- "olemarkus")
- echo "http://dev.gentoo.org/~olemarkus/php/${2}"
- ;;
- "gentoo")
- echo "mirror://gentoo/${2}"
- ;;
- *)
- die "unhandled case in php_get_uri"
- ;;
- esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
- crypt +ctype curl debug
- enchant exif frontbase +fileinfo +filter firebird
- flatfile ftp gd gdbm gmp +hash +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
- mssql mysql libmysqlclient mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline recode selinux +session sharedmem
- +simplexml snmp soap sockets spell sqlite ssl
- sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
- >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
- >=dev-libs/libpcre-8.32[unicode]
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
- =dev-libs/libmcrypt-2.4 )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( app-text/enchant )
- exif? ( !gd? (
- virtual/jpeg:0
- media-libs/libpng:0=
- sys-libs/zlib
- ) )
- firebird? ( dev-db/firebird )
- gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
- gmp? ( >=dev-libs/gmp-4.1.2 )
- iconv? ( virtual/libiconv )
- imap? ( virtual/imap-c-client[ssl=] )
- intl? ( dev-libs/icu:= )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
- libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
- mssql? ( dev-db/freetds[mssql] )
- libmysqlclient? (
- mysql? ( virtual/mysql )
- mysqli? ( >=virtual/mysql-4.1 )
- )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( dev-db/postgresql )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline )
- recode? ( app-text/recode )
- sharedmem? ( dev-libs/mm )
- simplexml? ( >=dev-libs/libxml2-2.6.8 )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- soap? ( >=dev-libs/libxml2-2.6.8 )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? ( >=dev-libs/openssl-0.9.7 )
- sybase-ct? ( dev-db/freetds )
- tidy? ( app-text/htmltidy )
- truetype? (
- =media-libs/freetype-2*
- >=media-libs/t1lib-5.0.0
- !gd? (
- virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
- )
- unicode? ( dev-libs/oniguruma )
- vpx? ( media-libs/libvpx )
- wddx? ( >=dev-libs/libxml2-2.6.8 )
- xml? ( >=dev-libs/libxml2-2.6.8 )
- xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
- xmlreader? ( >=dev-libs/libxml2-2.6.8 )
- xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? (
- x11-libs/libXpm
- virtual/jpeg:0
- media-libs/libpng:0= sys-libs/zlib
- )
- xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
- zip? ( sys-libs/zlib )
- zlib? ( sys-libs/zlib )
- virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
- truetype? ( gd )
- vpx? ( gd )
- cjk? ( gd )
- exif? ( gd )
-
- xpm? ( gd )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- wddx? ( xml )
- xmlrpc? ( || ( xml iconv ) )
- xmlreader? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- mhash? ( hash )
- phar? ( hash )
- libmysqlclient? ( || (
- mysql
- mysqli
- pdo
- ) )
-
- qdbm? ( !gdbm )
- readline? ( !libedit )
- recode? ( !imap !mysql !mysqli )
- sharedmem? ( !threads )
-
- !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
- sys-devel/flex
- >=sys-devel/m4-1.4.3
- >=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
- production|development)
- ;;
- *)
- PHP_INI_VERSION="development"
- ;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
- depend.apache_pkg_setup
-}
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
- cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
- dodir "${PHP_INI_DIR#${EPREFIX}}"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" "${PHP_INI_FILE}"
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use_if_iuse opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
-
- if [[ "${sapi}" == "fpm" ]] ; then
- [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
- einfo "Installing FPM CGI config file php-fpm.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
- # Remove bogus /etc/php-fpm.conf.default (bug 359906)
- [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
- fi
-
- # Install PHP ini files into /usr/share/php
-
- dodoc php.ini-development
- dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
- # ([empty session.save_path]/session_mm_[sapi][gid].sem)
- # there is no easy way to circumvent that, all php calls during
- # install use -n, so no php.ini file will be used.
- # As such, this is the easiest way to get around
- addpredict /session_mm_cli250.sem
- addpredict /session_mm_cli0.sem
-
- # Change PHP branding
- # Get the alpha/beta/rc version
- sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
- -i configure.in || die "Unable to change PHP branding"
-
- # Patch PHP to show Gentoo as the server platform
- sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
- -i configure.in || die "Failed to fix server platform name"
-
- # Prevent PHP from activating the Apache config,
- # as we will do that ourselves
- sed -i \
- -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
- -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
- configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
- # Patch PHP to support heimdal instead of mit-krb5
- if has_version "app-crypt/heimdal" ; then
- sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
- || die "Failed to fix heimdal libname"
- sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
- || die "Failed to fix heimdal crypt library reference"
- fi
-
- #Add user patches #357637
- epatch_user
-
- #force rebuilding aclocal.m4
- rm aclocal.m4
- eautoreconf
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # http://bugs.php.net/bug.php?id=48795, bug #343481
- sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
- fi
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # This is a global variable and should be in caps. It isn't because the
- # phpconfutils eclass relies on exactly this name...
- # for --with-libdir see bug #327025
- my_conf="
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}"/man
- --infodir="${PHP_DESTDIR}"/info
- --libdir="${PHP_DESTDIR}"/lib
- --with-libdir=$(get_libdir)
- --without-pear
- $(use_enable threads maintainer-zts)"
-
- # extension USE flag shared
- my_conf+="
- $(use_enable bcmath bcmath )
- $(use_with bzip2 bz2 "${EPREFIX}"/usr)
- $(use_enable calendar calendar )
- $(use_enable ctype ctype )
- $(use_with curl curl "${EPREFIX}"/usr)
- $(use_enable xml dom )
- $(use_with enchant enchant "${EPREFIX}"/usr)
- $(use_enable exif exif )
- $(use_enable fileinfo fileinfo )
- $(use_enable filter filter )
- $(use_enable ftp ftp )
- $(use_with nls gettext "${EPREFIX}"/usr)
- $(use_with gmp gmp "${EPREFIX}"/usr)
- $(use_enable hash hash )
- $(use_with mhash mhash "${EPREFIX}"/usr)
- $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
- $(use_enable intl intl )
- $(use_enable ipv6 ipv6 )
- $(use_enable json json )
- $(use_with kerberos kerberos "${EPREFIX}"/usr)
- $(use_enable xml libxml )
- $(use_with xml libxml-dir "${EPREFIX}"/usr)
- $(use_enable unicode mbstring )
- $(use_with crypt mcrypt "${EPREFIX}"/usr)
- $(use_with mssql mssql "${EPREFIX}"/usr)
- $(use_with unicode onig "${EPREFIX}"/usr)
- $(use_with ssl openssl "${EPREFIX}"/usr)
- $(use_with ssl openssl-dir "${EPREFIX}"/usr)
- $(use_enable pcntl pcntl )
- $(use_enable phar phar )
- $(use_enable pdo pdo )
- $(use_enable opcache opcache )
- $(use_with postgres pgsql "${EPREFIX}"/usr)
- $(use_enable posix posix )
- $(use_with spell pspell "${EPREFIX}"/usr)
- $(use_with recode recode "${EPREFIX}"/usr)
- $(use_enable simplexml simplexml )
- $(use_enable sharedmem shmop )
- $(use_with snmp snmp "${EPREFIX}"/usr)
- $(use_enable soap soap )
- $(use_enable sockets sockets )
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr)
- $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
- $(use_enable sysvipc sysvmsg )
- $(use_enable sysvipc sysvsem )
- $(use_enable sysvipc sysvshm )
- $(use_with systemd fpm-systemd)
- $(use_with tidy tidy "${EPREFIX}"/usr)
- $(use_enable tokenizer tokenizer )
- $(use_enable wddx wddx )
- $(use_enable xml xml )
- $(use_enable xmlreader xmlreader )
- $(use_enable xmlwriter xmlwriter )
- $(use_with xmlrpc xmlrpc)
- $(use_with xslt xsl "${EPREFIX}"/usr)
- $(use_enable zip zip )
- $(use_with zlib zlib "${EPREFIX}"/usr)
- $(use_enable debug debug )"
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm ; then
- my_conf="${my_conf} --enable-dba${shared}"
- fi
-
- # DBA drivers support
- my_conf+="
- $(use_with cdb cdb)
- $(use_with berkdb db4 ${EPREFIX}/usr)
- $(use_enable flatfile flatfile )
- $(use_with gdbm gdbm ${EPREFIX}/usr)
- $(use_enable inifile inifile )
- $(use_with qdbm qdbm ${EPREFIX}/usr)"
-
- # Support for the GD graphics library
- my_conf+="
- $(use_with truetype freetype-dir ${EPREFIX}/usr)
- $(use_with truetype t1lib ${EPREFIX}/usr)
- $(use_enable cjk gd-jis-conv )
- $(use_with gd jpeg-dir ${EPREFIX}/usr)
- $(use_with gd png-dir ${EPREFIX}/usr)
- $(use_with xpm xpm-dir ${EPREFIX}/usr)
- $(use_with vpx vpx-dir ${EPREFIX}/usr)"
- # enable gd last, so configure can pick up the previous settings
- my_conf+="
- $(use_with gd gd)"
-
- # IMAP support
- if use imap ; then
- my_conf+="
- $(use_with imap imap ${EPREFIX}/usr)
- $(use_with ssl imap-ssl ${EPREFIX}/usr)"
- fi
-
- # Interbase/firebird support
-
- if use firebird ; then
- my_conf+="
- $(use_with firebird interbase ${EPREFIX}/usr)"
- fi
-
- # LDAP support
- if use ldap ; then
- my_conf+="
- $(use_with ldap ldap ${EPREFIX}/usr)
- $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
- use libmysqlclient && mysqllib="${EPREFIX}/usr"
- use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
- my_conf+=" $(use_with mysql mysql $mysqllib)"
- my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
- local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
- if use mysql ; then
- my_conf+="${mysqlsock}"
- elif use mysqli ; then
- my_conf+="${mysqlsock}"
- fi
-
- # ODBC support
- if use odbc ; then
- my_conf+="
- $(use_with odbc unixODBC ${EPREFIX}/usr)"
- fi
-
- if use iodbc ; then
- my_conf+="
- $(use_with iodbc iodbc ${EPREFIX}/usr)"
- fi
-
- # Oracle support
- if use oci8-instant-client ; then
- my_conf+="
- $(use_with oci8-instant-client oci8)"
- fi
-
- # PDO support
- if use pdo ; then
- my_conf+="
- $(use_with mssql pdo-dblib )
- $(use_with mysql pdo-mysql ${mysqllib})
- $(use_with postgres pdo-pgsql )
- $(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
- $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
- if use oci8-instant-client ; then
- my_conf+="
- $(use_with oci8-instant-client pdo-oci)"
- fi
- fi
-
- # readline/libedit support
- my_conf+="
- $(use_with readline readline ${EPREFIX}/usr)
- $(use_with libedit libedit ${EPREFIX}/usr)"
-
- # Session support
- if use session ; then
- my_conf+="
- $(use_with sharedmem mm ${EPREFIX}/usr)"
- else
- my_conf+="
- $(use_enable session session )"
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- my_conf="${my_conf} --with-pic"
-
- # we use the system copy of pcre
- # --with-pcre-regex affects ext/pcre
- # --with-pcre-dir affects ext/filter and ext/zip
- my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Support user-passed configuration parameters
- my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- mkdir -p "${WORKDIR}/sapis-build"
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
- cd "${WORKDIR}/sapis-build/${one_sapi}"
-
- sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
- --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --enable-${sapi}"
- else
- sapi_conf="${sapi_conf} --disable-${sapi}"
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
- else
- sapi_conf="${sapi_conf} --without-apxs2"
- fi
- ;;
- esac
- done
-
- econf ${sapi_conf}
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake || die "emake failed"
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi"
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs \
- || die "emake install failed"
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir /usr/share/php${PHP_MV}
-
- local sapi="", file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}"
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}" || die "Unable to install ${sapi} sapi"
- else
- dobin "${source}" || die "Unable to install ${sapi} sapi"
- local name="$(basename ${source})"
- dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use_if_iuse opcache ; then
- dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" \
- "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i \
- "${ED}/etc/env.d/20php${SLOT}"
- sed -e "s|php5|php${SLOT}|g" -i \
- "${ED}/etc/env.d/20php${SLOT}"
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- APACHE2_MOD_DEFINE="PHP5"
- APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php
- apache-module_pkg_postinst
- fi
-
- # Create the symlinks for php
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT}
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
- elog "to compile extensions for the ${SLOT} ABI"
- elog
- if ! use readline && use cli ; then
- ewarn "Note that in order to use php interactivly, you need to enable"
- ewarn "the readline USE flag or php -a will hang"
- fi
- elog
- elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
- elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
- elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
- elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
- elog
- elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
- elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
- elog
-}
-
-pkg_prerm() {
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.5.25.ebuild b/dev-lang/php/php-5.5.25.ebuild
deleted file mode 100644
index 787e71cc927e..000000000000
--- a/dev-lang/php/php-5.5.25.ebuild
+++ /dev/null
@@ -1,784 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.25.ebuild,v 1.5 2015/05/27 13:06:06 ago Exp $
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
- case "${1}" in
- "php-pre")
- echo "http://downloads.php.net/dsp/${2}"
- ;;
- "php")
- echo "http://www.php.net/distributions/${2}"
- ;;
- "olemarkus")
- echo "http://dev.gentoo.org/~olemarkus/php/${2}"
- ;;
- "gentoo")
- echo "mirror://gentoo/${2}"
- ;;
- *)
- die "unhandled case in php_get_uri"
- ;;
- esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
- crypt +ctype curl debug
- enchant exif frontbase +fileinfo +filter firebird
- flatfile ftp gd gdbm gmp +hash +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
- mssql mysql libmysqlclient mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline recode selinux +session sharedmem
- +simplexml snmp soap sockets spell sqlite ssl
- sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
- >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
- >=dev-libs/libpcre-8.32[unicode]
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
- =dev-libs/libmcrypt-2.4 )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( app-text/enchant )
- exif? ( !gd? (
- virtual/jpeg:0
- media-libs/libpng:0=
- sys-libs/zlib
- ) )
- firebird? ( dev-db/firebird )
- gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
- gmp? ( >=dev-libs/gmp-4.1.2 )
- iconv? ( virtual/libiconv )
- imap? ( virtual/imap-c-client[ssl=] )
- intl? ( dev-libs/icu:= )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
- libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
- mssql? ( dev-db/freetds[mssql] )
- libmysqlclient? (
- mysql? ( virtual/mysql )
- mysqli? ( >=virtual/mysql-4.1 )
- )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( dev-db/postgresql )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline )
- recode? ( app-text/recode )
- sharedmem? ( dev-libs/mm )
- simplexml? ( >=dev-libs/libxml2-2.6.8 )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- soap? ( >=dev-libs/libxml2-2.6.8 )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? ( >=dev-libs/openssl-0.9.7 )
- sybase-ct? ( dev-db/freetds )
- tidy? ( app-text/htmltidy )
- truetype? (
- =media-libs/freetype-2*
- >=media-libs/t1lib-5.0.0
- !gd? (
- virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
- )
- unicode? ( dev-libs/oniguruma )
- vpx? ( media-libs/libvpx )
- wddx? ( >=dev-libs/libxml2-2.6.8 )
- xml? ( >=dev-libs/libxml2-2.6.8 )
- xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
- xmlreader? ( >=dev-libs/libxml2-2.6.8 )
- xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? (
- x11-libs/libXpm
- virtual/jpeg:0
- media-libs/libpng:0= sys-libs/zlib
- )
- xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
- zip? ( sys-libs/zlib )
- zlib? ( sys-libs/zlib )
- virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
- truetype? ( gd )
- vpx? ( gd )
- cjk? ( gd )
- exif? ( gd )
-
- xpm? ( gd )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- wddx? ( xml )
- xmlrpc? ( || ( xml iconv ) )
- xmlreader? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- mhash? ( hash )
- phar? ( hash )
- libmysqlclient? ( || (
- mysql
- mysqli
- pdo
- ) )
-
- qdbm? ( !gdbm )
- readline? ( !libedit )
- recode? ( !imap !mysql !mysqli )
- sharedmem? ( !threads )
-
- !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
- sys-devel/flex
- >=sys-devel/m4-1.4.3
- >=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
- production|development)
- ;;
- *)
- PHP_INI_VERSION="development"
- ;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
- depend.apache_pkg_setup
-}
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
- cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
- dodir "${PHP_INI_DIR#${EPREFIX}}"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" "${PHP_INI_FILE}"
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use_if_iuse opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
-
- if [[ "${sapi}" == "fpm" ]] ; then
- [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
- einfo "Installing FPM CGI config file php-fpm.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
- # Remove bogus /etc/php-fpm.conf.default (bug 359906)
- [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
- fi
-
- # Install PHP ini files into /usr/share/php
-
- dodoc php.ini-development
- dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
- # ([empty session.save_path]/session_mm_[sapi][gid].sem)
- # there is no easy way to circumvent that, all php calls during
- # install use -n, so no php.ini file will be used.
- # As such, this is the easiest way to get around
- addpredict /session_mm_cli250.sem
- addpredict /session_mm_cli0.sem
-
- # Change PHP branding
- # Get the alpha/beta/rc version
- sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
- -i configure.in || die "Unable to change PHP branding"
-
- # Patch PHP to show Gentoo as the server platform
- sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
- -i configure.in || die "Failed to fix server platform name"
-
- # Prevent PHP from activating the Apache config,
- # as we will do that ourselves
- sed -i \
- -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
- -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
- configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
- # Patch PHP to support heimdal instead of mit-krb5
- if has_version "app-crypt/heimdal" ; then
- sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
- || die "Failed to fix heimdal libname"
- sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
- || die "Failed to fix heimdal crypt library reference"
- fi
-
- #Add user patches #357637
- epatch_user
-
- #force rebuilding aclocal.m4
- rm aclocal.m4
- eautoreconf
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # http://bugs.php.net/bug.php?id=48795, bug #343481
- sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
- fi
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # This is a global variable and should be in caps. It isn't because the
- # phpconfutils eclass relies on exactly this name...
- # for --with-libdir see bug #327025
- my_conf="
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}"/man
- --infodir="${PHP_DESTDIR}"/info
- --libdir="${PHP_DESTDIR}"/lib
- --with-libdir=$(get_libdir)
- --without-pear
- $(use_enable threads maintainer-zts)"
-
- # extension USE flag shared
- my_conf+="
- $(use_enable bcmath bcmath )
- $(use_with bzip2 bz2 "${EPREFIX}"/usr)
- $(use_enable calendar calendar )
- $(use_enable ctype ctype )
- $(use_with curl curl "${EPREFIX}"/usr)
- $(use_enable xml dom )
- $(use_with enchant enchant "${EPREFIX}"/usr)
- $(use_enable exif exif )
- $(use_enable fileinfo fileinfo )
- $(use_enable filter filter )
- $(use_enable ftp ftp )
- $(use_with nls gettext "${EPREFIX}"/usr)
- $(use_with gmp gmp "${EPREFIX}"/usr)
- $(use_enable hash hash )
- $(use_with mhash mhash "${EPREFIX}"/usr)
- $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
- $(use_enable intl intl )
- $(use_enable ipv6 ipv6 )
- $(use_enable json json )
- $(use_with kerberos kerberos "${EPREFIX}"/usr)
- $(use_enable xml libxml )
- $(use_with xml libxml-dir "${EPREFIX}"/usr)
- $(use_enable unicode mbstring )
- $(use_with crypt mcrypt "${EPREFIX}"/usr)
- $(use_with mssql mssql "${EPREFIX}"/usr)
- $(use_with unicode onig "${EPREFIX}"/usr)
- $(use_with ssl openssl "${EPREFIX}"/usr)
- $(use_with ssl openssl-dir "${EPREFIX}"/usr)
- $(use_enable pcntl pcntl )
- $(use_enable phar phar )
- $(use_enable pdo pdo )
- $(use_enable opcache opcache )
- $(use_with postgres pgsql "${EPREFIX}"/usr)
- $(use_enable posix posix )
- $(use_with spell pspell "${EPREFIX}"/usr)
- $(use_with recode recode "${EPREFIX}"/usr)
- $(use_enable simplexml simplexml )
- $(use_enable sharedmem shmop )
- $(use_with snmp snmp "${EPREFIX}"/usr)
- $(use_enable soap soap )
- $(use_enable sockets sockets )
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr)
- $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
- $(use_enable sysvipc sysvmsg )
- $(use_enable sysvipc sysvsem )
- $(use_enable sysvipc sysvshm )
- $(use_with systemd fpm-systemd)
- $(use_with tidy tidy "${EPREFIX}"/usr)
- $(use_enable tokenizer tokenizer )
- $(use_enable wddx wddx )
- $(use_enable xml xml )
- $(use_enable xmlreader xmlreader )
- $(use_enable xmlwriter xmlwriter )
- $(use_with xmlrpc xmlrpc)
- $(use_with xslt xsl "${EPREFIX}"/usr)
- $(use_enable zip zip )
- $(use_with zlib zlib "${EPREFIX}"/usr)
- $(use_enable debug debug )"
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm ; then
- my_conf="${my_conf} --enable-dba${shared}"
- fi
-
- # DBA drivers support
- my_conf+="
- $(use_with cdb cdb)
- $(use_with berkdb db4 ${EPREFIX}/usr)
- $(use_enable flatfile flatfile )
- $(use_with gdbm gdbm ${EPREFIX}/usr)
- $(use_enable inifile inifile )
- $(use_with qdbm qdbm ${EPREFIX}/usr)"
-
- # Support for the GD graphics library
- my_conf+="
- $(use_with truetype freetype-dir ${EPREFIX}/usr)
- $(use_with truetype t1lib ${EPREFIX}/usr)
- $(use_enable cjk gd-jis-conv )
- $(use_with gd jpeg-dir ${EPREFIX}/usr)
- $(use_with gd png-dir ${EPREFIX}/usr)
- $(use_with xpm xpm-dir ${EPREFIX}/usr)
- $(use_with vpx vpx-dir ${EPREFIX}/usr)"
- # enable gd last, so configure can pick up the previous settings
- my_conf+="
- $(use_with gd gd)"
-
- # IMAP support
- if use imap ; then
- my_conf+="
- $(use_with imap imap ${EPREFIX}/usr)
- $(use_with ssl imap-ssl ${EPREFIX}/usr)"
- fi
-
- # Interbase/firebird support
-
- if use firebird ; then
- my_conf+="
- $(use_with firebird interbase ${EPREFIX}/usr)"
- fi
-
- # LDAP support
- if use ldap ; then
- my_conf+="
- $(use_with ldap ldap ${EPREFIX}/usr)
- $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
- use libmysqlclient && mysqllib="${EPREFIX}/usr"
- use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
- my_conf+=" $(use_with mysql mysql $mysqllib)"
- my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
- local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
- if use mysql ; then
- my_conf+="${mysqlsock}"
- elif use mysqli ; then
- my_conf+="${mysqlsock}"
- fi
-
- # ODBC support
- if use odbc ; then
- my_conf+="
- $(use_with odbc unixODBC ${EPREFIX}/usr)"
- fi
-
- if use iodbc ; then
- my_conf+="
- $(use_with iodbc iodbc ${EPREFIX}/usr)"
- fi
-
- # Oracle support
- if use oci8-instant-client ; then
- my_conf+="
- $(use_with oci8-instant-client oci8)"
- fi
-
- # PDO support
- if use pdo ; then
- my_conf+="
- $(use_with mssql pdo-dblib )
- $(use_with mysql pdo-mysql ${mysqllib})
- $(use_with postgres pdo-pgsql )
- $(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
- $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
- if use oci8-instant-client ; then
- my_conf+="
- $(use_with oci8-instant-client pdo-oci)"
- fi
- fi
-
- # readline/libedit support
- my_conf+="
- $(use_with readline readline ${EPREFIX}/usr)
- $(use_with libedit libedit ${EPREFIX}/usr)"
-
- # Session support
- if use session ; then
- my_conf+="
- $(use_with sharedmem mm ${EPREFIX}/usr)"
- else
- my_conf+="
- $(use_enable session session )"
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- my_conf="${my_conf} --with-pic"
-
- # we use the system copy of pcre
- # --with-pcre-regex affects ext/pcre
- # --with-pcre-dir affects ext/filter and ext/zip
- my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Support user-passed configuration parameters
- my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- mkdir -p "${WORKDIR}/sapis-build"
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
- cd "${WORKDIR}/sapis-build/${one_sapi}"
-
- sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
- --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --enable-${sapi}"
- else
- sapi_conf="${sapi_conf} --disable-${sapi}"
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
- else
- sapi_conf="${sapi_conf} --without-apxs2"
- fi
- ;;
- esac
- done
-
- econf ${sapi_conf}
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake || die "emake failed"
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi"
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs \
- || die "emake install failed"
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir /usr/share/php${PHP_MV}
-
- local sapi="", file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}"
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}" || die "Unable to install ${sapi} sapi"
- else
- dobin "${source}" || die "Unable to install ${sapi} sapi"
- local name="$(basename ${source})"
- dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use_if_iuse opcache ; then
- dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" \
- "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i \
- "${ED}/etc/env.d/20php${SLOT}"
- sed -e "s|php5|php${SLOT}|g" -i \
- "${ED}/etc/env.d/20php${SLOT}"
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- APACHE2_MOD_DEFINE="PHP5"
- APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php
- apache-module_pkg_postinst
- fi
-
- # Create the symlinks for php
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT}
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
- elog "to compile extensions for the ${SLOT} ABI"
- elog
- if ! use readline && use cli ; then
- ewarn "Note that in order to use php interactivly, you need to enable"
- ewarn "the readline USE flag or php -a will hang"
- fi
- elog
- elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
- elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
- elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
- elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
- elog
- elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
- elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
- elog
-}
-
-pkg_prerm() {
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.6.8.ebuild b/dev-lang/php/php-5.5.27.ebuild
similarity index 99%
rename from dev-lang/php/php-5.6.8.ebuild
rename to dev-lang/php/php-5.5.27.ebuild
index 1f300cbcc8e4..bd20a0eecbb2 100644
--- a/dev-lang/php/php-5.6.8.ebuild
+++ b/dev-lang/php/php-5.5.27.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.8.ebuild,v 1.1 2015/04/18 10:56:15 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.27.ebuild,v 1.1 2015/07/11 10:59:01 olemarkus Exp $
EAPI=5
@@ -308,9 +308,6 @@ src_prepare() {
|| die "Failed to fix heimdal crypt library reference"
fi
- # Fix build with libvpx-1.4.0, bug #545952 .
- epatch "${FILESDIR}/${PN}-libvpx.patch"
-
#Add user patches #357637
epatch_user
diff --git a/dev-lang/php/php-5.6.7.ebuild b/dev-lang/php/php-5.6.11.ebuild
similarity index 99%
rename from dev-lang/php/php-5.6.7.ebuild
rename to dev-lang/php/php-5.6.11.ebuild
index 0b75c0b49526..9d130d7c85f0 100644
--- a/dev-lang/php/php-5.6.7.ebuild
+++ b/dev-lang/php/php-5.6.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.7.ebuild,v 1.4 2015/04/17 04:55:28 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.11.ebuild,v 1.1 2015/07/11 10:59:01 olemarkus Exp $
EAPI=5
@@ -308,9 +308,6 @@ src_prepare() {
|| die "Failed to fix heimdal crypt library reference"
fi
- # Fix build with libvpx-1.4.0, bug #545952 .
- epatch "${FILESDIR}/${PN}-libvpx.patch"
-
#Add user patches #357637
epatch_user
diff --git a/dev-lang/php/php-7.0.0_alpha2.ebuild b/dev-lang/php/php-7.0.0_alpha2.ebuild
deleted file mode 100644
index 6a99231e8b40..000000000000
--- a/dev-lang/php/php-7.0.0_alpha2.ebuild
+++ /dev/null
@@ -1,760 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-7.0.0_alpha2.ebuild,v 1.1 2015/06/29 17:11:51 olemarkus Exp $
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
- case "${1}" in
- "php-pre")
- echo "http://downloads.php.net/~ab/${2}"
- ;;
- "php")
- echo "http://www.php.net/distributions/${2}"
- ;;
- "olemarkus")
- echo "http://dev.gentoo.org/~olemarkus/php/${2}"
- ;;
- "gentoo")
- echo "mirror://gentoo/${2}"
- ;;
- *)
- die "unhandled case in php_get_uri"
- ;;
- esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
- crypt +ctype curl debug
- enchant exif frontbase +fileinfo +filter firebird
- flatfile ftp gd gdbm gmp +hash +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
- mysql mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline recode selinux +session sharedmem
- +simplexml snmp soap sockets spell sqlite ssl
- sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
- >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
- >=dev-libs/libpcre-8.32[unicode]
- apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
- =dev-libs/libmcrypt-2.4 )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( app-text/enchant )
- exif? ( !gd? (
- virtual/jpeg:0
- media-libs/libpng:0=
- sys-libs/zlib
- ) )
- firebird? ( dev-db/firebird )
- gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
- gmp? ( >=dev-libs/gmp-4.1.2 )
- iconv? ( virtual/libiconv )
- imap? ( virtual/imap-c-client[ssl=] )
- intl? ( dev-libs/icu:= )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
- libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( dev-db/postgresql )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline )
- recode? ( app-text/recode )
- sharedmem? ( dev-libs/mm )
- simplexml? ( >=dev-libs/libxml2-2.6.8 )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- soap? ( >=dev-libs/libxml2-2.6.8 )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? ( >=dev-libs/openssl-0.9.7 )
- tidy? ( app-text/htmltidy )
- truetype? (
- =media-libs/freetype-2*
- !gd? (
- virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
- )
- unicode? ( dev-libs/oniguruma )
- vpx? ( media-libs/libvpx )
- wddx? ( >=dev-libs/libxml2-2.6.8 )
- xml? ( >=dev-libs/libxml2-2.6.8 )
- xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
- xmlreader? ( >=dev-libs/libxml2-2.6.8 )
- xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? (
- x11-libs/libXpm
- virtual/jpeg:0
- media-libs/libpng:0= sys-libs/zlib
- )
- xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
- zip? ( sys-libs/zlib )
- zlib? ( sys-libs/zlib )
- virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
- truetype? ( gd )
- vpx? ( gd )
- cjk? ( gd )
- exif? ( gd )
-
- xpm? ( gd )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- wddx? ( xml )
- xmlrpc? ( || ( xml iconv ) )
- xmlreader? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- mhash? ( hash )
- phar? ( hash )
-
- qdbm? ( !gdbm )
- readline? ( !libedit )
- recode? ( !imap !mysqli )
- sharedmem? ( !threads )
-
- mysql? ( || ( mysqli pdo ) )
-
- !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
- sys-devel/flex
- >=sys-devel/m4-1.4.3
- >=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
- production|development)
- ;;
- *)
- PHP_INI_VERSION="development"
- ;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
- depend.apache_pkg_setup
-}
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
- cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
- dodir "${PHP_INI_DIR#${EPREFIX}}"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" "${PHP_INI_FILE}"
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use_if_iuse opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
-
- if [[ "${sapi}" == "fpm" ]] ; then
- [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
- einfo "Installing FPM CGI config file php-fpm.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
- # Remove bogus /etc/php-fpm.conf.default (bug 359906)
- [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
- fi
-
- # Install PHP ini files into /usr/share/php
-
- dodoc php.ini-development
- dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
- # ([empty session.save_path]/session_mm_[sapi][gid].sem)
- # there is no easy way to circumvent that, all php calls during
- # install use -n, so no php.ini file will be used.
- # As such, this is the easiest way to get around
- addpredict /session_mm_cli250.sem
- addpredict /session_mm_cli0.sem
-
- # Change PHP branding
- # Get the alpha/beta/rc version
- sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
- -i configure.in || die "Unable to change PHP branding"
-
- # Patch PHP to show Gentoo as the server platform
- sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
- -i configure.in || die "Failed to fix server platform name"
-
- # Patch PHP to support heimdal instead of mit-krb5
- if has_version "app-crypt/heimdal" ; then
- sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
- || die "Failed to fix heimdal libname"
- sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
- || die "Failed to fix heimdal crypt library reference"
- fi
-
- #Add user patches #357637
- epatch_user
-
- #force rebuilding aclocal.m4
- rm aclocal.m4
- eautoreconf
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # http://bugs.php.net/bug.php?id=48795, bug #343481
- sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
- fi
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # This is a global variable and should be in caps. It isn't because the
- # phpconfutils eclass relies on exactly this name...
- # for --with-libdir see bug #327025
- my_conf="
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}"/man
- --infodir="${PHP_DESTDIR}"/info
- --libdir="${PHP_DESTDIR}"/lib
- --with-libdir=$(get_libdir)
- --without-pear
- $(use_enable threads maintainer-zts)"
-
- # extension USE flag shared
- my_conf+="
- $(use_enable bcmath bcmath )
- $(use_with bzip2 bz2 "${EPREFIX}"/usr)
- $(use_enable calendar calendar )
- $(use_enable ctype ctype )
- $(use_with curl curl "${EPREFIX}"/usr)
- $(use_enable xml dom )
- $(use_with enchant enchant "${EPREFIX}"/usr)
- $(use_enable exif exif )
- $(use_enable fileinfo fileinfo )
- $(use_enable filter filter )
- $(use_enable ftp ftp )
- $(use_with nls gettext "${EPREFIX}"/usr)
- $(use_with gmp gmp "${EPREFIX}"/usr)
- $(use_enable hash hash )
- $(use_with mhash mhash "${EPREFIX}"/usr)
- $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
- $(use_enable intl intl )
- $(use_enable ipv6 ipv6 )
- $(use_enable json json )
- $(use_with kerberos kerberos "${EPREFIX}"/usr)
- $(use_enable xml libxml )
- $(use_with xml libxml-dir "${EPREFIX}"/usr)
- $(use_enable unicode mbstring )
- $(use_with crypt mcrypt "${EPREFIX}"/usr)
- $(use_with unicode onig "${EPREFIX}"/usr)
- $(use_with ssl openssl "${EPREFIX}"/usr)
- $(use_with ssl openssl-dir "${EPREFIX}"/usr)
- $(use_enable pcntl pcntl )
- $(use_enable phar phar )
- $(use_enable pdo pdo )
- $(use_enable opcache opcache )
- $(use_with postgres pgsql "${EPREFIX}"/usr)
- $(use_enable posix posix )
- $(use_with spell pspell "${EPREFIX}"/usr)
- $(use_with recode recode "${EPREFIX}"/usr)
- $(use_enable simplexml simplexml )
- $(use_enable sharedmem shmop )
- $(use_with snmp snmp "${EPREFIX}"/usr)
- $(use_enable soap soap )
- $(use_enable sockets sockets )
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr)
- $(use_enable sysvipc sysvmsg )
- $(use_enable sysvipc sysvsem )
- $(use_enable sysvipc sysvshm )
- $(use_with systemd fpm-systemd)
- $(use_with tidy tidy "${EPREFIX}"/usr)
- $(use_enable tokenizer tokenizer )
- $(use_enable wddx wddx )
- $(use_enable xml xml )
- $(use_enable xmlreader xmlreader )
- $(use_enable xmlwriter xmlwriter )
- $(use_with xmlrpc xmlrpc)
- $(use_with xslt xsl "${EPREFIX}"/usr)
- $(use_enable zip zip )
- $(use_with zlib zlib "${EPREFIX}"/usr)
- $(use_enable debug debug )"
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm ; then
- my_conf="${my_conf} --enable-dba${shared}"
- fi
-
- # DBA drivers support
- my_conf+="
- $(use_with cdb cdb)
- $(use_with berkdb db4 ${EPREFIX}/usr)
- $(use_enable flatfile flatfile )
- $(use_with gdbm gdbm ${EPREFIX}/usr)
- $(use_enable inifile inifile )
- $(use_with qdbm qdbm ${EPREFIX}/usr)"
-
- # Support for the GD graphics library
- my_conf+="
- $(use_with truetype freetype-dir ${EPREFIX}/usr)
- $(use_enable cjk gd-jis-conv )
- $(use_with gd jpeg-dir ${EPREFIX}/usr)
- $(use_with gd png-dir ${EPREFIX}/usr)
- $(use_with xpm xpm-dir ${EPREFIX}/usr)
- $(use_with vpx vpx-dir ${EPREFIX}/usr)"
- # enable gd last, so configure can pick up the previous settings
- my_conf+="
- $(use_with gd gd)"
-
- # IMAP support
- if use imap ; then
- my_conf+="
- $(use_with imap imap ${EPREFIX}/usr)
- $(use_with ssl imap-ssl ${EPREFIX}/usr)"
- fi
-
- # Interbase/firebird support
-
- if use firebird ; then
- my_conf+="
- $(use_with firebird interbase ${EPREFIX}/usr)"
- fi
-
- # LDAP support
- if use ldap ; then
- my_conf+="
- $(use_with ldap ldap ${EPREFIX}/usr)
- $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
-
- my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
- local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
- if use mysql ; then
- my_conf+="${mysqlsock}"
- elif use mysqli ; then
- my_conf+="${mysqlsock}"
- fi
-
- # ODBC support
- if use odbc ; then
- my_conf+="
- $(use_with odbc unixODBC ${EPREFIX}/usr)"
- fi
-
- if use iodbc ; then
- my_conf+="
- $(use_with iodbc iodbc ${EPREFIX}/usr)"
- fi
-
- # Oracle support
- if use oci8-instant-client ; then
- my_conf+="
- $(use_with oci8-instant-client oci8)"
- fi
-
- # PDO support
- if use pdo ; then
- my_conf+="
- $(use_with mysql pdo-mysql ${mysqllib})
- $(use_with postgres pdo-pgsql )
- $(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
- $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
- if use oci8-instant-client ; then
- my_conf+="
- $(use_with oci8-instant-client pdo-oci)"
- fi
- fi
-
- # readline/libedit support
- my_conf+="
- $(use_with readline readline ${EPREFIX}/usr)
- $(use_with libedit libedit ${EPREFIX}/usr)"
-
- # Session support
- if use session ; then
- my_conf+="
- $(use_with sharedmem mm ${EPREFIX}/usr)"
- else
- my_conf+="
- $(use_enable session session )"
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- my_conf="${my_conf} --with-pic"
-
- # we use the system copy of pcre
- # --with-pcre-regex affects ext/pcre
- # --with-pcre-dir affects ext/filter and ext/zip
- my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Support user-passed configuration parameters
- my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- mkdir -p "${WORKDIR}/sapis-build"
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
- cd "${WORKDIR}/sapis-build/${one_sapi}"
-
- sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
- --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --enable-${sapi}"
- else
- sapi_conf="${sapi_conf} --disable-${sapi}"
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
- else
- sapi_conf="${sapi_conf} --without-apxs2"
- fi
- ;;
- esac
- done
-
- econf ${sapi_conf}
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index
- addpredict /var/lib/net-snmp/mib_indexes
-
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake || die "emake failed"
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi"
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs \
- || die "emake install failed"
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir /usr/share/php${PHP_MV}
-
- local sapi="", file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}"
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp${PHP_MV}$(get_libname)" "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}" || die "Unable to install ${sapi} sapi"
- else
- dobin "${source}" || die "Unable to install ${sapi} sapi"
- local name="$(basename ${source})"
- dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use_if_iuse opcache ; then
- dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" \
- "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i \
- "${ED}/etc/env.d/20php${SLOT}"
- sed -e "s|php5|php${SLOT}|g" -i \
- "${ED}/etc/env.d/20php${SLOT}"
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- APACHE2_MOD_DEFINE="PHP5"
- APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php
- apache-module_pkg_postinst
- fi
-
- # Create the symlinks for php
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT}
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
- elog "to compile extensions for the ${SLOT} ABI"
- elog
- if ! use readline && use cli ; then
- ewarn "Note that in order to use php interactivly, you need to enable"
- ewarn "the readline USE flag or php -a will hang"
- fi
- elog
- elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
- elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
- elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
- elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
- elog
- elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
- elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
- elog
-}
-
-pkg_prerm() {
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.0.0_alpha1.ebuild b/dev-lang/php/php-7.0.0_beta1.ebuild
similarity index 99%
rename from dev-lang/php/php-7.0.0_alpha1.ebuild
rename to dev-lang/php/php-7.0.0_beta1.ebuild
index 9857b9c5f3e3..7639768669f5 100644
--- a/dev-lang/php/php-7.0.0_alpha1.ebuild
+++ b/dev-lang/php/php-7.0.0_beta1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-7.0.0_alpha1.ebuild,v 1.2 2015/06/13 09:33:07 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-7.0.0_beta1.ebuild,v 1.1 2015/07/11 11:32:24 olemarkus Exp $
EAPI=5
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 59afa074c0ec..ec7ba8e435ba 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,4 +1,5 @@
DIST libinput-0.13.0.tar.xz 540300 SHA256 6cecaf7fde525f1d81474cbd495ce526d5e34c845d3e9d6f3e2565b7048cc61a SHA512 d07b35cec8d8cd3f75d7f8916fda4723e6a7b94bf457e249ee2b93e9a7c60b9999508d071b8959c7fb3676d13a3b5430c71f2bf579572cab87bcc4e655ab69ab WHIRLPOOL 944a1336d764d6359f65a4d3ac8d3150caf1b0db649a6dea2eaf52fae2b2e14a2ffac8b3de93280115d296c773bb7fc0d6c771e98514f76061fb8814bf0d56ff
DIST libinput-0.18.0.tar.xz 623740 SHA256 64a70f96bab17a22eaf2fd7af17cf83def3388374096c7623be9448f62808cda SHA512 352a941a03942ed486f4d0d1ce09c928b5230bb041f71d6d906307cd208d23071b85f885658e9118cf29a72686dcd76c2c66c1b3291f48745efd40e6e5dfe38b WHIRLPOOL 50a6e2f58ef35746fec615bb61f9859347853f3fbc6044903975668e50f92fa6713a4bf05e6e038ebe5184a7fd496778b6b64d582607b0f183d44404e327587b
+DIST libinput-0.19.0.tar.xz 627800 SHA256 69a97da47ef8fa9debadaa8ee11005b9b5183bd2b87c5aa7827b7c388a5acc5d SHA512 773e59ff0e797c206410f417fcc8cb775dd0e87277a598cf7bacd2f116df1e62de9e99b12b318de0d098ad43882728fa19334ed4e2ae1f8f39bc28c255307c5a WHIRLPOOL adac12649898714306ab59f7af08a7edfdc133bdd9703b7896cde2a771111b60b5a359182698ab9cb46cd8a66dfc3d422bd9a0bceb940a83f9ecfdc9dccbc21d
DIST libinput-0.7.0.tar.xz 440228 SHA256 129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e SHA512 0e03ab7ca98c4574997742b7d8912000fb176d7a3e2c381b7e63139f78455374f8f38284e226fe443d5a524f34be8995317b91fc0190795a97b10af060423b77 WHIRLPOOL 664510fc33cb718b56600553332bb3eb587b3f4a40f81d4a80dd218882aba204522bcbbfab98f3ae0c6447d3a39cc98b9d88aea5f8e3c21da0803b93d64ad321
DIST libinput-0.9.0.tar.xz 510512 SHA256 309043976f41f5451c2a4b1c25bc2993b18aecb22524d797f21eb6b6c968ff0d SHA512 a6f718215428eda45ac00c25d0b62ada84bf924822cb66e0a9b28f4cfc36e7d1678f2dfb47afae16ce4c277d589adcf97aefe8e2e5a154873b649fe4a84527a1 WHIRLPOOL 23da6dbcd7b17000cea641e0931db8a9b2ad34b0655e4e31b0419ff4799adc59d2646b10316e073ad49695ebd652c150abf05c39d15c735ecb1d97f6f8c1d8de
diff --git a/dev-libs/libinput/libinput-0.19.0.ebuild b/dev-libs/libinput/libinput-0.19.0.ebuild
new file mode 100644
index 000000000000..e979a5450b35
--- /dev/null
+++ b/dev-libs/libinput/libinput-0.19.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libinput/libinput-0.19.0.ebuild,v 1.1 2015/07/11 16:07:24 mrueg Exp $
+
+EAPI=5
+
+inherit eutils udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/libevdev-0.4
+ >=sys-libs/mtdev-1.1
+ virtual/libudev
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+# test? (
+# >=dev-libs/check-0.9.10
+# dev-util/valgrind
+# sys-libs/libunwind )
+
+src_configure() {
+ # Doc handling in kinda strange but everything
+ # is available in the tarball already.
+ sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
+ -i Makefile.am Makefile.in || die
+}
+
+src_configure() {
+ # gui can be built but will not be installed
+ # building documentation silently fails with graphviz syntax errors
+ econf \
+ --disable-documentation \
+ --disable-event-gui \
+ $(use_enable test tests) \
+ --with-udev-dir="$(get_udevdir)"
+}
+
+src_install() {
+ emake install DESTDIR="${D}"
+ dodoc -r doc/html
+ prune_libtool_files
+}
diff --git a/dev-libs/rasqal/rasqal-0.9.32.ebuild b/dev-libs/rasqal/rasqal-0.9.32.ebuild
index fb16fe801f80..5f54e3a30e9b 100644
--- a/dev-libs/rasqal/rasqal-0.9.32.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/rasqal/rasqal-0.9.32.ebuild,v 1.1 2014/10/21 04:45:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/rasqal/rasqal-0.9.32.ebuild,v 1.2 2015/07/11 16:54:25 klausman Exp $
EAPI=5
inherit eutils libtool
@@ -11,7 +11,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
RDEPEND=">=media-libs/raptor-2.0.14
diff --git a/dev-php/pecl-memcache/pecl-memcache-3.0.8-r1.ebuild b/dev-php/pecl-memcache/pecl-memcache-3.0.8-r1.ebuild
index b3bd57347898..73a51cee4b5f 100644
--- a/dev-php/pecl-memcache/pecl-memcache-3.0.8-r1.ebuild
+++ b/dev-php/pecl-memcache/pecl-memcache-3.0.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcache/pecl-memcache-3.0.8-r1.ebuild,v 1.5 2015/06/09 07:07:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcache/pecl-memcache-3.0.8-r1.ebuild,v 1.6 2015/07/11 11:54:20 jer Exp $
EAPI="5"
PHP_EXT_NAME="memcache"
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php5-5 php5-4"
inherit php-ext-pecl-r2
-KEYWORDS="amd64 ~hppa ~ppc64 x86"
+KEYWORDS="amd64 hppa ppc64 x86"
DESCRIPTION="PHP extension for using memcached"
LICENSE="PHP-3"
diff --git a/dev-python/cffi/cffi-0.8.6.ebuild b/dev-python/cffi/cffi-0.8.6.ebuild
index 6374d09ca45a..8d1fdb72185f 100644
--- a/dev-python/cffi/cffi-0.8.6.ebuild
+++ b/dev-python/cffi/cffi-0.8.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.8.6.ebuild,v 1.12 2015/04/04 19:39:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.8.6.ebuild,v 1.13 2015/07/11 13:48:32 klausman Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="doc"
RDEPEND="virtual/libffi
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild
index aa00f2ca8c8a..df679475fcaf 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild,v 1.5 2015/04/04 19:42:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.6.1.ebuild,v 1.6 2015/07/11 13:49:22 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/cryptography-0.6.1.ebuild b/dev-python/cryptography/cryptography-0.6.1.ebuild
index 851ae855b434..4942c36b27af 100644
--- a/dev-python/cryptography/cryptography-0.6.1.ebuild
+++ b/dev-python/cryptography/cryptography-0.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.6.1.ebuild,v 1.9 2015/05/16 14:15:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.6.1.ebuild,v 1.10 2015/07/11 13:47:55 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-python/enum34/enum34-1.0.4.ebuild b/dev-python/enum34/enum34-1.0.4.ebuild
index 0cecb705b229..005ee7cdf4e6 100644
--- a/dev-python/enum34/enum34-1.0.4.ebuild
+++ b/dev-python/enum34/enum34-1.0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enum34/enum34-1.0.4.ebuild,v 1.13 2015/05/16 14:04:15 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enum34/enum34-1.0.4.ebuild,v 1.14 2015/07/11 13:48:52 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3} pypy pypy3 ) # Do NOT add python3_4—see DESCRIPTION
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="doc"
DEPEND=""
diff --git a/dev-python/iso8601/iso8601-0.1.10.ebuild b/dev-python/iso8601/iso8601-0.1.10.ebuild
index 79b9b4ebbca4..bca019c8a233 100644
--- a/dev-python/iso8601/iso8601-0.1.10.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/iso8601/iso8601-0.1.10.ebuild,v 1.16 2015/04/04 19:57:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/iso8601/iso8601-0.1.10.ebuild,v 1.17 2015/07/11 13:49:01 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/ply/ply-3.4-r1.ebuild b/dev-python/ply/ply-3.4-r1.ebuild
index 5ff19bf93227..50d0d268705a 100644
--- a/dev-python/ply/ply-3.4-r1.ebuild
+++ b/dev-python/ply/ply-3.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ply-3.4-r1.ebuild,v 1.22 2015/04/04 19:38:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ply-3.4-r1.ebuild,v 1.23 2015/07/11 13:48:11 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="http://www.dabeaz.com/ply/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="examples"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pretend/pretend-1.0.8.ebuild b/dev-python/pretend/pretend-1.0.8.ebuild
index 198f141a8875..f1d74c3aea62 100644
--- a/dev-python/pretend/pretend-1.0.8.ebuild
+++ b/dev-python/pretend/pretend-1.0.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pretend/pretend-1.0.8.ebuild,v 1.11 2015/04/08 08:05:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pretend/pretend-1.0.8.ebuild,v 1.12 2015/07/11 13:49:11 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycparser/pycparser-2.10.ebuild b/dev-python/pycparser/pycparser-2.10.ebuild
index 642be6203c9f..39b4c667dd1b 100644
--- a/dev-python/pycparser/pycparser-2.10.ebuild
+++ b/dev-python/pycparser/pycparser-2.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycparser/pycparser-2.10.ebuild,v 1.22 2015/04/04 19:38:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycparser/pycparser-2.10.ebuild,v 1.23 2015/07/11 13:48:22 klausman Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyopenssl/pyopenssl-0.14.ebuild b/dev-python/pyopenssl/pyopenssl-0.14.ebuild
index 6e67785eaaaa..6377262761e4 100644
--- a/dev-python/pyopenssl/pyopenssl-0.14.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.14.ebuild,v 1.20 2015/04/04 19:59:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.14.ebuild,v 1.21 2015/07/11 13:48:43 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="doc examples"
RDEPEND="
diff --git a/dev-python/pyquery/pyquery-1.2.9.ebuild b/dev-python/pyquery/pyquery-1.2.9.ebuild
index 6cb1cfacbcca..5a024406ec24 100644
--- a/dev-python/pyquery/pyquery-1.2.9.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyquery/pyquery-1.2.9.ebuild,v 1.10 2015/05/31 11:07:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyquery/pyquery-1.2.9.ebuild,v 1.11 2015/07/11 14:58:12 klausman Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 x86"
IUSE="beautifulsoup3 test"
RDEPEND=">=dev-python/lxml-2.1[beautifulsoup3?,${PYTHON_USEDEP}]
diff --git a/dev-ruby/arel/Manifest b/dev-ruby/arel/Manifest
index 2fcb2cb71bca..3e198053f31d 100644
--- a/dev-ruby/arel/Manifest
+++ b/dev-ruby/arel/Manifest
@@ -3,3 +3,4 @@ DIST arel-3.0.3.gem 48128 SHA256 c0006e2169deee3b8cc2d258296388822eeb2db59832450
DIST arel-4.0.2.gem 52736 SHA256 eddf4c7794df8ba2673e0d0f35e3f7b064f346c6f5be098a36e293e5c9c53a26 SHA512 dd7293388d99115c0511c9ece52adeb0fb0f9fbf5178d42e7fa54e1d2de4ef8ee0dae11be605851276591e540225fd96c9f50773e2a475db198c12bcb0bda8f5 WHIRLPOOL bf0c550b77efaff501bbea9eb3312aadfb0838d0e6e0c8f3bf2019d2499618bf5cbe2f4b754778b659d20db788f61d2158af3867282b50285fd73bfa2daeccf7
DIST arel-5.0.1.20140414130214.gem 52224 SHA256 c941f07bad89af26e8837c73d8a399b7777c721609f759eda015ed0081601636 SHA512 9f4c768712492ef8f7a938d89ce9c54c4e7c7ec2ff53ee52d5d12f0cefd7960895049f112b772864d034a4419acab91511173ddaab70a9f3d4027899af150011 WHIRLPOOL ebfae83108a1049dff2cdeb697c1c0514baa2ebdfbc0d885e586240397b33af8be8181268017a759fab9b7655992abceed844d80b91f8d85f8e9dfca98c3bc32
DIST arel-6.0.0.tar.gz 51889 SHA256 9670d35a23a906c3f1f83b976df149fb3fbb7c6df0b82e446fade60ac5e58d3a SHA512 c638a8dd782abe11061f21f23188ea8af506ff6f76889fdc65874c71dd163c2c44bd908ba8571eeb569f6953f42afa2aae8974b0aa6158c4fc2623492b7d2b0a WHIRLPOOL 9347e130147ecf3d89df292b51c7b4a0022689c56ab254fa05091ff03ddffcb700ae7a1028de58eaff2c67075fbf203d11ca26852890d8d24cc9b4830340c906
+DIST arel-6.0.2.tar.gz 51951 SHA256 5bb34a5dd4257a6f05b31f565db9c370df302f053ac42a63ea3f997fe8c593a3 SHA512 b7ad77a32b88296a2fe7b52ffbcfb2d5e7deb32c2dd02286a3c25563a565d323efa82a38047515f6e5bd9f99b5476f5aaeb2198f8213f5bb818dcf041817de90 WHIRLPOOL c27b868404e8dcee11ac24b5bed05052e8ab16b66eba0379a319e2a13f40b5f008994fbad599099e112a72fe2c54d157e8445ed0f27b9a089971e5bf769b0b8c
diff --git a/dev-ruby/arel/arel-6.0.2.ebuild b/dev-ruby/arel/arel-6.0.2.ebuild
new file mode 100644
index 000000000000..d8ed0d9af06b
--- /dev/null
+++ b/dev-ruby/arel/arel-6.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/arel/arel-6.0.2.ebuild,v 1.1 2015/07/11 17:58:27 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.txt README.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="arel.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Arel is a Relational Algebra for Ruby"
+HOMEPAGE="http://github.com/rails/arel"
+SRC_URI="https://github.com/rails/arel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/test-unit:2
+ >=dev-ruby/minitest-5.4:5
+ )"
+
+all_ruby_prepare() {
+ sed -i -e "/[Bb]undler/d" Rakefile || die
+}
diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index 41d3013c97f2..e293656200df 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -2,3 +2,4 @@ DIST sass-3.2.19.gem 261632 SHA256 ddcd7d76d98daa8f3ebbaec196972500a6cf6e854f9c3
DIST sass-3.3.14.gem 315392 SHA256 95435ddef3aee817ef727e3576852e9cb12f7020027c9f2da8a3835f16ec46c1 SHA512 816c3aa7869648b51708a6a3bb14598dffdbb6335db7800ddb789c3f325f58822e2f3031f25f036eca2aabdd5ce8da1507ce58a75d0edcda17b7ae7a3484f39a WHIRLPOOL 544f2cfceff59872737dc9c564be5a328212c714bfbe78fb954511e5a70ad43cf80eac556026b13ea3fc48943d331925d8d2e7bc8954614e0a1b63e42648581e
DIST sass-3.4.14.gem 336384 SHA256 f33dd19fb5f85991b6bac1903aabbce2f8c7bfebb69bbd5b23faa016af795574 SHA512 f7a1395c1ab43129e5f27eb8bc932ecd82e4ed2ef12792b3cbd10a96c1abd6658e8ddf2f314632c6d67d89f22e7c3dd8a73d1c328b264c897a9124264a0b31d5 WHIRLPOOL d8244c1f328b864fe3e9bd23837f8a1d87ce76f70ed461ee9cbe181cdf1af8b9eb31e7938fd57de835db9a427c2113a357663b38d0d606e18eefbbf650bba7d8
DIST sass-3.4.15.gem 336896 SHA256 6b461a469d29ec80b52b1401b5e5d58c48762a8f3e00f3b0b2d37b6791a87a59 SHA512 9a6db0d6bdcb788b850e47fb61c5b803e156178eecce7b0c7d0edd2a3578405fa6dc88d397051d738b8bf52c70b6457618afbaf14b5b6fb4bf5f43f057229d0b WHIRLPOOL c3691b0eae97f5b7f4ef1398b99e3702ac32d1894308f9c0ccd2c81a2d30c812e9b775b96d8898ea1941ad11de7f378cf988d38cac6fd8c4e32e678ddedcbaef
+DIST sass-3.4.16.gem 337408 SHA256 5e0ec434e4a3004ac2c164dcdbb40c38e0aae0c8f38d4e914fc5a4b89dfd0d13 SHA512 b704e5ceede5312da13027c0e1c226dea01f7cb5e4b57956fca68d5891b77f06e7c690ae6ae5a15876686f6d5b2f748fb3fb4879c28bc24d2ee7ddc8cfa09614 WHIRLPOOL 085c819fc1e544a0834ee1a0bbcc4683e594b7dfe2d07a64a299065714e5291a77ec2cc8b19bffb4b4c9a6f68fe65c88724dbb45167f238a8ed4fb648e73e2c8
diff --git a/dev-ruby/sass/sass-3.4.16.ebuild b/dev-ruby/sass/sass-3.4.16.ebuild
new file mode 100644
index 000000000000..a1b0544bcee0
--- /dev/null
+++ b/dev-ruby/sass/sass-3.4.16.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/sass-3.4.16.ebuild,v 1.1 2015/07/11 15:36:59 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_NAME"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, selector inheritance, and more"
+HOMEPAGE="http://sass-lang.com/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+SLOT="$(get_version_component_range 1-2)"
+IUSE=""
+
+ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"
+
+ruby_add_rdepend ">=dev-ruby/listen-1.3.1:1 !!
+Date: Tue, 17 Mar 2015 23:33:57 +0000
+Subject: [PATCH] Make 3.2.1 fix: make thread check platform specific.
+
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8847614..c881c32 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -109,6 +109,8 @@ IF(APPLE)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7")
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
+ ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++ find_package(Threads REQUIRED)
++
+ set(USE_DBUS_DEFAULT 1)
+
+ find_package(UDev)
+@@ -230,7 +232,6 @@ endif(EVENT_INPUT)
+ # check required dependencies
+ find_package(Boost REQUIRED)
+ find_package(ZLIB REQUIRED)
+-find_package(Threads REQUIRED)
+ find_package(OpenGL REQUIRED)
+ find_package(OpenAL REQUIRED)
+ find_package(OpenSceneGraph 3.2.0 REQUIRED
diff --git a/games-simulation/flightgear/files/0002-flightgear-3.4.0-cmake.patch b/games-simulation/flightgear/files/0002-flightgear-3.4.0-cmake.patch
new file mode 100644
index 000000000000..2151acdbbcf4
--- /dev/null
+++ b/games-simulation/flightgear/files/0002-flightgear-3.4.0-cmake.patch
@@ -0,0 +1,54 @@
+From 14405fe2e397b9a6ab9b004cb8c7459eeb41ec59 Mon Sep 17 00:00:00 2001
+From: "Rebecca N. Palmer"
+Date: Fri, 3 Apr 2015 19:15:52 +0100
+Subject: [PATCH] Fix compile with CMake 3.2.1, by Kevin Seroux
+
+Explicitly link X11, as this no longer comes with OpenGL
+---
+ CMakeLists.txt | 1 +
+ src/Main/CMakeLists.txt | 4 +++-
+ utils/fgviewer/CMakeLists.txt | 4 ++++
+ 3 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c881c32..c443f58 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,6 +110,7 @@ IF(APPLE)
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
+ ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ find_package(Threads REQUIRED)
++ find_package(X11 REQUIRED)
+
+ set(USE_DBUS_DEFAULT 1)
+
+diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
+index 949b379..4b6926e 100644
+--- a/src/Main/CMakeLists.txt
++++ b/src/Main/CMakeLists.txt
+@@ -130,7 +130,9 @@ endif()
+ if (CRASHRPT_FOUND)
+ target_link_libraries(fgfs ${CRASHRPT_LIBRARY})
+ endif()
+-
++if(X11_FOUND)
++ target_link_libraries(fgfs ${X11_LIBRARIES})
++endif()
+ target_link_libraries(fgfs
+ ${SQLITE3_LIBRARY}
+ ${SIMGEAR_LIBRARIES}
+diff --git a/utils/fgviewer/CMakeLists.txt b/utils/fgviewer/CMakeLists.txt
+index 165be74..bfc52ad 100644
+--- a/utils/fgviewer/CMakeLists.txt
++++ b/utils/fgviewer/CMakeLists.txt
+@@ -42,6 +42,10 @@ else()
+ endif()
+
+ add_executable(fgviewer ${FGVIEWER_SOURCES} ${FGVIEWER_RTI_SOURCES})
++if(X11_FOUND)
++ target_link_libraries(fgviewer ${X11_LIBRARIES})
++endif()
++
+ target_link_libraries(fgviewer
+ ${SIMGEAR_LIBRARIES}
+ ${OPENSCENEGRAPH_LIBRARIES}
diff --git a/games-simulation/flightgear/flightgear-3.4.0.ebuild b/games-simulation/flightgear/flightgear-3.4.0.ebuild
index cc123e643611..405038025f0b 100644
--- a/games-simulation/flightgear/flightgear-3.4.0.ebuild
+++ b/games-simulation/flightgear/flightgear-3.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-3.4.0.ebuild,v 1.4 2015/04/19 10:15:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-3.4.0.ebuild,v 1.5 2015/07/11 15:08:35 reavertm Exp $
EAPI=5
@@ -45,6 +45,11 @@ RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
+PATCHES=(
+ "${FILESDIR}/0001-${P}-cmake.patch"
+ "${FILESDIR}/0002-${P}-cmake.patch"
+)
+
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
src_configure() {
diff --git a/java-virtuals/jms/jms-1.1.ebuild b/java-virtuals/jms/jms-1.1.ebuild
index 37bb834a007d..5a941e33c970 100644
--- a/java-virtuals/jms/jms-1.1.ebuild
+++ b/java-virtuals/jms/jms-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jms/jms-1.1.ebuild,v 1.12 2014/12/02 14:30:17 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/jms/jms-1.1.ebuild,v 1.13 2015/07/11 09:23:49 chewi Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND=""
diff --git a/java-virtuals/servlet-api/servlet-api-2.2.ebuild b/java-virtuals/servlet-api/servlet-api-2.2.ebuild
index 1769ba03a50e..f6a2d48e99e9 100644
--- a/java-virtuals/servlet-api/servlet-api-2.2.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.2.ebuild,v 1.17 2014/12/02 14:27:10 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.2.ebuild,v 1.18 2015/07/11 09:24:04 chewi Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="${PV}"
-KEYWORDS="amd64 ~ia64 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"
IUSE=""
RDEPEND="dev-java/tomcat-servlet-api:${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-2.3.ebuild b/java-virtuals/servlet-api/servlet-api-2.3.ebuild
index 49edb9c36382..16394c6f73f7 100644
--- a/java-virtuals/servlet-api/servlet-api-2.3.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.3.ebuild,v 1.19 2014/12/02 14:27:10 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.3.ebuild,v 1.20 2015/07/11 09:24:04 chewi Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="${PV}"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS=" amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-java/tomcat-servlet-api:${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-2.4.ebuild b/java-virtuals/servlet-api/servlet-api-2.4.ebuild
index 143604df89de..b67f7b221be4 100644
--- a/java-virtuals/servlet-api/servlet-api-2.4.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.4.ebuild,v 1.14 2014/12/02 14:27:10 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.4.ebuild,v 1.15 2015/07/11 09:24:04 chewi Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="|| (
diff --git a/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild b/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild
index 5ae86a79bdca..5a1de5f8f5f3 100644
--- a/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild,v 1.10 2013/06/27 21:39:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild,v 1.11 2015/07/11 09:24:04 chewi Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE=""
RDEPEND="|| (
diff --git a/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild b/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild
index 715782e78003..405cb27d875a 100644
--- a/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild,v 1.8 2013/06/27 21:39:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild,v 1.9 2015/07/11 09:24:04 chewi Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="${PV}"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS=" amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND="|| (
diff --git a/kde-base/akonadiconsole/Manifest b/kde-base/akonadiconsole/Manifest
index b9e8128fcee4..c5cdc062f3a3 100644
--- a/kde-base/akonadiconsole/Manifest
+++ b/kde-base/akonadiconsole/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.14.10.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.14.10.ebuild
new file mode 100644
index 000000000000..316e75743944
--- /dev/null
+++ b/kde-base/akonadiconsole/akonadiconsole-4.14.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/akonadiconsole-4.14.10.ebuild,v 1.1 2015/07/11 11:49:27 johu Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="Akonadi developer console"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ >=app-office/akonadi-server-1.12.90
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+ akonadi_next/
+ calendarsupport/
+ messageviewer/
+"
diff --git a/kde-base/akregator/Manifest b/kde-base/akregator/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/akregator/Manifest
+++ b/kde-base/akregator/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/akregator/akregator-4.14.10.ebuild b/kde-base/akregator/akregator-4.14.10.ebuild
new file mode 100644
index 000000000000..be5be826a45d
--- /dev/null
+++ b/kde-base/akregator/akregator-4.14.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.14.10.ebuild,v 1.1 2015/07/11 11:49:26 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="KDE news feed aggregator"
+HOMEPAGE="http://www.kde.org/applications/internet/akregator"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/blogilo/Manifest b/kde-base/blogilo/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/blogilo/Manifest
+++ b/kde-base/blogilo/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/blogilo/blogilo-4.14.10.ebuild b/kde-base/blogilo/blogilo-4.14.10.ebuild
new file mode 100644
index 000000000000..f173e9e1423a
--- /dev/null
+++ b/kde-base/blogilo/blogilo-4.14.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.14.10.ebuild,v 1.1 2015/07/11 11:49:28 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="KDE Blogging Client"
+HOMEPAGE="http://www.kde.org/applications/internet/blogilo"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdebase_dep kdepim-common-libs)
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ >=net-libs/libkgapi-2.2.0:4
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+ composereditor-ng/
+ pimcommon/
+"
diff --git a/kde-base/calendarjanitor/Manifest b/kde-base/calendarjanitor/Manifest
index b9e8128fcee4..c5cdc062f3a3 100644
--- a/kde-base/calendarjanitor/Manifest
+++ b/kde-base/calendarjanitor/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/calendarjanitor/calendarjanitor-4.14.10.ebuild b/kde-base/calendarjanitor/calendarjanitor-4.14.10.ebuild
new file mode 100644
index 000000000000..5269555d9051
--- /dev/null
+++ b/kde-base/calendarjanitor/calendarjanitor-4.14.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/calendarjanitor/calendarjanitor-4.14.10.ebuild,v 1.1 2015/07/11 11:49:27 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="A tool to scan calendar data for buggy instances"
+HOMEPAGE="http://www.kde.org/"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdebase_dep kdepim-common-libs)
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+ calendarsupport/
+"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kabcclient/Manifest b/kde-base/kabcclient/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/kabcclient/Manifest
+++ b/kde-base/kabcclient/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/kabcclient/kabcclient-4.14.10.ebuild b/kde-base/kabcclient/kabcclient-4.14.10.ebuild
new file mode 100644
index 000000000000..ae35c885a1dc
--- /dev/null
+++ b/kde-base/kabcclient/kabcclient-4.14.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/kabcclient-4.14.10.ebuild,v 1.1 2015/07/11 11:49:27 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="A command line client for accessing the KDE addressbook"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ kde4-meta_src_install
+
+ # work around NULL DT_RPATH in kabc2mutt
+ dosym kabcclient ${PREFIX}/bin/kabc2mutt
+}
diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-base/kaddressbook/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/kaddressbook/kaddressbook-4.14.10.ebuild b/kde-base/kaddressbook/kaddressbook-4.14.10.ebuild
new file mode 100644
index 000000000000..d579a87b1914
--- /dev/null
+++ b/kde-base/kaddressbook/kaddressbook-4.14.10.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.14.10.ebuild,v 1.1 2015/07/11 11:49:27 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="The KDE Address Book"
+HOMEPAGE="http://www.kde.org/applications/office/kaddressbook/"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdebase_dep kdepim-common-libs)
+ dev-libs/grantlee:0
+ !kde-base/contactthemeeditor
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="
+ grantleeeditor/contactthemeeditor
+ plugins/kaddressbook/
+ plugins/ktexteditor/
+"
+KMCOMPILEONLY="
+ grantleetheme/
+ kaddressbookgrantlee/
+"
+KMEXTRACTONLY="
+ akonadi_next/
+ calendarsupport/
+ grantleeeditor/grantleethemeeditor/
+ libkleo/
+ pimcommon/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+
+ if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+ echo
+ elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+ echo
+ fi
+}
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/kalarm/Manifest
+++ b/kde-base/kalarm/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/kalarm/kalarm-4.14.10.ebuild b/kde-base/kalarm/kalarm-4.14.10.ebuild
new file mode 100644
index 000000000000..2dd2f4a79af4
--- /dev/null
+++ b/kde-base/kalarm/kalarm-4.14.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.14.10.ebuild,v 1.1 2015/07/11 11:49:27 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
+HOMEPAGE+=" http://userbase.kde.org/KAlarm"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdebase_dep kdepim-common-libs)
+ media-libs/phonon[qt4]
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+KMEXTRACTONLY="
+ kmail/
+"
diff --git a/kde-base/kdepim-common-libs/Manifest b/kde-base/kdepim-common-libs/Manifest
index b9e8128fcee4..c5cdc062f3a3 100644
--- a/kde-base/kdepim-common-libs/Manifest
+++ b/kde-base/kdepim-common-libs/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/kdepim-common-libs/files/kdepim-common-libs-install-headers.patch b/kde-base/kdepim-common-libs/files/kdepim-common-libs-install-headers.patch
new file mode 100644
index 000000000000..f0037beac4cd
--- /dev/null
+++ b/kde-base/kdepim-common-libs/files/kdepim-common-libs-install-headers.patch
@@ -0,0 +1,86 @@
+Install headers needed by Kopete's cryptography plugin.
+
+Patch borrowed from Fedora.
+
+diff --git a/libkleo/CMakeLists.txt b/libkleo/CMakeLists.txt
+index 84e660f..bfb92f8 100644
+--- a/libkleo/CMakeLists.txt
++++ b/libkleo/CMakeLists.txt
+@@ -124,3 +124,61 @@ install ( FILES libkleopatrarc-win32.desktop DESTINATION ${CONFIG_INSTALL_DIR} R
+ else ()
+ install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc )
+ endif ()
++
++install( FILES
++ kleo/kleo_export.h
++ kleo/enum.h
++ kleo/oidmap.h
++ kleo/cryptobackend.h
++ kleo/cryptobackendfactory.h
++ kleo/cryptoconfig.h
++ kleo/dn.h
++ kleo/job.h
++ kleo/keylistjob.h
++ kleo/keygenerationjob.h
++ kleo/abstractimportjob.h
++ kleo/importjob.h
++ kleo/importfromkeyserverjob.h
++ kleo/exportjob.h
++ kleo/changeexpiryjob.h
++ kleo/changeownertrustjob.h
++ kleo/downloadjob.h
++ kleo/deletejob.h
++ kleo/encryptjob.h
++ kleo/decryptjob.h
++ kleo/signjob.h
++ kleo/specialjob.h
++ kleo/verifydetachedjob.h
++ kleo/verifyopaquejob.h
++ kleo/decryptverifyjob.h
++ kleo/signencryptjob.h
++ kleo/signkeyjob.h
++ kleo/adduseridjob.h
++ kleo/refreshkeysjob.h
++ kleo/multideletejob.h
++ kleo/hierarchicalkeylistjob.h
++ kleo/keyfilter.h
++ kleo/keyfiltermanager.h
++ kleo/changepasswdjob.h
++ kleo/checksumdefinition.h
++ kleo/exception.h
++ kleo/kconfigbasedkeyfilter.h
++ kleo/listallkeysjob.h
++ kleo/stl_util.h
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel)
++
++install ( FILES
++ ui/kdhorizontalline.h
++ ui/messagebox.h
++ ui/progressbar.h
++ ui/progressdialog.h
++ ui/keylistview.h
++ ui/keyselectiondialog.h
++ ui/keyrequester.h
++ ui/keyapprovaldialog.h
++ ui/dnattributeorderconfigwidget.h
++ ui/cryptoconfigmodule.h
++ ui/cryptoconfigdialog.h
++ ui/directoryserviceswidget.h
++ ui/filenamerequester.h
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel)
+diff --git a/libkpgp/CMakeLists.txt b/libkpgp/CMakeLists.txt
+index 4be58ba..de868ad 100644
+--- a/libkpgp/CMakeLists.txt
++++ b/libkpgp/CMakeLists.txt
+@@ -35,3 +35,11 @@ add_subdirectory( tests )
+ install(FILES kconf_update/kpgp.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
+ install(PROGRAMS kconf_update/kpgp-3.1-upgrade-address-data.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
+
++install(FILES
++ kpgp.h
++ kpgpbase.h
++ kpgpblock.h
++ kpgpkey.h
++ kpgpui.h
++ libkpgp_export.h
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kpgp COMPONENT Devel )
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild
new file mode 100644
index 000000000000..79816cd4bdc3
--- /dev/null
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild,v 1.1 2015/07/11 11:49:26 johu Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="Common libraries for KDE PIM apps"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug google"
+
+DEPEND="
+ app-crypt/gpgme
+ >=app-office/akonadi-server-1.12.90
+ dev-libs/grantlee:0
+ $(add_kdebase_dep baloo '' 4.14.3)
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ google? ( net-libs/libkgapi:4 )
+"
+RDEPEND="${DEPEND}
+ !kde-base/akonadi:4
+ !kde-base/libkdepim:4
+ !kde-base/libkleo:4
+ !kde-base/libkpgp:4
+ !
-kde
+ kde
+
diff --git a/kde-base/kdepim-icons/Manifest b/kde-base/kdepim-icons/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/kdepim-icons/Manifest
+++ b/kde-base/kdepim-icons/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.14.10.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.14.10.ebuild
new file mode 100644
index 000000000000..ab570747faa7
--- /dev/null
+++ b/kde-base/kdepim-icons/kdepim-icons-4.14.10.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/kdepim-icons-4.14.10.ebuild,v 1.1 2015/07/11 11:49:26 johu Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+KMMODULE="icons"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM icons"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="$(add_kdebase_dep kdepimlibs 'akonadi(+)')"
+RDEPEND=""
diff --git a/kde-base/kdepim-kresources/Manifest b/kde-base/kdepim-kresources/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/kdepim-kresources/Manifest
+++ b/kde-base/kdepim-kresources/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.14.10.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.14.10.ebuild
new file mode 100644
index 000000000000..d3ce65eb4e76
--- /dev/null
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.14.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-4.14.10.ebuild,v 1.1 2015/07/11 11:49:27 johu Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+KMMODULE="kresources"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM groupware plugin collection"
+IUSE="debug"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+ kmail/
+ knotes/
+ korganizer/version.h
+"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild
new file mode 100644
index 000000000000..52ce868329db
--- /dev/null
+++ b/kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild,v 1.1 2015/07/11 11:49:28 johu Exp $
+
+EAPI=5
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
+HOMEPAGE+=" http://community.kde.org/KDE_PIM"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+RDEPEND="
+ $(add_kdebase_dep akonadiconsole)
+ $(add_kdebase_dep akregator)
+ $(add_kdebase_dep blogilo)
+ $(add_kdebase_dep calendarjanitor)
+ $(add_kdebase_dep kabcclient)
+ $(add_kdebase_dep kaddressbook)
+ $(add_kdebase_dep kalarm)
+ $(add_kdebase_dep kdepim-icons)
+ $(add_kdebase_dep kdepim-kresources)
+ $(add_kdebase_dep kdepim-runtime)
+ $(add_kdebase_dep kjots)
+ $(add_kdebase_dep kleopatra)
+ $(add_kdebase_dep kmail)
+ $(add_kdebase_dep knode)
+ $(add_kdebase_dep knotes)
+ $(add_kdebase_dep konsolekalendar)
+ $(add_kdebase_dep kontact)
+ $(add_kdebase_dep korganizer)
+ $(add_kdebase_dep ktimetracker)
+ $(add_kdebase_dep ktnef)
+ nls? ( || (
+ (
+ $(add_kdeapps_dep kde4-l10n '' 15.04.0)
+ )
+ (
+ $(add_kdeapps_dep kde4-l10n '' 4.14.3)
+ $(add_kdebase_dep kdepim-l10n '' 4.14.3)
+ )
+ ) )
+"
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index 7257cc48ded4..ec55eef8fe6b 100644
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-runtime-4.14.10.tar.xz 1175432 SHA256 d68d1e3278646c3e82c7913dd443b5e10c887fb983fad7d24b26916ed4afcd52 SHA512 599cf08ee7c4bfcc2dcde7d146c5c889663a463e59e4e4773e6b1cee909d02914fce414afe473a127d484b5daa2fa9332dcef8092c3b953cdbebc87663e70577 WHIRLPOOL c40c44f266716f7136c253904e7ee65c6e40de40df458608cc4a1f7e02ada5b17febe4611e7693ef48c63201577ca21866b82005849bdd2409dfd1415d9ba251
DIST kdepim-runtime-4.14.3.tar.xz 1168856 SHA256 2d8fe881c86b74015e3aa44df042110f8fc21156b5e596f93229435e58aab50f SHA512 1594c63d52111c5bcd923e733cf4e90e60791f332b5500454738df29a8dc6cd8ac3afea497471b5f81cbb9c290cc478d20815d2a38fdcf1b8319d7112385d849 WHIRLPOOL db8e25a40f835a5efa61730ceeace0913ccefed12754a06e36beb88b80bb0fef1465b89fb0a6b01b8f4af3cdedb5e3352246a8938f38501580c67a46b3073123
DIST kdepim-runtime-4.14.6.tar.xz 1174356 SHA256 2a89c9b53dd740537a010222e1029265872b8b6787c53a3efd4e1470bc7bdcca SHA512 febd9d01c57b1bebe1d5997d76905b3580170cff741d7c7ac0facc914e4edb2909206664ab0849d05ff90be68f62592ad5474ee3cc3ee2b0db9083661a499305 WHIRLPOOL 66899cc989f0092155806e25be2d9b49c61193db0a53390e4ed9a72d01a1baf1c5356ed560c46f4c3f5abdd079b6bac5fd3c06cfc07fa9fa6a64d6ee3cad0429
DIST kdepim-runtime-4.14.8.tar.xz 1173688 SHA256 1f4c82629947d7f1f796f1faf6333c861f908f1a02d9ae26a2adcfa698aa34b1 SHA512 378d59077493b9483ced85b7dd035ac792c1f5351f85a42459516f86028c8372f6304e6d36d6c4d33bb299847cc7650299e59afd7b100e755702943841f7f013 WHIRLPOOL e6554d278461e4324d28890c39ed083369eb89db64be9ac7270510e0e0f0c82a24ac7fd49a62567dae2168611a409f990bdd504e574493b90761378f3c1e7798
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.14.10.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.14.10.ebuild
new file mode 100644
index 000000000000..f08b89ab431d
--- /dev/null
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.14.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.14.10.ebuild,v 1.1 2015/07/11 11:49:27 johu Exp $
+
+EAPI=5
+
+KMNAME="kdepim-runtime"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-base
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug facebook google kolab"
+
+RESTRICT="test"
+# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
+
+DEPEND="
+ >=app-office/akonadi-server-1.12.90
+ dev-libs/boost:=
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ x11-misc/shared-mime-info
+ facebook? ( net-libs/libkfbapi )
+ google? ( >=net-libs/libkgapi-2.0:4 )
+ kolab? ( >=net-libs/libkolab-0.5 )
+"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep kdepim-icons)
+ !kde-misc/akonadi-google
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package facebook LibKFbAPI)
+ $(cmake-utils_use_find_package google LibKGAPI2)
+ $(cmake-utils_use_find_package kolab Libkolab)
+ $(cmake-utils_use_find_package kolab Libkolabxml)
+ )
+
+ kde4-base_src_configure
+}
diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index c8b5d44a03b9..5c3985b5c5a7 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -1,3 +1,4 @@
+DIST kdepimlibs-4.14.10.tar.xz 2831160 SHA256 c8cc9694add6ecf121bda050235ffa68d8307a82c85fbdffe69a8eab5be584c2 SHA512 64f396957ae1f70a19ba689fabc0850aed04e4e4bce58a4bbc27af2b5cfa27b50472614b4096d8424ee6b4463faaed37d98e6cccfe36d208e9193ba20dc6766a WHIRLPOOL b9123e702f5d4f696cd09d3e7932dbc796f4d8e09feace56a49a96ddb64478bf8cd237bcac9c438d77491822cd655f3f44b76e657f6dbb09b8deb96ab90da52a
DIST kdepimlibs-4.14.3.tar.xz 2790888 SHA256 65edb1bec191be1b6f8450dc71eadae734f4ab0585aab0a885207390399868d7 SHA512 0106f3b03cb7541f54fe568276ca3e5c5d14da244b8b1e73a9a34ca1b1f3b6d2ce3922cb499d79fca53f27429c84f1fcb1472fa3b9df80531cd1542825aa27d7 WHIRLPOOL 79a7b59aa67e06a94804dcbd9ee3807ce66ba5f1641620afa1d38cba453251189bd9cefe8efb26e33fdaa68a94af3b956527a47688783077f75165a3548ce13e
DIST kdepimlibs-4.14.6.tar.xz 2830364 SHA256 70ed1a31e36eac03d4ec2b247852c3b708552517f54fa98e88390badc4ebd60d SHA512 de0eab2f3ba0998d2f6e93b1a433babdf1b8b99aea1b801bc12d572afcf2ffe67fef5a491e9c3300269cf98be5b239ea39a890bb4642e3c8bcfc30b0f5005872 WHIRLPOOL a2be247cffd2c7fa2975802638c0a4790401ad4f25d98751e5f09c2dbe8ff86e6b6d78b9c843921f01e89de97e4cb537a7637acd7713fab34cf36c4435741c3b
DIST kdepimlibs-4.14.8.tar.xz 2832092 SHA256 8208e7fcd9751c244b6454d29f93d41efc9f41dca9dcf350b029d537fc524214 SHA512 49bd845d085bbf1279dbaf25663f151ce10e82d0823e00d44643bf41ea678bbc9792969b6a165789984476a15cb215a95c25ac3e7d4cf3f76228c63a0766e81b WHIRLPOOL 495a828ebd34f529f8bfd07eb1dbbaa1a9fd7c7d2ffece4750edfc6f66f30f812bae17479dfbc03de993a7b61b8de9823fd0c7226a4e3319ead7448a41e3a0ed
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.14.10.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.14.10.ebuild
new file mode 100644
index 000000000000..3bb45619d1eb
--- /dev/null
+++ b/kde-base/kdepimlibs/kdepimlibs-4.14.10.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.14.10.ebuild,v 1.1 2015/07/11 11:49:26 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap prison"
+
+# some akonadi tests timeout, that probaly needs more work as its ~700 tests
+RESTRICT="test"
+
+DEPEND="
+ !kde-misc/akonadi-social-utils
+ >=app-crypt/gpgme-1.1.6
+ >=app-office/akonadi-server-1.12.90[qt4]
+ >=dev-libs/boost-1.35.0-r5:=
+ dev-libs/libgpg-error
+ >=dev-libs/libical-0.48-r2:=
+ dev-libs/cyrus-sasl
+ >=dev-libs/qjson-0.8.1
+ media-libs/phonon[qt4]
+ x11-misc/shared-mime-info
+ prison? ( media-libs/prison:4 )
+ ldap? ( net-nds/openldap )
+"
+# boost is not linked to, but headers which include it are installed
+# bug #418071
+RDEPEND="${DEPEND}
+ !=kde-base/kdepim-runtime-4.10*
+ !=kde-base/kdepim-runtime-4.11*
+ !=app-crypt/gpgme-1.3.2
+ dev-libs/boost:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}
+ app-crypt/gnupg
+"
+
+KMEXTRACTONLY="
+ libkleo/
+"
+
+PATCHES=( "${FILESDIR}/${PN}-install-headers.patch" )
+
+src_unpack() {
+ if use handbook; then
+ KMEXTRA="
+ doc/kwatchgnupg
+ "
+ fi
+
+ kde4-meta_src_unpack
+}
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/kmail/kmail-4.14.10.ebuild b/kde-base/kmail/kmail-4.14.10.ebuild
new file mode 100644
index 000000000000..6391844c6e0f
--- /dev/null
+++ b/kde-base/kmail/kmail-4.14.10.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.14.10.ebuild,v 1.1 2015/07/11 11:49:28 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE"
+HOMEPAGE="http://www.kde.org/applications/internet/kmail/"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdebase_dep korganizer)
+ $(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="
+ ${DEPEND}
+ !=kde-base/kdepim-common-libs-4.12.1-r1
+"
+
+RESTRICT="test"
+# bug 393147
+
+KMEXTRACTONLY="
+ agents/folderarchiveagent.desktop
+ agents/sendlateragent/
+ akonadi_next/
+ calendarviews/
+ grantleeeditor/grantleethemeeditor/
+ kdgantt2/
+ korganizer/
+ kresources/
+ libkdepimdbusinterfaces/
+ libkleo/
+ libkpgp/
+"
+KMCOMPILEONLY="
+ calendarsupport/
+ grantleetheme/
+ incidenceeditor-ng/
+ kaddressbookgrantlee/
+ mailcommon/
+ mailimporter/
+ messagecomposer/
+ messagecore/
+ messagelist/
+ messageviewer/
+ mailcommon/
+ mailimporter/
+ noteshared/
+ pimcommon/
+ templateparser/
+"
+KMEXTRA="
+ agents/archivemailagent/
+ agents/followupreminderagent/
+ agents/mailfilteragent/
+ grantleeeditor/headerthemeeditor/
+ importwizard/
+ kmailcvt/
+ ksendemail/
+ libksieve/
+ mboximporter/
+ pimsettingexporter/
+ plugins/messageviewer/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_configure() {
+ # Bug 308903
+ use ppc64 && append-flags -mminimal-toc
+
+ kde4-meta_src_configure
+}
+
+src_compile() {
+ kde4-meta_src_compile kmail_xml
+ kde4-meta_src_compile
+}
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+
+ if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+ echo
+ elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+ echo
+ fi
+ if ! has_version kde-base/kleopatra:${SLOT}; then
+ echo
+ elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+ echo
+ fi
+
+ if has_version "app-office/akonadi-server[sqlite]"; then
+ ewarn
+ ewarn "We strongly recommend you set your Akonadi database backend to QMYSQL in your"
+ ewarn "user configuration. This is the backend recommended by KDE upstream."
+ ewarn "Reports indicate that kde-base/kmail-4.10 does not work properly with the sqlite"
+ ewarn "backend anymore."
+ if has_version "app-office/akonadi-server[-mysql]"; then
+ ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD app-office/akonadi-server WITH mysql USEFLAG ENABLED."
+ fi
+ ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+ ewarn
+ fi
+}
diff --git a/kde-base/knode/Manifest b/kde-base/knode/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/knode/Manifest
+++ b/kde-base/knode/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/knode/knode-4.14.10.ebuild b/kde-base/knode/knode-4.14.10.ebuild
new file mode 100644
index 000000000000..305743ef4925
--- /dev/null
+++ b/kde-base/knode/knode-4.14.10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.14.10.ebuild,v 1.1 2015/07/11 11:49:27 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="A newsreader for KDE"
+HOMEPAGE="http://www.kde.org/applications/internet/knode/"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# test fails, last checked for 4.2.96
+RESTRICT=test
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdebase_dep kdepim-common-libs "" 4.12.1-r1)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+ agents/
+ libkleo/
+ libkpgp/
+ messagecomposer/
+ messageviewer/
+ messagecore/
+"
+KMCOMPILEONLY="
+ grantleetheme/
+ kaddressbookgrantlee/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_unpack() {
+ if use handbook; then
+ KMEXTRA="
+ doc/kioslave/news
+ "
+ fi
+
+ kde4-meta_src_unpack
+}
diff --git a/kde-base/knotes/Manifest b/kde-base/knotes/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/knotes/Manifest
+++ b/kde-base/knotes/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/knotes/knotes-4.14.10.ebuild b/kde-base/knotes/knotes-4.14.10.ebuild
new file mode 100644
index 000000000000..3b24ddcd72fc
--- /dev/null
+++ b/kde-base/knotes/knotes-4.14.10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.14.10.ebuild,v 1.1 2015/07/11 11:49:28 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="KDE Notes application"
+HOMEPAGE="http://www.kde.org/applications/utilities/knotes/"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMCOMPILEONLY="
+ noteshared/
+"
+
+KMEXTRACTONLY="
+ akonadi_next/
+ pimcommon/
+"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/konsolekalendar/Manifest b/kde-base/konsolekalendar/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/konsolekalendar/Manifest
+++ b/kde-base/konsolekalendar/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.14.10.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.14.10.ebuild
new file mode 100644
index 000000000000..87a03a38d69c
--- /dev/null
+++ b/kde-base/konsolekalendar/konsolekalendar-4.14.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-4.14.10.ebuild,v 1.1 2015/07/11 11:49:27 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="A command line interface to KDE calendars"
+HOMEPAGE+=" http://userbase.kde.org/KonsoleKalendar"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMCOMPILEONLY="
+ calendarsupport/
+ grantleetheme/
+ incidenceeditor-ng/
+ kaddressbookgrantlee/
+ mailcommon/
+ messagecore/
+ messageviewer/
+ pimcommon/
+ templateparser/
+"
+KMEXTRACTONLY="
+ akonadi_next/
+ agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
+ calendarviews/
+ kdgantt2/
+ korganizer/data/org.kde.Korganizer.Calendar.xml
+ mailimporter/
+ messagecomposer/
+ libkdepimdbusinterfaces/
+ libkleo/
+ libkpgp/
+"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kontact/Manifest b/kde-base/kontact/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/kontact/Manifest
+++ b/kde-base/kontact/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/kontact/kontact-4.14.10.ebuild b/kde-base/kontact/kontact-4.14.10.ebuild
new file mode 100644
index 000000000000..2e43251bfe7a
--- /dev/null
+++ b/kde-base/kontact/kontact-4.14.10.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.14.10.ebuild,v 1.1 2015/07/11 11:49:27 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="KDE personal information manager"
+HOMEPAGE="http://www.kde.org/applications/office/kontact/"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
+KMSAVELIBS="true"
+
+# We remove plugins that are related to external kdepim programs. This way
+# kontact doesn't have to depend on all programs it has plugins for.
+# kcontactmanager gone from kdesvn
+#
+KMEXTRACTONLY="
+ kontact/plugins/akregator/
+ kontact/plugins/kaddressbook/
+ kontact/plugins/kjots/
+ kontact/plugins/kmail/
+ kontact/plugins/knode/
+ kontact/plugins/knotes/
+ kontact/plugins/korganizer/
+ kontact/plugins/ktimetracker/
+ kontact/plugins/planner/
+ kontact/plugins/specialdates/
+ libkdepimdbusinterfaces/
+"
+
+src_unpack() {
+ if use handbook; then
+ KMEXTRA+="
+ doc/kontact-admin/
+ "
+ fi
+
+ kde4-meta_src_unpack
+}
diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/korganizer/Manifest
+++ b/kde-base/korganizer/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/korganizer/files/korganizer-4.14.10-handbook.patch b/kde-base/korganizer/files/korganizer-4.14.10-handbook.patch
new file mode 100644
index 000000000000..a365d05c3372
--- /dev/null
+++ b/kde-base/korganizer/files/korganizer-4.14.10-handbook.patch
@@ -0,0 +1,16 @@
+--- a/doc/CMakeLists.txt 2015-06-25 19:47:38.000000000 +0200
++++ b/doc/CMakeLists.txt 2015-07-05 11:50:37.584637940 +0200
+@@ -28,9 +28,10 @@
+
+ if(BUILD_kmail)
+ add_subdirectory(kmail)
+- if(BUILD_korganizer)
+- add_subdirectory(korganizer)
+- endif()
++endif()
++
++if(BUILD_korganizer)
++ add_subdirectory(korganizer)
+ endif()
+
+ if(BUILD_knode)
diff --git a/kde-base/korganizer/korganizer-4.14.10.ebuild b/kde-base/korganizer/korganizer-4.14.10.ebuild
new file mode 100644
index 000000000000..4be167f26830
--- /dev/null
+++ b/kde-base/korganizer/korganizer-4.14.10.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.14.10.ebuild,v 1.1 2015/07/11 11:49:27 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="A Personal Organizer for KDE"
+HOMEPAGE="http://www.kde.org/applications/office/korganizer/"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdebase_dep kdepim-common-libs)
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+ $(add_kdeapps_dep ktimezoned '' 4.14.3)
+"
+
+RESTRICT="test"
+# bug 393135
+
+KMLOADLIBS="kdepim-common-libs"
+
+KMEXTRA="
+ korgac/
+"
+KMEXTRACTONLY="
+ agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
+ akonadi_next/
+ calendarviews/
+ kdgantt2/
+ kmail/
+ knode/org.kde.knode.xml
+ libkdepimdbusinterfaces/
+ libkleo/
+ libkpgp/
+ mailimporter/
+ messagecomposer/
+"
+KMCOMPILEONLY="
+ calendarsupport/
+ grantleetheme/
+ incidenceeditor-ng/
+ kaddressbookgrantlee/
+ mailcommon/
+ messagecore/
+ messageviewer/
+ pimcommon/
+ templateparser/
+"
+
+src_unpack() {
+ if use kontact; then
+ KMEXTRA="${KMEXTRA}
+ kontact/plugins/planner/
+ kontact/plugins/specialdates/
+ "
+ fi
+
+ kde4-meta_src_unpack
+}
+
+src_prepare() {
+ use handbook && epatch "${FILESDIR}/${PN}-4.14.10-handbook.patch"
+
+ kde4-meta_src_prepare
+}
+
+src_install() {
+ kde4-meta_src_install
+ # colliding with kdepim-common-libs
+ rm -rf "${ED}"/usr/share/kde4/servicetypes/calendarplugin.desktop
+ rm -rf "${ED}"/usr/share/kde4/servicetypes/calendardecoration.desktop
+}
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+
+ if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+ echo
+ elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+ echo
+ fi
+}
diff --git a/kde-base/ktimetracker/Manifest b/kde-base/ktimetracker/Manifest
index 1d9bdd6a931b..3fdafa5ece4b 100644
--- a/kde-base/ktimetracker/Manifest
+++ b/kde-base/ktimetracker/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/ktimetracker/ktimetracker-4.14.10.ebuild b/kde-base/ktimetracker/ktimetracker-4.14.10.ebuild
new file mode 100644
index 000000000000..ae98f3759d0c
--- /dev/null
+++ b/kde-base/ktimetracker/ktimetracker-4.14.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.14.10.ebuild,v 1.1 2015/07/11 11:49:28 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="KTimeTracker tracks time spent on various tasks"
+HOEMPAGE="http://www.kde.org/applications/utilities/ktimetracker/"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+ $(add_kdebase_dep kdepim-kresources)
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+ $(add_kdebase_dep kdepim-common-libs)
+ x11-libs/libXScrnSaver
+"
+DEPEND="${RDEPEND}
+ x11-proto/scrnsaverproto
+"
+
+KMEXTRACTONLY="
+ kresources/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_unpack() {
+ if use kontact; then
+ KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
+ fi
+
+ kde4-meta_src_unpack
+}
diff --git a/kde-base/ktnef/Manifest b/kde-base/ktnef/Manifest
index b9e8128fcee4..c5cdc062f3a3 100644
--- a/kde-base/ktnef/Manifest
+++ b/kde-base/ktnef/Manifest
@@ -1,3 +1,4 @@
+DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/ktnef/ktnef-4.14.10.ebuild b/kde-base/ktnef/ktnef-4.14.10.ebuild
new file mode 100644
index 000000000000..6b3ab7a413a6
--- /dev/null
+++ b/kde-base/ktnef/ktnef-4.14.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ktnef-4.14.10.ebuild,v 1.1 2015/07/11 11:49:27 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-meta
+
+DESCRIPTION="A viewer for TNEF attachments"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug"
+
+DEPEND="
+ app-office/akonadi-server
+ $(add_kdebase_dep kdepimlibs 'akonadi(+)')
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+ akonadi/
+"
diff --git a/media-libs/raptor/raptor-2.0.14.ebuild b/media-libs/raptor/raptor-2.0.14.ebuild
index 2665624fca66..537de6626da9 100644
--- a/media-libs/raptor/raptor-2.0.14.ebuild
+++ b/media-libs/raptor/raptor-2.0.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-2.0.14.ebuild,v 1.3 2014/10/21 04:42:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-2.0.14.ebuild,v 1.4 2015/07/11 16:54:41 klausman Exp $
EAPI=5
inherit eutils libtool
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+curl debug json static-libs unicode"
RDEPEND="dev-libs/libxml2
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f58b3a5a6d06..8971cbc1704f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 11 Jul 2015 08:36:52 +0000
+Sat, 11 Jul 2015 18:07:03 +0000
diff --git a/metadata/glsa/glsa-201507-12.xml b/metadata/glsa/glsa-201507-12.xml
index c4cd2db3fe7a..957562bcefd2 100644
--- a/metadata/glsa/glsa-201507-12.xml
+++ b/metadata/glsa/glsa-201507-12.xml
@@ -7,7 +7,7 @@
libcapsinetwork
July 10, 2015
- July 10, 2015: 2
+ July 11, 2015: 2
544324
remote
@@ -39,9 +39,9 @@
We recommend that users unmerge it:
- emerge --unmerge
- ‘net-libs/libcapsinetwork’
-
+
+ # emerge --unmerge "net-libs/libcapsinetwork"
+
CVE-2015-0841
@@ -49,7 +49,7 @@
pinkbyte
-
+
pinkbyte
diff --git a/metadata/glsa/glsa-201507-14.xml b/metadata/glsa/glsa-201507-14.xml
index d2327737347a..042ead72280f 100644
--- a/metadata/glsa/glsa-201507-14.xml
+++ b/metadata/glsa/glsa-201507-14.xml
@@ -8,7 +8,7 @@
oracle-jre oracle-jdk
July 10, 2015
- July 10, 2015: 1
+ July 11, 2015: 2
537214
local, remote
@@ -26,7 +26,9 @@
- Oracle’s Java SE Development Kit and Runtime Environment
+ The Oracle Java Development Kit (JDK) and the Oracle Java Runtime
+ Environment (JRE) provide the Oracle Java platform.
+
Multiple vulnerabilities have been discovered in Oracle JRE/JDK. Please
@@ -43,94 +45,56 @@
There is no workaround at this time.
- All Oracle JRE 8 users should upgrade to the latest stable version:
-
- # emerge --sync
- # emerge --ask --oneshot --verbose
- ">=dev-java/oracle-jre-bin-1.8.0.31
-
-
-
All Oracle JDK 8 users should upgrade to the latest stable version:
-
- # emerge --sync
- # emerge --ask --oneshot --verbose
- ">=dev-java/oracle-jdk-bin-1.8.0.31
-
-
-
All Oracle JRE 7 users should upgrade to the latest version:
-
- # emerge --sync
- # emerge --ask --oneshot --verbose
- ">=dev-java/oracle-jre-bin-1.7.0.76
-
-
-
All Oracle JDK 7 users should upgrade to the latest stable
- version:
- # emerge --sync
- # emerge --ask --oneshot --verbose
- ">=dev-java/oracle-jdk-bin-1.7.0.76
-
-
-
-
- CVE-2014-3566
-
-
- CVE-2014-6549
-
-
- CVE-2014-6585
-
-
- CVE-2014-6587
-
-
- CVE-2014-6591
-
-
- CVE-2014-6593
-
-
- CVE-2014-6601
-
-
- CVE-2015-0383
-
-
- CVE-2015-0395
-
-
- CVE-2015-0400
-
-
- CVE-2015-0403
-
-
- CVE-2015-0406
-
-
- CVE-2015-0407
-
-
- CVE-2015-0408
-
-
- CVE-2015-0410
-
-
- CVE-2015-0412
-
-
- CVE-2015-0413
-
-
- CVE-2015-0421
-
-
-
- BlueKnight
-
-
- stanley
-
-
+ All Oracle JRE 8 users should upgrade to the latest stable version:
+
+
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=dev-java/oracle-jre-bin-1.8.0.31
+
+
+ All Oracle JDK 8 users should upgrade to the latest stable version:
+
+
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=dev-java/oracle-jdk-bin-1.8.0.31
+
+
+ All Oracle JRE 7 users should upgrade to the latest version:
+
+
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=dev-java/oracle-jre-bin-1.7.0.76
+
+
+ All Oracle JDK 7 users should upgrade to the latest stable version:
+
+
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=dev-java/oracle-jdk-bin-1.7.0.76
+
+
+
+ CVE-2014-3566
+ CVE-2014-6549
+ CVE-2014-6585
+ CVE-2014-6587
+ CVE-2014-6591
+ CVE-2014-6593
+ CVE-2014-6601
+ CVE-2015-0383
+ CVE-2015-0395
+ CVE-2015-0400
+ CVE-2015-0403
+ CVE-2015-0406
+ CVE-2015-0407
+ CVE-2015-0408
+ CVE-2015-0410
+ CVE-2015-0412
+ CVE-2015-0413
+ CVE-2015-0421
+
+
+ BlueKnight
+
+ stanley
+
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f58b3a5a6d06..8971cbc1704f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 11 Jul 2015 08:36:52 +0000
+Sat, 11 Jul 2015 18:07:03 +0000
diff --git a/metadata/md5-cache/app-admin/killproc-2.13-r1 b/metadata/md5-cache/app-admin/killproc-2.13-r1
index 9c2b2734cc7e..4d423e1996eb 100644
--- a/metadata/md5-cache/app-admin/killproc-2.13-r1
+++ b/metadata/md5-cache/app-admin/killproc-2.13-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
DESCRIPTION=killproc and assorted tools for boot scripts
EAPI=5
HOMEPAGE=http://ftp.suse.com/pub/projects/init/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=ftp://ftp.suse.com/pub/projects/init/killproc-2.13.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=8076ec9601834a8cb1fa6a1cc4fb4ce4
+_md5_=37052cb1040486a2ae9c64fe79223472
diff --git a/metadata/md5-cache/app-shells/mksh-51 b/metadata/md5-cache/app-shells/mksh-51
new file mode 100644
index 000000000000..4e33f2a22e8e
--- /dev/null
+++ b/metadata/md5-cache/app-shells/mksh-51
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst test
+DEPEND=static? ( dev-libs/klibc )
+DESCRIPTION=MirBSD KSH Shell
+EAPI=5
+HOMEPAGE=http://mirbsd.de/mksh
+IUSE=static
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R51.tgz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
+_md5_=f6a31cb0bc2b2499e94ad8f46513cc1f
diff --git a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3
deleted file mode 100644
index 5424d7c895dc..000000000000
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=virtual/jdk:1.6 test? ( dev-java/junit:0 ) app-arch/unzip java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=The leading SQL relational database engine written in Java
-EAPI=4
-HOMEPAGE=http://hsqldb.org
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos ~x64-solaris ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=BSD GPL-2
-RDEPEND=>=virtual/jre-1.6 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/hsqldb/hsqldb_1_8_1_3.zip
-_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=08b9b00a4bbeae8b1df8e0df4faa8594
diff --git a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
index 33fcf401dce8..53fc6c65f54d 100644
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
+++ b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The leading SQL relational database engine written in Java
EAPI=5
HOMEPAGE=http://hsqldb.org
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD GPL-2
RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/hsqldb/hsqldb_1_8_1_3.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3f448683f64c852ef07506d8d6c7aca3
+_md5_=e5a922f6e13568c976db95aec8ae233e
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2
index 4cbc127319b3..910783b99a4e 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=Apache Ant's optional tasks depending on xalan
EAPI=5
HOMEPAGE=http://ant.apache.org/
IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=dev-java/xalan >=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
_eclasses_=ant-tasks 04c2320a11929b77cb8ac031fcfbf95a eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d11ccfb111176c593d8084d099f92bc1
+_md5_=d9ed97b0f64d3b3ef934d2379ed881c9
diff --git a/metadata/md5-cache/dev-java/ant-core-1.9.2 b/metadata/md5-cache/dev-java/ant-core-1.9.2
index e45749d2d7b4..7e1d44554c6b 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-core-1.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=Java-based build tool similar to 'make' that uses XML configuration
EAPI=5
HOMEPAGE=http://ant.apache.org/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk ) !dev-java/ant-tasks !dev-java/ant-optional >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3d2b36819eafb070dbc8ea805d1e9ab1
+_md5_=6520d8c4163b9b2c9267d483469ae4e0
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.9.2 b/metadata/md5-cache/dev-java/ant-junit-1.9.2
index 978b72a8632d..20426d0f3def 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-junit-1.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=Apache Ant's optional tasks depending on junit
EAPI=5
HOMEPAGE=http://ant.apache.org/
IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=dev-java/junit:4 >=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.5
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
_eclasses_=ant-tasks 04c2320a11929b77cb8ac031fcfbf95a eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ffe5924d1a955af9061e208a19c17628
+_md5_=58add5153110dfd03523e50f182bc363
diff --git a/metadata/md5-cache/dev-java/ant-nodeps-1.9.2 b/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
index c5191f544188..fdcc2947c7dc 100644
--- a/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=Formerly Ant's optional tasks w/o external deps, now compat empty ja
EAPI=5
HOMEPAGE=http://ant.apache.org/
IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
_eclasses_=ant-tasks 04c2320a11929b77cb8ac031fcfbf95a eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=db3ad4febd64a3a18ca4f662427e0ac7
+_md5_=88b6745cbd0fe7ca493dc451473b97b8
diff --git a/metadata/md5-cache/dev-java/ant-owanttask-1.3.2 b/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
index 048c26df1ad0..611c2ec287b8 100644
--- a/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
+++ b/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=ObjectWeb's Ant tasks
EAPI=5
HOMEPAGE=http://monolog.objectweb.org
IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=LGPL-2.1
RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 dev-java/xalan >=dev-java/java-config-2.2.0
SLOT=0
SRC_URI=http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_1.3.2.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=54ab6daf53a9c7baaf7d62a6d1df0e2b
+_md5_=bef76f6226b68ed0076ff5de74bea35a
diff --git a/metadata/md5-cache/dev-java/ant-trax-1.9.2 b/metadata/md5-cache/dev-java/ant-trax-1.9.2
index 326d626065c6..0ca0918a1319 100644
--- a/metadata/md5-cache/dev-java/ant-trax-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-trax-1.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=Apache Ant .jar with optional tasks depending on XML transformer (De
EAPI=5
HOMEPAGE=http://ant.apache.org/
IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
_eclasses_=ant-tasks 04c2320a11929b77cb8ac031fcfbf95a eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ea05039eda6e5a2825ce99b9f1ee9fe6
+_md5_=82421869388f7c81d4e36ac5d62fb6e1
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r2 b/metadata/md5-cache/dev-java/antlr-2.7.7-r2
deleted file mode 100644
index c2ae142de9e7..000000000000
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.3 mono? ( dev-lang/mono ) script? ( !dev-util/pccts ) source? ( app-arch/zip ) >=dev-java/java-config-2.2.0 python? ( =dev-lang/python-2* )
-DESCRIPTION=A parser generator for C++, C#, Java, and Python
-EAPI=3
-HOMEPAGE=http://www.antlr2.org/
-IUSE=doc debug examples mono +cxx +java python script source static-libs elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
-LICENSE=public-domain
-RDEPEND=>=virtual/jdk-1.3 mono? ( dev-lang/mono ) >=dev-java/java-config-2.2.0 python? ( =dev-lang/python-2* )
-SLOT=0
-SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 distutils 92e738ea29389cb3f34778d7a349ac71 eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc mono 203a4295c06155d318bdff9c6b2d5e1c multilib 62927b3db3a589b0806255f3a002d5d3 python 3a270b7b1d1e679847ff0faeac25c5a3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=949d24e3a6602e11edf4127c8b9f1049
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r5 b/metadata/md5-cache/dev-java/antlr-2.7.7-r5
index 9ae6cd0b7205..ce0a67523f3e 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r5
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r5
@@ -4,11 +4,11 @@ DESCRIPTION=A parser generator for C++, C#, Java, and Python
EAPI=5
HOMEPAGE=http://www.antlr2.org/
IUSE=doc debug examples mono +cxx +java python script source static-libs elibc_FreeBSD python_targets_python2_7
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=public-domain
RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=virtual/jdk-1.3 mono? ( dev-lang/mono ) >=dev-java/java-config-2.2.0
REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb base 87f7447ccfc06fd0729ff4684e11e0d6 distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc libtool 52d0e17251d04645ffaa61bfdd858944 mono 203a4295c06155d318bdff9c6b2d5e1c multilib 62927b3db3a589b0806255f3a002d5d3 python-single-r1 351da1aa73960a282591217fb57c1bb8 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6e1679f9f635fccf9762436fd3ba9112
+_md5_=9db0d4d03382566bdc09c1b03c79d112
diff --git a/metadata/md5-cache/dev-java/antlr-3.1.3-r3 b/metadata/md5-cache/dev-java/antlr-3.1.3-r3
index a9af664d7704..3e1f581c2413 100644
--- a/metadata/md5-cache/dev-java/antlr-3.1.3-r3
+++ b/metadata/md5-cache/dev-java/antlr-3.1.3-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A parser generator for C++, C#, Java, and Python
EAPI=2
HOMEPAGE=http://www.antlr.org/
IUSE=gunit elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=>=virtual/jre-1.5 >=dev-java/stringtemplate-3.2:0 >=dev-java/antlr-2.7.7:0[java] gunit? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=3
SRC_URI=http://www.antlr.org/download/antlr-3.1.3.tar.gz mirror://gentoo/antlr-3.1.3-generated.tar.bz2
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3b6633ce7ddfa49a6005ab7c63637509
+_md5_=13fbc48d3d4d387ead679aecafa56618
diff --git a/metadata/md5-cache/dev-java/antlr-4.4 b/metadata/md5-cache/dev-java/antlr-4.4
index 445a5abaf866..c1d9a77d0e96 100644
--- a/metadata/md5-cache/dev-java/antlr-4.4
+++ b/metadata/md5-cache/dev-java/antlr-4.4
@@ -4,10 +4,10 @@ DESCRIPTION=A parser generator for C++, C#, Java, and Python
EAPI=5
HOMEPAGE=http://www.antlr.org/
IUSE=gunit elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=>=dev-java/stringtemplate-3.2:0 gunit? ( dev-java/junit:4 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=4
SRC_URI=https://github.com/antlr/antlr4/archive/4.4.zip http://www.antlr3.org/download/antlr-3.5.2-complete-no-st3.jar http://www.antlr.org/download/antlr-4.3-complete.jar
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ec6241f0d5c2b2b7792cf7791d72625a
+_md5_=e36b16820e079659796cfc089c6de3be
diff --git a/metadata/md5-cache/dev-java/asm-2.0-r1 b/metadata/md5-cache/dev-java/asm-2.0-r1
index 4e5e21de2290..2ba098f4da9d 100644
--- a/metadata/md5-cache/dev-java/asm-2.0-r1
+++ b/metadata/md5-cache/dev-java/asm-2.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Bytecode manipulation framework for Java
EAPI=4
HOMEPAGE=http://asm.objectweb.org
IUSE=doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris
LICENSE=BSD
RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
RESTRICT=test
SLOT=2
SRC_URI=http://download.forge.objectweb.org/asm/asm-2.0.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b57ad437f52b002b10d1e025cb39b1ff
+_md5_=e12fe2441e36a38df75fec1d7be86883
diff --git a/metadata/md5-cache/dev-java/asm-2.2.3-r1 b/metadata/md5-cache/dev-java/asm-2.2.3-r1
index 699dfc90dca2..8dcb9fb00d3d 100644
--- a/metadata/md5-cache/dev-java/asm-2.2.3-r1
+++ b/metadata/md5-cache/dev-java/asm-2.2.3-r1
@@ -3,11 +3,11 @@ DEPEND=>=virtual/jdk-1.4 dev-java/ant-core dev-java/ant-owanttask source? ( app-
DESCRIPTION=Bytecode manipulation framework for Java
HOMEPAGE=http://asm.objectweb.org
IUSE=doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
LICENSE=BSD
RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
RESTRICT=test
SLOT=2.2
SRC_URI=http://download.forge.objectweb.org/asm/asm-2.2.3.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c9a0515a0be2389f6396eb11dcf9001c
+_md5_=2851080bbeabcbdb87567fb6e263620a
diff --git a/metadata/md5-cache/dev-java/asm-3.3.1 b/metadata/md5-cache/dev-java/asm-3.3.1
index 22eb5d85fe0d..ccad81675c43 100644
--- a/metadata/md5-cache/dev-java/asm-3.3.1
+++ b/metadata/md5-cache/dev-java/asm-3.3.1
@@ -3,11 +3,11 @@ DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >
DESCRIPTION=Bytecode manipulation framework for Java
HOMEPAGE=http://asm.objectweb.org
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
RESTRICT=test
SLOT=3
SRC_URI=http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=00e60010675123ac9d4578109559fffc
+_md5_=edb37bde5da483a28feb1e47ff611316
diff --git a/metadata/md5-cache/dev-java/bcel-5.2-r2 b/metadata/md5-cache/dev-java/bcel-5.2-r2
index 86d6f3865e99..63e718411693 100644
--- a/metadata/md5-cache/dev-java/bcel-5.2-r2
+++ b/metadata/md5-cache/dev-java/bcel-5.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=The Byte Code Engineering Library: analyze, create, manipulate Java
EAPI=2
HOMEPAGE=http://commons.apache.org/bcel/
IUSE=-findbugs elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/jakarta/bcel/source/bcel-5.2-src.tar.gz findbugs? ( http://dev.gentoo.org/~fordfrog/distfiles/findbugs-bcel-5.2_p20070531.patch.bz2 )
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=df9ac36d0101fed8fcdc619599385656
+_md5_=7c9ee1f12b1758d78fd22cf3b1971106
diff --git a/metadata/md5-cache/dev-java/bcel-6.0_rc3 b/metadata/md5-cache/dev-java/bcel-6.0_rc3
index aee9939c0f25..7c4879d198f4 100644
--- a/metadata/md5-cache/dev-java/bcel-6.0_rc3
+++ b/metadata/md5-cache/dev-java/bcel-6.0_rc3
@@ -4,10 +4,10 @@ DESCRIPTION=The Byte Code Engineering Library: analyze, create, manipulate Java
EAPI=5
HOMEPAGE=http://commons.apache.org/bcel/
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/apache/commons-bcel/archive/BCEL_6_0_RC3.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-pkg-simple 28dc6c3e6fa8ed51b88360dfd5fee53e java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3699a06287399424912bffc88706f108
+_md5_=457e8f97b71358abefbf8ce404c7045e
diff --git a/metadata/md5-cache/dev-java/dom4j-1.6.1-r5 b/metadata/md5-cache/dev-java/dom4j-1.6.1-r5
deleted file mode 100644
index b0e04f609791..000000000000
--- a/metadata/md5-cache/dev-java/dom4j-1.6.1-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/ant-junit:0 dev-java/xalan:0 dev-java/junitperf:0 ) >=virtual/jre-1.4 dev-java/jaxme:0 dev-java/jsr173:0 >=dev-java/msv-20050627-r2:0 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/relaxng-datatype:0 dev-java/xerces:2 >=dev-java/xsdlib-20050627-r2:0 dev-java/xml-commons-external:1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java library for working with XML
-EAPI=5
-HOMEPAGE=http://dom4j.sourceforge.net/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~ia64
-LICENSE=dom4j
-RDEPEND=>=virtual/jre-1.4 dev-java/jaxme:0 dev-java/jsr173:0 >=dev-java/msv-20050627-r2:0 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/relaxng-datatype:0 dev-java/xerces:2 >=dev-java/xsdlib-20050627-r2:0 dev-java/xml-commons-external:1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=mirror://sourceforge/dom4j/dom4j-1.6.1.tar.gz mirror://gentoo/dom4j-1.6.1-java5.patch.bz2
-_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7f98cc3cd15559410c217cd4e8156a06
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3 b/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
index fc6cebe81242..cdaf55256a36 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
+++ b/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A subset of Eclipse Compiler for Java compiled by gcj, serving as ja
EAPI=5
HOMEPAGE=http://www.eclipse.org/
IUSE=+native elibc_FreeBSD
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
LICENSE=EPL-1.0
RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2.0
SLOT=3.5
SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/ecjsrc-3.5.2.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2de0b07d6b26a78e6435b3bb8df38a97
+_md5_=a83f170450a22f080d7ff7e908f80ea6
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1 b/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
index 86a2fbe2b502..45f2006ab79d 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
+++ b/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A subset of Eclipse Compiler for Java compiled by gcj, serving as ja
EAPI=5
HOMEPAGE=http://www.eclipse.org/
IUSE=+native elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
LICENSE=EPL-1.0
RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2.0
SLOT=3.6
SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.6-201006080911/ecjsrc-3.6.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3be159939de9526a44e4b329b28884c7
+_md5_=8dcd0c5bbff053f9ac0a6a8c7ff2a8d8
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2 b/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
index fc9e003abf79..a6e94585b4dc 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
+++ b/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A subset of Eclipse Compiler for Java compiled by gcj, serving as ja
EAPI=5
HOMEPAGE=http://www.eclipse.org/
IUSE=+native elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
LICENSE=EPL-1.0
RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2.0
SLOT=4.2
SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=967dbb349dc0a2f4a5519253d95688be
+_md5_=ae27070bfcd068782f31341858adc4b5
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-4.4.2 b/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
index 2f60a6b945f0..a7080f7d6f62 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
+++ b/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=A subset of Eclipse Compiler for Java compiled by gcj, serving as ja
EAPI=5
HOMEPAGE=http://www.eclipse.org/
IUSE=+native elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
LICENSE=EPL-1.0
RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2.0
SLOT=4.4
SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bd5ee3b5839c06904682409f04744247
+_md5_=0bb9bf3b36a9687d723e62f0ed0d211c
diff --git a/metadata/md5-cache/dev-java/fop-2.0 b/metadata/md5-cache/dev-java/fop-2.0
index 0452b23552d2..cfffdd531a1c 100644
--- a/metadata/md5-cache/dev-java/fop-2.0
+++ b/metadata/md5-cache/dev-java/fop-2.0
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=2
SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.0-src.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fa6e78479f0fec0ca028a70eea08e355
+_md5_=3828b748253944719d8d2eda26f82d96
diff --git a/metadata/md5-cache/dev-java/gcj-jdk-4.7.3-r1 b/metadata/md5-cache/dev-java/gcj-jdk-4.7.3-r1
deleted file mode 100644
index 83a124dc7953..000000000000
--- a/metadata/md5-cache/dev-java/gcj-jdk-4.7.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prerm setup
-DEPEND=dev-java/ecj-gcj:3.6 dev-lang/perl ~sys-devel/gcc-4.7.3[gcj] X? ( ~sys-devel/gcc-4.7.3[awt] ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-DESCRIPTION=Java wrappers around GCJ
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/
-IUSE=X
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-java/ecj-gcj:3.6 dev-lang/perl ~sys-devel/gcc-4.7.3[gcj] X? ( ~sys-devel/gcc-4.7.3[awt] ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-SLOT=0
-_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa java-vm-2 caa0212cf1c60716fd4b3ab09268be3e multilib 62927b3db3a589b0806255f3a002d5d3 pax-utils dfe060cb70d89757fde5c1ff8405e950 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=88e94c9b044e84aeac71d9bc7d3fefa3
diff --git a/metadata/md5-cache/dev-java/gcj-jdk-4.7.4 b/metadata/md5-cache/dev-java/gcj-jdk-4.7.4
index 8920bc22f73c..ac57338b72e9 100644
--- a/metadata/md5-cache/dev-java/gcj-jdk-4.7.4
+++ b/metadata/md5-cache/dev-java/gcj-jdk-4.7.4
@@ -4,9 +4,9 @@ DESCRIPTION=Java wrappers around GCJ
EAPI=5
HOMEPAGE=http://www.gentoo.org/
IUSE=X
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-linux
LICENSE=GPL-2
RDEPEND=dev-java/ecj-gcj:3.6 dev-lang/perl ~sys-devel/gcc-4.7.4[gcj] X? ( ~sys-devel/gcc-4.7.4[awt] ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
SLOT=0
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa java-vm-2 caa0212cf1c60716fd4b3ab09268be3e multilib 62927b3db3a589b0806255f3a002d5d3 pax-utils dfe060cb70d89757fde5c1ff8405e950 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=71a4009ebdd7557f4e5aab1b584d91e6
+_md5_=99e045ad1208c4a4b078b4eb34e10398
diff --git a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2 b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2
index 85df048eb936..ead9b6c47cb3 100644
--- a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2
+++ b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0
DESCRIPTION=GNU regular expression package for Java
HOMEPAGE=http://www.cacas.org/java/gnu/regexp/
IUSE=doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
LICENSE=LGPL-2.1
RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
SLOT=1
SRC_URI=ftp://ftp.tralfamadore.com/pub/java/gnu.regexp-1.1.4.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f812ec64449bc7722d94a313ad5aa5b3
+_md5_=a1145fc8c965bc2e491fa2e72ef97b4b
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.1 b/metadata/md5-cache/dev-java/hamcrest-core-1.1
index 0828b70f5ff5..39a48db9a6ec 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.1
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.5 >=dev-java/jarjar-0.9 =dev-java/qdox-1.6* >=dev-java/ja
DESCRIPTION=Library of matchers for building test expressions
HOMEPAGE=http://code.google.com/p/hamcrest/
IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos ~x64-solaris
LICENSE=BSD-2
RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5b7cdfaeadf1975d5747a3bec6579c51
+_md5_=70805d202ba45bc3ea12952743a34d9a
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.1 b/metadata/md5-cache/dev-java/hamcrest-generator-1.1
index 0cfe79e686dc..b29d3c655851 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.1
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Code generator for Hamcrest's library of matchers for building test
EAPI=5
HOMEPAGE=http://code.google.com/p/hamcrest/
IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
LICENSE=BSD-2
RDEPEND=>=virtual/jre-1.5 dev-java/qdox:1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e8287e9465e40c31ed43dabf8238248c
+_md5_=9e1a7f1bb1cdfa31770701416fd947e1
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.2 b/metadata/md5-cache/dev-java/hamcrest-generator-1.2
index 048d1988afa6..39d0428862f5 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.2
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Code generator for Hamcrest's library of matchers for building test
EAPI=5
HOMEPAGE=http://code.google.com/p/hamcrest/
IUSE=elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
LICENSE=BSD-2
RDEPEND=>=virtual/jre-1.5 dev-java/qdox:1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1.2
SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.2.tgz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=eeedf4b70eea9cce52f6e17d069119cd
+_md5_=2d9122dbca21e51df9d482461688c26a
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.13.5 b/metadata/md5-cache/dev-java/icedtea-6.1.13.5
index e153a43f55d1..69859add346e 100644
--- a/metadata/md5-cache/dev-java/icedtea-6.1.13.5
+++ b/metadata/md5-cache/dev-java/icedtea-6.1.13.5
@@ -4,11 +4,11 @@ DESCRIPTION=A harness to build OpenJDK using Free Software build tools and depen
EAPI=5
HOMEPAGE=http://icedtea.classpath.org
IUSE=+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux +source systemtap test +webstart elibc_FreeBSD test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
PDEPEND=webstart? ( || ( dev-java/icedtea-web:0 >=dev-java/icedtea-web-1.3.2:6 ) ) nsplugin? ( || ( dev-java/icedtea-web:0[nsplugin] >=dev-java/icedtea-web-1.3.2:6[nsplugin] ) )
RDEPEND=>=media-libs/giflib-4.1.6:= >=media-libs/libpng-1.2:0= >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= >=media-libs/lcms-2.5 javascript? ( dev-java/rhino:1.6 ) kerberos? ( virtual/krb5 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea6 X? ( dev-libs/glib >=media-libs/freetype-2.3.5:2= >=x11-libs/gtk+-2.8:2= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXt media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts !ppc? ( !ppc64? ( media-fonts/lklug ) ) media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 >=dev-java/java-config-2.2.0 app-eselect/eselect-java
SLOT=6
SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.13.5.tar.xz https://java.net/downloads/openjdk6/openjdk-6-src-b32-15_jul_2014.tar.xz http://icedtea.classpath.org/download/drops/cacao/68fe50ac34ec.tar.gz -> icedtea-6.1.13-cacao-68fe50ac34ec.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-6.1.13-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
_eclasses_=check-reqs a7f404bfb16e0a996700c5d3ac4edad3 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc java-vm-2 caa0212cf1c60716fd4b3ab09268be3e multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 pax-utils dfe060cb70d89757fde5c1ff8405e950 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=99fc48ca593f51939113d00f8cc07ab4
+_md5_=378548b3f7c2d7c7785a51f6ab4dde1a
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.4.8 b/metadata/md5-cache/dev-java/icedtea-7.2.4.8
deleted file mode 100644
index 795343e326c6..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-7.2.4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=media-libs/giflib-4.1.6:= >=media-libs/lcms-2.5 >=media-libs/libpng-1.2:0= >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= ) kerberos? ( virtual/krb5 ) >=dev-util/systemtap-1 >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.26 media-libs/fontconfig >=media-libs/freetype-2.3.5:2= >=x11-libs/cairo-1.8.8:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXt >=x11-libs/pango-1.24.5 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:7 dev-java/icedtea-bin:6 dev-java/icedtea:7 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.8.2 dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl virtual/pkgconfig sys-apps/attr sys-apps/lsb-release >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto pax_kernel? ( sys-apps/elfix ) >=dev-java/java-config-2.2.0 >=dev-java/java-config-2.2.0 app-eselect/eselect-java test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
-EAPI=5
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+X +alsa cacao cjk +cups debug doc examples jamvm javascript +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux +source test zero +webstart elibc_FreeBSD test
-KEYWORDS=~amd64 ~ia64 ~x86
-LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
-PDEPEND=webstart? ( || ( dev-java/icedtea-web:0[icedtea7] >=dev-java/icedtea-web-1.3.2:7 ) ) nsplugin? ( || ( dev-java/icedtea-web:0[icedtea7,nsplugin] >=dev-java/icedtea-web-1.3.2:7[nsplugin] ) )
-RDEPEND=>=media-libs/giflib-4.1.6:= >=media-libs/lcms-2.5 >=media-libs/libpng-1.2:0= >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= ) kerberos? ( virtual/krb5 ) >=dev-util/systemtap-1 !dev-java/icedtea:0 X? ( >=net-print/cups-1.2.12 >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.26 media-libs/fontconfig >=media-libs/freetype-2.3.5:2= >=x11-libs/cairo-1.8.8:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXt >=x11-libs/pango-1.24.5 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 >=dev-java/java-config-2.2.0 app-eselect/eselect-java
-SLOT=7
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.4.8.tar.xz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/archive/2b38d8f0e43f.tar.gz -> icedtea-2.4-openjdk-2b38d8f0e43f.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba/archive/58b31c5bf14e.tar.gz -> icedtea-2.4-corba-58b31c5bf14e.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp/archive/95d394340fda.tar.gz -> icedtea-2.4-jaxp-95d394340fda.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws/archive/bce4362b2996.tar.gz -> icedtea-2.4-jaxws-bce4362b2996.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/archive/22d79652f370.tar.gz -> icedtea-2.4-jdk-22d79652f370.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot/archive/6f93cec20d27.tar.gz -> icedtea-2.4-hotspot-6f93cec20d27.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools/archive/43cdaf529543.tar.gz -> icedtea-2.4-langtools-43cdaf529543.tar.gz http://icedtea.classpath.org/download/drops/cacao/e215e36be9fc.tar.gz -> icedtea-2.4-cacao-e215e36be9fc.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz -> icedtea-2.4-jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz
-_eclasses_=check-reqs a7f404bfb16e0a996700c5d3ac4edad3 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc java-vm-2 caa0212cf1c60716fd4b3ab09268be3e multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 pax-utils dfe060cb70d89757fde5c1ff8405e950 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f697fa0c8effda9ce06e97e8e29e5b83
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r2 b/metadata/md5-cache/dev-java/iso-relax-20050331-r2
index 9ee5ad060dc6..57215741698e 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r2
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Interfaces useful for applications which support RELAX Core
EAPI=2
HOMEPAGE=http://iso-relax.sourceforge.net
IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~ia64 ~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=MIT
RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://gentoo/iso-relax-20050331-gentoo.tar.bz2
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c27cba76b70338fa82c1ef2e223795cd
+_md5_=33b921f2f48387d6aabc90718b362d22
diff --git a/metadata/md5-cache/dev-java/jarjar-0.9 b/metadata/md5-cache/dev-java/jarjar-0.9
index d69e70b33471..36c1d8e2b789 100644
--- a/metadata/md5-cache/dev-java/jarjar-0.9
+++ b/metadata/md5-cache/dev-java/jarjar-0.9
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 test? ( dev-java/ant-junit ) app-arch/unzip =dev-java/a
DESCRIPTION=Tool for repackaging third-party jars
HOMEPAGE=http://jarjar.sourceforge.net
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.4 =dev-java/asm-2.0* =dev-java/gnu-regexp-1* >=dev-java/ant-core-1.7.0 dev-java/java-getopt >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1
SRC_URI=mirror://sourceforge/jarjar/jarjar-src-0.9.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b4220a4939c0d7970c0deec1b75086f7
+_md5_=468f6bcdc739f0763ac9ef4032a66098
diff --git a/metadata/md5-cache/dev-java/java-config-2.2.0 b/metadata/md5-cache/dev-java/java-config-2.2.0
index 725ecd9ecdd3..5d23e872ca27 100644
--- a/metadata/md5-cache/dev-java/java-config-2.2.0
+++ b/metadata/md5-cache/dev-java/java-config-2.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Java environment configuration query tool
EAPI=5
HOMEPAGE=http://www.gentoo.org/proj/en/java/
IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
LICENSE=GPL-2
RDEPEND=>=dev-java/java-config-wrapper-0.15 sys-apps/baselayout-java sys-apps/portage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
SLOT=2
SRC_URI=http://dev.gentoo.org/~sera/distfiles/java-config-2.2.0.tar.bz2
_eclasses_=distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=c316806be70263d8db01fcee50c62086
+_md5_=d80a051ae945b32ae7ac950ad84cc2bd
diff --git a/metadata/md5-cache/dev-java/java-config-wrapper-0.16 b/metadata/md5-cache/dev-java/java-config-wrapper-0.16
index d6c9f9325942..2ba1602ea5a0 100644
--- a/metadata/md5-cache/dev-java/java-config-wrapper-0.16
+++ b/metadata/md5-cache/dev-java/java-config-wrapper-0.16
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DEPEND=!=virtual/jdk-1.4 dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java command line option parser
-HOMEPAGE=http://www.urbanophile.com/arenn/hacking/download.html
-IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=ftp://ftp.urbanophile.com/pub/arenn/software/sources/java-getopt-1.0.13.tar.gz
-_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a2fd66f80231d4698bcd06b8f413b08f
diff --git a/metadata/md5-cache/dev-java/java-getopt-1.0.14 b/metadata/md5-cache/dev-java/java-getopt-1.0.14
index f79e8bd277cf..3beff668c5e6 100644
--- a/metadata/md5-cache/dev-java/java-getopt-1.0.14
+++ b/metadata/md5-cache/dev-java/java-getopt-1.0.14
@@ -4,10 +4,10 @@ DESCRIPTION=Java command line option parser
EAPI=5
HOMEPAGE=http://www.urbanophile.com/arenn/hacking/download.html
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=LGPL-2.1
RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1
SRC_URI=http://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.14.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f4caf19553eb77c80c249c1dde1f3ef2
+_md5_=92cef7c03524fbc70c4d71a7f4d11071
diff --git a/metadata/md5-cache/dev-java/javacup-0.10k-r1 b/metadata/md5-cache/dev-java/javacup-0.10k-r1
deleted file mode 100644
index 40fdf062a387..000000000000
--- a/metadata/md5-cache/dev-java/javacup-0.10k-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.3 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0
-DESCRIPTION=CUP Parser Generator for Java
-HOMEPAGE=http://www2.cs.tum.edu/projects/cup/
-IUSE=source elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=http://www.cs.princeton.edu/~appel/modern/java/CUP/java_cup_v10k.tar.gz
-_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ab4cbfb46d394fa6072f91ff34fab1f4
diff --git a/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608 b/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608
index d8bed24378b6..327eb19e80d8 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608
+++ b/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 !userland_BSD? ( >=sys-apps/findutils-4.4 ) >=dev-java/
DESCRIPTION=CUP Parser Generator for Java
HOMEPAGE=http://www2.cs.tum.edu/projects/cup/
IUSE=userland_BSD elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://gentoo/javacup-0.11a_beta20060608.tar.bz2
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=741921e1a6935ff7b7e7b097b8b2d8e7
+_md5_=ea165ac8790bb9a303165cb5e8a5183a
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9 b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
index 8f0fb4942c56..ea8ea7b65fee 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of Gentoo-specific tools for Java
EAPI=5
HOMEPAGE=http://www.gentoo.org/proj/en/java/
IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc ppc64 x86 sparc ~ia64 ~arm ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=GPL-2
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=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/javatoolkit-0.3.0.tar.bz2
_eclasses_=distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=89bb55992440f9efb46cd643bde72a17
+_md5_=eb9617e12ca16bb19bdd456c4f4a01d6
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.1 b/metadata/md5-cache/dev-java/jaxen-1.1.1
index 19fd5d5e4f49..ce3a69be49a7 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.1.1
+++ b/metadata/md5-cache/dev-java/jaxen-1.1.1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 test? ( dev-java/ant-junit =dev-java/junit-3* ) ~dev-ja
DESCRIPTION=A Java XPath Engine
HOMEPAGE=http://jaxen.org/
IUSE=doc source test elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=JDOM
RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0 =dev-java/dom4j-1* dev-java/xom >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1.1
SRC_URI=http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.1-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=00d2c91546b0b6af4d6e8ad8ebee7ea8
+_md5_=8dae68539b2fa33320585ee7f18c5034
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.4 b/metadata/md5-cache/dev-java/jaxen-1.1.4
index ee32bdcc9687..823a033f5cc1 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.1.4
+++ b/metadata/md5-cache/dev-java/jaxen-1.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=A Java XPath Engine
EAPI=5
HOMEPAGE=http://jaxen.codehaus.org/
IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=JDOM
RDEPEND=>=virtual/jre-1.4 dev-java/dom4j:1 dev-java/jdom:1.0 dev-java/xom:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1.1
SRC_URI=http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.4-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f577b2c24f6e9748a1a847c5db0d3ec6
+_md5_=814df7e464ab8083af5e9623f0f0b2f8
diff --git a/metadata/md5-cache/dev-java/jaxme-0.5.2 b/metadata/md5-cache/dev-java/jaxme-0.5.2
index d892989864a6..c23a3ad6e22b 100644
--- a/metadata/md5-cache/dev-java/jaxme-0.5.2
+++ b/metadata/md5-cache/dev-java/jaxme-0.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=JaxMe 2 is an open source implementation of JAXB, the specification
EAPI=2
HOMEPAGE=http://ws.apache.org/jaxme/index.html
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.5 dev-java/antlr:0[java] >=dev-java/xerces-2.7 =dev-java/junit-3.8* >=dev-java/log4j-1.2.8 dev-java/xmldb:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c32ad55c4bab3e375c077fdf20bb7d85
+_md5_=de3feed939a6ef592111de359c9af9b2
diff --git a/metadata/md5-cache/dev-java/jaxme-0.5.2-r1 b/metadata/md5-cache/dev-java/jaxme-0.5.2-r1
index d439fc75f0e5..ef8788850506 100644
--- a/metadata/md5-cache/dev-java/jaxme-0.5.2-r1
+++ b/metadata/md5-cache/dev-java/jaxme-0.5.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=JaxMe 2 is an open source implementation of JAXB, the specification
EAPI=2
HOMEPAGE=http://ws.apache.org/jaxme/index.html
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.5 dev-java/antlr:0[java] >=dev-java/xerces-2.7 =dev-java/junit-3.8* >=dev-java/log4j-1.2.8:0 dev-java/xmldb:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=946aa588fd81bb6ae89662850e6292cd
+_md5_=cc5bbe62286834d9b9ae9eb9aefe5583
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r4 b/metadata/md5-cache/dev-java/jdom-1.0-r4
index c1da8d247b36..d87f017ab5ac 100644
--- a/metadata/md5-cache/dev-java/jdom-1.0-r4
+++ b/metadata/md5-cache/dev-java/jdom-1.0-r4
@@ -3,11 +3,11 @@ DEPEND=>=virtual/jdk-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-
DESCRIPTION=Java API to manipulate XML data
HOMEPAGE=http://www.jdom.org
IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=JDOM
PDEPEND=~dev-java/jdom-jaxen-1.0
RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1.0
SRC_URI=http://www.jdom.org/dist/source/archive/jdom-1.0.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d5eba7c55440382b0b865b6467d30dd4
+_md5_=6fd012a6601121c60bfc9c34b3c6b7f9
diff --git a/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1 b/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
index f60de36d23e7..25b9d7ef6a07 100644
--- a/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
+++ b/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 app-arch/unzip ~dev-java/jdom-1.0 =dev-java/jaxen-1.1*
DESCRIPTION=Jaxen binding for jdom
HOMEPAGE=http://www.jdom.org
IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=JDOM
RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0 =dev-java/jaxen-1.1* dev-java/saxpath >=dev-java/java-config-2.2.0
SLOT=1.0
SRC_URI=http://www.jdom.org/dist/source/jdom-1.0.tar.gz
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=11cb3b453c2c315dbbff093b5e7e63a1
+_md5_=1233ca063c370a9caf58b969e21502b5
diff --git a/metadata/md5-cache/dev-java/jsr173-1.0-r1 b/metadata/md5-cache/dev-java/jsr173-1.0-r1
index cf307393cfcb..20409079fcfb 100644
--- a/metadata/md5-cache/dev-java/jsr173-1.0-r1
+++ b/metadata/md5-cache/dev-java/jsr173-1.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.3 >=virtual/jre-1.3 dev-java/jaxme >=dev-java/java-config
DESCRIPTION=The Streaming API for XML (StAX) is a Java API for parsing and writing XML easily and efficiently
HOMEPAGE=http://dev2dev.bea.com/xml/stax.html
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 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=bea.ri.jsr173
RDEPEND=>=virtual/jre-1.3 dev-java/jaxme >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://ftpna2.bea.com/pub/downloads/jsr173.jar
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cc0075d2b2ba16173ed8a65e0ad2820a
+_md5_=76dc3575ad50437048aecfb2e4fe5a30
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r1 b/metadata/md5-cache/dev-java/junit-3.8.2-r1
index 6b5c3209f34b..0a641e4de590 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r1
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0 source? ( a
DESCRIPTION=Simple framework to write repeatable tests
HOMEPAGE=http://www.junit.org/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=CPL-1.0
RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5c51e9b24d63ab3d271eed2047d37539
+_md5_=4c4e348dd6c9b196b372bae1fa6e891d
diff --git a/metadata/md5-cache/dev-java/junit-4.6 b/metadata/md5-cache/dev-java/junit-4.6
deleted file mode 100644
index 5f72932828cb..000000000000
--- a/metadata/md5-cache/dev-java/junit-4.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=>=virtual/jdk-1.5 userland_GNU? ( >=sys-apps/findutils-4.3 ) app-arch/unzip =dev-java/hamcrest-core-1.1* >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple framework to write repeatable tests
-HOMEPAGE=http://www.junit.org/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=CPL-1.0
-RDEPEND=>=virtual/jre-1.5 =dev-java/hamcrest-core-1.1* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=4
-SRC_URI=mirror://sourceforge/junit/junit4.6.zip
-_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4f8b6c53689a4ff68dc09e97bf054d52
diff --git a/metadata/md5-cache/dev-java/junit-4.8.2-r1 b/metadata/md5-cache/dev-java/junit-4.8.2-r1
deleted file mode 100644
index e168a45f78fb..000000000000
--- a/metadata/md5-cache/dev-java/junit-4.8.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.5 userland_GNU? ( >=sys-apps/findutils-4.3 ) dev-java/hamcrest-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Simple framework to write repeatable tests
-EAPI=3
-HOMEPAGE=http://www.junit.org/
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=CPL-1.0
-RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=4
-SRC_URI=mirror://github/KentBeck/junit/junit4.8.2.zip
-_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a7237c43ee157cabf5d32c1e4c611960
diff --git a/metadata/md5-cache/dev-java/junitperf-1.9.1-r1 b/metadata/md5-cache/dev-java/junitperf-1.9.1-r1
index 0677fdb56118..93cfdc0fa035 100644
--- a/metadata/md5-cache/dev-java/junitperf-1.9.1-r1
+++ b/metadata/md5-cache/dev-java/junitperf-1.9.1-r1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 app-arch/unzip test? ( dev-java/ant-junit ) =dev-java/j
DESCRIPTION=Simple framework to write repeatable tests
HOMEPAGE=http://www.clarkware.com/software/JUnitPerf.html
IUSE=elibc_FreeBSD doc test source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
LICENSE=BSD
RDEPEND=>=virtual/jre-1.4 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://www.clarkware.com/software/junitperf-1.9.1.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f0f049231965cad827c8fe3236c2b749
+_md5_=3a47ef22a139b1ee7109455b3595371a
diff --git a/metadata/md5-cache/dev-java/log4j-1.2.16 b/metadata/md5-cache/dev-java/log4j-1.2.16
index 899aad0a07e6..b004a8497574 100644
--- a/metadata/md5-cache/dev-java/log4j-1.2.16
+++ b/metadata/md5-cache/dev-java/log4j-1.2.16
@@ -4,10 +4,10 @@ DESCRIPTION=A low-overhead robust logging package for Java
EAPI=4
HOMEPAGE=http://logging.apache.org/log4j/
IUSE=doc javamail jms jmx source elibc_FreeBSD doc javamail jms jmx source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.4 javamail? ( java-virtuals/javamail java-virtuals/jaf ) jmx? ( dev-java/sun-jmx:0 ) jms? ( java-virtuals/jms ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/logging/log4j/1.2.16/apache-log4j-1.2.16.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3278c458483236b6b6666ac3f5c5d926
+_md5_=0d4127dd335ee425970c3fa8123475c4
diff --git a/metadata/md5-cache/dev-java/log4j-1.2.17 b/metadata/md5-cache/dev-java/log4j-1.2.17
index 4298db97387e..878b2f9627ff 100644
--- a/metadata/md5-cache/dev-java/log4j-1.2.17
+++ b/metadata/md5-cache/dev-java/log4j-1.2.17
@@ -4,10 +4,10 @@ DESCRIPTION=A low-overhead robust logging package for Java
EAPI=5
HOMEPAGE=http://logging.apache.org/log4j/
IUSE=doc javamail jms jmx source elibc_FreeBSD doc javamail jms jmx source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.6 javamail? ( java-virtuals/javamail java-virtuals/jaf ) jmx? ( dev-java/sun-jmx ) jms? ( java-virtuals/jms ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/logging/log4j/1.2.17/log4j-1.2.17.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f035017dab501f5d46de9775d41c4bf8
+_md5_=613a05eba80cacb8bf5f2056174551d2
diff --git a/metadata/md5-cache/dev-java/msv-20050627-r3 b/metadata/md5-cache/dev-java/msv-20050627-r3
index f95500263d74..0e54d029b90d 100644
--- a/metadata/md5-cache/dev-java/msv-20050627-r3
+++ b/metadata/md5-cache/dev-java/msv-20050627-r3
@@ -4,10 +4,10 @@ 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 ~ia64 ~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-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 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=89c8fde0ef00accb767a09750d2fc6a1
+_md5_=283d446cfc875210fbc98cc6bf15a882
diff --git a/metadata/md5-cache/dev-java/offo-hyphenation-1.2 b/metadata/md5-cache/dev-java/offo-hyphenation-1.2
index d853b2404db6..46560b4ac3fa 100644
--- a/metadata/md5-cache/dev-java/offo-hyphenation-1.2
+++ b/metadata/md5-cache/dev-java/offo-hyphenation-1.2
@@ -3,8 +3,8 @@ DEPEND=app-arch/unzip
DESCRIPTION=Hyphenation patterns for Apache Fop
HOMEPAGE=http://offo.sourceforge.net
IUSE=doc
-KEYWORDS=amd64 ~ia64 ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2 Apache-2.0 LPPL-1.3b TeX
SLOT=0
SRC_URI=mirror://sourceforge/offo/offo-hyphenation_v1.2.zip
-_md5_=6b4f951b3974fc5d6c68c0043f51ea98
+_md5_=4b47d44d0b64b0ca7d4b2660c214cf61
diff --git a/metadata/md5-cache/dev-java/qdox-1.6.3 b/metadata/md5-cache/dev-java/qdox-1.6.3
index a12cc1fddbd5..d5a111125b20 100644
--- a/metadata/md5-cache/dev-java/qdox-1.6.3
+++ b/metadata/md5-cache/dev-java/qdox-1.6.3
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core =dev-java/junit-3.8* >
DESCRIPTION=Parser for extracting class/interface/method definitions
HOMEPAGE=http://qdox.codehaus.org/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.4 dev-java/ant-core =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1.6
SRC_URI=http://repository.codehaus.org/com/thoughtworks/qdox/qdox/1.6.3/qdox-1.6.3-sources.jar
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1fe7d79bedcc367168d73ce96c61eff1
+_md5_=e120f2e2cef2c2aab4b8a4d0df90e082
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1 b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
index ee812ba117fd..8aed0312a79a 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0 source? ( a
DESCRIPTION=Interface between RELAX NG validators and datatype libraries
HOMEPAGE=http://relaxng.org/
IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/relaxng/relaxngDatatype-1.0.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6bb9027aa3dcbcd9dbe4c0e3117caf30
+_md5_=5ef45a2d0aaa02e7bc3b61ebd57df99e
diff --git a/metadata/md5-cache/dev-java/saxpath-1.0-r2 b/metadata/md5-cache/dev-java/saxpath-1.0-r2
index 22b4681a6b87..0116927479f6 100644
--- a/metadata/md5-cache/dev-java/saxpath-1.0-r2
+++ b/metadata/md5-cache/dev-java/saxpath-1.0-r2
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 doc? ( dev-java/ant-trax ) test? ( dev-java/ant-junit )
DESCRIPTION=A Simple API for XPath
HOMEPAGE=http://saxpath.sourceforge.net/
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=JDOM
RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/saxpath/saxpath-1.0.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=517019d41650e251aad910a3f6ba4b59
+_md5_=2dc74ffa8a34c86db6d05f259cb2b265
diff --git a/metadata/md5-cache/dev-java/servletapi-2.4-r5 b/metadata/md5-cache/dev-java/servletapi-2.4-r5
index 9b2abde2b48b..8ed5b8da54f8 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.4-r5
+++ b/metadata/md5-cache/dev-java/servletapi-2.4-r5
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.5 source? ( app-arch/zip ) >=dev-
DESCRIPTION=Servlet API 2.4 from jakarta.apache.org
HOMEPAGE=http://jakarta.apache.org/
IUSE=doc source elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=Apache-1.1
RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0
SLOT=2.4
SRC_URI=http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/src/apache-tomcat-5.5.20-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=499b9859d413525dbd8402a03616d442
+_md5_=c9478d37f013fa5e6c8a3e50de2d58f2
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1
index 25e8d78c1914..a66f216fb042 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=A Java template engine
EAPI=2
HOMEPAGE=http://www.stringtemplate.org/
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=>=virtual/jre-1.5 >=dev-java/antlr-2.7.7:0[java] >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://www.stringtemplate.org/download/stringtemplate-3.2.1.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fefb538cbd317e224652e4945c3c7ef8
+_md5_=9e359fcddc46bce92a8ad4e7f36ff9e7
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-3 b/metadata/md5-cache/dev-java/tomcat-servlet-api-3
index 69254665a732..0abccf430bfb 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-3
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-3
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >
DESCRIPTION=Tomcat's Servlet API 2.2/JSP API 1.2 implementation
HOMEPAGE=http://tomcat.apache.org/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 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=Apache-1.1
RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=2.2
SRC_URI=mirror://apache/jakarta/tomcat-3/src/jakarta-servletapi-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=78dd7f141ae46d77d4e3858d3b737c1c
+_md5_=b45f165f3f6a9a3ff1faea1348c82699
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36 b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
index 9b83e6aaaf0e..d87539989a10 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >
DESCRIPTION=Tomcat's Servlet API 2.3/JSP API 1.2 implementation
HOMEPAGE=http://tomcat.apache.org/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=2.3
SRC_URI=mirror://apache/tomcat/tomcat-4/v4.1.36/src/apache-tomcat-4.1.36-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=79d86b4e7c73e8cdfe589b2037de2da8
+_md5_=3bf5fb1d2850a9557ee0ec95c2b06b86
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
index 5cbed0407e9f..9e5841f35c33 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.5 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0 >
DESCRIPTION=Tomcat's Servlet API 2.4/JSP API 2.0 implementation
HOMEPAGE=http://tomcat.apache.org/
IUSE=doc source elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=Apache-2.0
RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0
SLOT=2.4
SRC_URI=mirror://apache/tomcat/tomcat-5/v5.5.27/src/apache-tomcat-5.5.27-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-osgi fb81d0ede6b5759b64ec19226fe6d2f2 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=17fed72a9b0770673d3dead9a6d0c9d3
+_md5_=5658f3aa4140817bd6bcbc387aabe8f2
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
index f88eb7d201df..1815fb794c42 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.5 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0 >
DESCRIPTION=Tomcat's Servlet API 2.4/JSP API 2.0 implementation
HOMEPAGE=http://tomcat.apache.org/
IUSE=doc source elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=Apache-2.0
RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0
SLOT=2.4
SRC_URI=mirror://apache/tomcat/tomcat-5/v5.5.34/src/apache-tomcat-5.5.34-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-osgi fb81d0ede6b5759b64ec19226fe6d2f2 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d013cd0385d3cc513948a84132088921
+_md5_=c242ac11dcf72653d583870029bedb2d
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44
index 0ae456a71b7e..c96075bff826 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 2.5/JSP API 2.1 implementation
EAPI=5
HOMEPAGE=http://tomcat.apache.org/
IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=2.5
SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.44/src/apache-tomcat-6.0.44-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=98a9ecbc8cb35b9763a89e5725eaf717
+_md5_=9898be7aac60e64a036ad7c8a80c4638
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59
index 8d44e4f380f5..99aa7a45c504 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
EAPI=5
HOMEPAGE=http://tomcat.apache.org/
IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=3.0
SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.59/src/apache-tomcat-7.0.59-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c65aa63f39174a0c462c3f91b90b9d3e
+_md5_=ba6db453cc01ee413f4522db43a272ce
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.22 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.22
deleted file mode 100644
index d514cff39c1a..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.22
+++ /dev/null
@@ -1,13 +0,0 @@
-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 >=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 ~ia64 ~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.22/src/apache-tomcat-8.0.22-src.tar.gz
-_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a92e26a3276e539fd8c6324bf6d247e2
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.23 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.23
index db04aece6f70..01bba0859f3b 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.23
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.23
@@ -4,10 +4,10 @@ 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 ~ia64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+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.23/src/apache-tomcat-8.0.23-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1d56779e794929709b575421c8757f69
+_md5_=6a5b8ccc54352bada664b6856c0f76a5
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.1 b/metadata/md5-cache/dev-java/xalan-2.7.1
index cde1983d7967..cac5ae440ff6 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.1
+++ b/metadata/md5-cache/dev-java/xalan-2.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=Apache's XSLT processor for transforming XML documents into HTML, te
EAPI=1
HOMEPAGE=http://xml.apache.org/xalan-j/index.html
IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.4 dev-java/javacup:0 dev-java/bcel:0 dev-java/xerces:2 dev-java/xml-commons-external:1.3 ~dev-java/xalan-serializer-2.7.1 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/xml/xalan-j/source/xalan-j_2_7_1-src.tar.gz doc? ( mirror://apache/xml/xalan-j/binaries/xalan-j_2_7_1-bin.zip )
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4b260f4bfaaf0e9265ea4a558d4ce6a5
+_md5_=dd9a61c3644faac4ab44f4790ab22377
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.1 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.1
index 89bf8aee69d8..dd18e276c579 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.1
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 =dev-java/xml-commons-external-1.3* >=dev-java/java-con
DESCRIPTION=DOM Level 3 serializer from Apache Xalan, shared by Xalan and Xerces
HOMEPAGE=http://xml.apache.org/xalan-j/index.html
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.4 =dev-java/xml-commons-external-1.3* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/xml/xalan-j/source/xalan-j_2_7_1-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=433c190019fe20369bfb33fb33a032c3
+_md5_=512cc89bc7fe4a76822395e68eba9d84
diff --git a/metadata/md5-cache/dev-java/xerces-2.11.0 b/metadata/md5-cache/dev-java/xerces-2.11.0
index c15102fa4081..70e469f6b44c 100644
--- a/metadata/md5-cache/dev-java/xerces-2.11.0
+++ b/metadata/md5-cache/dev-java/xerces-2.11.0
@@ -4,11 +4,11 @@ DESCRIPTION=The next generation of high performance, fully compliant XML parsers
EAPI=4
HOMEPAGE=http://xml.apache.org/xerces2-j/index.html
IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
RESTRICT=test
SLOT=2
SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.11.0.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fd9321d0f887d305ea09dde0ee61caf9
+_md5_=a12a97cceb7d08f10702682bb42a6aec
diff --git a/metadata/md5-cache/dev-java/xjavac-20110814 b/metadata/md5-cache/dev-java/xjavac-20110814
index c7bead6facd0..64d5b2923270 100644
--- a/metadata/md5-cache/dev-java/xjavac-20110814
+++ b/metadata/md5-cache/dev-java/xjavac-20110814
@@ -4,10 +4,10 @@ DESCRIPTION=The implementation of the javac compiler for IBM JDK 1.4 (needed for
EAPI=2
HOMEPAGE=http://cvs.apache.org/viewcvs.cgi/xml-xerces/java/tools/src/XJavac.java
IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0
SLOT=1
SRC_URI=mirror://gentoo/xjavac-20110814.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cede6d8717b23164e36f3ccc7ee9b091
+_md5_=5e3d69c3f9504518fb99855e0e5ec740
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04 b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
index 95002f1e725f..a970ff9c53f0 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >
DESCRIPTION=An Apache-hosted set of externally-defined standards interfaces, namely DOM, SAX, and JAXP
HOMEPAGE=http://xml.apache.org/commons/
IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1.3
SRC_URI=mirror://gentoo/xml-commons-external-1.3.04.tar.bz2
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c857ec7b7f6a33a4fe5fd60060a8804e
+_md5_=068f5b3715e1b91a63bea6a9aba65616
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
index d1a5245b104d..bd1a9df3f8a1 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
@@ -4,10 +4,10 @@ DESCRIPTION=An Apache-hosted set of externally-defined standards interfaces, nam
EAPI=4
HOMEPAGE=http://xml.apache.org/commons/
IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1.4
SRC_URI=https://dev.gentoo.org/~sera/distfiles/xml-commons-external-1.4.01.tar.bz2
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ea35937ea0c635d5a8eb79e19a6f9a78
+_md5_=5bb050f5b549280bcc3ddce270fb6b79
diff --git a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2 b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2
index 6478f8f720b4..7b7c6542662e 100644
--- a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2
+++ b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >
DESCRIPTION=An XML Entity and URI Resolver
HOMEPAGE=http://xml.apache.org/commons/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/xml/commons/xml-commons-resolver-1.2.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3c18a68a7a550cd2b366d2447c55f103
+_md5_=a3121ac22b027b2ffa4935640eb7b5cd
diff --git a/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217 b/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217
index d04c9c2d0eea..0b84d9202552 100644
--- a/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217
+++ b/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 =dev-java/jaxen-1.1* >=dev-java/ant-c
DESCRIPTION=An XML-Java binding tool
HOMEPAGE=http://xmlbeans.apache.org/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.4 =dev-java/jaxen-1.1* >=dev-java/ant-core-1.6.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1
SRC_URI=mirror://gentoo/xml-xmlbeans-20041217.tar.bz2
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b39d28f4a06173df7e1d2ecf773942a1
+_md5_=9d61ab49ce6bc32948224012562b906c
diff --git a/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1 b/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1
index 282eee333c4d..e2e2f126afc2 100644
--- a/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1
+++ b/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An XML-Java binding tool
EAPI=5
HOMEPAGE=http://xmlbeans.apache.org/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=dev-java/jaxen:1.1 dev-java/ant-core:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1
SRC_URI=mirror://gentoo/xml-xmlbeans-20041217.tar.bz2
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d09e11135a64bd3c955f062273b52ee3
+_md5_=83bdfd5d0e0ef6021c5263599b17b8a6
diff --git a/metadata/md5-cache/dev-java/xmldb-20011111-r1 b/metadata/md5-cache/dev-java/xmldb-20011111-r1
index be99c4e0ff0f..7f03d2d9f1d6 100644
--- a/metadata/md5-cache/dev-java/xmldb-20011111-r1
+++ b/metadata/md5-cache/dev-java/xmldb-20011111-r1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 >=dev-java/xerces-2.7 >=dev-java/xalan-2.7 =dev-java/ju
DESCRIPTION=Java implementation for specifications made by XML:DB
HOMEPAGE=http://sourceforge.net/projects/xmldb-org/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-1.1
RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/xalan-2.7 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/xmldb-org/xmldb-api-11112001.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=668b8af8281ccf0c03c1128b7d68d349
+_md5_=02d3d2ed2eee664b353c24f2c65e9c49
diff --git a/metadata/md5-cache/dev-java/xom-1.2.10 b/metadata/md5-cache/dev-java/xom-1.2.10
index d57d2e9959d9..6922445b6873 100644
--- a/metadata/md5-cache/dev-java/xom-1.2.10
+++ b/metadata/md5-cache/dev-java/xom-1.2.10
@@ -4,11 +4,11 @@ DESCRIPTION=A new XML object model
EAPI=5
HOMEPAGE=http://cafeconleche.org/XOM/index.html
IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=LGPL-2
RDEPEND=>=virtual/jre-1.4 dev-java/xerces:2 dev-java/xml-commons-external:1.3 examples? ( java-virtuals/servlet-api:2.4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
RESTRICT=test
SLOT=0
SRC_URI=http://cafeconleche.org/XOM/xom-1.2.10.tar.gz http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.6-src.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c956e79e6123082ad7fb8fabf925ff75
+_md5_=8f59b5219f5d7b24411a87c794b96512
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r1 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r1
index 0e8d1085db61..d9b013b2a72e 100644
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r1
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A streaming pull XML parser used to quickly process input elements
EAPI=1
HOMEPAGE=http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-1.1 IBM
RDEPEND=>=virtual/jre-1.3 dev-java/xerces:2 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=959b2d9e3514c240148c766fb9e6b791
+_md5_=bdd3f56a581982b9e291dd28d1d59659
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r1 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r1
index 14500ad5017b..7e08393f3078 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r1
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 app-arch/unzip test? ( dev-java/ant-junit ) >=dev-java/
DESCRIPTION=An implementation of XMLPULL V1 API
HOMEPAGE=http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-1.1 IBM JDOM LGPL-2.1+
RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-1.1.4c_src.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-ant-2 1091461b8b02f54fabcfbf159164ff15 java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e868c60394e90889d269c3ec55eed7d6
+_md5_=e4eab6a130d651095dca0205b255693d
diff --git a/metadata/md5-cache/dev-java/xsdlib-20090415 b/metadata/md5-cache/dev-java/xsdlib-20090415
index ff2e583ac4ed..8dea56881e6c 100644
--- a/metadata/md5-cache/dev-java/xsdlib-20090415
+++ b/metadata/md5-cache/dev-java/xsdlib-20090415
@@ -4,10 +4,10 @@ DESCRIPTION=Sun XML Datatypes Library
EAPI=4
HOMEPAGE=http://msv.java.net/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD Apache-1.1
RDEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://java.net/downloads/msv/releases/xsdlib.20090415.zip
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-2 1889f7787714c5f7e3b5bb1c2be07c1f java-pkg-simple 28dc6c3e6fa8ed51b88360dfd5fee53e java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1ddb12796956ee9a7df72b83d2c7d2a7
+_md5_=c4daee5e6f7ae7f65f3d3495342966c9
diff --git a/metadata/md5-cache/dev-lang/php-5.4.40 b/metadata/md5-cache/dev-lang/php-5.4.40
deleted file mode 100644
index 8bd4b6252a5b..000000000000
--- a/metadata/md5-cache/dev-lang/php-5.4.40
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs
-EAPI=5
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=PHP-3
-RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
-SLOT=5.4
-SRC_URI=http://www.php.net/distributions/php-5.4.40.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.tar.bz2
-_eclasses_=apache-module 5c4c90da2d68c2dc8391666824f1293c autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f90c9c97634f9211d59e0eb662e8a81f
diff --git a/metadata/md5-cache/dev-lang/php-5.4.39 b/metadata/md5-cache/dev-lang/php-5.4.43
similarity index 95%
rename from metadata/md5-cache/dev-lang/php-5.4.39
rename to metadata/md5-cache/dev-lang/php-5.4.43
index b233757e8480..adfb51433792 100644
--- a/metadata/md5-cache/dev-lang/php-5.4.39
+++ b/metadata/md5-cache/dev-lang/php-5.4.43
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and
EAPI=5
HOMEPAGE=http://php.net/
IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=PHP-3
RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
SLOT=5.4
-SRC_URI=http://www.php.net/distributions/php-5.4.39.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.tar.bz2
+SRC_URI=http://www.php.net/distributions/php-5.4.43.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.tar.bz2
_eclasses_=apache-module 5c4c90da2d68c2dc8391666824f1293c autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4edb7c4a9bd52782a707f3dedb866238
+_md5_=37df4b67fecdedd1eed2d518c83291a2
diff --git a/metadata/md5-cache/dev-lang/php-5.5.22 b/metadata/md5-cache/dev-lang/php-5.5.22
deleted file mode 100644
index 8ac46d18b669..000000000000
--- a/metadata/md5-cache/dev-lang/php-5.5.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs
-EAPI=5
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=PHP-3
-RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
-SLOT=5.5
-SRC_URI=http://www.php.net/distributions/php-5.5.22.tar.bz2
-_eclasses_=apache-module 5c4c90da2d68c2dc8391666824f1293c autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9f2d5429f941bee29520cf64054c3a62
diff --git a/metadata/md5-cache/dev-lang/php-5.5.23 b/metadata/md5-cache/dev-lang/php-5.5.23
deleted file mode 100644
index 4684b29bf56e..000000000000
--- a/metadata/md5-cache/dev-lang/php-5.5.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs
-EAPI=5
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=PHP-3
-RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
-SLOT=5.5
-SRC_URI=http://www.php.net/distributions/php-5.5.23.tar.bz2
-_eclasses_=apache-module 5c4c90da2d68c2dc8391666824f1293c autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=589838ee62ccfe9403b4dae795874f38
diff --git a/metadata/md5-cache/dev-lang/php-5.5.24 b/metadata/md5-cache/dev-lang/php-5.5.24
deleted file mode 100644
index eeb980795d28..000000000000
--- a/metadata/md5-cache/dev-lang/php-5.5.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs
-EAPI=5
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=PHP-3
-RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
-SLOT=5.5
-SRC_URI=http://www.php.net/distributions/php-5.5.24.tar.bz2
-_eclasses_=apache-module 5c4c90da2d68c2dc8391666824f1293c autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7d7099cc208297514f5e391704d855d0
diff --git a/metadata/md5-cache/dev-lang/php-5.5.25 b/metadata/md5-cache/dev-lang/php-5.5.25
deleted file mode 100644
index f1838cfc399f..000000000000
--- a/metadata/md5-cache/dev-lang/php-5.5.25
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs
-EAPI=5
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=PHP-3
-RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
-SLOT=5.5
-SRC_URI=http://www.php.net/distributions/php-5.5.25.tar.bz2
-_eclasses_=apache-module 5c4c90da2d68c2dc8391666824f1293c autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=26e4b9a4b7c40b9b75c1f9e63fa928e1
diff --git a/metadata/md5-cache/dev-lang/php-5.6.8 b/metadata/md5-cache/dev-lang/php-5.5.27
similarity index 98%
rename from metadata/md5-cache/dev-lang/php-5.6.8
rename to metadata/md5-cache/dev-lang/php-5.5.27
index 00650a0a570e..a20ad03b67f3 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.8
+++ b/metadata/md5-cache/dev-lang/php-5.5.27
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=PHP-3
RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
-SLOT=5.6
-SRC_URI=http://www.php.net/distributions/php-5.6.8.tar.bz2
+SLOT=5.5
+SRC_URI=http://www.php.net/distributions/php-5.5.27.tar.bz2
_eclasses_=apache-module 5c4c90da2d68c2dc8391666824f1293c autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c07e61fbaa128e2fece41d278190b157
+_md5_=b8c37839cc608bd3f967b258d1044862
diff --git a/metadata/md5-cache/dev-lang/php-5.6.7 b/metadata/md5-cache/dev-lang/php-5.6.11
similarity index 98%
rename from metadata/md5-cache/dev-lang/php-5.6.7
rename to metadata/md5-cache/dev-lang/php-5.6.11
index 52a90ad00ced..8c8b6136a290 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.7
+++ b/metadata/md5-cache/dev-lang/php-5.6.11
@@ -9,6 +9,6 @@ LICENSE=PHP-3
RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
SLOT=5.6
-SRC_URI=http://www.php.net/distributions/php-5.6.7.tar.bz2
+SRC_URI=http://www.php.net/distributions/php-5.6.11.tar.bz2
_eclasses_=apache-module 5c4c90da2d68c2dc8391666824f1293c autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4d829aa5de82b9c8d2178c08f612f9bf
+_md5_=995811ac82d30c104eee48c2a9bec6ca
diff --git a/metadata/md5-cache/dev-lang/php-7.0.0_alpha2 b/metadata/md5-cache/dev-lang/php-7.0.0_alpha2
deleted file mode 100644
index 0a0930adb045..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.0.0_alpha2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs
-EAPI=5
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=PHP-3
-RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
-SLOT=7.0
-SRC_URI=http://downloads.php.net/~ab/php-7.0.0alpha2.tar.bz2
-_eclasses_=apache-module 5c4c90da2d68c2dc8391666824f1293c autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b4aee7d75cbe2455e45a5d07d30729b7
diff --git a/metadata/md5-cache/dev-lang/php-7.0.0_alpha1 b/metadata/md5-cache/dev-lang/php-7.0.0_beta1
similarity index 98%
rename from metadata/md5-cache/dev-lang/php-7.0.0_alpha1
rename to metadata/md5-cache/dev-lang/php-7.0.0_beta1
index 0929d1029957..8f9b3fbab177 100644
--- a/metadata/md5-cache/dev-lang/php-7.0.0_alpha1
+++ b/metadata/md5-cache/dev-lang/php-7.0.0_beta1
@@ -9,6 +9,6 @@ LICENSE=PHP-3
RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
SLOT=7.0
-SRC_URI=http://downloads.php.net/~ab/php-7.0.0alpha1.tar.bz2
+SRC_URI=http://downloads.php.net/~ab/php-7.0.0beta1.tar.bz2
_eclasses_=apache-module 5c4c90da2d68c2dc8391666824f1293c autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0015e20da81b75e4080418aff0328eaa
+_md5_=78d1237265d3fcd77667bed7bc60dc0b
diff --git a/metadata/md5-cache/dev-libs/libinput-0.19.0 b/metadata/md5-cache/dev-libs/libinput-0.19.0
new file mode 100644
index 000000000000..4cc8cf24f7b2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-0.19.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/libevdev-0.4 >=sys-libs/mtdev-1.1 virtual/libudev virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Library to handle input devices in Wayland
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/libinput/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libevdev-0.4 >=sys-libs/mtdev-1.1 virtual/libudev
+RESTRICT=test
+SLOT=0/10
+SRC_URI=http://www.freedesktop.org/software/libinput/libinput-0.19.0.tar.xz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 udev da001465a2e939c93f7ae16947ce3438
+_md5_=b806aefee79eb3ffe86eb35ae0c62a30
diff --git a/metadata/md5-cache/dev-libs/rasqal-0.9.32 b/metadata/md5-cache/dev-libs/rasqal-0.9.32
index 232c4275987b..0dcad66bd856 100644
--- a/metadata/md5-cache/dev-libs/rasqal-0.9.32
+++ b/metadata/md5-cache/dev-libs/rasqal-0.9.32
@@ -4,10 +4,10 @@ DESCRIPTION=library that handles Resource Description Framework (RDF)
EAPI=5
HOMEPAGE=http://librdf.org/rasqal/
IUSE=+crypt gmp kernel_linux +mhash pcre static-libs test xml
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
LICENSE=Apache-2.0 GPL-2 LGPL-2.1
RDEPEND=>=media-libs/raptor-2.0.14 kernel_linux? ( >=sys-apps/util-linux-2.19 ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) !gmp? ( dev-libs/mpfr ) gmp? ( dev-libs/gmp ) crypt? ( !mhash? ( dev-libs/libgcrypt:0 ) mhash? ( app-crypt/mhash ) )
SLOT=0
SRC_URI=http://download.librdf.org/source/rasqal-0.9.32.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=e839670b5d01844504c931d5eb27ec16
+_md5_=dbb0186267e0717616adf7e382f45fdf
diff --git a/metadata/md5-cache/dev-php/pecl-memcache-3.0.8-r1 b/metadata/md5-cache/dev-php/pecl-memcache-3.0.8-r1
index 7c9c7989a6ba..4d8d3edb0055 100644
--- a/metadata/md5-cache/dev-php/pecl-memcache-3.0.8-r1
+++ b/metadata/md5-cache/dev-php/pecl-memcache-3.0.8-r1
@@ -4,7 +4,7 @@ DESCRIPTION=PHP extension for using memcached
EAPI=5
HOMEPAGE=http://pecl.php.net/memcache
IUSE=+session php_targets_php5-6 php_targets_php5-5 php_targets_php5-4
-KEYWORDS=amd64 ~hppa ~ppc64 x86
+KEYWORDS=amd64 hppa ppc64 x86
LICENSE=PHP-3
RDEPEND=sys-libs/zlib dev-lang/php:*[session?] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php5-5 php_targets_php5-4 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://pecl.php.net/get/memcache-3.0.8.tgz
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 php-ext-pecl-r2 de1308bcf4fef59a8ee8793efc7c3051 php-ext-source-r2 b4d5827d04ab9f22f094e1ecab1df639 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=cce48a2de58cf666978b192d39ebb7aa
+_md5_=9aa1d7a0463cf74186a6ecc360109e92
diff --git a/metadata/md5-cache/dev-python/cffi-0.8.6 b/metadata/md5-cache/dev-python/cffi-0.8.6
index cd53130b6e5f..c8011c35d055 100644
--- a/metadata/md5-cache/dev-python/cffi-0.8.6
+++ b/metadata/md5-cache/dev-python/cffi-0.8.6
@@ -4,11 +4,11 @@ DESCRIPTION=Foreign Function Interface for Python calling C code
EAPI=5
HOMEPAGE=http://cffi.readthedocs.org/
IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
LICENSE=MIT
RDEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
SLOT=0/0.8.6
SRC_URI=mirror://pypi/c/cffi/cffi-0.8.6.tar.gz
_eclasses_=distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=a2eb3ff11344066ce70998745aeca638
+_md5_=d326c62effbf2e177f983b90ca5ef608
diff --git a/metadata/md5-cache/dev-python/cryptography-0.6.1 b/metadata/md5-cache/dev-python/cryptography-0.6.1
index 3a2b88c0b9f2..3efe9c8fc171 100644
--- a/metadata/md5-cache/dev-python/cryptography-0.6.1
+++ b/metadata/md5-cache/dev-python/cryptography-0.6.1
@@ -4,7 +4,7 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
EAPI=5
HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
LICENSE=Apache-2.0
RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-libs/openssl:0 >=dev-python/six-1.4.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_3? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/c/cryptography/cryptography-0.6.1.tar.gz
_eclasses_=distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=dc7bbe26edfed37a2ae25ec66b33822b
+_md5_=61f06a263cb67f9dc275005506e14e25
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-0.6.1 b/metadata/md5-cache/dev-python/cryptography-vectors-0.6.1
index 82bd74f4f33f..0227067dd061 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-0.6.1
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-0.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=Test vectors for the cryptography package
EAPI=5
HOMEPAGE=https://pypi.python.org/pypi/cryptography-vectors/
IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd
LICENSE=Apache-2.0
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= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
SLOT=0
SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-0.6.1.tar.gz
_eclasses_=distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=58897b51f3e90d431646daa8828bde27
+_md5_=822422a9f82c142b00f712a25fc3bb54
diff --git a/metadata/md5-cache/dev-python/enum34-1.0.4 b/metadata/md5-cache/dev-python/enum34-1.0.4
index 189facb2adc9..80e10327ae34 100644
--- a/metadata/md5-cache/dev-python/enum34-1.0.4
+++ b/metadata/md5-cache/dev-python/enum34-1.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python 3.4 Enum backported
EAPI=5
HOMEPAGE=https://pypi.python.org/pypi/enum34
IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_pypy python_targets_pypy3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x86-macos
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_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_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy python_targets_pypy3 )
SLOT=0
SRC_URI=mirror://pypi/e/enum34/enum34-1.0.4.tar.gz
_eclasses_=distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=dc4a4e1e37cee63a0c0a3038c492f264
+_md5_=d3cb3a247449f0054c6883d2ec5f2c51
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.10 b/metadata/md5-cache/dev-python/iso8601-0.1.10
index efc0ae23093a..0bbe4463539a 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.10
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.10
@@ -4,11 +4,11 @@ DESCRIPTION=Simple module to parse ISO 8601 dates
EAPI=5
HOMEPAGE=http://code.google.com/p/pyiso8601/ http://pypi.python.org/pypi/iso8601
IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
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/i/iso8601/iso8601-0.1.10.tar.gz
_eclasses_=distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=8dc0fa46a3f977a4ceba39fa7c7db792
+_md5_=e330db72a7324ef5ed0f61f9c4d30003
diff --git a/metadata/md5-cache/dev-python/ply-3.4-r1 b/metadata/md5-cache/dev-python/ply-3.4-r1
index 6f5bdef2084d..0293711250f7 100644
--- a/metadata/md5-cache/dev-python/ply-3.4-r1
+++ b/metadata/md5-cache/dev-python/ply-3.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python Lex-Yacc library
EAPI=5
HOMEPAGE=http://www.dabeaz.com/ply/ http://pypi.python.org/pypi/ply
IUSE=examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
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= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://www.dabeaz.com/ply/ply-3.4.tar.gz
_eclasses_=distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=b3005becdac009fb254d2c705549f16b
+_md5_=9a5c8d66fba1da23b4296d936b3b82bc
diff --git a/metadata/md5-cache/dev-python/pretend-1.0.8 b/metadata/md5-cache/dev-python/pretend-1.0.8
index 41428ecf6427..d5512170ecbf 100644
--- a/metadata/md5-cache/dev-python/pretend-1.0.8
+++ b/metadata/md5-cache/dev-python/pretend-1.0.8
@@ -4,11 +4,11 @@ DESCRIPTION=A library for stubbing in Python
EAPI=5
HOMEPAGE=https://github.com/alex/pretend/ https://pypi.python.org/pypi/pretend/
IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
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= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
SLOT=0
SRC_URI=mirror://pypi/p/pretend/pretend-1.0.8.tar.gz
_eclasses_=distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=97e145466bce6e6df29f64ea77fa7b3a
+_md5_=3be2921482db79198d799ea549f5e072
diff --git a/metadata/md5-cache/dev-python/pycparser-2.10 b/metadata/md5-cache/dev-python/pycparser-2.10
index 9ef700f59ce4..cabcc89ff56b 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.10
+++ b/metadata/md5-cache/dev-python/pycparser-2.10
@@ -4,11 +4,11 @@ DESCRIPTION=C parser and AST generator written in Python
EAPI=5
HOMEPAGE=https://github.com/eliben/pycparser
IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
LICENSE=BSD
RDEPEND=dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
SLOT=0
SRC_URI=mirror://pypi/p/pycparser/pycparser-2.10.tar.gz
_eclasses_=distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4 vcs-snapshot 58b766562c9fbfb3268b04e33cdf2f66
-_md5_=fd3b08f2ad1ea753964a4fb0334e911c
+_md5_=51277c735aba5ac798b2a92b77af7751
diff --git a/metadata/md5-cache/dev-python/pyopenssl-0.14 b/metadata/md5-cache/dev-python/pyopenssl-0.14
index ab8b5c9854ba..d83bd3dd6435 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-0.14
+++ b/metadata/md5-cache/dev-python/pyopenssl-0.14
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to the OpenSSL library
EAPI=5
HOMEPAGE=http://pyopenssl.sourceforge.net/ https://launchpad.net/pyopenssl http://pypi.python.org/pypi/pyOpenSSL
IUSE=doc examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
LICENSE=Apache-2.0
RDEPEND=>=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/cryptography-0.2.1-r2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
SLOT=0
SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-0.14.tar.gz
_eclasses_=distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=5fadc361306ae82cd3268a14f2e57074
+_md5_=eae65a97bc29b00db3de6fb655ed8223
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.9 b/metadata/md5-cache/dev-python/pyquery-1.2.9
index 456573554797..d1df6cc27803 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.2.9
+++ b/metadata/md5-cache/dev-python/pyquery-1.2.9
@@ -4,11 +4,11 @@ DESCRIPTION=A jQuery-like library for python
EAPI=5
HOMEPAGE=https://github.com/gawel/pyquery
IUSE=beautifulsoup3 test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 arm ~hppa ppc ppc64 x86
+KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 x86
LICENSE=BSD
RDEPEND=>=dev-python/lxml-2.1[beautifulsoup3?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >dev-python/cssselect-0.7.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.1.9[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
REQUIRED_USE=test? ( beautifulsoup3 ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
SLOT=0
SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.9.zip
_eclasses_=distutils-r1 8fd6db5e1c80bd7c6d640bce0413569e eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 23846c6ba39f6655e2027001eeed8e81 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=66607024369a91b421e70c078ccfa7af
+_md5_=2ced2e11ce65cb56b041aa7e18d4eda7
diff --git a/metadata/md5-cache/dev-ruby/arel-6.0.2 b/metadata/md5-cache/dev-ruby/arel-6.0.2
new file mode 100644
index 000000000000..2c3d563b90bf
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/arel-6.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/minitest-5.4:5[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/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/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=Arel is a Relational Algebra for Ruby
+EAPI=5
+HOMEPAGE=http://github.com/rails/arel
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_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=6.0
+SRC_URI=https://github.com/rails/arel/archive/v6.0.2.tar.gz -> arel-6.0.2.tar.gz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc multilib 62927b3db3a589b0806255f3a002d5d3 ruby-fakegem 59aa129a3b9dc9e6225a0622860d2f54 ruby-ng a1c75617b3482d513ad41d1aea8dbf8f ruby-utils a74e21a353442acf697b6c82e7df6df8 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=124ea5178dc6c1b0a7f97237dddb2051
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.16 b/metadata/md5-cache/dev-ruby/sass-3.4.16
new file mode 100644
index 000000000000..221ecfec008c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby19] !!=dev-ruby/listen-1.3.1:1[ruby_targets_ruby20] !!=dev-ruby/listen-1.3.1:1[ruby_targets_ruby21] !!=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!=dev-ruby/listen-1.3.1:1[ruby_targets_ruby19] !!=dev-ruby/listen-1.3.1:1[ruby_targets_ruby20] !!=dev-ruby/listen-1.3.1:1[ruby_targets_ruby21] !!=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear
SLOT=0
SRC_URI=mirror://flightgear/Source/flightgear-3.4.0.tar.bz2
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 games 1ad3205dbf62a2c98249f2f59b0a2d39 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747
-_md5_=47fb25dea83b0ba1aca2e2b22d0dd961
+_md5_=847ada314b79574c544291ab10f14a37
diff --git a/metadata/md5-cache/java-virtuals/jms-1.1 b/metadata/md5-cache/java-virtuals/jms-1.1
index 04479d0e6a73..d450473f65f1 100644
--- a/metadata/md5-cache/java-virtuals/jms-1.1
+++ b/metadata/md5-cache/java-virtuals/jms-1.1
@@ -4,9 +4,9 @@ DESCRIPTION=Virtual for Java Message Service (JMS) API
EAPI=5
HOMEPAGE=http://www.gentoo.org
IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
LICENSE=public-domain
RDEPEND=|| ( dev-java/glassfish-jms-api:0 dev-java/sun-jms:0 ) >=dev-java/java-config-2.2.0
SLOT=0
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc java-virtuals-2 3f6b3450d42c285ae53f6b9da9fb5ba3 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=44ddede3872072c77421b703677dd19b
+_md5_=6bfdc68371f62f6871c30555378c9c4b
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.2 b/metadata/md5-cache/java-virtuals/servlet-api-2.2
index c74dee897835..57dba7e10d2e 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.2
+++ b/metadata/md5-cache/java-virtuals/servlet-api-2.2
@@ -4,9 +4,9 @@ DESCRIPTION=Virtual for servlet api
EAPI=5
HOMEPAGE=http://java.sun.com/products/servlet/
IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 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=public-domain
RDEPEND=dev-java/tomcat-servlet-api:2.2 >=dev-java/java-config-2.2.0
SLOT=2.2
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc java-virtuals-2 3f6b3450d42c285ae53f6b9da9fb5ba3 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1df6ef611342701295b09ac893b75801
+_md5_=d8158b512043d1f6ad1e63709f795857
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.3 b/metadata/md5-cache/java-virtuals/servlet-api-2.3
index c65f8528edd0..9c445f6fd066 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.3
+++ b/metadata/md5-cache/java-virtuals/servlet-api-2.3
@@ -4,9 +4,9 @@ DESCRIPTION=Virtual for servlet api
EAPI=5
HOMEPAGE=http://java.sun.com/products/servlet/
IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=public-domain
RDEPEND=dev-java/tomcat-servlet-api:2.3 >=dev-java/java-config-2.2.0
SLOT=2.3
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc java-virtuals-2 3f6b3450d42c285ae53f6b9da9fb5ba3 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=95c2bd28a7a96787f2b0c9a747632665
+_md5_=2e2f90c088fb62f3ced622f11c08b211
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.4 b/metadata/md5-cache/java-virtuals/servlet-api-2.4
index e5fda90d4e40..ce91e8b675b7 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.4
+++ b/metadata/md5-cache/java-virtuals/servlet-api-2.4
@@ -4,9 +4,9 @@ DESCRIPTION=Virtual for servlet api
EAPI=5
HOMEPAGE=http://java.sun.com/products/servlet/
IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
LICENSE=public-domain
RDEPEND=|| ( dev-java/tomcat-servlet-api:2.4 dev-java/resin-servlet-api:2.4 ) >=dev-java/java-config-2.2.0
SLOT=2.4
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc java-virtuals-2 3f6b3450d42c285ae53f6b9da9fb5ba3 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e03d683eb370f1ac5e1a5899fc530450
+_md5_=a628344632f13f1b621411585527c602
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.5-r1 b/metadata/md5-cache/java-virtuals/servlet-api-2.5-r1
index 9e05d6781607..425000934944 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.5-r1
+++ b/metadata/md5-cache/java-virtuals/servlet-api-2.5-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Virtual for servlet api
EAPI=4
HOMEPAGE=http://java.sun.com/products/servlet/
IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
LICENSE=public-domain
RDEPEND=|| ( dev-java/tomcat-servlet-api:2.5 dev-java/resin-servlet-api:2.5 dev-java/glassfish-servlet-api:2.5 ) >=dev-java/java-config-2.2.0
SLOT=2.5
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc java-virtuals-2 3f6b3450d42c285ae53f6b9da9fb5ba3 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6dd5b937e5b4b731bbf369694a22be12
+_md5_=dbd940a27d44f46a8bb0cfbf1e4de9ff
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1 b/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1
index b05c1cae220c..d78fc499ab23 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1
+++ b/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Virtual for servlet api
EAPI=4
HOMEPAGE=http://java.sun.com/products/servlet/
IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
LICENSE=public-domain
RDEPEND=|| ( dev-java/tomcat-servlet-api:3.0 dev-java/resin-servlet-api:3.0 ) >=dev-java/java-config-2.2.0
SLOT=3.0
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 8cdf065211fa6d6687bdc3f3ebe12efc java-virtuals-2 3f6b3450d42c285ae53f6b9da9fb5ba3 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d9781a3b8a82e3b2e190942c7e3b7f28
+_md5_=f5e75ca7ed8cd264bcc8d565c3cd9add
diff --git a/metadata/md5-cache/kde-base/akonadiconsole-4.14.10 b/metadata/md5-cache/kde-base/akonadiconsole-4.14.10
new file mode 100644
index 000000000000..54cc434eb3a1
--- /dev/null
+++ b/metadata/md5-cache/kde-base/akonadiconsole-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-office/akonadi-server-1.12.90 >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=Akonadi developer console
+EAPI=5
+HOMEPAGE=http://www.kde.org/
+IUSE=debug aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=app-office/akonadi-server-1.12.90 >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=d0b6fe561e13e6be27cf084feb076033
diff --git a/metadata/md5-cache/kde-base/akregator-4.14.10 b/metadata/md5-cache/kde-base/akregator-4.14.10
new file mode 100644
index 000000000000..1ce0661a4001
--- /dev/null
+++ b/metadata/md5-cache/kde-base/akregator-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=KDE news feed aggregator
+EAPI=5
+HOMEPAGE=http://www.kde.org/applications/internet/akregator
+IUSE=debug +handbook aqua +kontact
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=] kontact? ( >=kde-base/kontact-4.14.10:4[aqua=] )
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=72dcb9ef2ec5ed8d3138e65b4f07ba1d
diff --git a/metadata/md5-cache/kde-base/blogilo-4.14.10 b/metadata/md5-cache/kde-base/blogilo-4.14.10
new file mode 100644
index 000000000000..5f8cb2a1ff34
--- /dev/null
+++ b/metadata/md5-cache/kde-base/blogilo-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepim-common-libs-4.14.10:4[aqua=] >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=net-libs/libkgapi-2.2.0:4 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=KDE Blogging Client
+EAPI=5
+HOMEPAGE=http://www.kde.org/applications/internet/blogilo
+IUSE=debug +handbook aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepim-common-libs-4.14.10:4[aqua=] >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=net-libs/libkgapi-2.2.0:4 kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=7f7bd31a59aa930ef9c7dd040307b80f
diff --git a/metadata/md5-cache/kde-base/calendarjanitor-4.14.10 b/metadata/md5-cache/kde-base/calendarjanitor-4.14.10
new file mode 100644
index 000000000000..ed9a4f0e1e93
--- /dev/null
+++ b/metadata/md5-cache/kde-base/calendarjanitor-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepim-common-libs-4.14.10:4[aqua=] >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=A tool to scan calendar data for buggy instances
+EAPI=5
+HOMEPAGE=http://www.kde.org/
+IUSE=debug +handbook aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepim-common-libs-4.14.10:4[aqua=] >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=dfed6e52db50ef9a4b3e2a4d9a7109c8
diff --git a/metadata/md5-cache/kde-base/kabcclient-4.14.10 b/metadata/md5-cache/kde-base/kabcclient-4.14.10
new file mode 100644
index 000000000000..bcefef493e7c
--- /dev/null
+++ b/metadata/md5-cache/kde-base/kabcclient-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=A command line client for accessing the KDE addressbook
+EAPI=5
+HOMEPAGE=http://www.kde.org/
+IUSE=debug +handbook aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=3ef31cd47c5f2e220dbceb0b38fdb542
diff --git a/metadata/md5-cache/kde-base/kaddressbook-4.14.10 b/metadata/md5-cache/kde-base/kaddressbook-4.14.10
new file mode 100644
index 000000000000..7ee037d3ff1d
--- /dev/null
+++ b/metadata/md5-cache/kde-base/kaddressbook-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] dev-libs/grantlee:0 !kde-base/contactthemeeditor >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=The KDE Address Book
+EAPI=5
+HOMEPAGE=http://www.kde.org/applications/office/kaddressbook/
+IUSE=debug +handbook aqua +kontact
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] dev-libs/grantlee:0 !kde-base/contactthemeeditor kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=] kontact? ( >=kde-base/kontact-4.14.10:4[aqua=] )
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=04a6f207b1c9dc2b2da46dc93b742352
diff --git a/metadata/md5-cache/kde-base/kalarm-4.14.10 b/metadata/md5-cache/kde-base/kalarm-4.14.10
new file mode 100644
index 000000000000..b9ad7ca7c569
--- /dev/null
+++ b/metadata/md5-cache/kde-base/kalarm-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] media-libs/phonon[qt4] x11-libs/libX11 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=Personal alarm message, command and email scheduler for KDE
+EAPI=5
+HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/KAlarm
+IUSE=debug +handbook aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] media-libs/phonon[qt4] x11-libs/libX11 kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=130d6bbb405e2d6d29f5a7324108cae4
diff --git a/metadata/md5-cache/kde-base/kdepim-common-libs-4.14.10 b/metadata/md5-cache/kde-base/kdepim-common-libs-4.14.10
new file mode 100644
index 000000000000..dac7a91474bc
--- /dev/null
+++ b/metadata/md5-cache/kde-base/kdepim-common-libs-4.14.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=app-crypt/gpgme >=app-office/akonadi-server-1.12.90 dev-libs/grantlee:0 >=kde-base/baloo-4.14.3:4[aqua=] >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] google? ( net-libs/libkgapi:4 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=Common libraries for KDE PIM apps
+EAPI=5
+HOMEPAGE=http://www.kde.org/
+IUSE=debug google aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=app-crypt/gpgme >=app-office/akonadi-server-1.12.90 dev-libs/grantlee:0 >=kde-base/baloo-4.14.3:4[aqua=] >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] google? ( net-libs/libkgapi:4 ) !kde-base/akonadi:4 !kde-base/libkdepim:4 !kde-base/libkleo:4 !kde-base/libkpgp:4 !=kde-base/kdepim-runtime-4.14.10:4[aqua=] kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+RESTRICT=test
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=d8be5ff9e018d8875db089bcc2f3166e
diff --git a/metadata/md5-cache/kde-base/kdepim-icons-4.14.10 b/metadata/md5-cache/kde-base/kdepim-icons-4.14.10
new file mode 100644
index 000000000000..42261e2f8104
--- /dev/null
+++ b/metadata/md5-cache/kde-base/kdepim-icons-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=KDE PIM icons
+EAPI=5
+HOMEPAGE=http://www.kde.org/
+IUSE=aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=9cb48d2f2f04f1cd96dd89c7b91a3ac9
diff --git a/metadata/md5-cache/kde-base/kdepim-kresources-4.14.10 b/metadata/md5-cache/kde-base/kdepim-kresources-4.14.10
new file mode 100644
index 000000000000..ec69d3bf6a10
--- /dev/null
+++ b/metadata/md5-cache/kde-base/kdepim-kresources-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=KDE PIM groupware plugin collection
+EAPI=5
+HOMEPAGE=http://www.kde.org/
+IUSE=debug aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=6e0e2691a58668de72aeb1128ceabc66
diff --git a/metadata/md5-cache/kde-base/kdepim-meta-4.14.10 b/metadata/md5-cache/kde-base/kdepim-meta-4.14.10
new file mode 100644
index 000000000000..ed2d331857df
--- /dev/null
+++ b/metadata/md5-cache/kde-base/kdepim-meta-4.14.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdepim - merge this to pull in all kdepim-derived packages
+EAPI=5
+HOMEPAGE=http://www.kde.org/ http://community.kde.org/KDE_PIM
+IUSE=nls aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=metapackage
+RDEPEND=>=kde-base/akonadiconsole-4.14.10:4[aqua=] >=kde-base/akregator-4.14.10:4[aqua=] >=kde-base/blogilo-4.14.10:4[aqua=] >=kde-base/calendarjanitor-4.14.10:4[aqua=] >=kde-base/kabcclient-4.14.10:4[aqua=] >=kde-base/kaddressbook-4.14.10:4[aqua=] >=kde-base/kalarm-4.14.10:4[aqua=] >=kde-base/kdepim-icons-4.14.10:4[aqua=] >=kde-base/kdepim-kresources-4.14.10:4[aqua=] >=kde-base/kdepim-runtime-4.14.10:4[aqua=] >=kde-base/kjots-4.14.10:4[aqua=] >=kde-base/kleopatra-4.14.10:4[aqua=] >=kde-base/kmail-4.14.10:4[aqua=] >=kde-base/knode-4.14.10:4[aqua=] >=kde-base/knotes-4.14.10:4[aqua=] >=kde-base/konsolekalendar-4.14.10:4[aqua=] >=kde-base/kontact-4.14.10:4[aqua=] >=kde-base/korganizer-4.14.10:4[aqua=] >=kde-base/ktimetracker-4.14.10:4[aqua=] >=kde-base/ktnef-4.14.10:4[aqua=] nls? ( || ( ( >=kde-apps/kde4-l10n-15.04.0:4[aqua=] ) ( >=kde-apps/kde4-l10n-4.14.3:4[aqua=] >=kde-base/kdepim-l10n-4.14.3:4[aqua=] ) ) )
+SLOT=4
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta-pkg c803ab12295a2918961b64111d6682fa multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=abcd5ff23cf1b2a31bd8b85ff507b131
diff --git a/metadata/md5-cache/kde-base/kdepim-runtime-4.14.10 b/metadata/md5-cache/kde-base/kdepim-runtime-4.14.10
new file mode 100644
index 000000000000..45d39e52344d
--- /dev/null
+++ b/metadata/md5-cache/kde-base/kdepim-runtime-4.14.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0:4 ) kolab? ( >=net-libs/libkolab-0.5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=KDE PIM runtime plugin collection
+EAPI=5
+HOMEPAGE=http://www.kde.org/
+IUSE=debug facebook google kolab aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi ) google? ( >=net-libs/libkgapi-2.0:4 ) kolab? ( >=net-libs/libkolab-0.5 ) >=kde-base/kdepim-icons-4.14.10:4[aqua=] !kde-misc/akonadi-google kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+RESTRICT=test
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-runtime-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=97ab3ab98a18bea018c32d0ce627e914
diff --git a/metadata/md5-cache/kde-base/kdepimlibs-4.14.10 b/metadata/md5-cache/kde-base/kdepimlibs-4.14.10
new file mode 100644
index 000000000000..a64aa10f70ca
--- /dev/null
+++ b/metadata/md5-cache/kde-base/kdepimlibs-4.14.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=!kde-misc/akonadi-social-utils >=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=Common library for KDE PIM apps
+EAPI=5
+HOMEPAGE=http://www.kde.org/
+IUSE=debug ldap prison test +handbook aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=!kde-misc/akonadi-social-utils >=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) !=kde-base/kdepim-runtime-4.10* !=kde-base/kdepim-runtime-4.11* !=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+RESTRICT=test
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepimlibs-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=b35801a4ac07531fc1f8fe5f0e1b7516
diff --git a/metadata/md5-cache/kde-base/kjots-4.14.10 b/metadata/md5-cache/kde-base/kjots-4.14.10
new file mode 100644
index 000000000000..166e1d2d9665
--- /dev/null
+++ b/metadata/md5-cache/kde-base/kjots-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/grantlee:0 >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=KDE note taking utility
+EAPI=5
+HOMEPAGE=http://www.kde.org/applications/utilities/kjots/
+IUSE=debug +handbook aqua +kontact
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/grantlee:0 >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=] kontact? ( >=kde-base/kontact-4.14.10:4[aqua=] )
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=e41f91eb20205de40323b86feeefb108
diff --git a/metadata/md5-cache/kde-base/kleopatra-4.14.10 b/metadata/md5-cache/kde-base/kleopatra-4.14.10
new file mode 100644
index 000000000000..102500c32992
--- /dev/null
+++ b/metadata/md5-cache/kde-base/kleopatra-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/gpgme-1.3.2 dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=Kleopatra - KDE X.509 key manager
+EAPI=5
+HOMEPAGE=http://www.kde.org/applications/utilities/kleopatra/
+IUSE=debug +handbook aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=app-crypt/gpgme-1.3.2 dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] app-crypt/gnupg kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=8deaf19bf3d47ed824053dec2fb70031
diff --git a/metadata/md5-cache/kde-base/kmail-4.14.10 b/metadata/md5-cache/kde-base/kmail-4.14.10
new file mode 100644
index 000000000000..70717cf5f377
--- /dev/null
+++ b/metadata/md5-cache/kde-base/kmail-4.14.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/korganizer-4.14.10:4[aqua=] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=KMail is the email component of Kontact, the integrated personal information manager of KDE
+EAPI=5
+HOMEPAGE=http://www.kde.org/applications/internet/kmail/
+IUSE=debug test +handbook aqua +kontact
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/korganizer-4.14.10:4[aqua=] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] !=kde-base/kdepim-common-libs-4.12.1-r1 kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=] kontact? ( >=kde-base/kontact-4.14.10:4[aqua=] )
+RESTRICT=test
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=d277af9925bd9220f104323bed9152b9
diff --git a/metadata/md5-cache/kde-base/knode-4.14.10 b/metadata/md5-cache/kde-base/knode-4.14.10
new file mode 100644
index 000000000000..f9e32782665d
--- /dev/null
+++ b/metadata/md5-cache/kde-base/knode-4.14.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.12.1-r1:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=A newsreader for KDE
+EAPI=5
+HOMEPAGE=http://www.kde.org/applications/internet/knode/
+IUSE=debug +handbook aqua +kontact
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.12.1-r1:4[aqua=] kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=] kontact? ( >=kde-base/kontact-4.14.10:4[aqua=] )
+RESTRICT=test
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=006ada4fcc3f38b9c3b6eff368e97afd
diff --git a/metadata/md5-cache/kde-base/knotes-4.14.10 b/metadata/md5-cache/kde-base/knotes-4.14.10
new file mode 100644
index 000000000000..ea4e60672eff
--- /dev/null
+++ b/metadata/md5-cache/kde-base/knotes-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=KDE Notes application
+EAPI=5
+HOMEPAGE=http://www.kde.org/applications/utilities/knotes/
+IUSE=debug +handbook aqua +kontact
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=] kontact? ( >=kde-base/kontact-4.14.10:4[aqua=] )
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=eafd399bd03c20e3d6a01f948f6a756b
diff --git a/metadata/md5-cache/kde-base/konsolekalendar-4.14.10 b/metadata/md5-cache/kde-base/konsolekalendar-4.14.10
new file mode 100644
index 000000000000..6e5cef7cc79d
--- /dev/null
+++ b/metadata/md5-cache/kde-base/konsolekalendar-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=A command line interface to KDE calendars
+EAPI=5
+HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/KonsoleKalendar
+IUSE=debug +handbook aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=98cec377d1d86b4c4482515f43f88140
diff --git a/metadata/md5-cache/kde-base/kontact-4.14.10 b/metadata/md5-cache/kde-base/kontact-4.14.10
new file mode 100644
index 000000000000..e343aa71a791
--- /dev/null
+++ b/metadata/md5-cache/kde-base/kontact-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=KDE personal information manager
+EAPI=5
+HOMEPAGE=http://www.kde.org/applications/office/kontact/
+IUSE=debug +handbook aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=32b15d973b214eec263f98c4d713db02
diff --git a/metadata/md5-cache/kde-base/korganizer-4.14.10 b/metadata/md5-cache/kde-base/korganizer-4.14.10
new file mode 100644
index 000000000000..2f02c546f4f0
--- /dev/null
+++ b/metadata/md5-cache/kde-base/korganizer-4.14.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] sys-libs/zlib >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=A Personal Organizer for KDE
+EAPI=5
+HOMEPAGE=http://www.kde.org/applications/office/korganizer/
+IUSE=debug +handbook aqua +kontact
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] sys-libs/zlib >=kde-apps/ktimezoned-4.14.3:4[aqua=] kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=] kontact? ( >=kde-base/kontact-4.14.10:4[aqua=] )
+RESTRICT=test
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=2a60028d91b702c2bee8bf18fee30d3a
diff --git a/metadata/md5-cache/kde-base/ktimetracker-4.14.10 b/metadata/md5-cache/kde-base/ktimetracker-4.14.10
new file mode 100644
index 000000000000..ee21c258c349
--- /dev/null
+++ b/metadata/md5-cache/kde-base/ktimetracker-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepim-kresources-4.14.10:4[aqua=] >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] x11-libs/libXScrnSaver x11-proto/scrnsaverproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=KTimeTracker tracks time spent on various tasks
+EAPI=5
+HOMEPAGE=http://www.kde.org/
+IUSE=debug +handbook aqua +kontact
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepim-kresources-4.14.10:4[aqua=] >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=kde-base/kdepim-common-libs-4.14.10:4[aqua=] x11-libs/libXScrnSaver kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=] kontact? ( >=kde-base/kontact-4.14.10:4[aqua=] )
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=c2e5461e230ffbc10d6f04b65d013426
diff --git a/metadata/md5-cache/kde-base/ktnef-4.14.10 b/metadata/md5-cache/kde-base/ktnef-4.14.10
new file mode 100644
index 000000000000..30f7262802d5
--- /dev/null
+++ b/metadata/md5-cache/kde-base/ktnef-4.14.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=app-office/akonadi-server >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+DESCRIPTION=A viewer for TNEF attachments
+EAPI=5
+HOMEPAGE=http://www.kde.org/
+IUSE=debug +handbook aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=app-office/akonadi-server >=kde-base/kdepimlibs-4.14.10:4[aqua=,akonadi(+)] kde-apps/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.10:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.10:4[aqua=]
+SLOT=4/4.14
+SRC_URI=mirror://kde/stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz
+_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c9602887773166fe300444712fc7ff98 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base 559feb798976aacd15eeb289dbcdc11c kde4-functions 99e770658f27aaf2c8a5850af7598b18 kde4-meta 99e6fa43762d8563ba5546fed686a63a multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=043bd552b40cd0265889247244a033aa
diff --git a/metadata/md5-cache/media-libs/raptor-2.0.14 b/metadata/md5-cache/media-libs/raptor-2.0.14
index d72ff13e1016..a137450e028a 100644
--- a/metadata/md5-cache/media-libs/raptor-2.0.14
+++ b/metadata/md5-cache/media-libs/raptor-2.0.14
@@ -4,10 +4,10 @@ DESCRIPTION=The RDF Parser Toolkit
EAPI=5
HOMEPAGE=http://librdf.org/raptor/
IUSE=+curl debug json static-libs unicode
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0 GPL-2 LGPL-2.1
RDEPEND=dev-libs/libxml2 dev-libs/libxslt curl? ( net-misc/curl ) json? ( dev-libs/yajl ) unicode? ( dev-libs/icu:= ) !media-libs/raptor:0
SLOT=2
SRC_URI=http://download.librdf.org/source/raptor2-2.0.14.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=c9a8b01c5c9622fa5fdcd2b6798cd28e
+_md5_=a95343f1cbc9b56353e82c0ce9e3e577
diff --git a/metadata/md5-cache/net-im/skype-4.3.0.37-r5 b/metadata/md5-cache/net-im/skype-4.3.0.37-r5
index 804f691e9697..9058d1676f8c 100644
--- a/metadata/md5-cache/net-im/skype-4.3.0.37-r5
+++ b/metadata/md5-cache/net-im/skype-4.3.0.37-r5
@@ -3,13 +3,13 @@ DEPEND=>=sys-apps/sed-4
DESCRIPTION=P2P Internet Telephony (VoiceIP) client
EAPI=5
HOMEPAGE=http://www.skype.com/
-IUSE=apulse pax_kernel +pulseaudio selinux
+IUSE=apulse pax_kernel plasma +pulseaudio selinux
KEYWORDS=~amd64 ~x86
LICENSE=skype-4.0.0.7-copyright BSD MIT RSA W3C regexp-UofT no-source-code
-RDEPEND=virtual/ttf-fonts dev-qt/qtcore:4[abi_x86_32(-)] dev-qt/qtdbus:4[abi_x86_32(-)] dev-qt/qtgui:4[accessibility,abi_x86_32(-)] dev-qt/qtwebkit:4[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXScrnSaver[abi_x86_32(-)] x11-libs/libXv[abi_x86_32(-)] apulse? ( media-sound/apulse[abi_x86_32(-)] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] ) selinux? ( sec-policy/selinux-skype )
+RDEPEND=virtual/ttf-fonts dev-qt/qtcore:4[abi_x86_32(-)] dev-qt/qtdbus:4[abi_x86_32(-)] dev-qt/qtgui:4[accessibility,abi_x86_32(-)] dev-qt/qtwebkit:4[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXScrnSaver[abi_x86_32(-)] x11-libs/libXv[abi_x86_32(-)] apulse? ( media-sound/apulse[abi_x86_32(-)] ) amd64? ( plasma? ( dev-libs/sni-qt[abi_x86_32(-)] ) ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] ) selinux? ( sec-policy/selinux-skype )
REQUIRED_USE=apulse? ( !pulseaudio )
RESTRICT=mirror bindist strip
SLOT=0
SRC_URI=http://download.skype.com/linux/skype-4.3.0.37.tar.bz2
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 62927b3db3a589b0806255f3a002d5d3 pax-utils dfe060cb70d89757fde5c1ff8405e950 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=fb7e8eabef925eecc26e548e2565f6ae
+_md5_=9b244b2bf3818c09754d63d64b72abd9
diff --git a/metadata/md5-cache/net-p2p/litecoin-qt-0.10.2.2 b/metadata/md5-cache/net-p2p/litecoin-qt-0.10.2.2
new file mode 100644
index 000000000000..91be0915ded0
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/litecoin-qt-0.10.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] qrcode? ( media-gfx/qrencode ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] virtual/bitcoin-leveldb !qt5? ( dev-qt/qtgui:4 dbus? ( dev-qt/qtdbus:4 ) ) qt5? ( dev-qt/qtgui:5 dbus? ( dev-qt/qtdbus:5 ) ) >=app-shells/bash-4.1 !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=P2P Internet currency based on Bitcoin but easier to mine
+EAPI=5
+HOMEPAGE=https://litecoin.org/
+IUSE=dbus kde +qrcode qt5 upnp linguas_ach linguas_af_ZA linguas_ar linguas_be_BY linguas_bg linguas_bs linguas_ca_ES linguas_ca linguas_ca@valencia linguas_cmn linguas_cs linguas_cy linguas_da linguas_de linguas_el_GR linguas_en linguas_eo linguas_es_CL linguas_es_DO linguas_es_MX linguas_es linguas_es_UY linguas_et linguas_eu_ES linguas_fa_IR linguas_fa linguas_fi linguas_fr_CA linguas_fr linguas_gl linguas_gu_IN linguas_he linguas_hi_IN linguas_hr linguas_hu linguas_id_ID linguas_it linguas_ja linguas_ka linguas_kk_KZ linguas_ko_KR linguas_ky linguas_la linguas_lt linguas_lv_LV linguas_mn linguas_ms_MY linguas_nb linguas_nl linguas_pam linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro_RO linguas_ru linguas_sah linguas_sk linguas_sl_SI linguas_sq linguas_sr linguas_sv linguas_th_TH linguas_tr linguas_uk linguas_ur_PK linguas_uz@Cyrl linguas_vi linguas_vi_VN linguas_zh_CN linguas_zh_HK linguas_zh_TW
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT ISC GPL-3 LGPL-2.1 public-domain || ( CC-BY-SA-3.0 LGPL-2.1 )
+RDEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] qrcode? ( media-gfx/qrencode ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] virtual/bitcoin-leveldb !qt5? ( dev-qt/qtgui:4 dbus? ( dev-qt/qtdbus:4 ) ) qt5? ( dev-qt/qtgui:5 dbus? ( dev-qt/qtdbus:5 ) )
+SLOT=0
+SRC_URI=https://github.com/litecoin-project/litecoin/archive/v0.10.2.2.tar.gz -> litecoin-0.10.2.2.tar.gz
+_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb base 87f7447ccfc06fd0729ff4684e11e0d6 db-use 82d0e62839f20e1e0d5a2259abd5316f eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-functions 99e770658f27aaf2c8a5850af7598b18 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 qmake-utils 4ce40e37ef0e28425a7159b0353be026 qt4-r2 7199e3db5b5908325487d379c6f67cf0 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=d0e4409053918874dc2bf54cfe8cc706
diff --git a/metadata/md5-cache/net-p2p/litecoin-qt-0.8.7.1 b/metadata/md5-cache/net-p2p/litecoin-qt-0.8.7.1
deleted file mode 100644
index 93b64113a743..000000000000
--- a/metadata/md5-cache/net-p2p/litecoin-qt-0.8.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] qrcode? ( media-gfx/qrencode ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] <=dev-libs/leveldb-1.12.0[-snappy] dev-qt/qtgui:4 dbus? ( dev-qt/qtdbus:4 ) >=app-shells/bash-4.1 >=sys-apps/sed-4
-DESCRIPTION=P2P Internet currency based on Bitcoin but easier to mine
-EAPI=5
-HOMEPAGE=https://litecoin.org/
-IUSE=dbus ipv6 kde +qrcode upnp linguas_af_ZA linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca_ES linguas_cs linguas_cy linguas_da linguas_de linguas_el_GR linguas_en linguas_eo linguas_es linguas_es_CL linguas_et linguas_eu_ES linguas_fa linguas_fa_IR linguas_fi linguas_fr linguas_fr_CA linguas_gu_IN linguas_he linguas_hi_IN linguas_hr linguas_hu linguas_it linguas_ja linguas_la linguas_lt linguas_lv_LV linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro_RO linguas_ru linguas_sk linguas_sr linguas_sv linguas_th_TH linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT ISC GPL-3 LGPL-2.1 public-domain || ( CC-BY-SA-3.0 LGPL-2.1 )
-RDEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] qrcode? ( media-gfx/qrencode ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] <=dev-libs/leveldb-1.12.0[-snappy] dev-qt/qtgui:4 dbus? ( dev-qt/qtdbus:4 )
-SLOT=0
-SRC_URI=https://github.com/litecoin-project/litecoin/archive/v0.8.7.1.tar.gz -> litecoin-0.8.7.1.tar.gz
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 db-use 82d0e62839f20e1e0d5a2259abd5316f eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 qmake-utils 4ce40e37ef0e28425a7159b0353be026 qt4-r2 7199e3db5b5908325487d379c6f67cf0 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b788f5e5367a6572e1df7eb9d16093fa
diff --git a/metadata/md5-cache/net-p2p/litecoin-qt-0.8.7.2 b/metadata/md5-cache/net-p2p/litecoin-qt-0.8.7.2
deleted file mode 100644
index 0abaac88fc03..000000000000
--- a/metadata/md5-cache/net-p2p/litecoin-qt-0.8.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] qrcode? ( media-gfx/qrencode ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] <=dev-libs/leveldb-1.12.0[-snappy] dev-qt/qtgui:4 dbus? ( dev-qt/qtdbus:4 ) >=app-shells/bash-4.1 >=sys-apps/sed-4
-DESCRIPTION=P2P Internet currency based on Bitcoin but easier to mine
-EAPI=5
-HOMEPAGE=https://litecoin.org/
-IUSE=dbus ipv6 kde +qrcode upnp linguas_af_ZA linguas_ar linguas_bg linguas_bs linguas_ca linguas_ca_ES linguas_cs linguas_cy linguas_da linguas_de linguas_el_GR linguas_en linguas_eo linguas_es linguas_es_CL linguas_et linguas_eu_ES linguas_fa linguas_fa_IR linguas_fi linguas_fr linguas_fr_CA linguas_gu_IN linguas_he linguas_hi_IN linguas_hr linguas_hu linguas_it linguas_ja linguas_la linguas_lt linguas_lv_LV linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro_RO linguas_ru linguas_sk linguas_sr linguas_sv linguas_th_TH linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT ISC GPL-3 LGPL-2.1 public-domain || ( CC-BY-SA-3.0 LGPL-2.1 )
-RDEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] qrcode? ( media-gfx/qrencode ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] <=dev-libs/leveldb-1.12.0[-snappy] dev-qt/qtgui:4 dbus? ( dev-qt/qtdbus:4 )
-SLOT=0
-SRC_URI=https://github.com/litecoin-project/litecoin/archive/v0.8.7.2.tar.gz -> litecoin-0.8.7.2.tar.gz
-_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 db-use 82d0e62839f20e1e0d5a2259abd5316f eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-functions 99e770658f27aaf2c8a5850af7598b18 multilib 62927b3db3a589b0806255f3a002d5d3 qmake-utils 4ce40e37ef0e28425a7159b0353be026 qt4-r2 7199e3db5b5908325487d379c6f67cf0 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9b10c14143c0fc76552774b614ee2b5c
diff --git a/metadata/md5-cache/net-p2p/litecoind-0.10.2.2 b/metadata/md5-cache/net-p2p/litecoind-0.10.2.2
new file mode 100644
index 000000000000..3aabcfe1e2a4
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/litecoind-0.10.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] virtual/bitcoin-leveldb >=app-shells/bash-4.1 sys-apps/sed !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=P2P Internet currency based on Bitcoin but easier to mine
+EAPI=5
+HOMEPAGE=https://litecoin.org/
+IUSE=logrotate upnp
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT ISC GPL-2
+RDEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] virtual/bitcoin-leveldb
+SLOT=0
+SRC_URI=https://github.com/litecoin-project/litecoin/archive/v0.10.2.2.tar.gz -> litecoin-0.10.2.2.tar.gz
+_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb db-use 82d0e62839f20e1e0d5a2259abd5316f eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=473d776d66d680deb43dc2c8c2f0321d
diff --git a/metadata/md5-cache/net-p2p/litecoind-0.8.7.1 b/metadata/md5-cache/net-p2p/litecoind-0.8.7.1
deleted file mode 100644
index c1af46950620..000000000000
--- a/metadata/md5-cache/net-p2p/litecoind-0.8.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] <=dev-libs/leveldb-1.12.0[-snappy] >=app-shells/bash-4.1 sys-apps/sed virtual/pkgconfig
-DESCRIPTION=P2P Internet currency based on Bitcoin but easier to mine
-EAPI=5
-HOMEPAGE=https://litecoin.org/
-IUSE=examples ipv6 logrotate upnp
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT ISC GPL-2
-RDEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] <=dev-libs/leveldb-1.12.0[-snappy]
-SLOT=0
-SRC_URI=https://github.com/litecoin-project/litecoin/archive/v0.8.7.1.tar.gz -> litecoin-0.8.7.1.tar.gz
-_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 db-use 82d0e62839f20e1e0d5a2259abd5316f eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=989f310d82953f80812de9224ea15276
diff --git a/metadata/md5-cache/net-p2p/litecoind-0.8.7.2 b/metadata/md5-cache/net-p2p/litecoind-0.8.7.2
deleted file mode 100644
index a55b280c73fc..000000000000
--- a/metadata/md5-cache/net-p2p/litecoind-0.8.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] <=dev-libs/leveldb-1.12.0[-snappy] >=app-shells/bash-4.1 sys-apps/sed virtual/pkgconfig
-DESCRIPTION=P2P Internet currency based on Bitcoin but easier to mine
-EAPI=5
-HOMEPAGE=https://litecoin.org/
-IUSE=examples ipv6 logrotate upnp
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT ISC GPL-2
-RDEPEND=dev-libs/boost[threads(+)] dev-libs/openssl:0[-bindist] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] <=dev-libs/leveldb-1.12.0[-snappy]
-SLOT=0
-SRC_URI=https://github.com/litecoin-project/litecoin/archive/v0.8.7.2.tar.gz -> litecoin-0.8.7.2.tar.gz
-_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 db-use 82d0e62839f20e1e0d5a2259abd5316f eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6dc1f6ec196922cbfc4a67708cdcfeab
diff --git a/metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57-r1 b/metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57-r1
index 1ad7d20d45b5..2e1915ad0fdf 100644
--- a/metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57-r1
+++ b/metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
DESCRIPTION=Script to rescan the SCSI bus without rebooting
EAPI=5
HOMEPAGE=http://www.garloff.de/kurt/linux/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/sg3_utils-1.24 app-admin/killproc virtual/modutils app-shells/bash
SLOT=0
SRC_URI=http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh-1.57
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=0ee9a811d3598aa48f7a39f7b430c3b0
+_md5_=7c27008e17a92ea6617bcfa412d590d5
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 429a5fc39ec7..519a5c83f9c9 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
SLOT=0/2
SRC_URI=terminal? ( http://unifoundry.com/pub/unifont-8.0.01/font-builds/unifont-8.0.01.hex.gz )
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb autotools-utils dbce0f7913bd240fdf0ef428149855c0 bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 git-r3 727a612b4c6247766904e3f74a326e2b libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 8cbc678e083c23e4ad546ca6509cf304 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multilib-build e733e978b7fa70607cc221fd9c070db6 multilib-minimal 13dd976916c35a1e2c8d170e840c7018 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed python-any-r1 4756de53ea4d40471a582e898815a5c8 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 42408102d713fbad60ca21349865edb4 udev da001465a2e939c93f7ae16947ce3438 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5c32cc47b94aae78409c46e450587832
+_md5_=30d77ef4d75e5ecebd66ec59d9728f3b
diff --git a/metadata/md5-cache/sys-devel/bison-3.0.4-r1 b/metadata/md5-cache/sys-devel/bison-3.0.4-r1
index 7ccfc9120981..f977567a0dde 100644
--- a/metadata/md5-cache/sys-devel/bison-3.0.4-r1
+++ b/metadata/md5-cache/sys-devel/bison-3.0.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A general-purpose (yacc-compatible) parser generator
EAPI=5
HOMEPAGE=http://www.gnu.org/software/bison/
IUSE=examples nls static test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=sys-devel/m4-1.4.16
SLOT=0
SRC_URI=mirror://gnu/bison/bison-3.0.4.tar.xz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
-_md5_=25a76a72e9e421549bd6301132a1763e
+_md5_=11bab5c20236153d719cac7070c7b7a3
diff --git a/metadata/md5-cache/virtual/jdk-1.6.0-r2 b/metadata/md5-cache/virtual/jdk-1.6.0-r2
index c3ac8b0de016..24436371bfa8 100644
--- a/metadata/md5-cache/virtual/jdk-1.6.0-r2
+++ b/metadata/md5-cache/virtual/jdk-1.6.0-r2
@@ -1,7 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for Java Development Kit (JDK)
EAPI=4
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
RDEPEND=|| ( ppc? ( || ( =dev-java/ibm-jdk-bin-1.6.0* =dev-java/icedtea-6* ) ) ppc64? ( || ( =dev-java/ibm-jdk-bin-1.6.0* =dev-java/icedtea-6* ) ) =dev-java/icedtea-bin-6* =dev-java/icedtea-6* =dev-java/ibm-jdk-bin-1.6.0* =dev-java/hp-jdk-bin-1.6.0* =dev-java/soylatte-jdk-bin-1.0* =dev-java/apple-jdk-bin-1.6.0* )
SLOT=1.6
-_md5_=ff46ae1360e0e9057edce94b461e8ca7
+_md5_=a875a411045e850da1737d8437148e35
diff --git a/metadata/md5-cache/virtual/jdk-1.7.0 b/metadata/md5-cache/virtual/jdk-1.7.0
index e38506681fc2..00b60b37418f 100644
--- a/metadata/md5-cache/virtual/jdk-1.7.0
+++ b/metadata/md5-cache/virtual/jdk-1.7.0
@@ -1,7 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for Java Development Kit (JDK)
EAPI=5
-KEYWORDS=amd64 ~arm ~ia64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
RDEPEND=|| ( =dev-java/icedtea-bin-7* =dev-java/icedtea-7* =dev-java/oracle-jdk-bin-1.7.0* =dev-java/soylatte-jdk-bin-7* )
SLOT=1.7
-_md5_=5266f8d83ee172a2f27db519caa65918
+_md5_=0b380212ee338d21648e0358c58e0763
diff --git a/metadata/md5-cache/virtual/jdk-1.8.0 b/metadata/md5-cache/virtual/jdk-1.8.0
index 59f68350fe28..512f5b606707 100644
--- a/metadata/md5-cache/virtual/jdk-1.8.0
+++ b/metadata/md5-cache/virtual/jdk-1.8.0
@@ -4,4 +4,4 @@ EAPI=5
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris
RDEPEND==dev-java/oracle-jdk-bin-1.8.0*
SLOT=1.8
-_md5_=4d21cd64f42b8c437306535e84e711d9
+_md5_=232a2f475be56477c72cccb86eed7369
diff --git a/metadata/md5-cache/virtual/jre-1.6.0-r1 b/metadata/md5-cache/virtual/jre-1.6.0-r1
index 90a85ed9363f..b4dcca2002c9 100644
--- a/metadata/md5-cache/virtual/jre-1.6.0-r1
+++ b/metadata/md5-cache/virtual/jre-1.6.0-r1
@@ -1,7 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for Java Runtime Environment (JRE)
EAPI=5
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
RDEPEND=|| ( =virtual/jdk-1.6.0* =dev-java/ibm-jre-bin-1.6.0* )
SLOT=1.6
-_md5_=58426a121ff7d69ff3fb57f52335b547
+_md5_=99c8a9968fab6218fa83810b64602445
diff --git a/metadata/md5-cache/virtual/jre-1.7.0 b/metadata/md5-cache/virtual/jre-1.7.0
index 7f17acc9c6d5..e2bab43e8cec 100644
--- a/metadata/md5-cache/virtual/jre-1.7.0
+++ b/metadata/md5-cache/virtual/jre-1.7.0
@@ -1,7 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for Java Runtime Environment (JRE)
EAPI=5
-KEYWORDS=amd64 ~arm ~ia64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
RDEPEND=|| ( =virtual/jdk-1.7.0* =dev-java/oracle-jre-bin-1.7.0* )
SLOT=1.7
-_md5_=31dc624c5b6c6799306471543dead409
+_md5_=fc5df4b7b64457913e58e956bd0506f9
diff --git a/metadata/md5-cache/virtual/jre-1.8.0 b/metadata/md5-cache/virtual/jre-1.8.0
index 6c9f77c19010..1aceb3abdbf8 100644
--- a/metadata/md5-cache/virtual/jre-1.8.0
+++ b/metadata/md5-cache/virtual/jre-1.8.0
@@ -4,4 +4,4 @@ EAPI=5
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris
RDEPEND=|| ( =virtual/jdk-1.8.0* =dev-java/oracle-jre-bin-1.8.0* )
SLOT=1.8
-_md5_=4b60c31fe663a3fe0d0754b09c94a161
+_md5_=1888572c7bc4830162c5ec148886c8dd
diff --git a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.11 b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.11-r1
similarity index 72%
rename from metadata/md5-cache/x11-apps/intel-gpu-tools-1.11
rename to metadata/md5-cache/x11-apps/intel-gpu-tools-1.11-r1
index 888f3002f436..b5c4c01bd2f9 100644
--- a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.11
+++ b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.11-r1
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/glib:2 >=x11-libs/cairo-1.12.0 >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEPEND=dev-libs/glib:2 >=x11-libs/cairo-1.12.0 >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) unwind? ( sys-libs/libunwind ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
DESCRIPTION=Intel GPU userland tools
EAPI=5
HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=python test-programs video_cards_nouveau python_targets_python3_3 python_targets_python3_4 python_single_target_python3_3 python_single_target_python3_4
+IUSE=python test-programs unwind video_cards_nouveau python_targets_python3_3 python_targets_python3_4 python_single_target_python3_3 python_single_target_python3_4
KEYWORDS=~amd64 ~x86
LICENSE=MIT
-RDEPEND=dev-libs/glib:2 >=x11-libs/cairo-1.12.0 >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] )
+RDEPEND=dev-libs/glib:2 >=x11-libs/cairo-1.12.0 >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) unwind? ( sys-libs/libunwind )
REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
RESTRICT=test
SLOT=0
SRC_URI=http://xorg.freedesktop.org/releases/individual/app/intel-gpu-tools-1.11.tar.bz2
_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb autotools-utils dbce0f7913bd240fdf0ef428149855c0 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 python-single-r1 351da1aa73960a282591217fb57c1bb8 python-utils-r1 ae9becb5d45344c01939c3f57df0d3fd toolchain-funcs 42408102d713fbad60ca21349865edb4 xorg-2 50dd640df6d0554c259daa81531ed3ee
-_md5_=010849c7bced518b3e2354e3c6fd7e1c
+_md5_=00a6d97377f57c57cfd5e4c6d20aa967
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3c2fd21165df..8df89b477a0c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 11 Jul 2015 08:36:56 +0000
+Sat, 11 Jul 2015 18:07:07 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2766ae1682b5..fdeb764c11bb 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jul 11 08:36:52 UTC 2015
+Sat Jul 11 18:07:03 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d373339d37e7..124fa65bdada 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 11 Jul 2015 09:00:01 +0000
+Sat, 11 Jul 2015 18:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ef2d7c5545a0..8529733f6f2a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1436603701 Sat 11 Jul 2015 08:35:01 AM UTC
+1436637901 Sat 11 Jul 2015 06:05:01 PM UTC
diff --git a/net-im/skype/skype-4.3.0.37-r5.ebuild b/net-im/skype/skype-4.3.0.37-r5.ebuild
index 2ae0c6878b43..f5ac02e44697 100644
--- a/net-im/skype/skype-4.3.0.37-r5.ebuild
+++ b/net-im/skype/skype-4.3.0.37-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.3.0.37-r5.ebuild,v 1.5 2015/06/20 08:17:08 amynka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.3.0.37-r5.ebuild,v 1.6 2015/07/11 09:49:39 amynka Exp $
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://download.${PN}.com/linux/${P}.tar.bz2"
LICENSE="skype-4.0.0.7-copyright BSD MIT RSA W3C regexp-UofT no-source-code"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="apulse pax_kernel +pulseaudio selinux"
+IUSE="apulse pax_kernel plasma +pulseaudio selinux"
REQUIRED_USE="apulse? ( !pulseaudio )"
QA_PREBUILT=opt/bin/${PN}
@@ -33,6 +33,7 @@ RDEPEND="
x11-libs/libXScrnSaver[abi_x86_32(-)]
x11-libs/libXv[abi_x86_32(-)]
apulse? ( media-sound/apulse[abi_x86_32(-)] )
+ amd64? ( plasma? ( dev-libs/sni-qt[abi_x86_32(-)] ) )
pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
selinux? ( sec-policy/selinux-skype )"
diff --git a/net-p2p/litecoin-qt/Manifest b/net-p2p/litecoin-qt/Manifest
index 05a5ec26e883..1ead5112eb41 100644
--- a/net-p2p/litecoin-qt/Manifest
+++ b/net-p2p/litecoin-qt/Manifest
@@ -1,3 +1,2 @@
-DIST litecoin-0.8.7.1.tar.gz 4808416 SHA256 e037dea00f866673aea524e936bd2cfc1938f44614ca03da9018033b9e8e2aec SHA512 6cc5ac99d42c2f5969159ad9922ec65882dd1a52602f706311ac3cd6bf52a834848e2d3e5e6e21f1f42d73e946da0e44d1f43ded016a5732a5ea4a3c27febf26 WHIRLPOOL 0eadf6d206256584b615aac8b570b108b0ae7f446274065d69cfe6dcd69096388741a0f1457f218938394b66c2389757d46628cee400e3842b09929fa18a692e
-DIST litecoin-0.8.7.2.tar.gz 4808488 SHA256 8fdfe3bc391aa5ff26ba4c21c51d85d0a2b3f7359d48eed326a95e0a17d4895f SHA512 e5489214719cd4bbd43cc174bd7b319f23d7e701be14c64ad9e4ecb3a7ca84f3c9826203dfc4546a60fa9d33e6d68b7627674c23312da199d2c76baa81864c86 WHIRLPOOL 11b5359dddf1d0e9caf2c1a710175df3f9c499c97ec2590faec2a332343ce51a5cd473824b940b8b7451c0ca215c4cd8db5dfabbe27e063e2328fbf3b5d63027
+DIST litecoin-0.10.2.2.tar.gz 4700783 SHA256 952c84b181323db17a8fa23217f59b576ad3ebad92c158b3a7c29d458a1130dc SHA512 46e4c014ae8527dd58af073bab96ea4fd55c69fcc63eaa4fd600bf3c1fc2102500151b49431a72b55334a409d4f5226937cd0c5337feaa4ad49e6ef9e9728aba WHIRLPOOL 5c1d5605d4afb16744fcf0b09dd52eb574aea0cdd9754f94d4cfd9ac064491a0e192d8c4b1a3324e355d71758735265b272dfa41f938212e17badb9f8a70698b
DIST litecoin-0.8.7.4.tar.gz 4808429 SHA256 032d1eb2ffb06ce467f514e08a66f42bcd507df2d8f1cf2c0541f2906288931a SHA512 14588dab6450bee439c3af16e277afc1f2ff562c93463d9767da27cf724cd6bb4a1c64100806d61dc1d062a39f440e4878e19b425f29e866562acc56c893cca5 WHIRLPOOL 1329d7c234c75b5083f58f5edf69b6ea9acc13f48a9734cd839001dcd3e52c10d3ade55ac853e196deca8b149aba00a3590e52cf766f62b941bd4e4828f10b96
diff --git a/net-p2p/litecoin-qt/files/0.9.0-sys_leveldb.patch b/net-p2p/litecoin-qt/files/0.9.0-sys_leveldb.patch
new file mode 100644
index 000000000000..60e9f2b20941
--- /dev/null
+++ b/net-p2p/litecoin-qt/files/0.9.0-sys_leveldb.patch
@@ -0,0 +1,34 @@
+commit c38e0af3e021eb0b2aba846c77b06ca71de06b11 (personal-github/sys_leveldb, sys_leveldb)
+Author: Luke Dashjr
+Date: Mon Sep 9 03:06:17 2013 +0000
+
+ configure: Add unsupported --with-system-leveldb configure flag
+
+diff --git a/configure.ac b/configure.ac
+index 3ed4549..5a5852d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -332,10 +332,22 @@ AC_TRY_COMPILE([#include ],
+ [ AC_MSG_RESULT(no)]
+ )
+
++dnl Check for leveldb, only if explicitly requested
+ LEVELDB_CPPFLAGS=
+ LIBLEVELDB=
+ LIBMEMENV=
+-AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
++AC_ARG_WITH([system-leveldb],
++ [AS_HELP_STRING([--with-system-leveldb],
++ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
++ [system_leveldb=$withval],
++ [system_leveldb=no]
++)
++if test x$system_leveldb != xno; then
++ LEVELDB_CPPFLAGS=
++ LIBLEVELDB=-lleveldb
++ LIBMEMENV=-lmemenv
++fi
++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno])
+ AC_SUBST(LEVELDB_CPPFLAGS)
+ AC_SUBST(LIBLEVELDB)
+ AC_SUBST(LIBMEMENV)
diff --git a/net-p2p/litecoin-qt/litecoin-qt-0.8.7.1.ebuild b/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2.ebuild
similarity index 59%
rename from net-p2p/litecoin-qt/litecoin-qt-0.8.7.1.ebuild
rename to net-p2p/litecoin-qt/litecoin-qt-0.10.2.2.ebuild
index e5b55050517d..970cb7dace70 100644
--- a/net-p2p/litecoin-qt/litecoin-qt-0.8.7.1.ebuild
+++ b/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/litecoin-qt/litecoin-qt-0.8.7.1.ebuild,v 1.2 2014/08/10 20:37:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/litecoin-qt/litecoin-qt-0.10.2.2.ebuild,v 1.1 2015/07/11 15:07:52 blueness Exp $
EAPI=5
DB_VER="4.8"
-LANGS="af_ZA ar bg bs ca ca_ES cs cy da de el_GR en eo es es_CL et eu_ES fa fa_IR fi fr fr_CA gu_IN he hi_IN hr hu it ja la lt lv_LV nb nl pl pt_BR pt_PT ro_RO ru sk sr sv th_TH tr uk zh_CN zh_TW"
-inherit db-use eutils fdo-mime gnome2-utils kde4-functions qt4-r2
+LANGS="ach af_ZA ar be_BY bg bs ca_ES ca ca@valencia cmn cs cy da de el_GR en eo es_CL es_DO es_MX es es_UY et eu_ES fa_IR fa fi fr_CA fr gl gu_IN he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_CN zh_HK zh_TW"
+
+inherit autotools db-use eutils fdo-mime gnome2-utils kde4-functions qt4-r2
MyPV="${PV/_/-}"
MyPN="litecoin"
@@ -20,7 +21,7 @@ SRC_URI="https://github.com/${MyPN}-project/${MyPN}/archive/v${MyPV}.tar.gz -> $
LICENSE="MIT ISC GPL-3 LGPL-2.1 public-domain || ( CC-BY-SA-3.0 LGPL-2.1 )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="dbus ipv6 kde +qrcode upnp"
+IUSE="dbus kde +qrcode qt5 upnp"
RDEPEND="
dev-libs/boost[threads(+)]
@@ -32,10 +33,18 @@ RDEPEND="
net-libs/miniupnpc
)
sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
- <=dev-libs/leveldb-1.12.0[-snappy]
- dev-qt/qtgui:4
- dbus? (
- dev-qt/qtdbus:4
+ virtual/bitcoin-leveldb
+ !qt5? (
+ dev-qt/qtgui:4
+ dbus? (
+ dev-qt/qtdbus:4
+ )
+ )
+ qt5? (
+ dev-qt/qtgui:5
+ dbus? (
+ dev-qt/qtdbus:5
+ )
)
"
DEPEND="${RDEPEND}
@@ -47,8 +56,9 @@ DOCS="doc/README.md doc/release-notes.md"
S="${WORKDIR}/${MyP}"
src_prepare() {
- epatch "${FILESDIR}"/${MyPN}-sys_leveldb.patch
- rm -r src/leveldb
+ epatch "${FILESDIR}/0.9.0-sys_leveldb.patch"
+ eautoreconf
+ rm -r src/leveldb
cd src || die
@@ -66,7 +76,7 @@ src_prepare() {
x="${x/.ts/}"
if ! use "linguas_$x"; then
nolang="$nolang $x"
- rm "$ts"
+ #rm "$ts"
filt="$filt\\|$x"
else
yeslang="$yeslang $x"
@@ -74,46 +84,35 @@ src_prepare() {
done
filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
- sed "/${filt}/d" -i 'qt/bitcoin.qrc'
+ sed "/${filt}/d" -i 'qt/bitcoin_locale.qrc'
einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
}
src_configure() {
- OPTS=()
-
- use dbus && OPTS+=("USE_DBUS=1")
+ local my_econf=
if use upnp; then
- OPTS+=("USE_UPNP=1")
+ my_econf="${my_econf} --with-miniupnpc --enable-upnp-default"
else
- OPTS+=("USE_UPNP=-")
- fi
-
- use qrcode && OPTS+=("USE_QRCODE=1")
- use ipv6 || OPTS+=("USE_IPV6=-")
-
- OPTS+=("USE_SYSTEM_LEVELDB=1")
- OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
- OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
-
- if has_version '>=dev-libs/boost-1.52'; then
- OPTS+=("LIBS+=-lboost_chrono\$\$BOOST_LIB_SUFFIX")
+ my_econf="${my_econf} --without-miniupnpc --disable-upnp-default"
fi
-
- #The litecoin codebase is mostly taken from bitcoin-qt
- eqmake4 bitcoin-qt.pro "${OPTS[@]}"
+ econf \
+ --enable-wallet \
+ --disable-ccache \
+ --disable-static \
+ --disable-tests \
+ --with-system-leveldb \
+ --with-system-libsecp256k1 \
+ --without-libs \
+ --without-utils \
+ --without-daemon \
+ --with-gui=$(usex qt5 qt5 qt4) \
+ $(use_with dbus qtdbus) \
+ $(use_with qrcode qrencode) \
+ ${my_econf}
}
-#Tests are broken with and without our litecoin-sys_leveldb.patch
-#src_test() {
-# cd src || die
-# emake -f makefile.unix "${OPTS[@]}" test_litecoin
-# ./test_litecoin || die 'Tests failed'
-#}
-
src_install() {
- qt4-r2_src_install
-
- dobin ${PN}
+ default
insinto /usr/share/pixmaps
newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
diff --git a/net-p2p/litecoin-qt/litecoin-qt-0.8.7.2.ebuild b/net-p2p/litecoin-qt/litecoin-qt-0.8.7.2.ebuild
deleted file mode 100644
index df73b8794eba..000000000000
--- a/net-p2p/litecoin-qt/litecoin-qt-0.8.7.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/litecoin-qt/litecoin-qt-0.8.7.2.ebuild,v 1.1 2014/08/28 23:08:58 blueness Exp $
-
-EAPI=5
-
-DB_VER="4.8"
-
-LANGS="af_ZA ar bg bs ca ca_ES cs cy da de el_GR en eo es es_CL et eu_ES fa fa_IR fi fr fr_CA gu_IN he hi_IN hr hu it ja la lt lv_LV nb nl pl pt_BR pt_PT ro_RO ru sk sr sv th_TH tr uk zh_CN zh_TW"
-inherit db-use eutils fdo-mime gnome2-utils kde4-functions qt4-r2
-
-MyPV="${PV/_/-}"
-MyPN="litecoin"
-MyP="${MyPN}-${MyPV}"
-
-DESCRIPTION="P2P Internet currency based on Bitcoin but easier to mine"
-HOMEPAGE="https://litecoin.org/"
-SRC_URI="https://github.com/${MyPN}-project/${MyPN}/archive/v${MyPV}.tar.gz -> ${MyP}.tar.gz"
-
-LICENSE="MIT ISC GPL-3 LGPL-2.1 public-domain || ( CC-BY-SA-3.0 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus ipv6 kde +qrcode upnp"
-
-RDEPEND="
- dev-libs/boost[threads(+)]
- dev-libs/openssl:0[-bindist]
- qrcode? (
- media-gfx/qrencode
- )
- upnp? (
- net-libs/miniupnpc
- )
- sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
- <=dev-libs/leveldb-1.12.0[-snappy]
- dev-qt/qtgui:4
- dbus? (
- dev-qt/qtdbus:4
- )
-"
-DEPEND="${RDEPEND}
- >=app-shells/bash-4.1
-"
-
-DOCS="doc/README.md doc/release-notes.md"
-
-S="${WORKDIR}/${MyP}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${MyPN}-sys_leveldb.patch
- rm -r src/leveldb
-
- cd src || die
-
- local filt= yeslang= nolang=
-
- for lan in $LANGS; do
- if [ ! -e qt/locale/bitcoin_$lan.ts ]; then
- ewarn "Language '$lan' no longer supported. Ebuild needs update."
- fi
- done
-
- for ts in $(ls qt/locale/*.ts)
- do
- x="${ts/*bitcoin_/}"
- x="${x/.ts/}"
- if ! use "linguas_$x"; then
- nolang="$nolang $x"
- rm "$ts"
- filt="$filt\\|$x"
- else
- yeslang="$yeslang $x"
- fi
- done
-
- filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
- sed "/${filt}/d" -i 'qt/bitcoin.qrc'
- einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
-}
-
-src_configure() {
- OPTS=()
-
- use dbus && OPTS+=("USE_DBUS=1")
- if use upnp; then
- OPTS+=("USE_UPNP=1")
- else
- OPTS+=("USE_UPNP=-")
- fi
-
- use qrcode && OPTS+=("USE_QRCODE=1")
- use ipv6 || OPTS+=("USE_IPV6=-")
-
- OPTS+=("USE_SYSTEM_LEVELDB=1")
- OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
- OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
-
- if has_version '>=dev-libs/boost-1.52'; then
- OPTS+=("LIBS+=-lboost_chrono\$\$BOOST_LIB_SUFFIX")
- fi
-
- #The litecoin codebase is mostly taken from bitcoin-qt
- eqmake4 bitcoin-qt.pro "${OPTS[@]}"
-}
-
-#Tests are broken with and without our litecoin-sys_leveldb.patch
-#src_test() {
-# cd src || die
-# emake -f makefile.unix "${OPTS[@]}" test_litecoin
-# ./test_litecoin || die 'Tests failed'
-#}
-
-src_install() {
- qt4-r2_src_install
-
- dobin ${PN}
-
- insinto /usr/share/pixmaps
- newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
-
- make_desktop_entry "${PN} %u" "Litecoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/litecoin;\nTerminal=false"
-
- newman contrib/debian/manpages/bitcoin-qt.1 ${PN}.1
-
- if use kde; then
- insinto /usr/share/kde4/services
- newins contrib/debian/bitcoin-qt.protocol ${PN}.protocol
- fi
-}
-
-update_caches() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
- buildsycoca
-}
-
-pkg_postinst() {
- update_caches
-}
-
-pkg_postrm() {
- update_caches
-}
diff --git a/net-p2p/litecoind/Manifest b/net-p2p/litecoind/Manifest
index 05a5ec26e883..1ead5112eb41 100644
--- a/net-p2p/litecoind/Manifest
+++ b/net-p2p/litecoind/Manifest
@@ -1,3 +1,2 @@
-DIST litecoin-0.8.7.1.tar.gz 4808416 SHA256 e037dea00f866673aea524e936bd2cfc1938f44614ca03da9018033b9e8e2aec SHA512 6cc5ac99d42c2f5969159ad9922ec65882dd1a52602f706311ac3cd6bf52a834848e2d3e5e6e21f1f42d73e946da0e44d1f43ded016a5732a5ea4a3c27febf26 WHIRLPOOL 0eadf6d206256584b615aac8b570b108b0ae7f446274065d69cfe6dcd69096388741a0f1457f218938394b66c2389757d46628cee400e3842b09929fa18a692e
-DIST litecoin-0.8.7.2.tar.gz 4808488 SHA256 8fdfe3bc391aa5ff26ba4c21c51d85d0a2b3f7359d48eed326a95e0a17d4895f SHA512 e5489214719cd4bbd43cc174bd7b319f23d7e701be14c64ad9e4ecb3a7ca84f3c9826203dfc4546a60fa9d33e6d68b7627674c23312da199d2c76baa81864c86 WHIRLPOOL 11b5359dddf1d0e9caf2c1a710175df3f9c499c97ec2590faec2a332343ce51a5cd473824b940b8b7451c0ca215c4cd8db5dfabbe27e063e2328fbf3b5d63027
+DIST litecoin-0.10.2.2.tar.gz 4700783 SHA256 952c84b181323db17a8fa23217f59b576ad3ebad92c158b3a7c29d458a1130dc SHA512 46e4c014ae8527dd58af073bab96ea4fd55c69fcc63eaa4fd600bf3c1fc2102500151b49431a72b55334a409d4f5226937cd0c5337feaa4ad49e6ef9e9728aba WHIRLPOOL 5c1d5605d4afb16744fcf0b09dd52eb574aea0cdd9754f94d4cfd9ac064491a0e192d8c4b1a3324e355d71758735265b272dfa41f938212e17badb9f8a70698b
DIST litecoin-0.8.7.4.tar.gz 4808429 SHA256 032d1eb2ffb06ce467f514e08a66f42bcd507df2d8f1cf2c0541f2906288931a SHA512 14588dab6450bee439c3af16e277afc1f2ff562c93463d9767da27cf724cd6bb4a1c64100806d61dc1d062a39f440e4878e19b425f29e866562acc56c893cca5 WHIRLPOOL 1329d7c234c75b5083f58f5edf69b6ea9acc13f48a9734cd839001dcd3e52c10d3ade55ac853e196deca8b149aba00a3590e52cf766f62b941bd4e4828f10b96
diff --git a/net-p2p/litecoind/files/0.9.0-sys_leveldb.patch b/net-p2p/litecoind/files/0.9.0-sys_leveldb.patch
new file mode 100644
index 000000000000..60e9f2b20941
--- /dev/null
+++ b/net-p2p/litecoind/files/0.9.0-sys_leveldb.patch
@@ -0,0 +1,34 @@
+commit c38e0af3e021eb0b2aba846c77b06ca71de06b11 (personal-github/sys_leveldb, sys_leveldb)
+Author: Luke Dashjr
+Date: Mon Sep 9 03:06:17 2013 +0000
+
+ configure: Add unsupported --with-system-leveldb configure flag
+
+diff --git a/configure.ac b/configure.ac
+index 3ed4549..5a5852d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -332,10 +332,22 @@ AC_TRY_COMPILE([#include ],
+ [ AC_MSG_RESULT(no)]
+ )
+
++dnl Check for leveldb, only if explicitly requested
+ LEVELDB_CPPFLAGS=
+ LIBLEVELDB=
+ LIBMEMENV=
+-AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
++AC_ARG_WITH([system-leveldb],
++ [AS_HELP_STRING([--with-system-leveldb],
++ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
++ [system_leveldb=$withval],
++ [system_leveldb=no]
++)
++if test x$system_leveldb != xno; then
++ LEVELDB_CPPFLAGS=
++ LIBLEVELDB=-lleveldb
++ LIBMEMENV=-lmemenv
++fi
++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno])
+ AC_SUBST(LEVELDB_CPPFLAGS)
+ AC_SUBST(LIBLEVELDB)
+ AC_SUBST(LIBMEMENV)
diff --git a/net-p2p/litecoind/litecoind-0.8.7.1.ebuild b/net-p2p/litecoind/litecoind-0.10.2.2.ebuild
similarity index 54%
rename from net-p2p/litecoind/litecoind-0.8.7.1.ebuild
rename to net-p2p/litecoind/litecoind-0.10.2.2.ebuild
index 806cbceffe8a..18b8c026dc6c 100644
--- a/net-p2p/litecoind/litecoind-0.8.7.1.ebuild
+++ b/net-p2p/litecoind/litecoind-0.10.2.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/litecoind/litecoind-0.8.7.1.ebuild,v 1.3 2014/08/28 22:34:06 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/litecoind/litecoind-0.10.2.2.ebuild,v 1.3 2015/07/11 13:54:41 blueness Exp $
EAPI=5
DB_VER="4.8"
-inherit bash-completion-r1 db-use eutils systemd user
+inherit autotools db-use eutils systemd user
MyPV="${PV/_/-}"
MyPN="litecoin"
@@ -19,19 +19,15 @@ SRC_URI="https://github.com/${MyPN}-project/${MyPN}/archive/v${MyPV}.tar.gz -> $
LICENSE="MIT ISC GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="examples ipv6 logrotate upnp"
+IUSE="logrotate upnp"
RDEPEND="
dev-libs/boost[threads(+)]
dev-libs/openssl:0[-bindist]
- logrotate? (
- app-admin/logrotate
- )
- upnp? (
- net-libs/miniupnpc
- )
+ logrotate? ( app-admin/logrotate )
+ upnp? ( net-libs/miniupnpc )
sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
- <=dev-libs/leveldb-1.12.0[-snappy]
+ virtual/bitcoin-leveldb
"
DEPEND="${RDEPEND}
>=app-shells/bash-4.1
@@ -47,47 +43,34 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${MyPN}-sys_leveldb.patch
+ epatch "${FILESDIR}/0.9.0-sys_leveldb.patch"
+ eautoreconf
rm -r src/leveldb
-
- if has_version '>=dev-libs/boost-1.52'; then
- sed -i 's/\(-l db_cxx\)/-l boost_chrono$(BOOST_LIB_SUFFIX) \1/' src/makefile.unix
- fi
}
src_configure() {
- OPTS=()
-
- OPTS+=("DEBUGFLAGS=")
- OPTS+=("CXXFLAGS=${CXXFLAGS}")
- OPTS+=("LDFLAGS=${LDFLAGS}")
-
+ local my_econf=
if use upnp; then
- OPTS+=("USE_UPNP=1")
+ my_econf="${my_econf} --with-miniupnpc --enable-upnp-default"
else
- OPTS+=("USE_UPNP=-")
+ my_econf="${my_econf} --without-miniupnpc --disable-upnp-default"
fi
-
- use ipv6 || OPTS+=("USE_IPV6=-")
-
- OPTS+=("USE_SYSTEM_LEVELDB=1")
- OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
- OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
-
- cd src || die
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f makefile.unix "${OPTS[@]}" ${PN}
+ econf \
+ --disable-wallet \
+ --disable-ccache \
+ --disable-static \
+ --disable-tests \
+ --with-system-leveldb \
+ --with-system-libsecp256k1 \
+ --without-libs \
+ --without-daemon \
+ --without-gui \
+ --without-qrencode \
+ ${my_econf}
}
-#Tests are broken with and without our litecoin-sys_leveldb.patch.
-#When tests work, make sure to inherit toolchain-funcs
-#src_test() {
-# cd src || die
-# emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f makefile.unix "${OPTS[@]}" test_litecoin
-# ./test_litecoin || die 'Tests failed'
-#}
-
src_install() {
- dobin src/${PN}
+ default
insinto /etc/litecoin
doins "${FILESDIR}/litecoin.conf"
@@ -108,14 +91,6 @@ src_install() {
newman contrib/debian/manpages/bitcoind.1 litecoind.1
newman contrib/debian/manpages/bitcoin.conf.5 litecoin.conf.5
- sed -i -e 's/bitcoin/litecoin/g' contrib/bitcoind.bash-completion
- newbashcomp contrib/bitcoind.bash-completion ${PN}.bash-completion
-
- if use examples; then
- docinto examples
- dodoc -r contrib/{bitrpc,pyminer,spendfrom,tidy_datadir.sh,wallettools}
- fi
-
if use logrotate; then
insinto /etc/logrotate.d
newins "${FILESDIR}/litecoind.logrotate" litecoind
diff --git a/net-p2p/litecoind/litecoind-0.8.7.2.ebuild b/net-p2p/litecoind/litecoind-0.8.7.2.ebuild
deleted file mode 100644
index 249237c9e624..000000000000
--- a/net-p2p/litecoind/litecoind-0.8.7.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/litecoind/litecoind-0.8.7.2.ebuild,v 1.1 2014/08/28 23:05:03 blueness Exp $
-
-EAPI=5
-
-DB_VER="4.8"
-
-inherit bash-completion-r1 db-use eutils systemd user
-
-MyPV="${PV/_/-}"
-MyPN="litecoin"
-MyP="${MyPN}-${MyPV}"
-
-DESCRIPTION="P2P Internet currency based on Bitcoin but easier to mine"
-HOMEPAGE="https://litecoin.org/"
-SRC_URI="https://github.com/${MyPN}-project/${MyPN}/archive/v${MyPV}.tar.gz -> ${MyP}.tar.gz"
-
-LICENSE="MIT ISC GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples ipv6 logrotate upnp"
-
-RDEPEND="
- dev-libs/boost[threads(+)]
- dev-libs/openssl:0[-bindist]
- logrotate? (
- app-admin/logrotate
- )
- upnp? (
- net-libs/miniupnpc
- )
- sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
- <=dev-libs/leveldb-1.12.0[-snappy]
-"
-DEPEND="${RDEPEND}
- >=app-shells/bash-4.1
- sys-apps/sed
-"
-
-S="${WORKDIR}/${MyP}"
-
-pkg_setup() {
- local UG='litecoin'
- enewgroup "${UG}"
- enewuser "${UG}" -1 -1 /var/lib/litecoin "${UG}"
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${MyPN}-sys_leveldb.patch
- rm -r src/leveldb
-
- if has_version '>=dev-libs/boost-1.52'; then
- sed -i 's/\(-l db_cxx\)/-l boost_chrono$(BOOST_LIB_SUFFIX) \1/' src/makefile.unix
- fi
-}
-
-src_configure() {
- OPTS=()
-
- OPTS+=("DEBUGFLAGS=")
- OPTS+=("CXXFLAGS=${CXXFLAGS}")
- OPTS+=("LDFLAGS=${LDFLAGS}")
-
- if use upnp; then
- OPTS+=("USE_UPNP=1")
- else
- OPTS+=("USE_UPNP=-")
- fi
-
- use ipv6 || OPTS+=("USE_IPV6=-")
-
- OPTS+=("USE_SYSTEM_LEVELDB=1")
- OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
- OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
-
- cd src || die
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f makefile.unix "${OPTS[@]}" ${PN}
-}
-
-#Tests are broken with and without our litecoin-sys_leveldb.patch.
-#When tests work, make sure to inherit toolchain-funcs
-#src_test() {
-# cd src || die
-# emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f makefile.unix "${OPTS[@]}" test_litecoin
-# ./test_litecoin || die 'Tests failed'
-#}
-
-src_install() {
- dobin src/${PN}
-
- insinto /etc/litecoin
- doins "${FILESDIR}/litecoin.conf"
- fowners litecoin:litecoin /etc/litecoin/litecoin.conf
- fperms 600 /etc/litecoin/litecoin.conf
-
- newconfd "${FILESDIR}/litecoin.confd" ${PN}
- newinitd "${FILESDIR}/litecoin.initd-r1" ${PN}
- systemd_dounit "${FILESDIR}/litecoin.service"
-
- keepdir /var/lib/litecoin/.litecoin
- fperms 700 /var/lib/litecoin
- fowners litecoin:litecoin /var/lib/litecoin/
- fowners litecoin:litecoin /var/lib/litecoin/.litecoin
- dosym /etc/litecoin/litecoin.conf /var/lib/litecoin/.litecoin/litecoin.conf
-
- dodoc doc/README.md doc/release-notes.md
- newman contrib/debian/manpages/bitcoind.1 litecoind.1
- newman contrib/debian/manpages/bitcoin.conf.5 litecoin.conf.5
-
- sed -i -e 's/bitcoin/litecoin/g' contrib/bitcoind.bash-completion
- newbashcomp contrib/bitcoind.bash-completion ${PN}.bash-completion
-
- if use examples; then
- docinto examples
- dodoc -r contrib/{bitrpc,pyminer,spendfrom,tidy_datadir.sh,wallettools}
- fi
-
- if use logrotate; then
- insinto /etc/logrotate.d
- newins "${FILESDIR}/litecoind.logrotate" litecoind
- fi
-}
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 86c3fbb3d6bd..c7ea4c4c078b 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.188 2015/07/05 13:43:48 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.189 2015/07/11 14:34:15 klausman Exp $
+
+# Tobias Klausmann (11 Jul 2015)
+# The test suite has ridiculous (transitive) requirements like
+# sci-mathematics/octave.
+>=dev-python/pyquery-1.2.9 test
# Gilles Dartiguelongue (09 Jun 2015)
# net-fs/libnfs lacks alpha keyword, bug #551576
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 63ff1986a11e..a3fc09bf6919 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,16 +1,16 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.172 2015/06/13 16:03:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.173 2015/07/11 10:59:45 chewi Exp $
+
+# James Le Cuirot (11 Jul 2015)
+# Requires dev-java/fop but we don't support java on ia64.
+gnome-extra/libgda reports
+net-analyzer/wireshark doc-pdf
# Pacho Ramos (13 Jun 2015)
# Missing keywords, bug #513108
net-misc/spice-gtk smartcard webdav
-# James Le Cuirot (11 Jun 2015)
-# Temporarily mask rdeps of rhino, which has EAPI 1, until I have a
-# chance to drop Java support on ia64 entirely.
-dev-java/icedtea javascript
-
# Gilles Dartiguelongue (09 Jun 2015)
# net-fs/libnfs lacks ia64 keyword, bug #551576
gnome-base/gvfs nfs
@@ -19,11 +19,6 @@ gnome-base/gvfs nfs
# dev-lang/luajit and dev-lua/lgi and lack ia64 keyword, bug #551540
dev-libs/libpeas lua jit
-# James Le Cuirot (20 May 2015)
-# Temporarily mask rdeps of icedtea-web to deal with bug #549134 until
-# I have a chance to drop Java support on ia64 entirely.
-dev-java/icedtea nsplugin webstart
-
# Mike Frysinger (16 Mar 2015)
# Needs sci-physics/bullet & media-libs/libsdl2 tested #499974
dev-libs/efl physics sdl
@@ -141,10 +136,6 @@ dev-haskell/dataenc test
# Fix per-arch mask of phonon[zeitgeist] #460140
media-libs/phonon zeitgeist
-# Tom Wijsman (9 May 2013)
-# Unmasking dev-java/antlr[java] as per bug #412223, acked by sera.
-dev-java/antlr -java
-
# Dirkjan Ochtman (3 May 2013)
# depends on net-libs/polarssl
>=net-misc/openvpn-2.3.1 polarssl
@@ -183,10 +174,6 @@ app-misc/tracker thunderbird
# keyworded here. Remove mask if this situation changes.
gnome-extra/sushi office
-# Alexandre Rostovtsev (27 Dec 2012)
-# remove mask when dev-java/fop is keyworded here
-gnome-extra/libgda reports
-
# Alexandre Rostovtsev (26 Dec 2012)
# remove when app-accessibility/at-spi2-core is stable for ia64
=net-libs/webkit-gtk-1.8.3-r300 webkit2
@@ -209,40 +196,10 @@ media-libs/phonon gstreamer vlc
# Needs x11-misc/lightdm(which also requires some other deps)
x11-misc/xscreensaver new-login
-# Mike Frysinger (10 May 2012)
-# We only want java available for unstable ebuilds, but we can't do that
-# currently, so we have to mask it from packages that go stable :(. #412223
-app-accessibility/brltty java
-app-pda/pilot-link java
-app-text/hyperestraier java
-dev-db/qdbm java
-dev-lang/R java
-dev-libs/beecrypt java
-dev-libs/cyrus-sasl java
-dev-libs/link-grammar java
-dev-ruby/fakeweb java
-dev-ruby/net-scp java
-dev-ruby/net-ssh java
-dev-ruby/test-spec java
-dev-ruby/tmail java
-dev-tex/tex4ht java
-dev-vcs/subversion java
-gnome-extra/libgda java
-media-libs/libcaca java
-net-dns/libidn java
-net-print/cups java
-sys-libs/db java
-www-client/firefox java
-www-client/seamonkey java
-
# Alexandre Rostovtsev (12 Apr 2012)
# Requires gnutls[pkcs11], which is use.masked on ia64
net-libs/glib-networking smartcard
-# Ralph Sennhauser (31 Dec 2011)
-# Needs dev-java/fop which is not available for ia64 due to missing JVM #345433
-net-analyzer/wireshark doc-pdf
-
# Alexey Shvetsov (17 Dec 2011)
# Mask use numa for openmpi
sys-cluster/openmpi openmpi_fabrics_psm openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_ofed openmpi_fabrics_dapl openmpi_rm_slurm openmpi_fabrics_sctp openmpi_ofed_features_rdmacm
@@ -280,8 +237,6 @@ app-text/asciidoc test
sys-apps/smartmontools caps
# Raúl Porcel (5 Dec 2010)
-# Mask doc-pdf because of Java dependencies (bug #347259)
-net-analyzer/wireshark doc-pdf
# Needs testing
www-client/elinks javascript
@@ -307,10 +262,6 @@ x11-wm/fvwm lock
# net-libs/webkit-gtk segfaults but dev-qt/qtwebkit doesn't
dev-python/PyQt4 -webkit
-# Jean-Noel Rivasseau (28 Jul 2008)
-# icu4j tests need jdk-1.6
-dev-java/icu4j test
-
# Raúl Porcel (07 Jul 2008)
# Make clisp deps minimal
dev-lisp/clisp hyperspec pari svm
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index a2003caf03b4..c598e2f05850 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -140,18 +140,10 @@ phonon
# architecture.
qdbm
-# java releated use flags
-# need to get dev-java/ant marked stable stable
-# before unmasking (16 Oct 2006 nichoj)
+# James Le Cuirot (11 Jul 2015)
+# We don't support java on ia64.
java
freetts
-# need to keyword openjms-bin, sun-jms
-jms
-# need to keyword sun-jmx
-jmx
-# need to keyword sun-javamail-bin, sun-javamail
-javamail
-# needs java
pdfannotextractor
# Aggelos Orfanakos (18 Jan 2008)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 692fc8af1098..3c8268fe84b6 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3156,6 +3156,7 @@ kde-base/kdebase-startkde:wallpapers - Install the KDE wallpapers
kde-base/kdebindings-meta:csharp - Enable C# language bindings for KDE and Qt
kde-base/kdelibs:nepomuk - Enable Nepomuk based semantic desktop support (deprecated)
kde-base/kdelibs:opengl - Enable OpenGL support for Plasma (GLApplet)
+kde-base/kdepim-common-libs:google - Google service integration via net-libs/libkgapi
kde-base/kdepim-meta:akonadi - Enables support for kde-base/akonadi
kde-base/kdepim-runtime:facebook - Facebook service integration via net-libs/libkfbapi
kde-base/kdepim-runtime:google - Google service integration via net-libs/libkgapi
@@ -7690,6 +7691,7 @@ www-servers/varnish:tools - Build additional tools: varnishhist, varnishstat, va
x11-apps/ardesia:cwiid - cwiid support: collection of Linux tools written in C for interfacing to the Nintendo Wiimote.
x11-apps/intel-gpu-tools:python - Install python based register dumper utilities
x11-apps/intel-gpu-tools:test-programs - Install test programs for DRM driver development
+x11-apps/intel-gpu-tools:unwind - Provide automatic stack traces on test failures
x11-apps/mesa-progs:egl - Build EGL utilities
x11-apps/mesa-progs:gles1 - Build OpenGL ES 1 utilities
x11-apps/mesa-progs:gles2 - Build OpenGL ES 2 utilities
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
index 3500f649fa70..31c7f2e6542c 100644
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild,v 1.10 2015/05/21 19:54:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild,v 1.11 2015/07/11 14:02:31 klausman Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86" # alpha hppa ppc64 sparc
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86" # alpha hppa ppc64 sparc
RDEPEND=">=sys-apps/sg3_utils-1.24
app-admin/killproc
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 478e7c281ddf..cb9a78cbe6b1 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.178 2015/07/10 23:08:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.179 2015/07/11 16:39:36 floppym Exp $
EAPI=5
@@ -152,6 +152,11 @@ pkg_setup() {
:
}
+src_unpack() {
+ default
+ [[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
src_prepare() {
# Bug 463376
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
diff --git a/sys-devel/bison/bison-3.0.4-r1.ebuild b/sys-devel/bison/bison-3.0.4-r1.ebuild
index 3dbff27bc28f..7824db880d15 100644
--- a/sys-devel/bison/bison-3.0.4-r1.ebuild
+++ b/sys-devel/bison/bison-3.0.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-3.0.4-r1.ebuild,v 1.3 2015/05/08 08:33:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-3.0.4-r1.ebuild,v 1.4 2015/07/11 16:54:51 klausman Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples nls static test"
RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/virtual/jdk/jdk-1.6.0-r2.ebuild b/virtual/jdk/jdk-1.6.0-r2.ebuild
index 1246dab8b330..05322fac22d2 100644
--- a/virtual/jdk/jdk-1.6.0-r2.ebuild
+++ b/virtual/jdk/jdk-1.6.0-r2.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild,v 1.3 2015/04/14 21:34:15 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r2.ebuild,v 1.4 2015/07/11 09:24:18 chewi Exp $
EAPI="4"
DESCRIPTION="Virtual for Java Development Kit (JDK)"
SLOT="1.6"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
# The keyword voodoo below is needed to work around confilcting masking types
# and for having arch specific preferences.
diff --git a/virtual/jdk/jdk-1.7.0.ebuild b/virtual/jdk/jdk-1.7.0.ebuild
index 023a8163f358..f2906fd7231f 100644
--- a/virtual/jdk/jdk-1.7.0.ebuild
+++ b/virtual/jdk/jdk-1.7.0.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.15 2015/04/17 08:35:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.16 2015/07/11 09:24:18 chewi Exp $
EAPI="5"
DESCRIPTION="Virtual for Java Development Kit (JDK)"
SLOT="1.7"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="|| (
=dev-java/icedtea-bin-7*
diff --git a/virtual/jdk/jdk-1.8.0.ebuild b/virtual/jdk/jdk-1.8.0.ebuild
index 492d36747bb6..bff029e99764 100644
--- a/virtual/jdk/jdk-1.8.0.ebuild
+++ b/virtual/jdk/jdk-1.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild,v 1.2 2014/05/30 11:20:17 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.8.0.ebuild,v 1.3 2015/07/11 09:24:18 chewi Exp $
EAPI="5"
@@ -8,6 +8,6 @@ DESCRIPTION="Virtual for Java Development Kit (JDK)"
SLOT="1.8"
# TODO: Temporarily dropped ~sparc-solaris and ~x86-solaris as oracle-jdk-bin
# no longer provides them. Also temporarily dropped ~ia64.
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris "
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
RDEPEND="=dev-java/oracle-jdk-bin-1.8.0*"
diff --git a/virtual/jre/jre-1.6.0-r1.ebuild b/virtual/jre/jre-1.6.0-r1.ebuild
index 59a7d71565a6..1aad5c282985 100644
--- a/virtual/jre/jre-1.6.0-r1.ebuild
+++ b/virtual/jre/jre-1.6.0-r1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.6.0-r1.ebuild,v 1.3 2015/04/14 21:35:32 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.6.0-r1.ebuild,v 1.4 2015/07/11 09:24:33 chewi Exp $
EAPI="5"
DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
SLOT="1.6"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="|| (
=virtual/jdk-1.6.0*
diff --git a/virtual/jre/jre-1.7.0.ebuild b/virtual/jre/jre-1.7.0.ebuild
index ffa7be9da539..87f98e48aa59 100644
--- a/virtual/jre/jre-1.7.0.ebuild
+++ b/virtual/jre/jre-1.7.0.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.7.0.ebuild,v 1.11 2015/04/17 08:35:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.7.0.ebuild,v 1.12 2015/07/11 09:24:33 chewi Exp $
EAPI="5"
DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
SLOT="1.7"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="|| (
=virtual/jdk-1.7.0*
diff --git a/virtual/jre/jre-1.8.0.ebuild b/virtual/jre/jre-1.8.0.ebuild
index 1a330c7463c9..7e1258a99614 100644
--- a/virtual/jre/jre-1.8.0.ebuild
+++ b/virtual/jre/jre-1.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.8.0.ebuild,v 1.2 2014/05/30 11:20:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jre/jre-1.8.0.ebuild,v 1.3 2015/07/11 09:24:33 chewi Exp $
EAPI="5"
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild
similarity index 86%
rename from x11-apps/intel-gpu-tools/intel-gpu-tools-1.11.ebuild
rename to x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild
index 3edcaf483e72..bc055a76cb6d 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11.ebuild,v 1.1 2015/07/07 17:47:10 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild,v 1.1 2015/07/11 12:08:17 mrueg Exp $
EAPI=5
@@ -10,7 +10,7 @@ inherit python-single-r1 xorg-2
DESCRIPTION="Intel GPU userland tools"
KEYWORDS="~amd64 ~x86"
-IUSE="python test-programs video_cards_nouveau"
+IUSE="python test-programs unwind video_cards_nouveau"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="test"
@@ -18,7 +18,8 @@ DEPEND="dev-libs/glib:2
>=x11-libs/cairo-1.12.0
>=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?]
>=x11-libs/libpciaccess-0.10
- python? ( ${PYTHON_DEPS} )"
+ python? ( ${PYTHON_DEPS} )
+ unwind? ( sys-libs/libunwind )"
RDEPEND="${DEPEND}"
pkg_setup() {
@@ -30,6 +31,7 @@ src_configure() {
$(use_enable python dumper)
$(use_enable video_cards_nouveau nouveau)
$(use_enable test-programs tests)
+ $(use_with unwind libunwind)
)
xorg-2_src_configure
}
diff --git a/x11-apps/intel-gpu-tools/metadata.xml b/x11-apps/intel-gpu-tools/metadata.xml
index 94ed2da9dc08..fe7694404ff5 100644
--- a/x11-apps/intel-gpu-tools/metadata.xml
+++ b/x11-apps/intel-gpu-tools/metadata.xml
@@ -5,5 +5,6 @@