gentoo resync : 29.08.2018

9 files changed, 54 insertions, 25 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4a291ecce293..8f1fc95d9006 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 5faf41a8c35b..2715aa383293 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -13,5 +13,5 @@ DIST icedtea-3.8-shenandoah-c44a9eef4985.tar.xz 6954776 BLAKE2B 348735f8a2ecd656
 DIST icedtea-3.8.0.tar.xz 1496972 BLAKE2B 9a376539ca2c4c8560aeaaa2fbc65c61a90519b9c87e924e2d54ef150401676e90df0fb5143fd90e9e4c6d254db56617456a668bf886573854f299402af378d8 SHA512 6336d35c11dbe16c96bc07eaa760fd849a2cd317416aba72b0732f8f1e52c9e3fedde5398d4a7f5a3057d4b6ae229965d597b3f5df09a76b5f31bbad0ad02a9a
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.8.0.ebuild 13468 BLAKE2B 62e98bbb5ed7e7e70965209ef0b3dd3024251bce50aca508986b17ac93b3a57df1e259a5a2c908c6f3663bc75d68b9b49d4b841a80fd3a9d39aff8abecc09e6d SHA512 9012597152243ebdf9aef973aaac34c0818f4998ef2359e930692ffee304faf1fca970b146dba8468b4ed7d163e60b232fc3f0e8de23d6b15d88d0368c8fb29b
+EBUILD icedtea-3.8.0.ebuild 13422 BLAKE2B 63fdd99ae1c59aa76e9725a42ce1c00438496e2e9287dd12f230296b1ec1bee43c9b882282cedd43762db9ad1e5642c12894379a55343a28dc12780b59ecf1e7 SHA512 fcb67c2743f3503b626cd4214f7232e9c9acfe3f088807d5cad4b9699298ea92e9036b518664cec4f9e12192ff60b848145386779b7e16fbd24cec89c19cd2f2
 MISC metadata.xml 2310 BLAKE2B eab8a40ebfc3b3f462fed14a7f21187aa0546e9b3925d8e08951c99ac8ebf846c184d37ed271f07d6bdde6379be92f7fa0244d7be8d0cec29a354c1ac75f69a2 SHA512 e4f1924775a63f058fbc5a385ade16a95115cee0b9ee3c4de05f2e904861e1c3de4f643c4c330da90879ed0a54eed7199b41def3193a494e0eb038ce820e673d
diff --git a/dev-java/icedtea/icedtea-3.8.0.ebuild b/dev-java/icedtea/icedtea-3.8.0.ebuild
index 01b3cb086235..cca3e65acb12 100644
--- a/dev-java/icedtea/icedtea-3.8.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.8.0.ebuild
@@ -133,9 +133,7 @@ RDEPEND="${COMMON_DEP}
 DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
 	|| (
 		dev-java/icedtea-bin:8
-		dev-java/icedtea-bin:7
 		dev-java/icedtea:8
-		dev-java/icedtea:7
 	)
 	app-arch/cpio
 	app-arch/unzip
diff --git a/dev-java/proguard/Manifest b/dev-java/proguard/Manifest
index fe546c722fc7..776aa6098169 100644
--- a/dev-java/proguard/Manifest
+++ b/dev-java/proguard/Manifest
@@ -1,7 +1,7 @@
 DIST proguard4.5.tar.gz 1827325 BLAKE2B a8bc7f8527f98094c08d178b0544e44e09b3ee03b8a100bba7a978b70ca60b655a12fbca822bd0bb60c1d81c9b83cfb61ebe7bbde6b2f854de962ede23c75d82 SHA512 bf1d9c29a4b3e1ba8062632b0f7f97e8f8d3dd2fbfbdc4bbbe98fa76151721fa45b22a1d99890654c557f3a1b87b45038d4882c0cb192b907ec2c65f4e7429fa
 DIST proguard4.8.tar.gz 1914047 BLAKE2B e32b9eab0b9d91fb7e565c881659582c3c90ebe3b068e79aecd62b7e5200420ef61ae4f303e654329e46627d8c746747019347baae74cf23ed791dc89e8a0197 SHA512 f06c98c784a71fa9e2c137c6bc4c062dfcf2eeaa28653b909b475226cf133fb67821128a3fb6ab0702807cd229330da8b64e810d9078d0b7510083453feffa10
 DIST proguard5.2.1.tar.gz 2160584 BLAKE2B 35cedaee26a8f8fb3ae28843f55867277817bdde28603c615ce4bea0b5fb8babf35b49ae494cde0b0496117077aa2984197bb06915f50699b5a5dc66197f2601 SHA512 7c2735860d689f9002e40e7a5304eb61f8fb8abc1da36ea62fa32541cdf2e655bb2d27814e2b8137d29a1ab02a57c57961491612ea8e735788fdea719e6239be
-EBUILD proguard-4.5.ebuild 1589 BLAKE2B 2e7c870d216ac7b4fc099c229c8afd0830a1efc9347917bb7f5ea0baca0224a4e35a5c11afd433cb99b3986b617e85f4ae5d7b67391afaa904e6739499088431 SHA512 62c71f50e764ffc6658d2652d8adc5022ca872206e764fba09eb5bf33b8007366c5c7a0f47de19c6fbf5941f3cebb4be29f216ff5b78889fea3bfb2695d0e0a7
-EBUILD proguard-4.8.ebuild 1585 BLAKE2B 0143f0ffec6ec400c01893cdf7c1539d83fb89bf3bad99a38124c442d0c530f8a52f047f03e4bd615ec125262d4ea11e8369d36b875ab5a65c911b85f6e3c7d1 SHA512 00feb16820b8676eb02f0876e516cb7d7ee17878ef16d561ff77e4c7c8a8adbce87fcee9d75def8c55261dbf457f96c90d3ef1e28aceb71cab98a36d4d871666
+EBUILD proguard-4.5.ebuild 1373 BLAKE2B 26d8f3e57bc3ec9de4ea55405bf2debbeac7c936a2746ec2b563936569b333488181f96677db1a855f5325cd224c44b7380fff596071ea331e349fb39232b3d1 SHA512 e1bd489456b0e92984b720dc9dbe75a473d2c4b7e5be6386e2bdebe2fa576da71f8cad4130fc4610bd88e163dce545e231cbb0d187f45ce3ff656bd0075fe558
+EBUILD proguard-4.8.ebuild 1369 BLAKE2B d6ab343bcda2e49dc203ce490af88dd1ff9bd7c0f47ba4a86fcee8c1455d3d636cba2d401639e3bc262b2ae3b3270fb12af710426fa064bba6e60fd7431775ce SHA512 67464340d8d54cd48937af8c8bb3cf6d74528e1017993f9e952d5aabd0fa4437222f9816331d270f3a1facacdec7be5cd56f20ad7bd4d3a043541753adf59ea3
 EBUILD proguard-5.2.1.ebuild 1582 BLAKE2B f5858a345acb37507e56cc9af29ac9d4efeea6bbf61f1f7a59b4ee8205fd8b54a6790ea395efa8614ab15953ba550972030ea040e4da565ba53fe13f229cad48 SHA512 3eb6154de15044062f182a1a0b0a3d58cb2f356e4d811ce4631ebcad81b1b22f671e75fcaa2badab43dd146e23db1d5ccaffbfeb1beef5a307e9fec023cb1b09
-MISC metadata.xml 470 BLAKE2B 038b609842f58b18fded44a04304459fdbb90f1eaa90e784e8e0aa8bb22c6725a240388cc12fef4dc9dd89bb87d2b963fa8c98d09c645e76341a5357cedcf5c9 SHA512 41a6f95762fe034432e6c02a20bf37a25f27e8a3edfc8b07d4506115526865e22a594582ca1d7ddc2f22ccc8b1fea59f66edb5209cab5f0c38553dc0f70a96f9
+MISC metadata.xml 404 BLAKE2B 93773f7c921b25ff141a8696b04ca82b4b88db47b1bfc186f34b06a4990f6db0eb6c50cdd435621cdc36b44edbb63dcdc8f063c7f52cdb4a42356bbde4076215 SHA512 526e2a3438bf9c71febee16baf33d3c05dc2680e5c54bf6290292cf7f6e09c979e318883e053f582fce55c28ab1b1654cffcdfb98b74b3f414f05ce0d061e887
diff --git a/dev-java/proguard/metadata.xml b/dev-java/proguard/metadata.xml
index e626ba121626..033beb86046d 100644
--- a/dev-java/proguard/metadata.xml
+++ b/dev-java/proguard/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="ant">Ant task for using ProGuard in build.xml scripts</flag>
-		<flag name="j2me">Adds support for J2ME Wireless Toolkit</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">proguard</remote-id>
diff --git a/dev-java/proguard/proguard-4.5.ebuild b/dev-java/proguard/proguard-4.5.ebuild
index 37a87d483852..d2cf182ea8e4 100644
--- a/dev-java/proguard/proguard-4.5.ebuild
+++ b/dev-java/proguard/proguard-4.5.ebuild
@@ -15,13 +15,11 @@ SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz"
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="ant j2me"
+IUSE="ant"
 
-DEPEND=">=virtual/jdk-1.4
-		j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )"
+DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4
-		>=dev-java/ant-core-1.7:0
-		j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )"
+		>=dev-java/ant-core-1.7:0"
 
 S=${WORKDIR}/${MY_P}
 
@@ -34,14 +32,12 @@ EANT_BUILD_TARGET="basic"
 EANT_DOC_TARGET=""
 
 src_compile() {
-	local j2mearg antarg
+	local antarg
 
 	use ant && antarg="-Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
-	use j2me && j2mearg="-Dwtk.jar=$(java-pkg_getjar sun-j2me-bin kenv.zip)"
 
 	java-pkg-2_src_compile \
-		$(use ant && echo anttask ${antarg}) \
-		$(use j2me && echo wtkplugin ${j2mearg})
+		$(use ant && echo anttask ${antarg})
 
 	if use doc; then
 		mkdir javadoc || die
diff --git a/dev-java/proguard/proguard-4.8.ebuild b/dev-java/proguard/proguard-4.8.ebuild
index c10cdecaa146..cf8bbd6043ec 100644
--- a/dev-java/proguard/proguard-4.8.ebuild
+++ b/dev-java/proguard/proguard-4.8.ebuild
@@ -15,13 +15,11 @@ SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz"
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ant j2me"
+IUSE="ant"
 
-DEPEND=">=virtual/jdk-1.4
-		j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )"
+DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4
-		>=dev-java/ant-core-1.7:0
-		j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )"
+		>=dev-java/ant-core-1.7:0"
 
 S=${WORKDIR}/${MY_P}
 
@@ -34,14 +32,12 @@ EANT_BUILD_TARGET="basic"
 EANT_DOC_TARGET=""
 
 src_compile() {
-	local j2mearg antarg
+	local antarg
 
 	use ant && antarg="-Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
-	use j2me && j2mearg="-Dwtk.jar=$(java-pkg_getjar sun-j2me-bin kenv.zip)"
 
 	java-pkg-2_src_compile \
-		$(use ant && echo anttask ${antarg}) \
-		$(use j2me && echo wtkplugin ${j2mearg})
+		$(use ant && echo anttask ${antarg})
 
 	if use doc; then
 		mkdir javadoc || die
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 4df1941ec244..0bc79f5ac4be 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -13,6 +13,7 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713
 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
 DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8d41c58fb96ed1330560a4064ac3b3eeb030c76ff066c2a2f950d6f2c1576bde214f963f1a12342536a8e2ab8ac179dd166bfb SHA512 f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044
 DIST apache-tomcat-7.0.88-src.tar.gz 4733229 BLAKE2B 2e2009f64ae8f027e93bd7f3cec21f98fbb1f5c741b6525da1638c6188ebe44aa8b43d984abd769385992a997226392c59ec059e408873261a04d9e96a4603c3 SHA512 2ad5c11ec7c5e8e68fba6c0427b0479969a56e7ccb3f0b1ee6c6f139d5f2b718ee9c56f044e982013108ee6e06c43037d0061e539203e95453e9cae7cb38711d
+DIST apache-tomcat-7.0.90-src.tar.gz 4752747 BLAKE2B 5062ead2756aa8461de5e8387f14838661c082b6e397934fc92c91403f1950d84d79f05b9d4420a973d1b4921515b66c2c847550e1a06d75e722b62d9aa3f8bd SHA512 b32cb6902866ef72337c721d99d77f1a645311bb7694f51b82f7acec500c6197df15fb41be444fc6089652e8c825fb193f1a9de8c1b9b6fabd9d95f784565f6a
 DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff
 DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 36318d0ae50fbca3f2a97e0210d0a8da8314f1ef79d0b047971bca30a5b0cc937faf013b5090f6e6b8aec4127b6185dc54ae589f5b57143b62c71c09f8bd5e9d SHA512 6d846213db0b15f9add8d80f30f304afdaf879ab6d7f85d212183a93f4f360ebfeeb079813bdea83cbd13f507504473028bbf8279e89b800b6f150b83086fa56
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
@@ -31,6 +32,7 @@ EBUILD tomcat-servlet-api-6.0.53.ebuild 943 BLAKE2B c7b1a81fcb5f243e1888df39fc62
 EBUILD tomcat-servlet-api-7.0.82.ebuild 906 BLAKE2B 2169547e97371a8532c797f02e31ad1e17b04d2f03f7ab3041dac4ac1f23e699cdea60fb5779436d259cb3fdba6c59cd083d9cf4f874e8dad3f3194919c38c6c SHA512 ea84aa02351af9a21ffdad739619e1b8bc22b0978a03f464fedd7400257ed253040c2bd89be2749f00889f009988dd4083a5ceb81a89d3d6d5e8a5b6bfc07dbb
 EBUILD tomcat-servlet-api-7.0.85.ebuild 907 BLAKE2B 4d44c9e83f65cb6997d11bc0cc586980ee5adb884b0e41b4a4f7e9e1634507d1cdf2d077e5e53138003d04e893c6f240afd54db14d00d0f98385e4dfe0cc41e1 SHA512 36a32450116f61421399c8ccd31ab78d37f743ea5f1c8a58f6a045e0a50cb5d505ba0e448d0335c463a50f9e3132859c7cb6a8517ac88147dcce656bf3528377
 EBUILD tomcat-servlet-api-7.0.88.ebuild 908 BLAKE2B cfcc0e873d630eeb6f43cff3cbc8d48587563baa299e4ef8550cdcd02cf6289ba96d4f70653c0328cee35898d8b560596d13f8fae24ccff9672a2b4ee3fa7694 SHA512 f670f2f7885177a3fe36088033f143673ed1b104877daad5f6c895da7e2964301e018e5ad80b5eeb5cfa2aa2e226a99fe034dc752edb133cfed758be9bbeb7f4
+EBUILD tomcat-servlet-api-7.0.90.ebuild 908 BLAKE2B cfcc0e873d630eeb6f43cff3cbc8d48587563baa299e4ef8550cdcd02cf6289ba96d4f70653c0328cee35898d8b560596d13f8fae24ccff9672a2b4ee3fa7694 SHA512 f670f2f7885177a3fe36088033f143673ed1b104877daad5f6c895da7e2964301e018e5ad80b5eeb5cfa2aa2e226a99fe034dc752edb133cfed758be9bbeb7f4
 EBUILD tomcat-servlet-api-8.0.50.ebuild 964 BLAKE2B 1b68372c27f23b04a1c042e7f689f32ce5b9a6b29d397cc94c41eab20194489ea551d66dc69e8e1689b17ff9a158d31387677893d22ba5dd759d5bc1dc78e780 SHA512 f7cb5af08726a44158c0ffa080737c2ddbd8f14f2c29768392af2a413fa0c98e87b5f96828c569fa34241e5dbde8857fa5790dfd69c347c592ce207ca633536e
 EBUILD tomcat-servlet-api-8.0.52.ebuild 965 BLAKE2B 8137fd074339a70166e04ecbdd631dbeb32ae21804918a65d79bd30b9790c54bfc9acffae5bfc6390b86d1b230959eba5043539bc367cafc0bb7f4eb6582b33c SHA512 f4e9c7c4be07457d48d8162a2e68c12a21289cc58b509cc2cc2570bd11a60d74ff83e98c31ed09a96a12e376eb22042a21ed08319a74c21fe6b3faa663bd4f05
 EBUILD tomcat-servlet-api-8.5.23.ebuild 1010 BLAKE2B fb16fa9955dd865619850de21cdae0e44130895b3f886ec96ad5cff37f45f8a13b5caaddc083f46d2eab6b00e174689e652a5a0ead58fb4626e40612c1fd5784 SHA512 1ceaa37c6434f32e10705b0663bc39e2ccc5507c621a2ede604feec69a49bcb46ddd49fff33a5ccce50d4daa228170a3db30e31624ae84dfc83b538de10f7824
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.90.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.90.ebuild
new file mode 100644
index 000000000000..f0304e00ca2a
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.90.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+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 ~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/
+}