gentoo resync : 24.12.2018

41 files changed, 498 insertions, 392 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e04d850c87ad..41e981d3d6cc 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-nodeps/Manifest b/dev-java/ant-nodeps/Manifest
deleted file mode 100644
index 83cf4e50464a..000000000000
--- a/dev-java/ant-nodeps/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
-DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-nodeps-1.9.2.ebuild 910 BLAKE2B 1070d9ed907ae07fff24be179bf2591b6b8e5bec091fc7409a17799670a111c9f6da8f8c84aa80c9623cd4c249063971a412066f29ff36580e761059d837f27f SHA512 123fd523f2c641e0c64dc857b90111dc1f57aadcd28872f09d380310e44687b9a5ec34a65655ffe6e70412ec8ed33392793888f9d298d84f73ac34829437a1d6
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
deleted file mode 100644
index 11cd200f684f..000000000000
--- a/dev-java/ant-nodeps/ant-nodeps-1.9.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-ANT_TASK_DEPNAME=""
-ANT_TASK_DISABLE_VM_DEPS="true"
-
-inherit ant-tasks
-
-DESCRIPTION="Formerly Ant's optional tasks w/o external deps, now compat empty jar"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Dependency needed for jar.
-DEPEND=">=virtual/jdk-1.4"
-
-src_compile() {
-	# The classes were moved to ant-core in 1.8.2, this is just for compatibility.
-	mkdir -p build/lib/empty && cd build/lib/empty || die
-	jar -cf ../${PN}.jar . || die
-}
-
-pkg_postinst() {
-	elog "Upstream has removed ant-nodeps.jar as of 1.8.2 and moved the classes to ant.jar"
-	elog "This package thus installs an empty jar for compatibility"
-	elog "and will be removed once reverse dependencies are transitioned."
-}
diff --git a/dev-java/ant-nodeps/metadata.xml b/dev-java/ant-nodeps/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/ant-nodeps/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/ant-trax/Manifest b/dev-java/ant-trax/Manifest
deleted file mode 100644
index 061d01a53044..000000000000
--- a/dev-java/ant-trax/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
-DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
-EBUILD ant-trax-1.9.2.ebuild 910 BLAKE2B 3980b05b32731b1a97f4574fbd3a2127b05e13160fc2d93d3d8f859e3d8b1dee5bdacbbb8e3b63618dbe19de790c8896d82cfab806924464fce4525f9d6f23d7 SHA512 aac3b8e362f2c0fff8426437dadf84e64fae853dd735d7ef26c97cfe0039b000be9ab9a4b53bada5eec23b9189554dc9ed65b72242089927c43a69b63fa5fb07
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-trax/ant-trax-1.9.2.ebuild b/dev-java/ant-trax/ant-trax-1.9.2.ebuild
deleted file mode 100644
index e6c1636dcb56..000000000000
--- a/dev-java/ant-trax/ant-trax-1.9.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-ANT_TASK_DEPNAME=""
-ANT_TASK_DISABLE_VM_DEPS="true"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant .jar with optional tasks depending on XML transformer (Deprecated!)"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Dependency needed for jar.
-DEPEND=">=virtual/jdk-1.4"
-
-src_compile() {
-	# The classes were moved to ant-core in 1.8.1, this is just for compatibility.
-	mkdir -p build/lib/empty && cd build/lib/empty || die
-	jar -cf ../${PN}.jar .
-}
-
-pkg_postinst() {
-	elog "Upstream has removed ant-trax.jar as of 1.8.1 and moved the classes to ant.jar"
-	elog "This package thus installs an empty jar for compatibility"
-	elog "and will be removed once reverse dependencies are transitioned."
-}
diff --git a/dev-java/ant-trax/metadata.xml b/dev-java/ant-trax/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/ant-trax/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index aa4399ecf4e2..a05029cb22ec 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -9,5 +9,5 @@ EBUILD commons-lang-2.6-r1.ebuild 855 BLAKE2B e6c3f943bb7a61064323748ec99c54e44a
 EBUILD commons-lang-3.1.ebuild 841 BLAKE2B 1de87e9c73eea5aebd3891889025b5a81107ae54d6e8b3e456d66a9519cb87e90412ef16680cdefb06451320bfe021d490b1e42a4d205b9927676a5af2e8e012 SHA512 95de6c0c16b0b07def8cd4d698ec9ab5e79cb2715c658e95be67d9b7f3c28c04f47c5649edfa71be51026fcfa98c618e5283fa031ebcd621a1700dbe1d539c98
 EBUILD commons-lang-3.3.2.ebuild 1112 BLAKE2B 1b45826fa5fb04a270fd93c0b3526223d48fe32289f8a3c9d02b5c99b2997f65eff7d542700c13aafc68cb5c95e7af7cc8d9b7b74840d5a7d4b6c1fe715e3e2f SHA512 dba87629c9c5234c6b29604aa1401a52933644f901005c17f8a3eb4bd68fe5b6b5bc9c45096b7822e95aaedb292cc835604ec31b817c4babcde442cd2e4f11b6
 EBUILD commons-lang-3.4.ebuild 1110 BLAKE2B 3be8caf7bab320369e1ae456305abd79faaed94979835c7677f4c81019ccc0e7ea67fdbafbf839cf1c831cd8ba92730621350357db3f8e01cb84333ce62a0541 SHA512 c59defe42c47944e7ed60ae9bb3d6b52cf9e942617f1191f5f7cb8947b1995ab4e4c8db6cb26d1b1fa6f6edd1da1b355648b5f75ee782c6e8256b1a7d929ab2d
-EBUILD commons-lang-3.6.ebuild 961 BLAKE2B 81c6b5c74172be33876c6b9b6979fa636bf174dfff7987560a51d40c255ebe8f936071dd00eb85015ed69d86887454d8ab2fad9d0954e798ea24dd52430242b9 SHA512 5370bcd4273bf7943d5c1f2ddf3dc512e8d9a4f35299dfc805691fdcfe37e5dfc460c8c5dd995880bdb4eea5c91485a54f25bb02cf505967ae1475d3f189e06c
+EBUILD commons-lang-3.6.ebuild 957 BLAKE2B 70397b21b4bbb9e46bfcd3a2f9731486a94efcb9ef3a24f5000e3d7140c153d94782c4d630291c11c7b2da0e23017ef0a472d422ef1927d8cee89821fd1ac22c SHA512 15abf5f5fb7c29fcaf85e6fda4fd64f6352a88e4547839e00aa75dfe4f284a9ae37ea5efcfd557486f1f857c2a92c0c2dfd274b05ad6b1914172ee367d739c13
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-lang/commons-lang-3.6.ebuild b/dev-java/commons-lang/commons-lang-3.6.ebuild
index 1977332102ba..f6817c81ee26 100644
--- a/dev-java/commons-lang/commons-lang-3.6.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="http://commons.apache.org/lang"
 SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3.6"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 
 CDEPEND="
 	dev-java/easymock:3.2
diff --git a/dev-java/jdbc-informix/Manifest b/dev-java/jdbc-informix/Manifest
index 65d3061ae77f..b840ba86bad3 100644
--- a/dev-java/jdbc-informix/Manifest
+++ b/dev-java/jdbc-informix/Manifest
@@ -1,3 +1,3 @@
 DIST JDBC.3.00.JC3.tar 18447872 BLAKE2B 61951967bf1d9bd21583fd4270ccd5b177613896f4864a0bcbd9ecaf995e8a097238cb0f4b1f9f65f8012344b88bbd5b91440507192f2e2a63a39f0595a28ce9 SHA512 1f5d0848964b6e805ea735745e8af94664b55dcdf8de664d649b0b261eeac5f36ed0a6cff9bbfdd70b3b574c28b988013c97b1c2011fbcb51f21262f8dda0525
-EBUILD jdbc-informix-3.00.3.ebuild 1657 BLAKE2B 0f6bab8a986d17acdd12f6580506dd16bcea0cac5e21cd7d62e083316091ed133ae1f19ef18d56b1bee2caea748bf91e31059eff22a13d5662fa2576185c27ae SHA512 d38636f0e423c13da399a5d4a20c11fb262ae30adbfcdd7a911c2c7b7502f65280bdcde0fd4faff01ab8c05e61e1d3feb20acd540388bda0ae03ee55ce310d22
+EBUILD jdbc-informix-3.00.3.ebuild 1667 BLAKE2B 30e93784955dc0246a8cb962775732493cb8581a625aa36d3dc8646336572cefab875438846f04c6bb9da9909e837510c5850be3544d26c15517bf101564f9c1 SHA512 4c6535273602ae5cd8bcffa360b692664edfad75d020a24d9a628ad00b121e6a6b2c0620377fa773a2defcf259c814a5e39e3af271065b44c1231c5fc2e5f7b7
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild b/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
index 6cfbbfbeffee..c3676e5dfefa 100644
--- a/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
+++ b/dev-java/jdbc-informix/jdbc-informix-3.00.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -30,7 +30,7 @@ pkg_nofetch() {
 	elog "Click on the 'Informix JDBC Driver' link, version ${MY_PV}"
 	elog "Sign up with your IBM account (you need to register)."
 	elog "Go through the license agreement and survey."
-	elog "Download ${At} and place it into ${DISTDIR}"
+	elog "Download ${At} and place it into your DISTDIR directory."
 	elog "And restart the installation."
 }
 
diff --git a/dev-java/jdbc2-stdext/Manifest b/dev-java/jdbc2-stdext/Manifest
index e57235924670..2ce46e7c0f7b 100644
--- a/dev-java/jdbc2-stdext/Manifest
+++ b/dev-java/jdbc2-stdext/Manifest
@@ -1,3 +1,3 @@
 DIST jdbc2_0-stdext-src.zip 21642 BLAKE2B 475892fc77247a93eaaf400e48c585832df843cedcd1ff2f8de364f6895fc9661d1d2241969b126fbb056b23be78085317fbb14c69c349612d39b700913a5b72 SHA512 5157a5835983c094b13d947a39311d08ea57cd8e60197176681289d41a209f3f8b464e1e0dd97ed714534ba5afb749807e02efb3edba4e2c91e273e71f6f1ce3
-EBUILD jdbc2-stdext-2.0-r3.ebuild 1523 BLAKE2B a5ec3bd1adcda9a4317a01539a68ff4148f56a2e0bfe62aaacb57e3a8ae1a344c2f1f74437f26347e206703374ae4d742d27efa4d5ef83acb04dc9d07bb383c8 SHA512 1532f846d6ce1e2287d28e963b68ef689b2572f0eea2c795b97f22ef373eee2a4b5b618f4442221b5f8704fb8eba111618c38417d749735aefa911a145afda30
+EBUILD jdbc2-stdext-2.0-r3.ebuild 1532 BLAKE2B 307b27dfb5e8eb03279468d0fd1cda8e378c6d90568fb6bba62beb1a082c9cc02de0abbb9206921575db7ca253c3b231884eb5d1191637e134d8c0e0bd9c9582 SHA512 bcd2ee5029da8416bb5cdc3605ad944f1e5c3cfdcdc65ada998deb1d82ff3b52ed4705cfe850d452d2a29f863964cb8c6df2e8c6263d5ad6c3cd233a0c3d0ce6
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
index f49f640216bc..1c8b12f2670c 100644
--- a/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
+++ b/dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -39,7 +39,7 @@ pkg_nofetch() {
 	einfo " 1. Visit ${download_url}"
 	einfo " 2. Select 'JDBC Standard Extension Source 2.0'"
 	einfo " 3. Download ${stdext_src}"
-	einfo " 4. Move to ${DISTDIR}"
+	einfo " 4. Move to your DISTDIR directory"
 	einfo
 	einfo " Run emerge on this package again to complete"
 	einfo
diff --git a/dev-java/jta/Manifest b/dev-java/jta/Manifest
index 03d4a5223e60..a8b7c8371b91 100644
--- a/dev-java/jta/Manifest
+++ b/dev-java/jta/Manifest
@@ -1,3 +1,3 @@
 DIST jta-1_1-classes.zip 13236 BLAKE2B f2e1ffd531fce804d562c4cdcbe9b260d08eb2bcd79a879f94fbd3e23801849cbf311d8f7410a9776f9a8866027dcedcac479a64444321e8c6b2b23bd9a69054 SHA512 fb8b76223ccdec0ef97b00d7248d74b6316dd67c570667f3a644d03b05cd28af061a191cf71b6624fd4a4195f7bc107281eb847fc4c0ee4606c85c414da79a14
-EBUILD jta-1.1.ebuild 1038 BLAKE2B c7033edd634f33b8c3e578445b36c49b337cd49391ac20059fd041c3d95032904c9cb3e85bab1d8b57eec2519ca5ddbf4855e7e6c0fd407d6f28c9ba06d38cd4 SHA512 d23725de3801d5ec78b328a0162c3ab828745debcfdbbfb853d442386e991be5dbc207b15f6d4ab8f958ae9610d2ab6b195eca090482d67380f3b00c7dfb2beb
+EBUILD jta-1.1.ebuild 1047 BLAKE2B 84b36aa0dbe338a10e8b4126417be28c2921239c8c4053f5ed80d003faf772fa7653f9a0ade5650ca5f6d38b484375c00822ea76d3fa078efaff69114771b985 SHA512 b7ac0af2a03d4256d3d284c711027f83b7e244974bade6914fe128df8e19b2f8b9ec21314af9411b710419cfe5cbba0b51b4eaf614820a6d0c0f4b054619ef72
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jta/jta-1.1.ebuild b/dev-java/jta/jta-1.1.ebuild
index 6293b663d002..401962b1e482 100644
--- a/dev-java/jta/jta-1.1.ebuild
+++ b/dev-java/jta/jta-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -29,7 +29,7 @@ pkg_nofetch() {
 	einfo " 1. Visit ${HOMEPAGE}"
 	einfo " 2. Select 'Java Transaction API Specification 1.1 Maintenance Release'"
 	einfo " 3. Download ${JTA_ZIP}"
-	einfo " 4. Move file to ${DISTDIR}"
+	einfo " 4. Move file to your DISTDIR directory"
 	einfo " 5. Restart the emerge process"
 	einfo
 }
diff --git a/dev-java/jvmstat/Manifest b/dev-java/jvmstat/Manifest
index d3314b46605f..0684b17e6e3d 100644
--- a/dev-java/jvmstat/Manifest
+++ b/dev-java/jvmstat/Manifest
@@ -1,3 +1,3 @@
 DIST jvmstat-3_0.zip 153629 BLAKE2B 9191873c9d719a0aab33e3eb7d8ef056dc93861f81c09ef10f7adea457fbfb39f347d34d0b84410457b0b0c52479620bde1060bc5fbc6f7dd1c23efe643d385c SHA512 c3967f5c11ef70aac3b3131c7ca1330c4ea377e59a2e9fb18329cfd9c82a8363efd960c9fb71e4d5f7e81867bd24e5bb6263d2f38b95878222c9184c0aaf4f12
-EBUILD jvmstat-3.0.ebuild 1018 BLAKE2B 84e53700ce1b388dd2e531f7ca58268e9c5c6c03896411bb329d0b22f847394d5138bbca921076415d1355825d5d34b625b7a3687f47de0acc2f3c4768b5effa SHA512 3fa0f7246bb4a6cf263cb3bc96af279a42ec90a28237f038d03af89fe5b9fb682505f89bc1704fc594b7048197592433fc12918b13cdcad2d96da386da19a85e
+EBUILD jvmstat-3.0.ebuild 1029 BLAKE2B 97b6967b616f840c687a017a24e1eb29e0b8e53b5233c1fcfd2176f4e0efbad67f7c2c7fb4759a22430feb9696ca16de6208622d2afc989c3aec499caf032463 SHA512 7b6268681f23c943badeb9aba09daff1cc6e7559ce2e7ca5d4c8bdcf05068928724c4f96e396dbd7fb700b8cf78d1fc970dd3d908e944a2685dad4d299d4eb97
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jvmstat/jvmstat-3.0.ebuild b/dev-java/jvmstat/jvmstat-3.0.ebuild
index ebac4a87c59b..2d11cc6a946b 100644
--- a/dev-java/jvmstat/jvmstat-3.0.ebuild
+++ b/dev-java/jvmstat/jvmstat-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -28,8 +28,8 @@ pkg_nofetch() {
 
 	einfo "Please go to following URL:"
 	einfo " ${HOMEPAGE}"
-	einfo "download file named ${SRC_URI} and place it in:"
-	einfo " ${DISTDIR}"
+	einfo "download file named ${SRC_URI} and place it into"
+	einfo " your DISTDIR directory."
 
 }
 
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 9496095e3bbc..2814f933acdc 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -2,19 +2,25 @@ AUX maven 5108 BLAKE2B ea00d51464bb983871760ea1683a4b3f9129a5c91040fe7d1e86998e4
 DIST apache-maven-2.0.11-bin.tar.bz2 2104711 BLAKE2B 4bc6272957f3e258135d4efacacc625f63522a7e0277e3383ec27a9906e8e4b41cb606d44b30ba870fa5c05d79a45d26af9af00cbffb7615087949c2eec563f7 SHA512 829a583e44ea997576cb0949d74f95e6557069489329523c28c44b546f07cd9487a75f4326d7dc0a098a9755fd52630f2ee27a60daf35006eb48d6af250f84de
 DIST apache-maven-2.2.1-bin.tar.bz2 2839688 BLAKE2B 64427a0e8925c7ec4567a96878c389635aaf578a6569825749fb5786ee7566654d5e6583d40cced8e3585b72bc1cee70567388cddf32393ff1fb5962a4ad96eb SHA512 ffbf74b6b51616dcd87252973ddd776f13861fece7cd25df9cfba4bda1d8dd574772cb5d37ac7ed97ef8b93b507939d428d47b9b81742c801c7958b9fd6188e7
 DIST apache-maven-3.0.4-bin.tar.gz 4873043 BLAKE2B 6cdbc6362dfd766f8e14298873f574fff1a6b4c4e29011a234ff7f3f0d2350a7fe7ff26dd68d486b68d84ba575d77324d0cb950e0cea91894a2f0ce81da0f7de SHA512 d6935daff3b80ed6e40ee0acb4f269b4b16e63bc29b792316599a9847f1b33d9309d3c399cdb170710714a1d150957eedc909754de8f8a77d87bd20a0abcb36c
+DIST apache-maven-3.0.5-bin.tar.gz 5144659 BLAKE2B a109f1ab8656d031c4c904b9972b5dae7955956f95a383c93342bcd3b823e4355fd446150df60b19fc5754b4b19ca4f38bc11357e061e31b0a66b927611a5a6f SHA512 748c7deb8f56dd968a4dbc289b012adea3621f7b3847dc19004995c2f540bae68fb100c0f28caa57b0f9d15b74ae81eaa27c71e342342aa57afe23b41e80d35f
 DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1
 DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
 DIST apache-maven-3.3.3-bin.tar.gz 8042383 BLAKE2B 2d1826e85ee558e8672ac541237248b32db1577c76eecf9ac3d08d79e157c9c7a4fa7d892a7bc0bc25d2751f9713a72959198fb6ccd68907bda7f841068b6a63 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5
 DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
 DIST apache-maven-3.5.0-bin.tar.gz 8534562 BLAKE2B 200f7c012e2704c9057d4987a295b0fa9a5787d59707415259445952ae05963a7d333e6fc2eae88689161181077d2b9a9b2398b5baacc6527e76ed83d6068198 SHA512 d5a520ca8765ddbc86dca71249c602e2f798dedcc7430bc4979dd01918464c8dc69b694ec0dbbeeff6044179e1b98fce72af952663dd49503203d9742e328f3b
+DIST apache-maven-3.5.4-bin.tar.gz 8842660 BLAKE2B e56e22c2f9e51d47ff34b8516eb3d14d4ca2adddb36c800cfba5cb4e68c19c3c7df7d544c1e81c7be004fe5ceeee24f78b904f68b30b768aaf09562d804b61c3 SHA512 2a803f578f341e164f6753e410413d16ab60fabe31dc491d1fe35c984a5cce696bc71f57757d4538fe7738be04065a216f3ebad4ef7e0ce1bb4c51bc36d6be86
+DIST apache-maven-3.6.0-bin.tar.gz 9063587 BLAKE2B c5acab74168061ef8216cf6d085c25ce3e1eb941724bf0d4bbbe1a69a2da3c255c8233233a5bef800469b7363fa34ca1c4a4717c3f18b8eb2828fdd5d5762bcb SHA512 fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
 DIST maven-1.1.tar.gz 7625074 BLAKE2B b96b5b5c74fdccba8914772fe2ba789751b85170d78afb3fb75c151d56d757be10a1f8706d9593a4ff4459a1e7d8b31801eef07cf2514e1992ba1c99c4d0a7e8 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0
 EBUILD maven-bin-1.1-r3.ebuild 943 BLAKE2B 184f9d88036feecc7cf657e8bd792c126d2a5bebdc232a62c80ae845df5b9800cec324e07d543fad664add754fdc611c5b45b37eaae40ffc29767bfd5d63c2d0 SHA512 cfde3cb81d60eca2ff500228baf7aa5aaffbaa333d8364f05143811aee48b263dc3df8f5f2764bd486f04271f916e52250b7ec019fa80792527a4ca2c591e110
 EBUILD maven-bin-2.0.11-r2.ebuild 1198 BLAKE2B 7077d0a91ecffc1f5fb6e018d11a4bc0f17b477d39a46e14a4017e0cbfa9ce8136a4fb8b54d89371aa317083b7aa3374b69fedc045e935c9e1bfb53209b86002 SHA512 87e71fab63238961ab03f2509c1b1a7f19e5d027072d1c48c8e4a0b726a15e5e502e1f5afbe19fb95a2159c48ce88e742f8266bbf154ddaebdeeb4cb82379433
 EBUILD maven-bin-2.2.1-r2.ebuild 1198 BLAKE2B 53c2334854fa9215a3f9fc3b444d06363b74a7aa6444d88c742c3fe7cd83d9bce570cb8a4142db22dd4fb109f384f37619b28f91b6d17c952b9ccc17feab5503 SHA512 81db5d6d926eba62e7104a832c50799474e7a1ff2aeda48c9f0d37cb9d5649159881afecc68850538f0f946c7de6559faf6fbe728b9e1199f4a55c9cc5c5cfdf
 EBUILD maven-bin-3.0.4-r1.ebuild 1275 BLAKE2B aa254e625be8d5697261fdcafb064050a4918a77e19bc1ff16381b344347e4da0eb33dd639e4cfc0c74bc5557879dc8156a9e5ab8f851c74d746ac778fb1884a SHA512 962818f9a4762a4422498d67ee878d2e2cf33f1372192e4d8c1becae1357daef156a6588a08e7b7d43190b914d9b6d341a7cac61ce4161fd9ca1b35a1eb74fd9
+EBUILD maven-bin-3.0.5.ebuild 1275 BLAKE2B f499792eaf007071dcc11386cd6f1a26805b0aa9b8e88adf76d3445af59f47d98a98f74577550bbf99b1b4d511bbcb1ad83182350bab238171cf50e28260cbce SHA512 a80189ef83f60299d4f7db23cd1c5bfdb0453842830c86109288f1c5beca24dd87617a31bda03473b3e735ac691e4a5c9bd024a91c9b04e140d074585ba213cc
 EBUILD maven-bin-3.1.1.ebuild 2276 BLAKE2B 460b49a29f7aa9f07b672a2751b3a5df3ec6f7027380cb0c84ca4e6146c39da92f52dc6a3158c7e51e74311a1ef4d01402c27f426d9ce5bfb83ebe485b27c083 SHA512 42935864e2af19b20851fdada4ba22562a995fca5bcc63e178c0771ff5d6d9560806cb288ddf9663b1da12d1242627cf9c7903ad8acef32174b2848b4527a096
 EBUILD maven-bin-3.2.5.ebuild 2283 BLAKE2B 5d3292e5f0f2a50e0bb3fe71150d0853947af536432d6b7c6e159fd2cd16a387ee8aa0c3682ca4fc65211f1a32d8d246a901487c9445036285c57fa3397edbd8 SHA512 2a8e8145a454c2f88cf4d48c9cfc2a2cd7689f38f3ce53ffb6d579523aed92d04fe1c3368d8da1035c9ccff8c77142db25dd8fdb6a0d5a9682daf733bd6da71e
 EBUILD maven-bin-3.3.3-r1.ebuild 2220 BLAKE2B a781e334df1a9afd6b0ed76e0c67f29d20777384e7f99d54aea6c140669cdef3e060e3cac6925f7c77eabf5580296416984b21cf479d093f038e5276d09d99a3 SHA512 188beb36be65bc2699fee7ed75407399ecd66e13791242cb12de9a1c18a0c8a233018f5e86d779e597d6a7f7c0e7001a726b437a65c1e51bfba69af57a188683
 EBUILD maven-bin-3.3.9.ebuild 2222 BLAKE2B fe852cdf3e64577d3565cef67ac1be99e9d9a435dbae7609b46b53f18c0198da4da1f45bb5c55a9973eeb3d0656eee2cfe6fc52efe2dfa196c1142f2d2b7d165 SHA512 5ed211c1017f9079251f7888c9920d3bf37fe2d9be680f0d7dbc142da340da6467b328d3972c6d69cf26eb57f2e80d084f25344e02174953aa886f76b6a3a8ef
 EBUILD maven-bin-3.5.0.ebuild 2218 BLAKE2B b90dedfd02d216769a20524a4821f7d9c446e82213d4062415ef20ed4c7766efd0d63fce321b7878eaf2c4bc9948b2312c243b1ec445556402e983749dad44bf SHA512 2a218150d72a2f6bee6f9161ade9a6c6d836831cd01c2d7730ca7a899e396d447edf1e3dfa90ce9f6bf0452cbab66b3cc2a722d2ea0330e1999abfe1f30c3ac1
+EBUILD maven-bin-3.5.4.ebuild 2218 BLAKE2B b90dedfd02d216769a20524a4821f7d9c446e82213d4062415ef20ed4c7766efd0d63fce321b7878eaf2c4bc9948b2312c243b1ec445556402e983749dad44bf SHA512 2a218150d72a2f6bee6f9161ade9a6c6d836831cd01c2d7730ca7a899e396d447edf1e3dfa90ce9f6bf0452cbab66b3cc2a722d2ea0330e1999abfe1f30c3ac1
+EBUILD maven-bin-3.6.0.ebuild 2218 BLAKE2B 4692451547ef9a1d71f63a974f0a9bf86e43f101874c7f0690be0d3b0d7903fbbf87477cd64994e0e11b8b05f09923caee1a9971dfd0138cc822789c1b2b0890 SHA512 b444131af7c1bf8376a985c88a313a7515aab30aafb69aa4984c7421f0769480c7ed82ce59e811cbd160a42ebbb8224cc7e76414fb67671c9eae2068db9463aa
 MISC metadata.xml 610 BLAKE2B 84180dd51fc9e6b9089111a4f79aae2f2e8339a50b3db00cebb103714e7bb87c99a7fbfbd2401a5646f044b6d78cf370b1a1af7e524be91b7065176cf6b8673f SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083
diff --git a/dev-java/maven-bin/maven-bin-3.0.5.ebuild b/dev-java/maven-bin/maven-bin-3.0.5.ebuild
new file mode 100644
index 000000000000..e97007ba6b02
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.0.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_P="${MY_PN}-${PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-eselect/eselect-java"
+RDEPEND=">=virtual/jdk-1.5
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -v "${S}"/bin/*.bat || die
+	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
+}
+
+# TODO we should use jars from packages, instead of what is bundled
+src_install() {
+	dodir "${MAVEN_SHARE}"
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# bug #342901
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.5.4.ebuild b/dev-java/maven-bin/maven-bin-3.5.4.ebuild
new file mode 100644
index 000000000000..034526da0521
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.5.4.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.5"
+KEYWORDS="~amd64 ~x86"
+
+# TODO: Needs further resolution:
+#
+# - https://bugs.gentoo.org/show_bug.cgi?id=472850
+# - https://bugs.gentoo.org/show_bug.cgi?id=477436
+#
+CDEPEND="
+	dev-java/juel:0
+	dev-java/log4j:0
+	dev-java/jsoup:0
+	dev-java/jsr250:0
+	dev-java/commons-io:1
+	dev-java/aopalliance:1
+	dev-java/commons-cli:1
+	dev-java/javax-inject:0
+	dev-java/osgi-core-api:0
+	dev-java/commons-logging:0
+	java-virtuals/interceptor-api:0
+	java-virtuals/servlet-api:3.0"
+
+DEPEND="
+	${CDEPEND}
+	app-eselect/eselect-java
+	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
+	>=virtual/jdk-1.7"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+MAVEN_DEPENDENCIES=(
+	juel
+	jsoup
+	log4j
+	jsr250
+	javax-inject
+	commons-io-1
+	osgi-core-api
+	aopalliance-1
+	commons-cli-1
+	commons-logging
+	interceptor-api
+	servlet-api-3.0
+)
+
+java_prepare() {
+	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
+
+	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
+
+	# Symlink jars.
+	cd lib || die
+
+	# Link deps.
+	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
+		java-pkg_jar-from "${mvn_dep}"
+	done
+}
+
+# TODO: We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.6.0.ebuild b/dev-java/maven-bin/maven-bin-3.6.0.ebuild
new file mode 100644
index 000000000000..a7e55b1b599d
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.6.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="~amd64 ~x86"
+
+# TODO: Needs further resolution:
+#
+# - https://bugs.gentoo.org/show_bug.cgi?id=472850
+# - https://bugs.gentoo.org/show_bug.cgi?id=477436
+#
+CDEPEND="
+	dev-java/juel:0
+	dev-java/log4j:0
+	dev-java/jsoup:0
+	dev-java/jsr250:0
+	dev-java/commons-io:1
+	dev-java/aopalliance:1
+	dev-java/commons-cli:1
+	dev-java/javax-inject:0
+	dev-java/osgi-core-api:0
+	dev-java/commons-logging:0
+	java-virtuals/interceptor-api:0
+	java-virtuals/servlet-api:3.0"
+
+DEPEND="
+	${CDEPEND}
+	app-eselect/eselect-java
+	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
+	>=virtual/jdk-1.7"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+MAVEN_DEPENDENCIES=(
+	juel
+	jsoup
+	log4j
+	jsr250
+	javax-inject
+	commons-io-1
+	osgi-core-api
+	aopalliance-1
+	commons-cli-1
+	commons-logging
+	interceptor-api
+	servlet-api-3.0
+)
+
+java_prepare() {
+	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
+
+	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
+
+	# Symlink jars.
+	cd lib || die
+
+	# Link deps.
+	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
+		java-pkg_jar-from "${mvn_dep}"
+	done
+}
+
+# TODO: We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/mimepull/Manifest b/dev-java/mimepull/Manifest
index fd7d8aa88805..bdf15d96379d 100644
--- a/dev-java/mimepull/Manifest
+++ b/dev-java/mimepull/Manifest
@@ -1,6 +1,3 @@
-AUX mimepull-maven-build.xml 9697 BLAKE2B a297e74be1aa6bddf7c15b8601df79246a41d8490677bc555fee4db1a1ee81cfeb48ec5226f071c7869638fd8284309ee8857b4c9909a78fa922c5860bef01a5 SHA512 23ec5dfc06aa518632e9d69ddc6633010f0a41baa73f7a9e8695b8666927a2612b9ba3b31a74e9fae436dabb51657e39f2623acb41da14b3df71a93eb64dfa9e
-DIST mimepull-1.8.tar.bz2 48841 BLAKE2B ebc5ba45cff2d01c3d0960433f3334cd9c2e39bf9a627b41b3682ece4e376fc10ad53b00773cbb91fb66463e0f9d29790eb4f55dbd27c4b29b70a6fc24856c0d SHA512 60de5b888ccdf89ffdeba0a5ccd98e77f7497e57c6b3c71049446dab0293836f8f2b84a39354602e9073fb6fef880dbc11c80323413f8ed15f0a3af68086ae07
 DIST mimepull-1.9.6.jar 68382 BLAKE2B a59c4837dd82fa2a1e67e653870ead62c6db6ede03690eb483724d2a9bdb588e34145eff604b372a417cda12a1f4074741630e47b3acd81f438145c938d04578 SHA512 528eb77d6edbbfb1b1d8aebb617f9d20c84b9c18f7ab763163ea136c3898319519bbfa8a8e204bd0697a4eac9b964eaf3fb2ee214555efcb3da152ebf467ae64
-EBUILD mimepull-1.8.ebuild 953 BLAKE2B 1ffe4e9a41b81eae44414e20c84ea4c570c7f9786bdce7ffa33a81ad92e0a1e66da84f2477706603a0c849eb39504d62719ac5aa125c5d8d90229bcc7707c624 SHA512 ad20b2a6b8abc3d49028f575efe82b69218ba156411fbcbac7400934169d5d41dc54649fba4c35fdc575aa5032f8546da941f15dd0ce8f079e5f7d6998c8469f
-EBUILD mimepull-1.9.6-r1.ebuild 496 BLAKE2B 51f4d6ae0fc26652cc9adb3ecd26e0d72f019ab6d2660b30e368071c7a935a61434fbcaf96274836b05646f2fbd057d68814ed115857e6a601cb20768897d408 SHA512 97fe69a0ce8b215a306347a17655fd156754150a22593262927b0dee1740044239c433478fc6bb44bca14ddb9f2b60872b32cfce81acf65550e8d95faeeda357
+EBUILD mimepull-1.9.6-r2.ebuild 483 BLAKE2B 7b6e313d2c2a2c22f1614e5cc763f67df0cd11e97baeb8c3b2d6bc233d6d7589e15bcef64a4b2c7b49272c60c67ae54bd3fc5a6bba3b60ad9862437902902472 SHA512 b6032922753ed84bc7a0b5cb10e58925a7fb282a230acfa3d7958a5ed5a042f69375c61cd707c6ba84b63b0af553dfb6ac2acaf1902aac158a5643a6fbba888d
 MISC metadata.xml 573 BLAKE2B f056f34e757829704b8efe77f55e2da69d27a7dc086cde47135854469195578f1b9dd3b67638a0379bc30eff764c25269a93560e11e0e12f9d7440308d240f44 SHA512 5ba96c89a6e2e5c29367ec1b5e52ab3abbfa7bdb0d8e1dd2e305980d83de83b4c29d657e5ecb4a9c1eb3804fd8589b5de86e4f34f70b951b14b2ed453a8ef427
diff --git a/dev-java/mimepull/files/mimepull-maven-build.xml b/dev-java/mimepull/files/mimepull-maven-build.xml
deleted file mode 100644
index af6d5ea93733..000000000000
--- a/dev-java/mimepull/files/mimepull-maven-build.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/31/12 11:02 AM                      -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="mimepull-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property name="maven.build.finalName" value="mimepull"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-  </target>
-
-</project>
diff --git a/dev-java/mimepull/mimepull-1.8.ebuild b/dev-java/mimepull/mimepull-1.8.ebuild
deleted file mode 100644
index 61e403db28c5..000000000000
--- a/dev-java/mimepull/mimepull-1.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Pull API for parsing MIME messages"
-HOMEPAGE="http://java.net/projects/mimepull"
-# svn export https://svn.java.net/svn/mimepull~svn/tags/mimepull-1.8 mimepull-1.8
-# tar cjf mimepull-1.8.tar.bz2 mimepull-1.8
-SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	>=virtual/jdk-1.5
-	test? ( dev-java/ant-junit:0 )"
-
-java_prepare() {
-	find -name '*.class' -exec rm -v {} + || die
-
-	cp "${FILESDIR}"/${PN}-maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/mimepull/mimepull-1.9.6-r1.ebuild b/dev-java/mimepull/mimepull-1.9.6-r2.ebuild
index 301cfe14b421..87dee3af3282 100644
--- a/dev-java/mimepull/mimepull-1.9.6-r1.ebuild
+++ b/dev-java/mimepull/mimepull-1.9.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 JAVA_PKG_IUSE="source doc"
 
@@ -13,8 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/jvnet/${PN}/${PN}/${PV}/${P}-sources
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.7"
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index 9083f0d66939..bbb350d5bd6f 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -2,5 +2,5 @@ DIST pcfi-2010.08.09.jar 6731455 BLAKE2B 438dda63e91494231fba890d995227e7c6428b2
 DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
 DIST pdfbox-1.8.15-src.zip 11078696 BLAKE2B e468a1c263007484d47861945b50a8b0c9afed2d792619a49f41e57b313d86f4e04d317d1b75406876592d755958771c0468446eb23fe3b26ff529e07d467ffb SHA512 ac3f4b131f5cd2153ec2a744c486db921bc2165d596b243ad673cfc94be1bc4ae27bdf2981b63419fead18db569a2008264d6fdc7c89cf47f69f81c4a7d3a2a6
 EBUILD pdfbox-1.8.11.ebuild 2079 BLAKE2B 36c1ee6f0f1d517c7f7d0ce084c427e52993c7dd02e9795862de3c3234554dd245871e072402427b04c27232518e7d79e35b4e28fa4cc1f03adbce7b9bad891c SHA512 249af8e8327b87210e5919f7504978a9a258214accf957644e1a7803a7132b75532882a0ab87e19d35a7d7523eb5ecede5396657f55444f7874bda7b6d322ba8
-EBUILD pdfbox-1.8.15.ebuild 2094 BLAKE2B a25b0c50e62a70d3203c9b2e7b4183d217a1283de1a765a49277242de1e4cc0d7ba7a532d2f753c9e514473b09dedf768d1ab5a05de1e8de012f93ba57b47372 SHA512 37cef5b3c671c4689730537b192161820fc7c9584833d00eb58cb0e2b57d2ea403c6be251290ddd5ef7d9ce89066283c1d0373287af573a619dae15fc93e2b7f
+EBUILD pdfbox-1.8.15.ebuild 2088 BLAKE2B 7fbf6f88923a9903d77e4d49ea15645196ff7494f91d01ca17fe83b26299ac8224ac181d354ccb3811ace954a505dd088e47972458f918bc44699f5be66979b1 SHA512 b6890014cb12c6663bfb4ad6eaafff616fc06f9e9073bc299e2aeb8f8d2af038f6019b8368240c5994ba46e3fa41b7936f577c3cdbd2cca3cb492b33e456eecc
 MISC metadata.xml 641 BLAKE2B 03d882aee9a768dead555ff0394a3700c55dc9fd72097a1014cd7a87fca6d6e900b675e4ec4707c6ca5baca40646650bca3bcfbd25cd215af679c3e574442b3b SHA512 df978af8abefb42c2eadf80184cfdc0889758d758656f7b7bef19b7d4f59da28e465683cec26d96d288dccce4d82a182d56abff28ee14eb718280d469bb4183f
diff --git a/dev-java/pdfbox/pdfbox-1.8.15.ebuild b/dev-java/pdfbox/pdfbox-1.8.15.ebuild
index 806cc5ba04b8..850c40532bd3 100644
--- a/dev-java/pdfbox/pdfbox-1.8.15.ebuild
+++ b/dev-java/pdfbox/pdfbox-1.8.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
 	http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/${ADOBE_FILES}"
 LICENSE="Apache-2.0"
 SLOT="1.8"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="test" # Explosive even when manually using unmodified build.xml.
 
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index a1c33db740bd..9a7a7d615174 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,9 +1,15 @@
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
+DIST protobuf-3.6.1.1.tar.gz 4489116 BLAKE2B 4ed5da3dcb56245b3ce2f979142d5e77837e8e1fbc2f0af27be48664b8b7dfa2ec44382cf75678d226dd665c289f81d95bf04c5f2795fcdd759aa8ec630dba1f SHA512 df59ed966047471d7296883a4500d657eee5e7d8713dd7e44f3f2e0b8c4400e85cb511b316f2fa8518620f1074fd0cad8ee9538c063ac371d6b59358de81ee88
+DIST protobuf-3.6.1.2.tar.gz 4490331 BLAKE2B be5fac5a38369b21941c3c615a97cf35d05a24ee03536b6ea6c1c797a82a0a7f8ecc3630b62af7728f063c850c4faac8ae670171a18bacd44e2a2fb38b2e6fce SHA512 557ffb1216f663df94a16cd8e51e20acf42378913d656f56402c6653cb58ce6a83f77a6050bd846460c7dcac59bb41ad03ac003b0b06250df6a97fd17f8a2c7c
+DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
 EBUILD protobuf-java-3.5.1.1.ebuild 2095 BLAKE2B 9cb63175cfb02d00fa2e9273aba56bc3fe640d5a485af2746dde34505d6ec9317617dc41e7da0f7dba3f728673a9a846363f61889bb4c4fb46916852623435a5 SHA512 1cc3f361b4cb240b80cd3a5b43b7e3f8d95b08152b33e09aeb7a96a07683d621384468730cdbf1b99f24dd6937aef3745fe3678e0b57ba9f314b6a21fa2139ec
 EBUILD protobuf-java-3.5.2.ebuild 1814 BLAKE2B fd690cc2a8ecbf5d568ea3d20cd5c494dc97f75c3f61b3c506e2e39168bb5e138e0ffce2f1d3ae846e13c535372dc4638d32b356664849248d3b2e948dce5c4d SHA512 df61e203370b90295a3b48eea64c80fa53e9cabf51730e2c49db2520017833961560d7895f80060f08807089d3df54220c74df852807fa1d07efdca3b84991d4
 EBUILD protobuf-java-3.6.0.1.ebuild 1112 BLAKE2B ed95623a91d20e3c8e2ecbb69c8c52421441c0eed3a3f36bcf84486b98cc67cccab53da1f83f3299b071cd0332f59461af952d29be82dd9f65d58fb68ab47ef7 SHA512 2746cfa9ac7a844aac943cf6ea5e0b09b5544f0be8a2ef46bdd9d46a3e8261892d0cd153e668bffd5b7babe31601ec3338c81f79de3788353f48921ae2890f2b
+EBUILD protobuf-java-3.6.1.1.ebuild 1112 BLAKE2B c2196e26d93a7a1572195f6dec8e2a71fb5791aa1133a43385020a2d7276021479319ef8cd5ec195eb8ca054f797ee83284fbb7b94c702d30cafacf8f529569b SHA512 0c2943558095fb4b4dfb63612c6cdf7cd5b535a9590701cb83de83e971128dd772814adf51de9065dec5408fa60f9f8883d92cccade30c42abd6ac91afc5f680
+EBUILD protobuf-java-3.6.1.2.ebuild 1112 BLAKE2B c2196e26d93a7a1572195f6dec8e2a71fb5791aa1133a43385020a2d7276021479319ef8cd5ec195eb8ca054f797ee83284fbb7b94c702d30cafacf8f529569b SHA512 0c2943558095fb4b4dfb63612c6cdf7cd5b535a9590701cb83de83e971128dd772814adf51de9065dec5408fa60f9f8883d92cccade30c42abd6ac91afc5f680
+EBUILD protobuf-java-3.6.1.3.ebuild 1112 BLAKE2B c2196e26d93a7a1572195f6dec8e2a71fb5791aa1133a43385020a2d7276021479319ef8cd5ec195eb8ca054f797ee83284fbb7b94c702d30cafacf8f529569b SHA512 0c2943558095fb4b4dfb63612c6cdf7cd5b535a9590701cb83de83e971128dd772814adf51de9065dec5408fa60f9f8883d92cccade30c42abd6ac91afc5f680
 EBUILD protobuf-java-3.6.1.ebuild 1109 BLAKE2B bd8fb8e90a5f6386f16a9d98351b30e34b3307d323565fa016b22d69285cea18495f4fb29c6ec7bd4052bab2cd5d7af82219209e36a7303de55ca92cba1797cf SHA512 cc09ccf03e073edd2c7ec711f3e4c55afe7dae532ee94916f9f4319c3c9b019c49b42f8ae5c43c2de6ea11dfe3ea34fc5f7c96a2bc66f3d7b02ce1bc7749ec32
 MISC metadata.xml 805 BLAKE2B d90fd4afcd89ea87b592be42fa34d1279f2fc28b24c3891c2065b909b197927014c3e96d6cc88797b5cb9ccb087efdb2f3b31bb436bde3e7d6858cdacb714c3e SHA512 4bbb4b673edf832e0e5bd985d3d11e813d8512c31e79441c8b0321b4d40f89bf0a15b5bbcf12f3ef9294fa831c35b7dc518be1a86b2fb87eab173a6b2bccf476
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.1.1.ebuild
new file mode 100644
index 000000000000..21b22d791b71
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.6.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2008-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/java"
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
+}
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.1.2.ebuild
new file mode 100644
index 000000000000..21b22d791b71
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.6.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2008-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/java"
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
+}
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.1.3.ebuild
new file mode 100644
index 000000000000..21b22d791b71
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.6.1.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2008-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/java"
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
+}
diff --git a/dev-java/sun-java3d-bin/Manifest b/dev-java/sun-java3d-bin/Manifest
index 40f75be3dfed..612dc10f1dbf 100644
--- a/dev-java/sun-java3d-bin/Manifest
+++ b/dev-java/sun-java3d-bin/Manifest
@@ -4,7 +4,7 @@ DIST java3d-1_3_2-linux-amd64.zip 1241855 BLAKE2B 342b09f8643060115e642ba9da3027
 DIST java3d-1_3_2-linux-i586.zip 1235329 BLAKE2B f380465fa6442e129bcc4c2c7b0f1c2d00775735ccb1755eff0cbfa063bdceb23209fe157c1127a36dc24e5fa7988194e2b5e830a3ff43891dd8e0b00cc2d855 SHA512 5fb459ead7cfdae468017bc40cb6f8831a8fadbd27fd3c62404b9cf5ebdacef092e8a4153058731c2a004672bc69f4061b664412ed937a7b49a15ca580762839
 DIST java3d-1_4_0-build5-linux-amd64.zip 1281828 BLAKE2B 90f1faa775d1c0f29cb32dc36801dbb697721f9509a45b9cbf9e26750e928359dad5e7458d98412ed3c473ed108e4ec937d6ef1fd8bad75d5feb3a5e152a8967 SHA512 ec1074e5ad40964a80e2ec3332f67d1b7067db6aa5d99379f9e488e2c6a342b0c3d0c78aadd995bd647047efdeb0f040c8e8c7e4557a5161b6a8919fe93cff81
 DIST java3d-1_4_0-build5-linux-i586.zip 1274577 BLAKE2B 38bab843a406b563f21dbffd51aff26937035c48488c4c50fdc8268fa8fcd73455219b927018958c2a87b35085aa51c8abe565564690047a2da6628e914c5722 SHA512 1b6b87d660b98029c8a5a2cfc9435538c89032b4318243ee5dc01629c72f8f4ea189ee383150821b291a6bbe2b3284ef7c6da6404851a8d6adfe6fea0af3ac59
-EBUILD sun-java3d-bin-1.3.2-r1.ebuild 1081 BLAKE2B 30edfc0c0f912b5bc59aec81ef47c3ea7e7f4e981dd8b308dbcc6c14bbbb3ed5bd271433b521374c62f1480c687c83b9347a373b104d9f449138a38b684b1384 SHA512 c642ac5626c0f99bd2de378b1bd3f098932e92b694575331d02658f46ca18b4fd884607cf230cd73ad439d6362dcfaf25babcf3892b2ef7bc02234738419673c
+EBUILD sun-java3d-bin-1.3.2-r1.ebuild 1093 BLAKE2B ac0c12e3e4c06ac4b221c02db79223895b133e530a3ec8cb79339ea9b1b23901fa61f3f748c7806a42d938ea1ad4d11cb75b232b428b47a556ec9b305db3ff7e SHA512 f1c127b90c5be9cccdff1a3df034cd02e6c0753701ddad86bf1145cecf8ee8dcd4610e55a432d1109f6eb3c098deb1fe118aae85fc25eb7ab2844146d39c05f7
 EBUILD sun-java3d-bin-1.4.0_pre5-r1.ebuild 1195 BLAKE2B 5ca9b49e29ba94b7a111bc7debae5f5f5eaa00eca0e6c3ed0a3b98591bd9f0cc0120b1bfbf4d17aa2cb393fda10adc0f6052a0100d0b86e7c931dfd4680882bc SHA512 eb65d52d2f7f1915d150aeb975f214d91292967690bb50be306a3ce5e5e50d0d070dbda75f1464503c49a6455eba0a60e73011a20e63578feeed792a48fea8ca
 EBUILD sun-java3d-bin-1.5.2.ebuild 1142 BLAKE2B 21d2b10cec2764e564cc018379702eba298e1904cc592992d7d6223f9c4855aacb97c8f4ea7c4dc47146e6981a2743ad6d5b984311093c26411e74dc3e8d317c SHA512 110605860513f90c977a00219c4f509a3415976a99ca012758e186cfe174d134efed78a8756d7c5ce704773c00ccdd97e88fa1d023f98b7823e09440390855c4
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
index 6c09cc29e65b..1926def2bcf6 100644
--- a/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
+++ b/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -21,7 +21,7 @@ S=${WORKDIR}/${A/.zip/}
 
 pkg_nofetch() {
 	einfo "Please download java3d-${PV//./_}-linux-${ARCH/x86/i586}.zip from"
-	einfo "${HOMEPAGE} and place it in ${DISTDIR}"
+	einfo "${HOMEPAGE} and place it into your DISTDIR directory."
 }
 
 src_unpack() {
diff --git a/dev-java/sun-jimi/Manifest b/dev-java/sun-jimi/Manifest
index 8fe54ecf0f3c..0ddfaa22fd28 100644
--- a/dev-java/sun-jimi/Manifest
+++ b/dev-java/sun-jimi/Manifest
@@ -1,3 +1,3 @@
 DIST jimi1_0.zip 3880977 BLAKE2B b286cdc725cad2037d19bb188145ca0cd0799993011a8f22aa671e8807afd96dd3a9f3035a82dff9823ccba503e711db6b2ef377fc039c7050fc105655114ce6 SHA512 28ae3b3044910fca80dbdf23fee5f0d050df64ef48a09c41a836f3ff78365258c747f69a958579abda68d6d6f1c6b6a3ea5e960d36f2199afdb06258a25173d5
-EBUILD sun-jimi-1.0-r3.ebuild 1094 BLAKE2B 723c18d75e561d8eb8e06da3bffae128bcf1937ecd7bacfa49385de4f19a24fb1752e838b3624e88629fb8a218f57cb10eba8cd594a095b39a987a545fcda5bf SHA512 e67ccf0d46c4043f5183875630495d0113343fdb3b0dc9d8505d57d59ec105c0462f14b721ac7bf957e9bc177198ec1e5f6478c0d11f619c0ca9531cc2f2bebc
+EBUILD sun-jimi-1.0-r3.ebuild 1115 BLAKE2B 4a24a10891eb1b87e91f89029d211c6b984a6b37f0cbb1604ed88b8c1d76025352847bf33d4f02b5d52d04d6bf7ffc9181d3089dd651b11555cd1109b2e93472 SHA512 63d4e2d9493cb2b93332cb92f7d75663d9484b1820c3fc12545df3326f32a72ee007705d790b371c1ecba3fed4565b39a75087d379c34f3df04e889a0695da76
 MISC metadata.xml 603 BLAKE2B eb5162c96ffdfd1e0b07f8c6fc950b7c90bef41e49514d69121a546e60e0d7affe6d630e328fa4e3df505cc1dd68d5caf318a6ed9ab25496bc11b312286cbffa SHA512 9bb4826797c652c42446acc1c40de86e79b4a96fab91b36835439794f7f1df27fb1d03d73bf6e9e6e8762cc998a3026ab04309d176e9968bc2f19423c147ce7f
diff --git a/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild b/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
index ba659b246e78..25366df780b4 100644
--- a/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
+++ b/dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,8 @@ S=${WORKDIR}/Jimi
 
 pkg_nofetch() {
 	local download_url="http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-java-client-419417.html#7259-jimi_sdk-1.0-oth-JPR"
-	einfo "Please download ${A} from the following url and place it in ${DISTDIR}"
+	einfo "Please download ${A} from the following url and place it into your"
+	einfo "DISTDIR directory:"
 	einfo "${download_url} "
 }
 
diff --git a/dev-java/sun-jms/Manifest b/dev-java/sun-jms/Manifest
index 37ef9c53f0cf..b5decd477f05 100644
--- a/dev-java/sun-jms/Manifest
+++ b/dev-java/sun-jms/Manifest
@@ -1,3 +1,3 @@
 DIST jms-1_1-fr-apidocs.zip 361922 BLAKE2B 75342eaeb56ba329948a226f48304e0a520e83f7284d5d8b46b981531b7f8c78283e38b2a488177349aaabb70276fd4ca09bc86993800906aea1469a6549f318 SHA512 ac2c7925b7f5bd3918f0c69a7b18dfa2a15f58243aef7cb429c0571ea218860fc146fd355c905e17310072263f64385b9010eafb1050158f42f498d7f21dfe1d
-EBUILD sun-jms-1.1-r2.ebuild 1331 BLAKE2B 6ab882edd58dc1367cd52b45553a450ed8a3f74f1379aa680bfc5949b1373c935cf21cbe6c73cbe62f96b210f19295c375d37db1c7bea8b1f1593b9096345247 SHA512 623535c760b14b0472df293fbb41ce8de759eaf04fc7a578dd922a0314909c71a67174d452e6afeb73acd9fa29bd38a194f58f3898ec72fed668ec7471bf7492
+EBUILD sun-jms-1.1-r2.ebuild 1340 BLAKE2B 9810cd67decb03abc317a1663ef9a58a1f73a24553ef70d3b86859275e2947469f89e4aa3b4f402624ede326542ee87aff2ab2c0d06b1fac46993bc796c9e2ab SHA512 1b153505d533077344ca88989348f4ddf3257b23ed917379d7d9be68cde6dadd48e876cab14beff4b827d937e77c82b5f9316799da17ea89595ea13e18cf2b17
 MISC metadata.xml 420 BLAKE2B d00cdddbce707b1fbe67e796c7f62bc4f942c6f4e3c5af1aa3a643846dabded18b41b1e35d4e93cca068d2d0656fd5a88d65abfdc303cf5b6293d8fcd39be61d SHA512 60f2556340ffa7951c69e1bef1a5eda1905a02f3a1e72199c7af02225844c805fa2154ce6629b6d8bafcece22fc3d1c75349021af6932dff3ffaf952fdcb818c
diff --git a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
index 481a44dc1977..3a8512d4b2dc 100644
--- a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
+++ b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -29,7 +29,7 @@ pkg_nofetch() {
 	einfo " 1. Visit ${DOWNLOAD_PAGE}"
 	einfo " 2. Accept the License Agreement"
 	einfo " 3. Download ${At}"
-	einfo " 4. Move the file to ${DISTDIR}"
+	einfo " 4. Move the file to your DISTDIR directory"
 	einfo
 }
 
diff --git a/dev-java/sun-jmx/Manifest b/dev-java/sun-jmx/Manifest
index 34a25f8e6bd1..1e230ec609d4 100644
--- a/dev-java/sun-jmx/Manifest
+++ b/dev-java/sun-jmx/Manifest
@@ -1,3 +1,3 @@
 DIST jmx-1_2_1-ri.zip 1624569 BLAKE2B 7262ee10ab49d7371da988f6f636c22e7ad8cc06bd61db5490659899424465f2ed85000d176e6dc5cb7631942079fde19cde35837cda677fa463cdf53c94780c SHA512 39c933ec39f3fcc631d6d8f3aa88724bb0aa11ff62dfbac61762d07c718dff4ba1e16b1b565c7aa1ede7d616516e68d0dbe8c227db34a6d30bd8f29880c7a5d1
-EBUILD sun-jmx-1.2.1-r3.ebuild 1259 BLAKE2B 18c3213f6f2a692b2c796ac8733057db4c9ca1798618355913637ba8b4fa057dbdb2bc20daf31356e0f93aaaca4d007ab1cfe6489f36461a2b0952810afdb1de SHA512 4fb11fd7227ee9cea809a9822b6d1b899dc035663a15c0a4a739087295ffcbb4425ef389103fc0d4aa305e1e90b23c338ded324ddec809094a43b1d186ba9c8e
+EBUILD sun-jmx-1.2.1-r3.ebuild 1268 BLAKE2B 7a18f07f02cc756d9e70bccc15e2cf305ced677b0381fbe85c7f257df739c45b0f073def1cd03e3150a9187d71b6ce4173b440e45bfe1b4755aafdca0c967541 SHA512 47de6c96bb82f1a4db067565891c59b59a3b808e0615306b6e645a269b8e27d2da92b4d7f8ef9f3550d1e62e2d47aa722adcf82491fec964782b3ec32c4deadf
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
index 12307dbd4772..701e392e4734 100644
--- a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -35,7 +35,7 @@ pkg_nofetch() {
 	einfo
 	einfo " 1. Visit ${DOWNLOADSITE} and follow instructions"
 	einfo " 2. Download ${SRC_URI}"
-	einfo " 3. Move file to ${DISTDIR}"
+	einfo " 3. Move file to your DISTDIR directory"
 	einfo " 4. Run emerge on this package again to complete"
 	einfo
 }
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index fbe00f732ef8..652543ec1bfb 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,7 +1,9 @@
 DIST tomcat-native-1.2.16-src.tar.gz 405109 BLAKE2B e153caeb82c4ac4d2a8c7c24373204edf6e691068e70c858618caf72faaee1f4d10c4529ba758e24422e8580e8b3e95d28cc942998568106ec60b8de7c196c51 SHA512 0345f85fbab406f25c25c8fc06bf55f3d166fa14bfcf542bddb5dc5db4c8c7bd0c5b71603d85261d71152ead3023b112144f2ffa5ede14ae8595013f79c802aa
 DIST tomcat-native-1.2.17-src.tar.gz 408967 BLAKE2B 482b0416be01bcbe9ba55555715de37c6071502ed57f179115c3d351684621487b90e05dd488b1c2137e4813a785c1fe229241f191468bc88f7f0dd3a31562c0 SHA512 8fa946855fd14525ec0abe7b09975bbd34d6127352e90730a8afb77e16cd91715417e812a40017fee65939a9ce95faf39a9193222f441cda0ad2eb7f690e77b9
 DIST tomcat-native-1.2.18-src.tar.gz 411789 BLAKE2B 16f1ecff3abfa6bf1f88c44af4a6ba58addac69bec1c257325c429fe6eec6a522fd2ae7932d68afa9bb442b0cf248731ce3e1a9db2b383f502093bf0ea5bfd23 SHA512 66481c1f36dc7ea909bf8d55075a232bf6dea3300b56d36415b13da4aefbee16cb52456f3d44b4a2b09b43cd8c7df628145a0623b9cdfa322bc2432e6c44827f
+DIST tomcat-native-1.2.19-src.tar.gz 418183 BLAKE2B cab8621bca4dc41e87ebf6418337da8a86d56a0717aacd62c6e4fb2d039e413cb29e8f169abbd353719ce083d302613d3e0f64cd54f1bc8e57f26a523a828025 SHA512 7d69acd5dd684eee9a85c08357b7288a9f083c15a12a9524ba6344f1b9dcdc6ccc512a37b64b9f15b0e697609833e6c68591a60976dcfecce124ec29eb532dba
 EBUILD tomcat-native-1.2.16.ebuild 1238 BLAKE2B 2fea3080d1f68c5718caaf3e4a4780a66e511e3d2dc5b960adc86e788f1c6257dfd69dec607690d76178bb5fb4f2bb2723b2549c9b73b8dcb67a8fcb36a34887 SHA512 c86d56772be860e570f5ade50c5baa51c6267e689c767834aaed6965f9a483404d00b55558e10def1d8b0af9713cacd5e8018d41625403bc8cbc658c18db7727
 EBUILD tomcat-native-1.2.17.ebuild 1155 BLAKE2B 1a170dd795495595c0938b27017c5e017822f4ff515dc3ee60d645494c4999a378cc760ac0a49e0bc1b3e25183a0659b533f7158aae8d05e9eb1106b5e04a295 SHA512 2cce0be375c489a52c61fd629e6c2c499a27538df65f472e14fb4e6272aedd29fb6240831e3ad91990c41375b685d81255a61da350893e3ddd7c003e11f37358
 EBUILD tomcat-native-1.2.18.ebuild 1152 BLAKE2B 2732d749204372dfb2de8ccb517d7c12c433536cf9bafdac582a44eee2b4c599e1f40632df67fc7744414eff48b56a15dfdd2619094cb1a5115111a95e647b4e SHA512 cec8620ccbc912304ffce08fbd6d02b44546b0a2a65bd1685f42116520b31a93df96c0659026545d08f2b575eef5fc5548cabc10069e8e1528bd4b804b8cef07
+EBUILD tomcat-native-1.2.19.ebuild 1152 BLAKE2B 2732d749204372dfb2de8ccb517d7c12c433536cf9bafdac582a44eee2b4c599e1f40632df67fc7744414eff48b56a15dfdd2619094cb1a5115111a95e647b4e SHA512 cec8620ccbc912304ffce08fbd6d02b44546b0a2a65bd1685f42116520b31a93df96c0659026545d08f2b575eef5fc5548cabc10069e8e1528bd4b804b8cef07
 MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild
new file mode 100644
index 000000000000..bb3b879154d2
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="static-libs test"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/openssl:0=
+	>=virtual/jre-1.8"
+
+DEPEND=">=virtual/jdk-1.8
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+
+	cd native || die
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	eant jar
+
+	cd native || die
+	default
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+	cd native || die
+	default
+
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}