From bd3609c18174428a6a693a1f36d06600d941a686 Mon Sep 17 00:00:00 2001
From: root <root@sandbox.local.calculate.ru>
Date: Tue, 21 Jun 2016 14:42:32 +0300
Subject: [PATCH] Sync with portage [Tue Jun 21 14:42:32 MSK 2016].

---
 dev-java/tomcat-servlet-api/Manifest          |   1 +
 .../tomcat-servlet-api-7.0.70.ebuild          |  35 ++++
 metadata/dtd/timestamp.chk                    |   2 +-
 metadata/glsa/timestamp.chk                   |   2 +-
 .../dev-java/tomcat-servlet-api-7.0.70        |  13 ++
 metadata/md5-cache/net-misc/i2pd-2.8.0        |  13 ++
 .../sys-kernel/hardened-sources-4.5.7-r1      |  14 --
 .../sys-kernel/hardened-sources-4.5.7-r2      |  14 --
 ...ources-4.5.7 => hardened-sources-4.5.7-r3} |   6 +-
 metadata/md5-cache/www-servers/tomcat-7.0.70  |  14 ++
 metadata/news/timestamp.chk                   |   2 +-
 metadata/timestamp                            |   2 +-
 metadata/timestamp.chk                        |   2 +-
 metadata/timestamp.x                          |   2 +-
 metadata/xml-schema/timestamp.chk             |   2 +-
 net-misc/i2pd/Manifest                        |   1 +
 net-misc/i2pd/i2pd-2.8.0.ebuild               |  99 ++++++++++++
 sys-kernel/hardened-sources/Manifest          |   4 +-
 .../hardened-sources-4.5.7-r1.ebuild          |  45 ------
 ...build => hardened-sources-4.5.7-r3.ebuild} |   2 +-
 .../hardened-sources-4.5.7.ebuild             |  45 ------
 www-servers/tomcat/Manifest                   |   1 +
 .../files/tomcat-7.0.70-build.xml.patch       | 149 ++++++++++++++++++
 www-servers/tomcat/tomcat-7.0.70.ebuild       | 145 +++++++++++++++++
 24 files changed, 483 insertions(+), 132 deletions(-)
 create mode 100644 dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.70.ebuild
 create mode 100644 metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.70
 create mode 100644 metadata/md5-cache/net-misc/i2pd-2.8.0
 delete mode 100644 metadata/md5-cache/sys-kernel/hardened-sources-4.5.7-r1
 delete mode 100644 metadata/md5-cache/sys-kernel/hardened-sources-4.5.7-r2
 rename metadata/md5-cache/sys-kernel/{hardened-sources-4.5.7 => hardened-sources-4.5.7-r3} (91%)
 create mode 100644 metadata/md5-cache/www-servers/tomcat-7.0.70
 create mode 100644 net-misc/i2pd/i2pd-2.8.0.ebuild
 delete mode 100644 sys-kernel/hardened-sources/hardened-sources-4.5.7-r1.ebuild
 rename sys-kernel/hardened-sources/{hardened-sources-4.5.7-r2.ebuild => hardened-sources-4.5.7-r3.ebuild} (96%)
 delete mode 100644 sys-kernel/hardened-sources/hardened-sources-4.5.7.ebuild
 create mode 100644 www-servers/tomcat/files/tomcat-7.0.70-build.xml.patch
 create mode 100644 www-servers/tomcat/tomcat-7.0.70.ebuild

diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 1e9dea26d5c4..7d2eaa879f60 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -6,6 +6,7 @@ DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 d464b3e770197f026bf802d19be0
 DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
 DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c WHIRLPOOL 594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
 DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 fd29dc7ecd4796a693fdd7fc568ef4fde91debfd22f50a8d7d1676c018cf330b SHA512 14025071497dd3d1b601958297dcce5f4e4d2ec192ece3484fcdedfe0ca8d5e9a37941e8db857e90716c73484a2415c0aadc9334a292d8a15b5181dda23b05ce WHIRLPOOL 1713fdfcffcc454d9b04cdd108b14cb49daf790f60a607fba22d828183f3f8c1c53d99a225da838d9cadbf5890d81789f0d1c5636ef30afb4e721d1bec4e9667
+DIST apache-tomcat-7.0.70-src.tar.gz 4661050 SHA256 c15b193a2f3ed22d460fa135dd8719381bdddde0e59eb359c50d5a9c61868251 SHA512 e7a6108d2c5c5e66ac9c8c55493445d6d8eaf9a3949006e0f3f445d8dbae5a1e8a0e99106545a9048434968c945616377f63af5351765ce340e2df35eb5f1ef1 WHIRLPOOL 42ddd71b768f205a981e50ed6daa5b7c0d2342f7bae901f996695224a749bae1973c2859988e6db24d7692f66b868ae2632976983655bde3fdec5efd3cf5126d
 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
 DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d WHIRLPOOL b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
 DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 420036fde5e1bfe0a3d27299e355ee153b7c547d17c7b52fe4b15a1315d9c4e9 SHA512 c56ba4339fc114cda9a784c7f37be99c82238bbe043f69a3bed2ec86a0bf60325af9105d74cfcffa144636fecc7f4730cee08eca3a22ed035dd5e3e483fa1742 WHIRLPOOL 38d2382eabe19be8b008eb8975ddf95e086b482eb58cb56f566cf4ec7c7628663260a550b611f4db57803e503ab6746aedaac279bff24868c5997eaee3514966
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.70.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.70.ebuild
new file mode 100644
index 000000000000..4d6ba5488c50
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.70.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	java-pkg_clean
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 5fde3fc9b29a..d2a8e0333aa4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Jun 2016 08:40:46 +0000
+Tue, 21 Jun 2016 11:10:45 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 5fde3fc9b29a..d2a8e0333aa4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Jun 2016 08:40:46 +0000
+Tue, 21 Jun 2016 11:10:45 +0000
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.70 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.70
new file mode 100644
index 000000000000..16b509222c23
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.70
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
+EAPI=5
+HOMEPAGE=http://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~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-r3 source? ( app-arch/zip )
+SLOT=3.0
+SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.70/src/apache-tomcat-7.0.70-src.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=1f7ece82a9f85f19d4d2a1b2c2d71138
diff --git a/metadata/md5-cache/net-misc/i2pd-2.8.0 b/metadata/md5-cache/net-misc/i2pd-2.8.0
new file mode 100644
index 000000000000..888e4452f4da
--- /dev/null
+++ b/metadata/md5-cache/net-misc/i2pd-2.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!static? ( >=dev-libs/boost-1.49[threads] dev-libs/crypto++ !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) ) static? ( >=dev-libs/boost-1.49[static-libs,threads] dev-libs/crypto++[static-libs] !libressl? ( dev-libs/openssl:0[-bindist,static-libs] ) libressl? ( dev-libs/libressl[static-libs] ) upnp? ( net-libs/miniupnpc[static-libs] ) ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
+EAPI=6
+HOMEPAGE=https://github.com/PurpleI2P/i2pd
+IUSE=cpu_flags_x86_aes i2p-hardening libressl pch static +upnp
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=!static? ( >=dev-libs/boost-1.49[threads] dev-libs/crypto++ !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) )
+SLOT=0
+SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.8.0.tar.gz -> i2pd-2.8.0.tar.gz
+_eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3425755471ebc35fd306fc0ce6733d7f
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.5.7-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-4.5.7-r1
deleted file mode 100644
index 7c3f83f97885..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.5.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 4.5)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.5.7-r1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.5.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.5-gnu/deblob-4.5 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.5-gnu/deblob-check -> deblob-check-4.5 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.5.7-2.extras.tar.bz2 mirror://gentoo/genpatches-4.5-9.base.tar.xz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	kernel-2	42f76647114dfe0b91855624a26b2cc2	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=78c4f860214a4e2ba198073d19aaaccf
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.5.7-r2 b/metadata/md5-cache/sys-kernel/hardened-sources-4.5.7-r2
deleted file mode 100644
index cc666667853a..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.5.7-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Hardened kernel sources (kernel series 4.5)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.5.7-r2
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.5.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.5-gnu/deblob-4.5 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.5-gnu/deblob-check -> deblob-check-4.5 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.5.7-3.extras.tar.bz2 mirror://gentoo/genpatches-4.5-9.base.tar.xz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	kernel-2	42f76647114dfe0b91855624a26b2cc2	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9c2a8c17205f33c78f8734395253c187
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.5.7 b/metadata/md5-cache/sys-kernel/hardened-sources-4.5.7-r3
similarity index 91%
rename from metadata/md5-cache/sys-kernel/hardened-sources-4.5.7
rename to metadata/md5-cache/sys-kernel/hardened-sources-4.5.7-r3
index eff66db92af4..08d2972160d6 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.5.7
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.5.7-r3
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.5.7
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.5.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.5-gnu/deblob-4.5 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.5-gnu/deblob-check -> deblob-check-4.5 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.5.7-1.extras.tar.bz2 mirror://gentoo/genpatches-4.5-9.base.tar.xz
+SLOT=4.5.7-r3
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.5.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.5-gnu/deblob-4.5 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.5-gnu/deblob-check -> deblob-check-4.5 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.5.7-4.extras.tar.bz2 mirror://gentoo/genpatches-4.5-9.base.tar.xz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	kernel-2	42f76647114dfe0b91855624a26b2cc2	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9850243ee7ac616887c55ef03449678c
+_md5_=6e94a8fec1b1baf664ffe862b7893e04
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.70 b/metadata/md5-cache/www-servers/tomcat-7.0.70
new file mode 100644
index 000000000000..aa37a06221a5
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.70
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 websockets? ( >=virtual/jdk-1.7 ) !websockets? ( >=virtual/jdk-1.6 ) test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
+EAPI=5
+HOMEPAGE=http://tomcat.apache.org/
+IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 websockets? ( >=virtual/jre-1.7 ) !websockets? ( >=virtual/jre-1.6 ) !<dev-java/tomcat-native-1.1.24 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=7
+SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.70/src/apache-tomcat-7.0.70-src.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=27ca17b91df99495fc4092c23b134b5e
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 5fde3fc9b29a..d2a8e0333aa4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Jun 2016 08:40:46 +0000
+Tue, 21 Jun 2016 11:10:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3902d049a328..a941ae7fef4d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jun 21 08:39:51 UTC 2016
+Tue Jun 21 11:09:50 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c68b0ae0496a..6f3645326608 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Jun 2016 09:30:01 +0000
+Tue, 21 Jun 2016 11:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d48835ce55ae..7e5b351ed070 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1466498401 Tue 21 Jun 2016 08:40:01 AM UTC
+1466507401 Tue 21 Jun 2016 11:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 5fde3fc9b29a..d2a8e0333aa4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Jun 2016 08:40:46 +0000
+Tue, 21 Jun 2016 11:10:45 +0000
diff --git a/net-misc/i2pd/Manifest b/net-misc/i2pd/Manifest
index dfe7a712eeb5..4e3c9b3701a3 100644
--- a/net-misc/i2pd/Manifest
+++ b/net-misc/i2pd/Manifest
@@ -2,3 +2,4 @@ DIST i2pd-2.5.0.tar.gz 391637 SHA256 ea01cc99c443f838ab8faf3440da45dd2ca666ab627
 DIST i2pd-2.5.1.tar.gz 394332 SHA256 4cdc98676eb1d020dc11c8f2c7c5d0e739bf8c858c97eab235449cea98ca9d2c SHA512 33293e96a2715696a8cb7bcabe995ffc9a5b374e4fa4b72eebf878a8b4603600a910ded1dc775d08d89eb881f0492118ef837a0432664f4a492008b31dafec92 WHIRLPOOL c9b02580d4e6af8430e7ca0d90ad45653df700b4e955f9fcd852301129801ded284b7583c8a9a1398457caa04c8ca5080655c6bbb94686ee56af9547752c753b
 DIST i2pd-2.6.0.tar.gz 669220 SHA256 3af3edfd5def3504cbda59aa737a47f9852f844a2f5a1b47659e138acdd614c4 SHA512 73761737a50283ed78e59263ff91bb21a41147d85de62f2e27742f4f90d8e2441c20ec329b78f88e2255d837ed4584564396caee04df44b5cf5d7c1110508aa5 WHIRLPOOL 94821e65d05eba9e61ee353cc2318f0182c69393cdcf34bb3af818c54720fff76259532855689355453eb917639dcfd4e5d1e8d894f857bfc853728c11b1c71e
 DIST i2pd-2.7.0.tar.gz 410922 SHA256 e4a3e192e424492962092f65a04fe12cac10f267ba2c99e2e62ca917741fba7e SHA512 3ca7af86ff43f030ab6219bd5ebe9a9acf4822d452c5761b83392ab0055f7835cfd68ebb336a2af0817bcdf9c8ecbefb618d00374384ded0084b51594aa96e0e WHIRLPOOL e1d05a5454cd9a0dbee18fea3447bc81fc74ee519e6ddb8f3d984ac66076f4606a624d55b9f22e2542f491626c18b74235247fe665ba789da2258f53b159ecfb
+DIST i2pd-2.8.0.tar.gz 1695271 SHA256 3f3f538b3c5b3095021311b434456c42d6f3b5e43dc7972c263b10ef179ba063 SHA512 379b72c4021dc8342405a034219ecb3681014a0ea1612da8b61de2b03adf2611ebe267233ed2891a2fb5a345d9304d7501c42d8c985362be72239b653d0d3c39 WHIRLPOOL 511d4e3a084604289c041a69135d8afc5abca186fe96704ca35108e96c84523706aaa73c07884dcce65df1fe9fed9335cea65b52dc14bd4a61b94d6fd11c6838
diff --git a/net-misc/i2pd/i2pd-2.8.0.ebuild b/net-misc/i2pd/i2pd-2.8.0.ebuild
new file mode 100644
index 000000000000..55adfa5f8637
--- /dev/null
+++ b/net-misc/i2pd/i2pd-2.8.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils systemd user cmake-utils
+
+DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
+HOMEPAGE="https://github.com/PurpleI2P/i2pd"
+SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
+
+RDEPEND="!static? ( >=dev-libs/boost-1.49[threads]
+			dev-libs/crypto++
+			!libressl? ( dev-libs/openssl:0 )
+			libressl? ( dev-libs/libressl )
+			upnp? ( net-libs/miniupnpc )
+		)"
+DEPEND="${RDEPEND}
+	static? ( >=dev-libs/boost-1.49[static-libs,threads]
+		dev-libs/crypto++[static-libs]
+		!libressl? ( dev-libs/openssl:0[-bindist,static-libs] )
+		libressl? ( dev-libs/libressl[static-libs] )
+		upnp? ( net-libs/miniupnpc[static-libs] ) )
+	i2p-hardening? ( >=sys-devel/gcc-4.7 )
+	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
+
+I2PD_USER=i2pd
+I2PD_GROUP=i2pd
+
+CMAKE_USE_DIR="${S}/build"
+
+DOCS=( README.md docs/i2pd.conf debian/tunnels.conf debian/subscriptions.txt )
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.5.1-fix_installed_components.patch"
+	eapply_user
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+		-DWITH_PCH=$(usex pch ON OFF)
+		-DWITH_STATIC=$(usex static ON OFF)
+		-DWITH_UPNP=$(usex upnp ON OFF)
+		-DWITH_LIBRARY=ON
+		-DWITH_BINARY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# config
+	insinto /etc/i2pd
+	doins docs/i2pd.conf
+	doins debian/tunnels.conf
+	doins debian/subscriptions.txt
+
+	# grant i2pd group read and write access to config files
+	fowners "root:${I2PD_GROUP}" \
+		/etc/i2pd/i2pd.conf \
+		/etc/i2pd/tunnels.conf \
+		/etc/i2pd/subscriptions.txt
+	fperms 660 \
+		/etc/i2pd/i2pd.conf \
+		/etc/i2pd/tunnels.conf \
+		/etc/i2pd/subscriptions.txt
+
+	# working directory
+	keepdir /var/lib/i2pd
+	insinto /var/lib/i2pd
+	doins -r contrib/certificates
+	dosym /etc/i2pd/subscriptions.txt /var/lib/i2pd/subscriptions.txt
+	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
+	fperms 700 /var/lib/i2pd/
+
+	# add /var/lib/i2pd/certificates to CONFIG_PROTECT
+	doenvd "${FILESDIR}/99i2pd"
+
+	# openrc and systemd daemon routines
+	newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
+	newinitd "${FILESDIR}/i2pd-2.6.0-r3.initd" i2pd
+	systemd_newunit "${FILESDIR}/i2pd-2.6.0-r3.service" i2pd.service
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd
+}
+
+pkg_setup() {
+	enewgroup "${I2PD_GROUP}"
+	enewuser "${I2PD_USER}" -1 -1 /var/lib/run/i2pd "${I2PD_GROUP}"
+}
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 438eba8a343c..ff4a67fea50e 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -16,9 +16,7 @@ DIST hardened-patches-4.4.8-2.extras.tar.bz2 1743408 SHA256 5cde9a96f6a47ebe3c8a
 DIST hardened-patches-4.5.5-2.extras.tar.bz2 1857002 SHA256 1c207e88a652d2d9c239559b58ba9533ca0aae4fb545bc1ed6d2d6c34ccd7127 SHA512 ad820e0d5d44512d7a2f34d7b1bc49753fe02712b17a11130631fb80a117423d69a75dadae8e4c69a934c354f796213d5e76a2ab9028d88efd02538c739e74cb WHIRLPOOL 426d7019b644c922d8396441f206eb82b1fefc13bf805f77f1c0dccf2fde489c6e119f40007d90323d3c4f79060bd7dd0cf5de7cfcf2f1afb7b65d1ac16e29c6
 DIST hardened-patches-4.5.5-3.extras.tar.bz2 1860142 SHA256 810085dcf1a1cd1ff1bacbad32efd12ad14420258b19d44c2f069b82d1308f9d SHA512 b6149c1c74fa0cf7b08a3683b63c80b8c866170e56ddd297c559072f0218308df55327010a900e887ceaa9c25064ee32ace8c78749e89b2d7bceec968327f246 WHIRLPOOL 67999dea8f99d6fd5cea83a4010f957242ee857935172a4da7bbd4f5d5b62426940623517790a579b038d9e63bb8a45a8eceb553ac4d3a606a35918d91be0408
 DIST hardened-patches-4.5.6-1.extras.tar.bz2 1862944 SHA256 2f3cab5b41d843ba069d7fcd5f22edb8a38e68cf4d388823fae91ed7af7ff78b SHA512 3fc18551fbc4647a7e050659c4222cca68805605ed3fee863214e9a0c71c54cb9fc44ecf8aafedbca5238c72d3349a30028889117aca313d3ec27d00e2b82909 WHIRLPOOL 91e0292c5905ed018461b4150b054ed29519c72d9838facaf4d437fdca1fcb9642147fa9243021fab51fea63b1ab4ec1eeacd564fa439d33b7aa1019c7d5691b
-DIST hardened-patches-4.5.7-1.extras.tar.bz2 1861918 SHA256 4f5602f245dddc4dcd0aee6ef587a463e1738c301e30a547ff6a8b24b4df10d2 SHA512 d95f109c7bcf54450f2b5ebb8705e448905bcbbc21abc27fcd597beae8b6bff9954a4782169965c0b66c2ebc60544187a4e81fc7204733e7aa39f38f4075ffa0 WHIRLPOOL 81c0b8c7add4fd81d10d38890190e2a97cf81514d3718db908dc1e76136577b276064ffb0de80c27ac7e0e4dddfbf99ea1689eb4200c209a99bb44057e326062
-DIST hardened-patches-4.5.7-2.extras.tar.bz2 1865376 SHA256 066621126965be10695a5f7625d1628ee24ef69d11a2198df5beaca6d0980e2f SHA512 1b0a6ce77f08e8b2820eae1b75ac12de7f0ed90c30b368332e2f5822a8fa15b2c2747babc973a92d1a34c31bedbffcb77c539e220ea05b2206a147e8e9ef0279 WHIRLPOOL 66167a50b5221727ac3ee6cb46bfbc2a64d4fa889ad303b47ec18902df6d2f42e291b1e05f387982dea6be8ca011d183cc6089eebf997bbe57b02af286a09f52
-DIST hardened-patches-4.5.7-3.extras.tar.bz2 1869378 SHA256 04a6ec042679470c20bd06c6cb1b6e884a2465417ce3af8cd1ed5b8d466b7b75 SHA512 fbf5a812a43621b9eee2cb63ca9c94ae0f1b07352d787ad7351191e370aaab5de983ad4be4dcd3f09065ec7067628f8da611eebf7b122521bc4d8f2cdd84e21c WHIRLPOOL 87a7d1db01a581fdfba87e2a956c4dd94b0a6bd3e3165a239ffa2a31a2bc9e6fe304893090a7fb12620ac8acb837da4a82f9b20d459b6b7335d12970d5a9ed6b
+DIST hardened-patches-4.5.7-4.extras.tar.bz2 1868492 SHA256 e373f0389262ba9544eb2a9ed118dfdf38a468770f3155ef8440e9fc093f5ddb SHA512 ef06ecfd7dbed21340d6e45f03eda1cab3f349746b13fd114ec356891bc00c90552e4f78b89ff7f8508d491dd91bfb669105562aec07d7b3f2e05b6f671924aa WHIRLPOOL ce1bd1755bcb974dfddeb8d6f2e985ff052ded6b1fc20fd8b813a97b07fdd5e2324efb3cfd4106a966f9295d5f8dc1bcda13f1f22f916eb8d835f80fd146bbed
 DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
 DIST linux-4.5.tar.xz 88375040 SHA256 a40defb401e01b37d6b8c8ad5c1bbab665be6ac6310cdeed59950c96b31a519c SHA512 cb0d5f30baff37dfea40fbc1119a1482182f95858c883e019ee3f81055c8efbdb9dba7dfc02ebcc4216db38f03ece58688e69efc0fce1dade359af30bd5426de WHIRLPOOL 8faa0b02c5733fc45dbe61f82a7022e9246b9b1665f27541d4afa5d14c310b9dce7a8532dfac8273898edf8c6923654ee2fbcf2cec1ec2a220f4c9f926f2b333
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.5.7-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.5.7-r1.ebuild
deleted file mode 100644
index 01a347daccae..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-4.5.7-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="9"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.5.7-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.5.7-r3.ebuild
similarity index 96%
rename from sys-kernel/hardened-sources/hardened-sources-4.5.7-r2.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-4.5.7-r3.ebuild
index 63bd126567fc..473948b7a907 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.5.7-r2.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.5.7-r3.ebuild
@@ -12,7 +12,7 @@ K_DEBLOB_AVAILABLE="1"
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-4"
 HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.5.7.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.5.7.ebuild
deleted file mode 100644
index a485a1b21671..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-4.5.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="9"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 4c677ff307ce..cbdd2346df82 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,7 @@
 DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
 DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c WHIRLPOOL 594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
 DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 fd29dc7ecd4796a693fdd7fc568ef4fde91debfd22f50a8d7d1676c018cf330b SHA512 14025071497dd3d1b601958297dcce5f4e4d2ec192ece3484fcdedfe0ca8d5e9a37941e8db857e90716c73484a2415c0aadc9334a292d8a15b5181dda23b05ce WHIRLPOOL 1713fdfcffcc454d9b04cdd108b14cb49daf790f60a607fba22d828183f3f8c1c53d99a225da838d9cadbf5890d81789f0d1c5636ef30afb4e721d1bec4e9667
+DIST apache-tomcat-7.0.70-src.tar.gz 4661050 SHA256 c15b193a2f3ed22d460fa135dd8719381bdddde0e59eb359c50d5a9c61868251 SHA512 e7a6108d2c5c5e66ac9c8c55493445d6d8eaf9a3949006e0f3f445d8dbae5a1e8a0e99106545a9048434968c945616377f63af5351765ce340e2df35eb5f1ef1 WHIRLPOOL 42ddd71b768f205a981e50ed6daa5b7c0d2342f7bae901f996695224a749bae1973c2859988e6db24d7692f66b868ae2632976983655bde3fdec5efd3cf5126d
 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
 DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d WHIRLPOOL b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727
 DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 420036fde5e1bfe0a3d27299e355ee153b7c547d17c7b52fe4b15a1315d9c4e9 SHA512 c56ba4339fc114cda9a784c7f37be99c82238bbe043f69a3bed2ec86a0bf60325af9105d74cfcffa144636fecc7f4730cee08eca3a22ed035dd5e3e483fa1742 WHIRLPOOL 38d2382eabe19be8b008eb8975ddf95e086b482eb58cb56f566cf4ec7c7628663260a550b611f4db57803e503ab6746aedaac279bff24868c5997eaee3514966
diff --git a/www-servers/tomcat/files/tomcat-7.0.70-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.70-build.xml.patch
new file mode 100644
index 000000000000..481591fb6ff5
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.70-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml	2015-06-30 09:15:44.000000000 +0100
++++ apache-tomcat-7.0.63-src/build.xml	2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+       </fileset>
+     </copy>
+     <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+     <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+       <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+         <include name="*" />
+         <exclude name="jspxml*" />
+       </fileset>
+     </copy>
++-->
+ 
+   </target>
+ 
+@@ -721,26 +723,32 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+ 
+     <!-- JSP 2.2 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+       notice="${tomcat.manifests}/jsp-api.jar.notice"
+       license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+ 
+     <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- Bootstrap JAR File -->
+     <jarIt jarfile="${bootstrap.jar}"
+@@ -986,12 +994,14 @@
+   <target name="deploy" depends="package,build-docs,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+ 
++<!--
+     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+ 
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
++-->
+ 
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+@@ -1051,14 +1061,15 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
++<!--
+     <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+-
++-->
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+-
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+       failonerror="false"/>
+-
++-->
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1681,7 +1692,7 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1886,6 +1897,7 @@
+     description="Create the Tomcat javadoc" >
+     <fail unless="java.7.home"
+           message="The java.7.home property must be set for javadoc build"/>
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -1947,6 +1959,7 @@
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1985,9 +1998,11 @@
+         <path refid="tomcat.webservices.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2642,7 +2657,7 @@
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download (and build) components necessary to compile" >
++          description="Download (and build) components necessary to compile" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2699,7 +2714,7 @@
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2727,7 +2742,7 @@
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+ 
+     <antcall target="downloadzip-2">
+       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
diff --git a/www-servers/tomcat/tomcat-7.0.70.ebuild b/www-servers/tomcat/tomcat-7.0.70.ebuild
new file mode 100644
index 000000000000..268c29132a42
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.70.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	websockets? ( >=virtual/jre-1.7 )
+	!websockets? ( >=virtual/jre-1.6 )
+	!<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+	websockets? ( >=virtual/jdk-1.7 )
+	!websockets? ( >=virtual/jdk-1.6 )
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	java-pkg_clean
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+	use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}