commit: 80339d991c3f1fc715429bd08c0be6ba9adbd442
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 05:15:51 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 05:15:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80339d99
app-text/jabref-bin: switch to openjdk[javafx]
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
app-text/jabref-bin/jabref-bin-4.0.ebuild | 7 ++-----
app-text/jabref-bin/jabref-bin-4.1.ebuild | 7 ++-----
app-text/jabref-bin/jabref-bin-4.3.1.ebuild | 7 ++-----
app-text/jabref-bin/jabref-bin-4.9999.ebuild | 11 ++++-------
4 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/app-text/jabref-bin/jabref-bin-4.0.ebuild
b/app-text/jabref-bin/jabref-bin-4.0.ebuild
index a4bf511e4d4..cd9f996131f 100644
--- a/app-text/jabref-bin/jabref-bin-4.0.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,10 +23,7 @@ KEYWORDS="~amd64 ~x86"
DEPEND="app-arch/unzip"
RDEPEND="
- || (
- dev-java/oracle-jre-bin:1.8[javafx]
- dev-java/oracle-jdk-bin:1.8[javafx]
- )
+ dev-java/openjdk:8[javafx]
>=virtual/jre-1.8
"
diff --git a/app-text/jabref-bin/jabref-bin-4.1.ebuild
b/app-text/jabref-bin/jabref-bin-4.1.ebuild
index a4bf511e4d4..cd9f996131f 100644
--- a/app-text/jabref-bin/jabref-bin-4.1.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,10 +23,7 @@ KEYWORDS="~amd64 ~x86"
DEPEND="app-arch/unzip"
RDEPEND="
- || (
- dev-java/oracle-jre-bin:1.8[javafx]
- dev-java/oracle-jdk-bin:1.8[javafx]
- )
+ dev-java/openjdk:8[javafx]
>=virtual/jre-1.8
"
diff --git a/app-text/jabref-bin/jabref-bin-4.3.1.ebuild
b/app-text/jabref-bin/jabref-bin-4.3.1.ebuild
index a4bf511e4d4..cd9f996131f 100644
--- a/app-text/jabref-bin/jabref-bin-4.3.1.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,10 +23,7 @@ KEYWORDS="~amd64 ~x86"
DEPEND="app-arch/unzip"
RDEPEND="
- || (
- dev-java/oracle-jre-bin:1.8[javafx]
- dev-java/oracle-jdk-bin:1.8[javafx]
- )
+ dev-java/openjdk:8[javafx]
>=virtual/jre-1.8
"
diff --git a/app-text/jabref-bin/jabref-bin-4.9999.ebuild
b/app-text/jabref-bin/jabref-bin-4.9999.ebuild
index 9c54f3b9b7e..e04fd8f296f 100644
--- a/app-text/jabref-bin/jabref-bin-4.9999.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,12 +15,9 @@ SLOT="0"
DEPEND="app-arch/unzip"
RDEPEND="
- || (
- dev-java/oracle-jre-bin:1.8[javafx]
- dev-java/oracle-jdk-bin:1.8[javafx]
- )
- >=virtual/jre-1.8
- "
+ dev-java/openjdk:8[javafx]
+ >=virtual/jre-1.8
+"
S="${WORKDIR}"
