11 files changed, 24 insertions, 187 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 494469b8f8aa..6b336dfdeae6 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 1b202550c6f9..79bfeeb23ae9 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -28,5 +28,5 @@ DIST icedtea-bin-examples-3.12.0-x86.tar.xz 1859900 BLAKE2B 44ea53632b82e1bbcc7b
 DIST icedtea-bin-src-3.10.0.tar.xz 45755380 BLAKE2B ba6fd20de7d21e728108ff1d30599112ddf7ac24135e30891ae0d033bf77d52238c81c5c7fc7375e062ad4e8bb9492098cc0a20d3ab8486a4a02f20efa1f06a5 SHA512 0693cfe83a80d5e9e86be394b142b23097b0cfc1193f68f0fd07045ad4792b38bffcce47ea764f934d3dbfc568bdfbf5017725e7f35fbe1175b48498d53b0c5e
 DIST icedtea-bin-src-3.12.0.tar.xz 45776320 BLAKE2B 97ca4172ed8eadbcda0e20b598083b6948cd3a90705653716f1b6a9e65e150a1ef7d9e9ecdd3ad5ea90fd972ec9f1c3fe20ace44e4d2a0ede8e6d491991f7f9f SHA512 f6e7efa0962632d52032cd22a6b8de50bc2571a5ebcd18314b9aa01fb23cbd8d134eda5d1d2a6bb7fb1e26decc8a5740dfa60318019b920eb3f0498c2a9e9784
 EBUILD icedtea-bin-3.10.0-r2.ebuild 4394 BLAKE2B ffc1c96d61a6eb5afe2ad5677f493f0eeb4e84467a9426bc6b58a6f5440d14fa07df05edbeb828e36010dc58b6d57041cc9e03f1977a700e8ce2a869f159cda2 SHA512 8ff85806b905a1d2e8817d37ceefd1758b40d0a8a7824721fadb833bcd71e0aee6180287940fe0b77eb704086dfec6941479db6a8a581c85a7dfb08bc39bf7cf
-EBUILD icedtea-bin-3.12.0-r1.ebuild 4603 BLAKE2B cb8c562671f44895ac6984194295b63bd348452b7a071925ea40878b7a18cf3185b55df5874bf008a4c7022499f638956b931509a35429d59ee3b569588b63cd SHA512 a8c8a4b72d79d47e70de1afe83a0155e55259986ab102f6547b3736e07ab351b7f51c8a29e537a713646924d15a1a858a367b5120441f978f987d88c83c22860
+EBUILD icedtea-bin-3.12.0-r1.ebuild 4600 BLAKE2B dc791f18d2eac82f4cde2a6d2ea82cef5c583c5dda1f07738dce04140ebbc333d2091bca5e994b98e87a6c87fb6e03fbdceff1648b86b67ec842f9794de9bde0 SHA512 9c66dd3af5ebaaeef5c57ded7a59a6d7c342fd4b2b63c8cd741825862e4bff31853eb8b90d6405eb3875504f1764dc75c0489aacebc0c14c71f2199694f170bf
 MISC metadata.xml 560 BLAKE2B f377bffd73661fbf1573f3d80906a38fa9fd170a686dee6c13ee7769ffadd8ff2de696d63cd7fdc4332ca654851da027b76e22389a98412b52b4fd5c00935429 SHA512 71613013231a9bf6daabb672557c3f419bd9443999b740a4d73fe242b827a278a66671f2cb347d20833008c332262609f7df03691e313e0dc0ec3e2a56e79565
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
index c5065d63effb..5c5e744bca91 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 # Don't block arm. See bug #600134.
 #MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* ~amd64 ~arm  ~arm64 ~ppc64 ~x86"
+KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86"
 
 inherit java-vm-2 multilib-build toolchain-funcs
 
diff --git a/dev-java/jmh-core/Manifest b/dev-java/jmh-core/Manifest
index 0643f375be3f..366429661adf 100644
--- a/dev-java/jmh-core/Manifest
+++ b/dev-java/jmh-core/Manifest
@@ -1,5 +1,5 @@
 DIST jmh-core-1.21.tar.gz 615305 BLAKE2B 1a5cfe9784efe0cd7706382eaa89c8bcce0efcce3c2b802ce0772992dd16f0c6900a47d70b72d1c556584adb8afda442f49267ad4e0b53d04c20026979787210 SHA512 ac51d58d9b746157842a3bc9c4828bbff52c5882582e123e04b5ab6c4bfc1ff3cad1f6023ab1fe1eccfa68c73ffbd21b34388547bba544626af87092852ec166
 DIST jmh-core-1.4.1.tar.gz 585746 BLAKE2B ff6e9d3e8b11827042a9ff9983505fa5272d943a8365cf14ac43d940a7815f280c2b82c3ab810f1c22328a932912f6b09b9c5d5f1838a3cb357e6ebe21006e49 SHA512 a33c63b82712deb53218bb8d955c9606e5f393ff0c6256052ac8df022ec45be79bc0ee5ee08ce0d3762594214814bcf1e562717d83daa9ce13c664ca9e7c431b
-EBUILD jmh-core-1.21.ebuild 885 BLAKE2B d71329a17545d899a25a48821f3bfa2c960a914cfc9d055b7b5cd51d1a34a73759985d9965c51dff1d510cb8ff965131059d2cc414f55ee97dfaaa20bf306368 SHA512 00165f788eb323b41db8f8a77fb838663dfe8db751994986f422db89f1fdec5b50885d2afd1e12f41b943c8e760ef2593afbf7c602210f34fe41f4d9a538d2b5
-EBUILD jmh-core-1.4.1.ebuild 973 BLAKE2B 7071fed0c19efaf7f06e1d43dce2b76113ed59b4337220c2a34f50802a0ccd9cbb7e1288421918bbe58500a9203bff9a3e1c0e0a080930f5154d9f9d0aeee4eb SHA512 4d33e35a17571595b71bc01c46c2ce2ab7bfb596a61fcf64ddfd0564a014f753591682f1d7456ab006dfb4dc019d2f16c3cb339f4f4750635b18f3554189aceb
+EBUILD jmh-core-1.21.ebuild 885 BLAKE2B b5ab688fae4c7af12e0cfd2f5df1d578eb289ef2f2cf8a447749c6a21f840af6a88538773a9589785cc7aca78d90a2b2aadcba45921a4dd70371a0dfc30aa125 SHA512 542c21c157bb7b3c4b05b9ae50fccf42ddd0c6a279a3da4850e65e9f6c441d8e19d51cbd5234b55e7fa9006067c043129bcffd627a257caa5d3be10dc48ac6d3
+EBUILD jmh-core-1.4.1.ebuild 973 BLAKE2B 19bbd2fd6f94225ccd6c228ad5ba369770b301e86084eca8483a2f1234b20df183e4c47667e58bb28699d8766f413f76d5942390356c7b9b27822a2f584f2b59 SHA512 148cd479199a30796be28f2ff29a4a47db9b63179f99a5f7d9183f8e578cf8cb50e47843d8da7aecdcf1232ba365223cff6b3012ea7e35ad44f101c068b37211
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jmh-core/jmh-core-1.21.ebuild b/dev-java/jmh-core/jmh-core-1.21.ebuild
index 1d8994699b6f..ad044bba454e 100644
--- a/dev-java/jmh-core/jmh-core-1.21.ebuild
+++ b/dev-java/jmh-core/jmh-core-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,13 +12,13 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Harness for building, running, and analysing nano/micro/milli/macro benchmarks"
-HOMEPAGE="http://openjdk.java.net/projects/code-tools/jmh"
-SRC_URI="http://hg.openjdk.java.net/code-tools/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://openjdk.java.net/projects/code-tools/jmh"
+SRC_URI="https://hg.openjdk.java.net/code-tools/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# jopt *must* be 4.6, see http://mail.openjdk.java.net/pipermail/jmh-dev/2016-October/002395.html
+# jopt *must* be 4.6, see https://mail.openjdk.java.net/pipermail/jmh-dev/2016-October/002395.html
 CP_DEPEND="
 	dev-java/asm:4
 	dev-java/junit:4
diff --git a/dev-java/jmh-core/jmh-core-1.4.1.ebuild b/dev-java/jmh-core/jmh-core-1.4.1.ebuild
index 7cc5df2b7800..b2ef63a5460b 100644
--- a/dev-java/jmh-core/jmh-core-1.4.1.ebuild
+++ b/dev-java/jmh-core/jmh-core-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,13 +12,13 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Harness for building, running, and analysing nano/micro/milli/macro benchmarks"
-HOMEPAGE="http://openjdk.java.net/projects/code-tools/jmh"
-SRC_URI="http://hg.openjdk.java.net/code-tools/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://openjdk.java.net/projects/code-tools/jmh"
+SRC_URI="https://hg.openjdk.java.net/code-tools/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# jopt *must* be 4.6, see http://mail.openjdk.java.net/pipermail/jmh-dev/2016-October/002395.html
+# jopt *must* be 4.6, see https://mail.openjdk.java.net/pipermail/jmh-dev/2016-October/002395.html
 CDEPEND="
 	dev-java/asm:4
 	dev-java/junit:4
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 89fdd9b60708..d4c8e15b56dc 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,4 +1,3 @@
-AUX maven 5108 BLAKE2B ea00d51464bb983871760ea1683a4b3f9129a5c91040fe7d1e86998e46c6938df49481f26a0d1c94d32d2419544824022aaa439cd7c01edaaa391428e455e32b SHA512 91901a50153e148b2799b8a1298b4ef26ac07af4b7bbb3ae5c76edccdc8efe41b5613ffd78bd1dd917a78fae8086cdbe737096ff2d4912d0333fff206026dd0b
 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
diff --git a/dev-java/maven-bin/files/maven b/dev-java/maven-bin/files/maven
deleted file mode 100644
index 97f09f065f45..000000000000
--- a/dev-java/maven-bin/files/maven
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-#  Copyright 2001-2004 The Apache Software Foundation.
-#  
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#  
-#       http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-# ----------------------------------------------------------------------------
-
-#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
-#   reserved.
-
-FOREHEAD_VERSION=1.0-beta-5
-
-if [ -z "$MAVEN_OPTS" ] ; then
-  MAVEN_OPTS="-Xmx256m"
-fi
-
-if [ -f "$HOME/.mavenrc" ] ; then
-  . "$HOME/.mavenrc"
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  Darwin*) darwin=true 
-           if [ -z "$JAVA_VERSION" ] ; then
-             JAVA_VERSION="CurrentJDK"
-           else
-             echo "Using Java version: $JAVA_VERSION"
-           fi
-           if [ -z "$JAVA_HOME" ] ; then
-             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
-           fi
-           ;;
-esac
-
-  # try a couple ways to find MAVEN_HOME
-
-  if [ -z ${MAVEN_HOME} ] && [ -d /opt/maven ] ; then
-    MAVEN_HOME=/opt/maven
-  fi
-
-  if [ -z ${MAVEN_HOME} ] && [ -d "$HOME/maven" ] ; then
-    MAVEN_HOME="$HOME/maven"
-  fi
-
-  # try to load from env.d file
-  if [ -z ${MAVEN_HOME} ] && [ -f /etc/env.d/25maven ]; then
-  	MAVEN_HOME=$(source /etc/env.d/25maven; echo ${MAVEN_HOME})
-  fi
-
- # try to figure it out from how this script was invoked
-  if [ -z ${MAVEN_HOME} ]; then
-    ## resolve links - $0 may be a link to maven's home
-    PRG=$0
-    progname=`basename $0`
-    saveddir=`pwd`
-
-    # need this for relative symlinks
-    cd `dirname $PRG`
-
-    while [ -h "$PRG" ] ; do
-      ls=`ls -ld "$PRG"`
-      link=`expr "$ls" : '.*-> \(.*\)$'`
-      if expr "$link" : '.*/.*' > /dev/null; then
-        PRG="$link"
-      else
-        PRG="`dirname $PRG`/$link"
-      fi
-    done
-
-    MAVEN_HOME=`dirname "$PRG"`/..
-
-    # make it fully qualified
-    MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
-
-    cd $saveddir
-  fi
-
-[ -z "${MAVEN_HOME}" ] && exit "Was unable to determine MAVEN_HOME"
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$MAVEN_HOME" ] &&
-    MAVEN_HOME=`cygpath --unix "$MAVEN_HOME"`
-  [ -n "$MAVEN_HOME_LOCAL" ] &&
-    MAVEN_HOME_LOCAL=`cygpath --unix "$MAVEN_HOME_LOCAL"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD=java
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-  echo "  If build fails because sun.* classes could not be found"
-  echo "  you will need to set the JAVA_HOME environment variable"
-  echo "  to the installation directory of java."
-fi
-
-MAVEN_ENDORSED="${JAVA_HOME}/lib/endorsed:${MAVEN_HOME}/lib/endorsed"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$MAVEN_HOME" ] &&
-    MAVEN_HOME=`cygpath --path --windows "$MAVEN_HOME"`
-  [ -n "$MAVEN_HOME_LOCAL" ] &&
-    MAVEN_HOME_LOCAL=`cygpath --path --windows "$MAVEN_HOME_LOCAL"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$HOME" ] &&
-    HOME=`cygpath --path --windows "$HOME"`
-  [ -n "$MAVEN_ENDORSED" ] &&
-    MAVEN_ENDORSED=`cygpath --path --windows "$MAVEN_ENDORSED"`
-fi
-
-# For Darwin, use classes.jar for TOOLS_JAR
-TOOLS_JAR="${JAVA_HOME}/lib/tools.jar"
-if $darwin; then
-  TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Classes/classes.jar"
-fi
-
-MAIN_CLASS=com.werken.forehead.Forehead
-if [ -n "$MAVEN_HOME_LOCAL" ]; then
-  MAVEN_OPTS="$MAVEN_OPTS -Dmaven.home.local=${MAVEN_HOME_LOCAL}" 
-fi
-  
-"$JAVACMD" \
-  $MAVEN_OPTS \
-  -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
-  -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
-  "-Djava.endorsed.dirs=${MAVEN_ENDORSED}" \
-  -classpath "${MAVEN_HOME}/lib/forehead-${FOREHEAD_VERSION}.jar" \
-  "-Dforehead.conf.file=${MAVEN_HOME}/bin/forehead.conf"  \
-  "-Dtools.jar=$TOOLS_JAR" \
-  "-Dmaven.home=${MAVEN_HOME}" \
-  $MAIN_CLASS "$@"
-
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 2eb00db3e4f9..e8f505d608bc 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,6 +1,8 @@
 DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
 DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
+DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
 EBUILD protobuf-java-3.6.1.3.ebuild 1109 BLAKE2B d76e82ea1872d9c8d3a7cee220e243a424d5352dea09962435d487282c88157d937f89eb07e214f3a0bb62abdaab7afe88572cc4a00decc67e03ca13b6da4673 SHA512 8504a8fead79fe649cfd0d8bb63fe44c30e7f68c5fa8d0f3546a55460dc3e78fbd63f636b4f02269455159f471ead4a86d96431beb7d131c11c211b5b02d1e0a
-EBUILD protobuf-java-3.7.1.ebuild 1417 BLAKE2B 5762789bc4fd0095ccfedbb3812b33a62a09256c5a6df191cf9294faf5556f0a07c4773347b2478ee666f513bcbf40167cb80ae0e03627a70041e3943f2feeeb SHA512 bfbcc5ba53f08681b6b7e8afc0a0be9312e85770d55b3e2aacf7fa212805969d424e8331b631f04862e10ea102f385065f93b9637322016e6961995bee13479a
-EBUILD protobuf-java-9999.ebuild 1337 BLAKE2B af6d9b896e31dc453640066e7576a0a71e0a0a5e4467fc0511f791d7a5420e199ab99219fa74dfa02434377e7db3f911b1578fc11d4eb70e1947f9943ea8995e SHA512 1c58cecf9831d9178352b8d4ad26da70b17f9709ba1b2a7aaa508c21b2003209620d371ce7d24df3456500c0662720e5293a989d2329ccb1af9535200cc62c02
+EBUILD protobuf-java-3.7.1.ebuild 1447 BLAKE2B e048a175576353702c909fb4ecb935def9824ab21d52d1192c069128f04fb7766c626c6029b7be3c5f6113e1d5e60f5e4bb407a482c4b44679c6816e1b279ee6 SHA512 05282da135ff752a289789b15cc57566512335cd55456d07180a1fade7a4470243a1d7f1d9cedc7b181884be4458d0e5041a92dd5abb40250878678942fc0584
+EBUILD protobuf-java-3.8.0.ebuild 1449 BLAKE2B 6a418e784c7052ebec2d6bd981160ad5a980c0149469390e2a0308b28c9d3e4f6c3a0369335e2655bc1f2b34ea8606234275af456697016e242993cdc5b156e5 SHA512 3f464829e4ded44e8fda593d8cb28380a9fc4d30eeee924e4c9193b207591640d4c68fbfcff55ec6c3e5d1d5a1cd6e9a7a853298f79a4b7e02f31546d914f2f7
+EBUILD protobuf-java-9999.ebuild 1369 BLAKE2B afcc3df497c95019d2bc4a4a55a48e79c359894ab2387395d4546bf6c87e7d0ca58bd382dcd7bcf99b18a1f926cdbd00ec6d1c570ec3f467f80befb5b3b4ff80 SHA512 e231f61731af9dc90e71f4ad96c56fd6bc0280efe05349ba5c944651c33d6974801c1f909b1b7f8f65911e337c762f2378320a881669385e738da3f9dc57b186
 MISC metadata.xml 652 BLAKE2B 7c402c1ed247fad130bc21514855634041718335e7b43285560165d5b9d30649a760a124d50c57e940a19fa524c2bf5bfb85a7761d17b6f14c050edb53e100e5 SHA512 bb608da39ddc541c7cfc3a0db10da20db6f5f88da9b4a966d9b30c7a1bfc9390773cd9400c24c2be15d62e0a0e890df8a4259adfca4baac36cc6d4047b352e54
diff --git a/dev-java/protobuf-java/protobuf-java-3.7.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.7.1.ebuild
index 828c0e6a2a78..5c1ed13f0b47 100644
--- a/dev-java/protobuf-java/protobuf-java-3.7.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.7.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 2008-2019 Arfrever Frehtes Taifersar Arahesis and others
+# Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# True Authors: Arfrever Frehtes Taifersar Arahesis and others
+
 EAPI="6"
 JAVA_PKG_IUSE="doc source"
 
@@ -23,7 +25,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/18"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-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-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index b066b80a8320..86873f9cfdb6 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -1,6 +1,8 @@
-# Copyright 2008-2019 Arfrever Frehtes Taifersar Arahesis and others
+# Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# True Authors: Arfrever Frehtes Taifersar Arahesis and others
+
 EAPI="6"
 JAVA_PKG_IUSE="doc source"
 
@@ -22,7 +24,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/18"
+SLOT="0/19"
 KEYWORDS=""
 IUSE=""