gentoo resync 08.09.2018

15 files changed, 186 insertions, 10 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 8f1fc95d9006..dc8e2dc338e1 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/classmate/Manifest b/dev-java/classmate/Manifest
index 98538cafe45a..ea5ea27c54b1 100644
--- a/dev-java/classmate/Manifest
+++ b/dev-java/classmate/Manifest
@@ -1,5 +1,7 @@
 DIST classmate-0.9.0.tar.gz 57752 BLAKE2B 31247d159be4898b9ae71024da41c8602fe4d82f4ee10edab3146355cac06b23991fe926397737c43341085f35b392fc3f8a6b8278b9e47706f6fd06012f4c59 SHA512 7fb331c462458c8aab143f23c0d128a0e4e976f9d12bd181eb5658961b217bd1fe0871d056fc38bff794522c8b3118a2a017eab265afffc1d60b5580df1237a2
 DIST classmate-1.0.0.tar.gz 57807 BLAKE2B 171a82fb61fd1e183a5d435912099fd663d41c5d68791502c3a25752b77e809da817d2a8c5f8be55a211c4ab192aff6e2e566e8400c12fef688dfc05ea8a1b16 SHA512 cf721c813674e295fa6c1fe897493d14926d025cab51896ea0cec69ae285a540123060c39e3515daeffa48d6975d060861bf3ca5340bb9273980fee6d92d73b5
+DIST classmate-1.1.0.tar.gz 60936 BLAKE2B 07fe05e3f5e77b4d3551c99940b2c1e53473c37f59c592cca631266d9015618c0e72b4e659ffba999cf53bb6c5fff38a1525dbd2f49852b60ccfe66c1cb75e01 SHA512 461838806e9c181764433473af8a8d3e24539a8a8ccaed29fee8eab9c6a7a2a0b1a7dd4435931ab08ae46566330a69ce3a1d2efadb3bab2535aeb041c530ce9a
 EBUILD classmate-0.9.0-r1.ebuild 1153 BLAKE2B 8930a2941a6ba2dc88912ad163b6a90959b378b5589c762e35dd0a360337ba0695f554162e21bc5797cb84da76eaa5faf2e8274b35a18d978bfeb8581250bdbe SHA512 3f65f469845ed7e6d86e6f5e0473cac8d0a6c606270a0c256a01f78a5896267c975bf4b9dfbb4f36e25092c20e2baa1fc808ceb1ac18227aba3bee18ba24cfe4
 EBUILD classmate-1.0.0.ebuild 1161 BLAKE2B 2603fe68a5a76351ff3201e5e8afb8e89ffbf8e981a852b554d45022c61a5fba7c8c7a51dd0b6462d92fe732d795596c4c77f81f866a11a411e944f3f7ca0138 SHA512 d38fc03c084a8b941c8d6b6b2a8a5d07b2f092b416afc93b392c73c85eae14dd48485b223d61a14ac359c3526daf71bfe512d1080624b3d32f0562160a6a1ae3
+EBUILD classmate-1.1.0.ebuild 1221 BLAKE2B 4bc5b7d808f7068564b8b7cb7a641d7c469634664b4845aa9b9d63c1032ecefce973d6038facbbce4f8d7e4f33a22935ef88c2d29cf8d03d3ec0b8b42ac962c9 SHA512 1117e04a48578ab393ffa9222ea2bff023986e566c7fe12ee37ec0e502e7836d867cf512ab56a5236c95347de66cc03a46785b9ca1bd1e8822f668afeb3e2fd5
 MISC metadata.xml 328 BLAKE2B b3f4d20d37178f91bc06a2b989603370c97231531d8221d2aed030b538e9b0a93e4ae1e906b5a2b56b6877ec175abe04e4bf7b5ef9768bbb17c88879d0721184 SHA512 ed87fc70d548ed88634183da0afb2548e74bbf5f7435edfa25e71392438df87cc1e18aa90264519009f445810ccd750626460dccb66e0f68ac844c44ba8d9430
diff --git a/dev-java/classmate/classmate-1.1.0.ebuild b/dev-java/classmate/classmate-1.1.0.ebuild
new file mode 100644
index 000000000000..65b7a55fc95a
--- /dev/null
+++ b/dev-java/classmate/classmate-1.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Zero-dependency Java library for accurately introspecting type information"
+HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
+SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/java-${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+# This one test is buggy.
+JAVA_RM_FILES=(
+	src/test/java/com/fasterxml/classmate/AnnotationsTest.java
+)
+
+src_prepare() {
+	default
+	rm -v pom.xml \
+		src/test/java/com/fasterxml/classmate/AnnotationsTest.java || die
+}
+
+src_test() {
+	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
+
+	mkdir target/tests || die
+	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
+
+	tests=$(find target/tests -name "*Test.class" -not -name "BaseTest.class" \
+			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
+			| grep -vP '\$');
+	ejunit4 -cp "${testcp}" ${tests}
+}
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index 74bc09cb6dfb..5107fc40ace5 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,3 +1,5 @@
 DIST commons-daemon-1.0.15-src.tar.gz 291128 BLAKE2B af874e6a0852c2dc5c84fcbf5e1e443fb880a306b19054263d06e8d83a9b0866a52f2950c457315d80031a58250ec75284fc7839df82b7555b1ff3bd92e67810 SHA512 f20cc8796978fb09b6ecc8d99bb3c8b271b097d74c1f99b286cde213631e7f50a4104f5db2c354f9624ba8b037502d81e327c581b38253b9b216aa2172016e40
+DIST commons-daemon-1.1.0-src.tar.gz 298028 BLAKE2B 5e8a0719467523438559472270ac7038ecce040f2a5a8ea8704e181557df726b9c09267b57336d9659dcb3528fecb8ac61937ef3d56e5cb12b562b88b5f6f218 SHA512 a370085a991cd6b121fcfb49822660dfc0aac19f164677dd2e6373750c1a526ef5a10334a8e075fd965c038198f6638b9e9130b5b13256f4a23a6c5a29959701
 EBUILD commons-daemon-1.0.15.ebuild 1255 BLAKE2B 7dba8b76b4d39cdf13269a5e55babb479aa3bb0645a3d83ec8b80d870834aec80f8245fb5c9a7d8caadb23ac3d660b3db30305d93da18674fd0469a7b8fe23e7 SHA512 9f6b2160da39f474dddeb165397c523764069f1ed4123de817c279ce41ab0b0be3aa8396741f1dd201dff28577d5e39acd18431d94e75f27316b315330606524
+EBUILD commons-daemon-1.1.0.ebuild 1220 BLAKE2B 2a5594e81db8f11198acc5091c2ce4730e024c85896abb2508bcef2829f52a89cd7605e6129bd3589265745ae5dc54496eb7fdc1ca5a18aaf2ad179d57882f28 SHA512 7878e1fca1c91acbc7ff5d8b35c091deb1632f2e9e7fe560fdc3a9591304fbdb1e12b21b799403cb88a0f75b84baab96d1e74b0e816aedac2a390b8d17e0ec17
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild b/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
new file mode 100644
index 000000000000..6949a3798a39
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit autotools java-pkg-2 java-ant-2
+
+DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
+SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
+HOMEPAGE="https://commons.apache.org/daemon/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="kernel_linux"
+
+CDEPEND="kernel_linux? ( sys-libs/libcap )"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+src_prepare() {
+	default
+	cd "${S}/src/native/unix" || die
+	sed -i "s/powerpc/powerpc|powerpc64/g" support/apsupport.m4 || die
+	eautoconf
+}
+
+src_configure() {
+	java-ant-2_src_configure
+	cd "${S}/src/native/unix" || die
+	default
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	cd "${S}/src/native/unix" || die
+	default
+}
+
+src_install() {
+	dobin src/native/unix/jsvc
+	java-pkg_newjar dist/*.jar
+
+	dodoc README RELEASE-NOTES.txt PROPOSAL.html
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use examples && java-pkg_doexamples src/samples
+	use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/gnu-jaf/Manifest b/dev-java/gnu-jaf/Manifest
index 4972068e1f18..e5f13908deb4 100644
--- a/dev-java/gnu-jaf/Manifest
+++ b/dev-java/gnu-jaf/Manifest
@@ -1,3 +1,5 @@
 DIST activation-1.1.1.tar.gz 157018 BLAKE2B e9135b4c0996601c7963a46363e8ede3ba81e83e532637a92d83c89586eb52bd11be84ee37f5e8f31e372564f7c14aac4123726ba20712f5cef89a1e4bcd01f3 SHA512 d323644df13a4572bf1c10e7175c1c4cfa3078483886bba7b308989c215a23e12939b054124dbaf0437a4c5fdcb551b4e2189c09afc078218963389e4b3c3b7d
+DIST activation-1.1.2.tar.gz 290644 BLAKE2B 15ec89a5c757bb134b9ec71e384a80dea5394b9b6463ca1fe44e2e622993fa8809231379b262b0a54595c32451a49ef508bea45ce82120138efe07d81939a817 SHA512 26534f7bb47daddf97b850ab74fc8ef2c5bd62d12cfb96e28e235071af7dcfc7761fa15f2d8f3a2d194f035665cef127812b7476af6cc81f6d6374f1fa725584
 EBUILD gnu-jaf-1.1.1.ebuild 731 BLAKE2B f2ab23950463b298efd7dbab11f349ca27bae59c50627554e32812fa3116a0e9a87d46afaa6f6f8e23855ef59bd14d282439be0b30fca2af2fbbb5ce024c485a SHA512 1241777ad76d678a5ba360492db4ca0771544a9f57cc41146e1c8813ebc1e8f08856014f850e0512a49f005f7e4c3ff9cbc1e2f06410524b7d7468ae2f734be0
+EBUILD gnu-jaf-1.1.2.ebuild 710 BLAKE2B 26c96725f10a506d787bd8a76645fcde629ee0aab5f62c778e35cf1e0e14b00945a83d3f31478b3a3d6625de1edb048793b2e7ef8f7446aa7924e57839452604 SHA512 937ae18d484177f855223c4d8bd1a0f8c3505b885d6f110b42af9070ecdf8baaa869f7c1e35160e9ac533847fc32376cda65db0c86d84a3681b94c6fd3c3d913
 MISC metadata.xml 1072 BLAKE2B d6b9b7455a12a24c3e64b33f34faa427572e456c0d9c331137790d4db1aaf5bc0d870ff5f1bebf296804549cb69f7484d6536f1b7c4605a66331c08911f18cf5 SHA512 8116cd7f57a163402e1abef43f1abdef212914adda64de9a93585134bb232ad5ac0862f73a5422fa330d761d0c0429511a837ef8ae6b10a203b9de3302b830f3
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
new file mode 100644
index 000000000000..a51b85e9f953
--- /dev/null
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
@@ -0,0 +1,29 @@
+# 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
+
+DESCRIPTION="GNU implementation of the JavaBeans Activation Framework"
+HOMEPAGE="https://www.gnu.org/software/classpathx/jaf/jaf.html"
+SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/activation-${PV}"
+
+EANT_BUILD_TARGET="activation.jar"
+
+src_install() {
+	java-pkg_dojar activation.jar
+	einstalldocs
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc source/*
+}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 26dfa785156d..6f5af2646231 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -3,9 +3,9 @@ DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dcc
 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.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-EBUILD protobuf-java-3.4.1.ebuild 2094 BLAKE2B a0a5f55af03a0ddbb447c00a407318e704518d2202b93d8cff929fb8bc9b5954d31e148ea0fbff642e6279b71552034aaf8d3e655f839e510a3520e2f6bd38a7 SHA512 c2646fff280006c14db9fc3fca89375137723d7fe3001b7a76825963af5e822cadc32e99fe66540f6471f99757800158a04bb0607169f17b970763c33333e38c
-EBUILD protobuf-java-3.5.1.1.ebuild 2091 BLAKE2B 3bef86c71300d1e06e603a43c15beef0a9fdf66d052923720b060422344741b6f49366b67782db63bcf2e41261163ff9720c0bf1b7d9b660034963f08b7a4792 SHA512 92aaecdf9edd8e1b6980f7279928ae7dffaa4f3716e2af21c65c501445d633d8a8da9c154fed0dc2253c8a04d69952d99d379417d6e992afa56e32f464d029d0
-EBUILD protobuf-java-3.5.2.ebuild 1810 BLAKE2B f6e5af06878a4c3eb03e9fb9dd86903c9de483cb6e8fd162d30161dbe55264743e32f8d2fffc76e0e674b94ab9627e023caf498a15a1b925474d38399fb5fd8a SHA512 2e50f06a9fe16aba53b05d364e112d72625266fae494ef40a1b66e3977b0acd28a9574c3b0ba9a90448830384864599f090793d5eccfb4ab45b96bcf73234a4a
-EBUILD protobuf-java-3.6.0.1.ebuild 1108 BLAKE2B d014cfd67c18770561a8a4a7abb45da69daa579b4f25224f9d904585ae419b75bb27493e3f736cc61fe8c9a359bb3498944b667d18361a6a0be685708b609ac4 SHA512 2e9818c35adc7e42448af1eaaa7e9acd072344d3b2caa6a8e473b83d198e55d3822337d3a3635ed2db369af9ccb519a63b8d20ec445d0555aa8a13be346cf556
-EBUILD protobuf-java-3.6.1.ebuild 1108 BLAKE2B 0118b97e8a317b599c87984997d77a2278c99748b450ccf94e42bf4676cd7f4ce7dd70156b9941ff35a41836208cc6d4d53098a72aa33cc1b4d73fbd2bf34a92 SHA512 c5db6f6557a8630ee7229470be54c2c5f573b45642f6a77dea5b3647978fa7a4ead236fc8de5f539aa6dc9e3873cf2bb9ff865ca58477e1fe78f1eebd5651173
+EBUILD protobuf-java-3.4.1.ebuild 2083 BLAKE2B 0d8ddca861124a5d2869398b7c955338931baba25b478695deb569b224bde7d4b92d8e53a4871b78ef57e4f3d352ba7f03107008799a1e3a21109b49a35763b7 SHA512 2de4bb6979c348fa30528b0bf9c99dae2952d43c3b4485afed0068dbcf9803ab59a21f89b0a0f5bc8d3b6a0024ac85a856e97ea2e00cda93985705746cc9fb7f
+EBUILD protobuf-java-3.5.1.1.ebuild 2080 BLAKE2B 0e51dd999d692bfa8a663821c5e1d6bccb031e350e4da42208a99114c7154dca30aae4076e57db0b25761d0c1233c0e71904c6be171cefc19892a68856f2502b SHA512 8f203866faa74f44e8e6209d787f34c84fb0dc8847bdda30bbec0171a5b8133eff54ce3609bc41cc972a5a1848a36fa3fa53561836da3744db66b6d517ac9013
+EBUILD protobuf-java-3.5.2.ebuild 1799 BLAKE2B 9823ead3f3d611217a070907bae7d62a0e10b68a617c39af629ef48c1f83f840cf48588b21d6eca40e229f9e42ff05e2686ca973f4bdbd51a856612adae6a144 SHA512 c8df2c790f1584389c9d5a24d73c7ee0211e6c5b99d189fbfe483465bfdcd8a7e902c4025ace00bf59f7326fcec6f4c70b4c004f6bf656a6b260e24d61300a05
+EBUILD protobuf-java-3.6.0.1.ebuild 1097 BLAKE2B 2daec7aa9712be1a166a5281821adb1c29437824c28d6f79574c6ee7005c7e0576b0b39a86a661beedb3144b411309226ac052ada72c172613ced1480cf4bd7e SHA512 2deda95ada705bd49c281e839138c474c5183b67d12c9197da3772e3346d7d2637ab861a4000d0362b5e112c8728c9ac9251ffda031ee32e9dcaacf904267cc2
+EBUILD protobuf-java-3.6.1.ebuild 1097 BLAKE2B 03a214f5716dacf251b0b2827c26ed5c37f75d12e202d01a8f75fb26774245d36aa59ee36ca40a5ebc3be0af60a7406d3e0161ea3eb51e3062dfe85b657f0af3 SHA512 dd535ed4039aa48be10cc427005a3eca8d54434c33242c4e6bfd8e8f56a6310aa58980731cb0727b08909919bf38cfab776aeedf5454305a2ccfcd0fb0a65e2a
 MISC metadata.xml 796 BLAKE2B 730596798d9434732683c07bf8f4df861e3a2a4f0b681b642f6226e749729cbba260623c3d116e0dcc059fcce12df365e7ef1890139a570de37bf5d994d9035d SHA512 10479327785c7afbb86288465782b3c4af5b8901a5d63c7989bdebdecdda2ea44990b99cf74e0a1ed87d686e74991b65237a1e3e04b6b87bee510c70e810503b
diff --git a/dev-java/protobuf-java/protobuf-java-3.4.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.4.1.ebuild
index 1480aad8f919..e5e3a7c4b5d7 100644
--- a/dev-java/protobuf-java/protobuf-java-3.4.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${
 
 LICENSE="BSD"
 SLOT="0/14"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="nano"
 
 # Protobuf is only a build-time dep, but depends on the exact same version
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
index 2bea730d3d21..d734039adfee 100644
--- a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="nano"
 
 # Protobuf is only a build-time dep, but depends on the exact same version
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
index f2abe82842a5..77039bfd60d9 100644
--- a/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.5.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="nano"
 
 DEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
index bc88cf88156b..a2440356fbdb 100644
--- a/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${
 
 LICENSE="BSD"
 SLOT="0/16"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
index b616b3196431..d46192fa1762 100644
--- a/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
index 69da51923e15..4b057f398341 100644
--- a/dev-java/xz-java/Manifest
+++ b/dev-java/xz-java/Manifest
@@ -2,8 +2,10 @@ AUX xz-java-stop-fetching-external-files.patch 693 BLAKE2B 8b6e55a71921a3b6f16aa
 DIST xz-java-1.5.zip 131544 BLAKE2B 3984cf1e20bbf1d5f2508766e3ef4aff87f0bef774cb6f7a3f6e6b4bf7b744e74f1640330a4278b70006b7ec05e9d758bb55d63f247cc7afb1c2f4a4e64591aa SHA512 8f425b86b216927490c1ab7303ae9db7faf2c275777765ec7d10c4acd4717d2ecf76068afe9a81d099ea0941c05c517cd5e7fe1b4e8bfec804fd3355dd064f41
 DIST xz-java-1.6.zip 138434 BLAKE2B 015074e64f8b354b617cd2519f83cf4a7aa491a7229e54fecb012eabe80d3ff65394a433b88eb58b5c2eadf1855aeefa0eb4c0e904f34ab36d0c430c04a7ba90 SHA512 a1a6a2da05d51695e58b8e91503106bae6030cb83853df32bc7b8a23db4189c4afef01544c21de91ee3df9ad11e065059c758f121c52e6b6a319b93b2136f666
 DIST xz-java-1.7.zip 151864 BLAKE2B 6fc952d8f5ff7f75eecf64c8a26ca1a0cff78f5fe8cc71b7cf12d516d702a92b503e5e7e9ef2a3980922f2bcbc57fc95df475b612fe2f19e49969ef1c873a85e SHA512 6909d4c6bcf0479a5c1a6178c56971517dbb2a923ce6e05b3d21bd5dd1e1ead7d06f3f533276279f440f129607b89e6eb9ba909bad94340d67b16d83cf72b445
+DIST xz-java-1.8.zip 152470 BLAKE2B 601e3292936cb8b3a885551a275248628171f0fa15829785e2fb99d5dfefab59fd2283df4040f090a9d96d30bef5dacd5f4aed4f9d3163ee17dea4a72ad1b0f8 SHA512 3d30804baf9bf743347d87befdbf103107f413c4460639171257e87c4ac96c5e9bc6401a85c44939cd40a25b965162d916a552ae9967f1ff1c71ed389508f5b0
 EBUILD xz-java-1.5.ebuild 764 BLAKE2B 4748847ca4d7c6281423767b7b6e749c4d19b0157bbf2b9e994883aff286cba9153760d7770bf4151dd3573446e76da7957b0d3b0064ba5524796c4bcfd8ce6d SHA512 8184e39d04253dffff50d9899230176fed63ea957817f75d6568c2d7a33a2aa7d5dfcda32c32a9cef8507e07f42b48844d0b1026fc11ec3a6fd0d011178f3a96
 EBUILD xz-java-1.6-r1.ebuild 651 BLAKE2B c810d938d1e27719d5098d6d256c5a5f5383e49ccdebb309c5c53ba1f302f67ab95c017dd35d92aae7dcebb85e4dca2f874cf13fb45347257c6221b42d73de09 SHA512 0266edcbf8678ca58bba9bf01d10dd7eaa3d96fd405803aa8c60ea25b903bc0e44f11f043a5c238d9405215bf252c24a0c7a7aa9acb508916d3af6141725aa43
 EBUILD xz-java-1.6.ebuild 808 BLAKE2B a3222e8abac79531bc0c3a87211054ca499f11639076772820de127cdb448e2d978b643e083b7449a3679d0dec24cef78670ee15bf44e47218162721ba669aa3 SHA512 cbcfaa0cc5bfef2ad065b4493cb58fae2e45bcd219745e68a5c775073747d7141f23583927ccbbac042997353b9bbeb3dc5aa0292f921a194b5d67c08af84307
 EBUILD xz-java-1.7.ebuild 651 BLAKE2B c810d938d1e27719d5098d6d256c5a5f5383e49ccdebb309c5c53ba1f302f67ab95c017dd35d92aae7dcebb85e4dca2f874cf13fb45347257c6221b42d73de09 SHA512 0266edcbf8678ca58bba9bf01d10dd7eaa3d96fd405803aa8c60ea25b903bc0e44f11f043a5c238d9405215bf252c24a0c7a7aa9acb508916d3af6141725aa43
+EBUILD xz-java-1.8.ebuild 651 BLAKE2B c810d938d1e27719d5098d6d256c5a5f5383e49ccdebb309c5c53ba1f302f67ab95c017dd35d92aae7dcebb85e4dca2f874cf13fb45347257c6221b42d73de09 SHA512 0266edcbf8678ca58bba9bf01d10dd7eaa3d96fd405803aa8c60ea25b903bc0e44f11f043a5c238d9405215bf252c24a0c7a7aa9acb508916d3af6141725aa43
 MISC metadata.xml 352 BLAKE2B 8390000455654697f473905c14903172230b9667fd16c4db74dd32643b096cb7c8efa21f8614b30d676fb32e052a76c613298e2a28c362d6135f61a4fe27c242 SHA512 a3c6ce3cd97b39644238700277dd416e1ee79df975184de3429810ca4d77f7160112adef6a9b56f77243a003187f6642798b278cf8501d55da766ccfbaa861cf
diff --git a/dev-java/xz-java/xz-java-1.8.ebuild b/dev-java/xz-java/xz-java-1.8.ebuild
new file mode 100644
index 000000000000..0be4079e7b1d
--- /dev/null
+++ b/dev-java/xz-java/xz-java-1.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of xz data compression in pure java"
+HOMEPAGE="https://tukaani.org/xz/java.html"
+SRC_URI="https://tukaani.org/xz/${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="src/org"
+
+DOCS=( README NEWS COPYING THANKS )
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples src/*Demo.java
+	einstalldocs
+}