6 files changed, 44 insertions, 55 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index dd8ad39ed6c5..18c8887ff5c4 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
index fd9eaef59e3f..de8e492a4d43 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1,5 +1,3 @@
-DIST jsch-0.1.52.zip 363648 BLAKE2B 37f5105920868957409c6eed8fb7b1517c0816ee6c1da25b0ad5f1cb0b1e6c71954e30e255b8aa94989495e11767ee11c5ce8bfd9721da12d6823832dd57bb16 SHA512 a5a998b6139638eee403e120f5f217112a5c09e81db8e1b1240d53ca311df4540b56aaa5f67f7a5c40cbc8420535d72d456e4fbfc95fe86d46376a00295bec4d
 DIST jsch-0.1.54.zip 365455 BLAKE2B 5cd6fa012e5a511bad8f23a233559e6ad6d600f39ea7b519e66e118b1fdb997491b7ac8cff5bc1491c28f7ee99f0f4a3b4727f5d8ec02030576f34949d74e203 SHA512 2ed29f07495fbc28d6eb7b4fe414e8a9a96b911b2feea5b1513cc48a9439adba12341bceb23a3ea9ab307e32d48bfd4356c7bc877c56e77f6f55d69214db3a9e
-EBUILD jsch-0.1.52.ebuild 1189 BLAKE2B e1e2045e8b468aed2a19b065d70b00712c8a189eb37e5bd704773fe1ae96f52c847f85616bf04223ba87f27c8b62b6a4f78ecd0fe1f62d471abb8e3578f83f0c SHA512 dc1b37b2fc880253b4628bca7a79463f697868de8022e4faba4905e144c9984195057cad452a5efb5f69af1d8c23c04cc26acbe88fadaaf3ed9a1880bcc95e9d
-EBUILD jsch-0.1.54.ebuild 1169 BLAKE2B a09d7b8eba17059fdf49b15ff459bfe4b35c0da97898e9afd8a1083be958afb3e2e7bc3c8dd10e761de56df87bc9ffb5fc9067e1e3edd5ae8fed059a0e433f1b SHA512 92f6a520c797230e0671d7f590a0794151b954a2ce97eb5cf0fdb6ae226db37846f57ebd01626e4d19923326dd2b4f8728a395032ee38cd542d7ce5106651380
+EBUILD jsch-0.1.54.ebuild 1179 BLAKE2B 8ce76309a0e10768c90ae325a4257ba7a44dad9bc16691e32df02521bfa1854b52ff425a5d995c21fd592aacc663d81d6765fd3b3a1bad32ee290d2db56ef221 SHA512 94d2df1d179d05790093a2172d4635cdcbd6ba5b7bb1f9396fbcbdb45bd6dd9dbc163b2701b6a30246f8ef26e92bf011e8e03c63f6c7ac967c2619355b593cba
 MISC metadata.xml 310 BLAKE2B 6b76bef1eadb48caec1f3314829856f655be55da55fddeec91c3d3fd14f3eecf65dd2508de12a01fc75e2089e8ce1107481bbdb6f3c92eeac74fe85e5ba02aee SHA512 5051c200e3f618fda4991704418d902b513cf94b96917a1c23c1e552e1443cf9ccbf8a0a2ceddc8db46d7104284b43689be62dee0353d50b207c7c6ad3336262
diff --git a/dev-java/jsch/jsch-0.1.52.ebuild b/dev-java/jsch/jsch-0.1.52.ebuild
deleted file mode 100644
index 29979e493654..000000000000
--- a/dev-java/jsch/jsch-0.1.52.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="JSch is a pure Java implementation of SSH2"
-HOMEPAGE="http://www.jcraft.com/jsch/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="zlib"
-
-CDEPEND=""
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6
-	zlib? ( dev-java/jzlib:0 )"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-EANT_BUILD_TARGET="dist"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
-	if use zlib; then
-		EANT_EXTRA_ARGS="-Djzlib.available=true"
-		EANT_GENTOO_CLASSPATH="jzlib"
-	fi
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-osgi_newjar dist/lib/jsch*.jar "com.jcraft.jsch" "JSch" \
-		"com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, \
-		com.jcraft.jsch.jcraft;x-internal:=true"
-
-	dodoc README ChangeLog
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/jsch/jsch-0.1.54.ebuild b/dev-java/jsch/jsch-0.1.54.ebuild
index fa5203966a6e..96b5ef303633 100644
--- a/dev-java/jsch/jsch-0.1.54.ebuild
+++ b/dev-java/jsch/jsch-0.1.54.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.jcraft.com/jsch/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 CDEPEND="
@@ -24,6 +24,7 @@ RDEPEND="
 
 DEPEND="
 	${CDEPEND}
+	app-arch/unzip
 	>=virtual/jdk-1.6"
 
 EANT_BUILD_TARGET="dist"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 1bacab44fb5e..e2a8568dd6fd 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,6 +8,7 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.105-src.tar.gz 5312024 BLAKE2B 0eaad66c6dcc3e2f6a2d8e142a7832cbd413724cab8b10f00e87d5535f4f20d5ba4712794e09444a8b3e0cf23f036da7c6923f038a6a11714682b129ed4ac5dd SHA512 249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2
+DIST apache-tomcat-7.0.106-src.tar.gz 5302091 BLAKE2B f60975ef5570501b03e71645969170c44450f2b56f37688001ad1b4dce3a394f6800e9b28a8fabf59241116345fb7e2a287441f3eace020bc5c0203d57630c91 SHA512 5ce5a5af93c58e69c4758c2c0dedeadeceb6be920421b9d3b3d071d32fc8eb59ba8312c98d037b8434fe43d57a9f720ad8790de29a26ed2959f6c761fe1fd573
 DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60 SHA512 8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
 DIST apache-tomcat-8.5.58-src.tar.gz 5773000 BLAKE2B e361cc359f86bb02fa4c39ebd51b52b4552aa78603c4d8fa5c5c8d87bcb89f6ed391408e3713a5011b7b8cc29506ad65f25b6047ec1009267ce8a68d396b3bc6 SHA512 f9e21c0c60b80e1a15049ff4ee6a4914036d19ed171c40bc614fc999c81c59c394c0a6595ac969a5b86662fa6c366676e7ecb2695c28518473b3f6c79e9a0e05
 DIST apache-tomcat-9.0.37-src.tar.gz 5894559 BLAKE2B 63148418ef96e90f212ce8a00dc6a274a8da2a1aa8a53ad0f6d3960efc8e876dd2812f425c0f21c73ee291752c5fd3bc8025eed46d18d31ae72e8bbe6dc1ba10 SHA512 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98
@@ -16,6 +17,7 @@ EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1437 BLAKE2B b4c1e56e9d529fe47a4705255bdde6845603605e473ed2e07d7fafe1b470123e7c186f8ca80ee98bf52ab43c504c0fff4ad996601646082735b7155a6cd4f928 SHA512 4d7033bd7aab26684b0e81d2f16eb1870813ea515f7024fe189469d48406a09fdd4a9497a89e254f8567c11f3a62c7e0d561246933bf07c242161c88daa31061
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
 EBUILD tomcat-servlet-api-7.0.105.ebuild 906 BLAKE2B 275c28cec529a0e2eb3a1dfab4faca4a557555744ef8cf3a6b68c88fbd48233e67bd414c809d03aec790a33536117605d5c199a10f5224c15e07976d19384503 SHA512 37763c6d8945329c26fa0c3222b58ad5e5944fd35708a58c149269cdd1596bdca80db0c450a9db6604bca6ec87da4c9abc4f53fddf1decc94b25d4b9dfd7205f
+EBUILD tomcat-servlet-api-7.0.106.ebuild 908 BLAKE2B 603ab40aba15acba98d8028b81a16220f789f748e0f411db0a7ea7b91f1b11b434915f8d52ddccbd5ee62010c86e0558a2fe450f1cff49cbd59e77466ebd8cd7 SHA512 1ea3549ca5280987c97eb13be26f5e0194370495e16343a521084c2e868b6272ffeee707125582ba75dbd784b574cd01d6b2c69c5d7de624583d65dd646f8636
 EBUILD tomcat-servlet-api-8.5.57.ebuild 1010 BLAKE2B a366fb083a2773dc36ea015153eeeb3938baa9f660f156ced603f854cf75b2ad515e8c0a900a1230b96c3eb99b9af8df130cb7c94208a1b0ecd6f1885b4c5813 SHA512 955beccf5a490a86c20fc3d77bb9aaf6e115ab2cebbb8a05b85ea4a8cb22cb1267fe323bfd0cd97576f8e581276e2f15d6f4cdd7e5fa9cbf62bb808b8c4759b9
 EBUILD tomcat-servlet-api-8.5.58.ebuild 1013 BLAKE2B 01c959704db8d43db38477022598b7806d864a368b06d07abade1e550efe7e8917fb9027cf2d4aea05dfdf3bac72bc50d613c8df5d219c4e6555b26a9d09e999 SHA512 8e27db7deeee4afa07ba50ad6e75e5065401095cf6fd6e4990ba9b32d2ce54ea83ce66b90b79709c156e555f9d60292208126670b901ff08b9a2b120ce20214f
 EBUILD tomcat-servlet-api-9.0.37.ebuild 1012 BLAKE2B 0bfd9e19febd187f1a79298e5c051e8eba1bb4f72c64cda5bd90f64b34772b851008241b3866ebcec0a59aee0c0d4d29d2b883ce2f9c9a3253280e58577fe3b6 SHA512 4831af547dce2d5372fb7fe9f79cbb2bafc1c5bba3435477adf71c06ebf9498792f06e2ae321bab32a4cbad6eef64961c1bf6c4db611c796f036bdc5ff8bcde7
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild
new file mode 100644
index 000000000000..8da54889a0bd
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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="https://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 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}