gentoo resync : 17.02.2018

12 files changed, 175 insertions, 143 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ec2465436e3f..a58ab332d8cc 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 9c7e51844697..3fadd1e20d56 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -2,4 +2,5 @@ AUX commons-logging-1.2-gentoo.patch 897 BLAKE2B 353550109ecc13bfa897217d845ca9c
 AUX commons-logging-1.2-servletapi.patch 1855 BLAKE2B d3c7cb640563f200fde0a72fc1f7e74a89d3072d74593c2c7829162a71df385af9dfbda5cbd3cc82b78a8fadb353eb1dcc6fba0ff30ac425c4306fed9ec7e731 SHA512 3e608ec37279664249d89eb90eaee7e2f5536ab37efcb6e94a8d586b5284a4641aaa5c58f6ef4730955e51fd22491e82f1a6b5b50303f9c4d7cfd066f751799c
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
 EBUILD commons-logging-1.2-r1.ebuild 2216 BLAKE2B 6500f43ff9db9150f2f0077bbd6d180d7132c9112e407534f5716c111422cf5e0fde855b6a128690005049591c9ac13b7fa13d8c1f14d4c16f7b79750bba50ae SHA512 9ba1fb6158df59d239036d09ad071b244f0f1aec726355689db92bb0f0d7dda453d23c520388df9afe70cbeba01282b3b67acd0599280bd9c5a1d708e822fcb8
+EBUILD commons-logging-1.2-r2.ebuild 2313 BLAKE2B 8a02627abecd0391eaae3f32923114640ca84e39deb8f68d51e0f6e6f0d9997ca9d26145f2ef6b7a8bc6b117c9da32b1477e838607334e0b151dce40f24bbd50 SHA512 877fe2b27d0a32d77413c56e455080686ea56f06bed709920a321682d4179d62b7a71e41df95519db7a39fa5ac01f1d585c1f215a3fb2a3e0a808fbc33781508
 MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd
diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
new file mode 100644
index 000000000000..9d530b2fd238
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
+HOMEPAGE="https://commons.apache.org/logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="avalon-framework avalon-logkit log4j servletapi test"
+RESTRICT="!servletapi? ( test )"
+
+CDEPEND="
+	log4j? ( dev-java/log4j:0 )
+	servletapi? ( java-virtuals/servlet-api:3.1 )
+	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
+	avalon-framework? ( dev-java/avalon-framework:4.2 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src"
+
+EANT_BUILD_TARGET="compile"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
+
+DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
+
+src_prepare() {
+	default
+
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	# patch to make the build.xml respect no servletapi
+	epatch "${FILESDIR}/${P}-servletapi.patch"
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties || die
+
+	if use avalon-framework; then
+		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
+	fi
+	if use avalon-logkit; then
+		echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
+	fi
+	if use log4j; then
+		echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties || die
+	fi
+
+	if use servletapi; then
+		echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die
+	fi
+}
+
+src_install() {
+	local pkg=org.apache.commons.logging
+	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
+	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
+	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
+
+	einstalldocs
+	use doc && java-pkg_dojavadoc target/docs/
+	use source && java-pkg_dosrc src/main/java/org
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 45ba5d6a4c4e..a9b6e9274ede 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -12,8 +12,10 @@ DIST apache-tomcat-6.0.45-src.tar.gz 3494054 BLAKE2B 5dc7ac1c941b3b307ff6ccc53b5
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
 DIST apache-tomcat-7.0.84-src.tar.gz 4713409 BLAKE2B 3dc7766db1492413bbd3f878a2da7392dd4cfd1ca4c3e8a236e380cdfbc0c4ff075665d39871026e61f0bc88e0a84f372fbcef6914af9dc99e6dda05bafc6e48 SHA512 ca6b3f17f56a0b1befafd2efbfa07cbe094fb4ab022a3b5d704d249e551b44c6ef0d9691bd1b7c48ccda957efb43045209d11ca1a4aa0a7875e516e3a233cd74
+DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8d41c58fb96ed1330560a4064ac3b3eeb030c76ff066c2a2f950d6f2c1576bde214f963f1a12342536a8e2ab8ac179dd166bfb SHA512 f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044
 DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841
 DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87 SHA512 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73
+DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff
 DIST apache-tomcat-8.5.11-src.tar.gz 4996153 BLAKE2B c529fc37a12c14c942f4be23751acc0b7fe91de0c84ef3ad7c5a451499a86572d36fd5973dc60bfc97d07cb7d82b4e9a2d36d55eb31cccf2f6b15b2b3fb5d7c7 SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
@@ -31,8 +33,10 @@ EBUILD tomcat-servlet-api-6.0.45.ebuild 966 BLAKE2B 5d6a7edaee6709eb57ea31b35bc0
 EBUILD tomcat-servlet-api-6.0.53.ebuild 965 BLAKE2B 79ee853118429bd20b1c08f260865f01ae250e1c2ce67c4a48b31f8d5e4dd5711ec68acdd07b127a900014ecfa77a1a75bd02345c66cbc5744e1f1b535bc6990 SHA512 2ab89d11d3b6eaaeaf677e48cbae4d09e313dfac63ac9296d5a3ad3e37a93f23a548c06d3cc5fb79da73e83d32f5fd5a6c9eec899aaea36ec90873993d8d3f3c
 EBUILD tomcat-servlet-api-7.0.82.ebuild 928 BLAKE2B 1bde5610507919c8ea5926e62d9f9e8a002e28cd0158847cb12355f9a7ec3bd5ac619f4b31c742e2f0e7fa05f0291f6d8a916fa6f7a121b2620a3138af224e6c SHA512 e620d89395876f3ec079b8793561bd2290a614587fcc3d8b4b251e04b05f3c819ceeebfaa923e414b86e8d3bbf3aa33e8668cf4ee681ea5e1e50d2b68503d341
 EBUILD tomcat-servlet-api-7.0.84.ebuild 930 BLAKE2B 7e92815cb0698cc4ed6c1e735098bb7a3ccdb41a76829c7f34986e98efe838b2832e20e30f156ad1ed77dee187d2b49d0bd2c528554ffc6aa6c04c91616eb504 SHA512 5c2bda0d5c4c4752de7737533bb18a36880131bf0b02951bcbc36e822e261372897b0bbf563d1c3996d480df6917595305bd3da04bb6394a646767fb706af855
+EBUILD tomcat-servlet-api-7.0.85.ebuild 930 BLAKE2B 7e92815cb0698cc4ed6c1e735098bb7a3ccdb41a76829c7f34986e98efe838b2832e20e30f156ad1ed77dee187d2b49d0bd2c528554ffc6aa6c04c91616eb504 SHA512 5c2bda0d5c4c4752de7737533bb18a36880131bf0b02951bcbc36e822e261372897b0bbf563d1c3996d480df6917595305bd3da04bb6394a646767fb706af855
 EBUILD tomcat-servlet-api-8.0.48.ebuild 986 BLAKE2B f326eedb07b5048e2e6b0231fcf98dbfe00d2b7a6de0892e6ab30be25b74d758a389892d74897cf8f59749ec77b3f6e68fa3a0721a428e991846e4b49335727f SHA512 477f040dbdca1c4503f94b0e2cdb16e2910d117ccdf473751c3af0670525db08f004beeffeb7b12c7cfcf8d603e0ffdf3ef0323e2e0632d8253e7dc99fda1292
 EBUILD tomcat-servlet-api-8.0.49.ebuild 987 BLAKE2B 6ab9e76fa2c44b3165d9f3305d049e723ce65a7ef762751b590f8feca31b58144a1ead453bc44a47af267816b443a4138582ca53486e2dbd3f01eaba5c6b10bb SHA512 794739859244ae76ca9778fbb412f20c0de1e191be7e47de41f6eaf041b109712b545cc649f71bed9a52a68c5855dc15b951dc901a475bcd7e3b6bfda14d1ee0
+EBUILD tomcat-servlet-api-8.0.50.ebuild 987 BLAKE2B 6ab9e76fa2c44b3165d9f3305d049e723ce65a7ef762751b590f8feca31b58144a1ead453bc44a47af267816b443a4138582ca53486e2dbd3f01eaba5c6b10bb SHA512 794739859244ae76ca9778fbb412f20c0de1e191be7e47de41f6eaf041b109712b545cc649f71bed9a52a68c5855dc15b951dc901a475bcd7e3b6bfda14d1ee0
 EBUILD tomcat-servlet-api-8.5.11.ebuild 1026 BLAKE2B 491898f79d1185a9a0c0580ca30936b5ccceab95eada32b7c12ba77f802bfabc92b22c6bfb253eb2346ab0cae1264c664b4a63efee67ec4b2c66d4cf40881386 SHA512 2832c7f1e4e310ba6e220f7f69529d257e77b655a82dc1cf44e1580032773d31edffdef902c99b139bd8b52b913d7aa1578af2860d5d1967332a5f6a86dff48b
 EBUILD tomcat-servlet-api-8.5.23.ebuild 1033 BLAKE2B 6c5d35a13ac371445d39b9359cf1ac917a7d8d08692d6ea730c1d4c2a305319eac90697305d6d1bd3625478d63af74c4c62f15b78b33638d1f3a5c8d2b328ba4 SHA512 c6c829d08c1b04a737bcc0519396bd97dc52993e33bdfb550c7dcb8e2e8cedba93123e7c852f6c7100f989c9af882b2ab2d81925ce545e95172dd7c3f1a75c5c
 EBUILD tomcat-servlet-api-8.5.24.ebuild 1034 BLAKE2B 56a3a1d3f53d267dbfa60bd5f87ea5b1ca9c0e48fc500592c8be4324f9a2c3b41e9e2a32c6c1507f64559fddffee8dcb1afe86bd2ae8607add8cd2e618d4ec09 SHA512 18f7cbbcad7c7d36b101d76b136040a54ff5a3c3bb6d12de1e555cfbd9cf590fa5a9a2b6c99a66912324ca45fb36d367628b8dd302b2b5517281a6c09e6bd863
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild
new file mode 100644
index 000000000000..b0fc5f672cf2
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.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-fbsd ~x86-fbsd ~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/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild
new file mode 100644
index 000000000000..71c284a0ed23
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~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/trove/Manifest b/dev-java/trove/Manifest
index 036fb06a009b..3032f81592ce 100644
--- a/dev-java/trove/Manifest
+++ b/dev-java/trove/Manifest
@@ -1,8 +1,3 @@
-AUX trove-3.0.2-java.io.tmpdir.patch 809 BLAKE2B a3c6a8bc4d9d6e16f067e5b87af6d21a1c8328dfd13c2ba90e96b0d2a2a055b6639071723efb3b5e6595f6a9e4984a6f617120e9b9c47812e13cec32770374b8 SHA512 cf174935aaa56be3aad9bf65b7973fae08f4c614f26ba761f14573d2df6ce8bc116ef651402cdaae34df903c36d3d7c254ee9c39415dbd10f8679798896530a5
-DIST trove-2.1.0.tar.gz 2438529 BLAKE2B b4563b1bd388c40dade302f193a84aeb4c2052ce45304a058533a65ceaffab1b4d1c480ff67a3c3bd21f2bebd39e9045d9d818c5066b1896b29f16d7dd182003 SHA512 a0c3d71fa5bade59efcca7a65cacb90138a48d4346886a7a6e0c30f2736ef91afd532484efa73cb5b788449391433810bf6d51acac35bf28a4ceca9787d13429
 DIST trove-3.0.2.tar.gz 5880161 BLAKE2B a3dbb6a967ad9a519bd04abbbbf9e6af483360991956ff79532462a9ad471d409744017a3b24e4a09d2377243406e5d7cd542b452da8f59a1a97b454a2f60a8c SHA512 27460a66bad6f206eaeae02453c94333456db5a9c566246d495fb4184d42de6033b66d1bf74060f799cf4298d531afeb9597b92da4e2963b43dd4ef072ee750b
-EBUILD trove-2.1.0.ebuild 766 BLAKE2B 99684b3cbc0d21ec4655e999f8029d340ddfbf9cb33d1e76efdc047d5549774151c7e71f52b677033e366b25c1db7caa44be358240cf16bbe627f4b49a994c6a SHA512 2e38f205358597445ea8e5a9648f46de170400ff083a0cc241504a38fe33c1629ebfe0d8d0434919caaba45b21f112746692ce16961e9a99f4631b38bc3932e7
-EBUILD trove-3.0.2-r1.ebuild 871 BLAKE2B ec6d76311eec5d966071924b8fc5b35b5fc2de81879899f71ba092ae0d7b162a327311a390c751021e6f581a4a0e9cda39ddf269019857b6705828b3192f6411 SHA512 2f77697a09c76fb2181f0bbfa7ef480a81c2968af4132562be424abd1fbe23b2761a32aa1a1c169f0f8a8252dd035c1ff345712e2ba1004a12f5f392bd519602
-EBUILD trove-3.0.2-r2.ebuild 799 BLAKE2B f99d1c405686655612961e19338bca41ce81a3b9855f43f408bf52514861e3cb093bff8c0121cf97b63e1c23866c390506adcaf8c7fec1fe16b4744545417ba1 SHA512 aa83f2088a03331e413cc571e6654257a599072347dc125831a78966b4539ba45b61456ec6be3ba6c1e4562f0d4a624f2f75db93591e7878971ef3c139e8eb20
-EBUILD trove-3.0.2.ebuild 758 BLAKE2B aec1887cfe840ba2f496987d8b60c006ffca7bdd3cd2502fa1092eeac070cfa2a46b1fde22048a3aed0827664b17b3d770142d21516a5c91c265c1668b943c01 SHA512 ed2fff18a76cca9930ef9f06c0d667959645d7ba74c27340ecf4edfa57c48fbc46eeda271f8dd01230358f74a66a45abd4c7b791f06c0f6f645d43440fbf2325
+EBUILD trove-3.0.2-r3.ebuild 816 BLAKE2B ae12dfcb6783629e600349417933dc3ff9dbdf6d77c98d62ee7acba89d4e79a2109dac6dca5e82636bbe0f28c9684a03a605dcf9678cf301c8c7c0073b7c9a23 SHA512 ea9d16c26390c80596cbc6b018fd0d12f1991635a7ebd941073d9a089bdca270aecf270f0eb2871e507ebf7bf500e68605d7438a89f0c5b6b14908f8d2ba18d7
 MISC metadata.xml 313 BLAKE2B 033a387e2850f70d371e4362736a66f796d8aa33ab9c46dc4d49a919533c0d9f6cf55588a58ae3d9a413cec5c98daaa65530e095dad86154d467a1749cd02b59 SHA512 8d83dca7ca9717cd91fab6805a9ec4fdab65161643d583cfe2134fbcbaea07ceb236773e88365b137a6e2fb5215c821f54955dd641d0037025b826d29ec0d2de
diff --git a/dev-java/trove/files/trove-3.0.2-java.io.tmpdir.patch b/dev-java/trove/files/trove-3.0.2-java.io.tmpdir.patch
deleted file mode 100644
index d5f88a426814..000000000000
--- a/dev-java/trove/files/trove-3.0.2-java.io.tmpdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- build.xml.orig	2015-06-30 21:07:56.621000000 +0000
-+++ build.xml	2015-06-30 21:10:19.060000000 +0000
-@@ -99,6 +99,7 @@
-             <classpath>

-                 <pathelement path="${output.generator_classes}"/>

-             </classpath>

-+            <sysproperty key="java.io.tmpdir" value="${output.tmp}" />

-         </java>

-     </target>

-     

-@@ -339,6 +340,7 @@
-         <mkdir dir="${output.generated}/gnu"/>

-         <mkdir dir="${output.generated}/gnu/trove"/>

-         <mkdir dir="${output.lib}"/>

-+        <mkdir dir="${output.tmp}"/>

-         <mkdir dir="${dist.root}"/>

-     </target>

- 

-@@ -442,4 +444,4 @@
-             <format property="fullVersion" pattern="'build time' yyMMddHHmmss"/>

-         </tstamp>

-     </target>

--</project>
-\ No newline at end of file
-+</project>

diff --git a/dev-java/trove/trove-2.1.0.ebuild b/dev-java/trove/trove-2.1.0.ebuild
deleted file mode 100644
index 88a296a90443..000000000000
--- a/dev-java/trove/trove-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="GNU Trove: High performance collections for Java"
-SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
-HOMEPAGE="http://trove4j.sourceforge.net"
-LICENSE="LGPL-2.1"
-IUSE=""
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-java_prepare() {
-	rm -v lib/*.jar
-	rm -fr javadocs/*
-}
-
-src_install() {
-	java-pkg_newjar output/lib/*.jar
-	dodoc *.txt ChangeLog AUTHORS || die
-	use doc && java-pkg_dojavadoc output/javadocs
-	use source && java-pkg_dosrc src/* output/gen_src/*
-}
diff --git a/dev-java/trove/trove-3.0.2-r1.ebuild b/dev-java/trove/trove-3.0.2-r1.ebuild
deleted file mode 100644
index 9c134d5f852f..000000000000
--- a/dev-java/trove/trove-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="GNU Trove: High performance collections for Java"
-SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
-HOMEPAGE="http://trove4j.sourceforge.net"
-LICENSE="LGPL-2.1"
-IUSE=""
-SLOT="3"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-S="${WORKDIR}/${PV}"
-
-java_prepare() {
-	# See bug 553652
-	epatch "${FILESDIR}"/${P}-java.io.tmpdir.patch
-
-	rm -v lib/*.jar
-	rm -fr javadocs/*
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_newjar output/lib/*.jar
-	dodoc *.txt || die
-	use doc && java-pkg_dojavadoc output/javadocs
-	use source && java-pkg_dosrc src/* output/gen_src/*
-}
diff --git a/dev-java/trove/trove-3.0.2-r2.ebuild b/dev-java/trove/trove-3.0.2-r3.ebuild
index 501b2f6b8f10..08317df94524 100644
--- a/dev-java/trove/trove-3.0.2-r2.ebuild
+++ b/dev-java/trove/trove-3.0.2-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
@@ -10,32 +10,31 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="GNU Trove: High performance collections for Java"
 SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
 HOMEPAGE="http://trove4j.sourceforge.net"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE=""
 
 RDEPEND="
 	>=virtual/jre-1.6"
 
 DEPEND="
-	app-arch/unzip
 	>=virtual/jdk-1.6"
 
 S="${WORKDIR}/${PV}"
 
 RESTRICT="test"
 
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	unzip -d "${P}" "${P}-src.jar" || die
-	cp -r "${P}"/* ./src || die
-	rm -rf "${P}" || die
-	find ./src \
-		-type f \
-		! -name "*.java" \
-		-exec rm -v {} \; || die
-	java-pkg_clean
+src_unpack() {
+	unpack ${A}
+	mv "${PV}/${P}-src.jar" . || die
+	rm -rf "${PV}" || die
+	mkdir "${P}" || die
+	unzip -d "${P}" -qq "${P}-src.jar" || die
+	export S="${WORKDIR}/${P}"
+}
+
+src_prepare() {
+	default
+	find . -type f ! -name "*.java" -exec rm -v {} \; || die
 }
diff --git a/dev-java/trove/trove-3.0.2.ebuild b/dev-java/trove/trove-3.0.2.ebuild
deleted file mode 100644
index 79fd976ca9be..000000000000
--- a/dev-java/trove/trove-3.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="GNU Trove: High performance collections for Java"
-SRC_URI="mirror://sourceforge/trove4j/${P}.tar.gz"
-HOMEPAGE="http://trove4j.sourceforge.net"
-LICENSE="LGPL-2.1"
-IUSE=""
-SLOT="3"
-KEYWORDS="amd64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-S="${WORKDIR}/${PV}"
-
-java_prepare() {
-	rm -v lib/*.jar
-	rm -fr javadocs/*
-}
-
-src_install() {
-	java-pkg_newjar output/lib/*.jar
-	dodoc *.txt || die
-	use doc && java-pkg_dojavadoc output/javadocs
-	use source && java-pkg_dosrc src/* output/gen_src/*
-}