summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2019-10-30 12:45:51 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2019-10-30 12:45:51 +0000
commit33c972f6ef46ea71d89fcd6fd0afeea348ef0199 (patch)
tree606ae965dee0f14f02dbfbe9d89f5ebedd9ebe09
parent2019-10-30 12:26:04 UTC (diff)
parentdev-java/maven-bin: amd64 stable wrt bug #698908 (diff)
downloadgentoo-33c972f6ef46ea71d89fcd6fd0afeea348ef0199.tar.gz
gentoo-33c972f6ef46ea71d89fcd6fd0afeea348ef0199.tar.bz2
gentoo-33c972f6ef46ea71d89fcd6fd0afeea348ef0199.zip
Merge updates from master
-rw-r--r--dev-java/maven-bin/maven-bin-3.6.2.ebuild2
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild2
-rw-r--r--dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild2
-rw-r--r--dev-java/openjdk/openjdk-8.222_p10.ebuild2
-rw-r--r--virtual/jdk/jdk-1.8.0-r4.ebuild2
-rw-r--r--virtual/jre/jre-1.8.0-r2.ebuild2
6 files changed, 6 insertions, 6 deletions
diff --git a/dev-java/maven-bin/maven-bin-3.6.2.ebuild b/dev-java/maven-bin/maven-bin-3.6.2.ebuild
index 32ededf3fc7b..45851d6fa2f1 100644
--- a/dev-java/maven-bin/maven-bin-3.6.2.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.6.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="3.6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DEPEND="
>=virtual/jdk-1.8
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
index ce13b2b6deab..7dbd4cdd6a80 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
IUSE="alsa cups examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild
index 0b15e6a49cc9..4daca60480dd 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux +webstart"
diff --git a/dev-java/openjdk/openjdk-8.222_p10.ebuild b/dev-java/openjdk/openjdk-8.222_p10.ebuild
index 2bb661e689e7..263ac8f7d306 100644
--- a/dev-java/openjdk/openjdk-8.222_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.222_p10.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
COMMON_DEPEND="
diff --git a/virtual/jdk/jdk-1.8.0-r4.ebuild b/virtual/jdk/jdk-1.8.0-r4.ebuild
index 589862862cb8..446612519801 100644
--- a/virtual/jdk/jdk-1.8.0-r4.ebuild
+++ b/virtual/jdk/jdk-1.8.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
DESCRIPTION="Virtual for Java Development Kit (JDK)"
SLOT="1.8"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
RDEPEND="|| (
dev-java/icedtea-bin:8
diff --git a/virtual/jre/jre-1.8.0-r2.ebuild b/virtual/jre/jre-1.8.0-r2.ebuild
index 702beda46e4c..4b0e1e98bd24 100644
--- a/virtual/jre/jre-1.8.0-r2.ebuild
+++ b/virtual/jre/jre-1.8.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
SLOT="1.8"
-KEYWORDS="~amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
RDEPEND="|| (
virtual/jdk:1.8