diff options
| author | James Le Cuirot <chewi@gentoo.org> | 2016-01-24 20:21:09 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2016-01-24 20:32:21 +0000 |
| commit | f3c7954bc1ead2884a609ee6e2e9147645b9ef6e (patch) | |
| tree | 34895027aa7180b28f1921ea84881638b92cb05c | |
| parent | 068881d3d799c0dd14e60c67d29f00dac9c9521b (diff) | |
| download | gentoo-f3c7954bc1ead2884a609ee6e2e9147645b9ef6e.tar.gz gentoo-f3c7954bc1ead2884a609ee6e2e9147645b9ef6e.tar.xz | |
virtual/jre: It's 2016, let's use EAPI 6 and SLOT dependencies
Ignoring 1.6 because it's about to die.
Package-Manager: portage-2.2.27
| -rw-r--r-- | virtual/jre/jre-1.7.0-r1.ebuild | 14 | ||||
| -rw-r--r-- | virtual/jre/jre-1.8.0-r1.ebuild (renamed from virtual/jre/jre-1.8.0.ebuild) | 11 |
2 files changed, 18 insertions, 7 deletions
diff --git a/virtual/jre/jre-1.7.0-r1.ebuild b/virtual/jre/jre-1.7.0-r1.ebuild new file mode 100644 index 00000000000..2d9cf3ea472 --- /dev/null +++ b/virtual/jre/jre-1.7.0-r1.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +DESCRIPTION="Virtual for Java Runtime Environment (JRE)" +SLOT="1.7" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="|| ( + virtual/jdk:1.7 + dev-java/oracle-jre-bin:1.7 + )" diff --git a/virtual/jre/jre-1.8.0.ebuild b/virtual/jre/jre-1.8.0-r1.ebuild index 79271225d7d..ae9a4efc446 100644 --- a/virtual/jre/jre-1.8.0.ebuild +++ b/virtual/jre/jre-1.8.0-r1.ebuild @@ -1,17 +1,14 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" DESCRIPTION="Virtual for Java Runtime Environment (JRE)" SLOT="1.8" -# TODO: Temporarily dropped ~sparc-solaris and ~x86-solaris as oracle-jre-bin -# no longer provides them. Also temporarily dropped ~ia64. KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" RDEPEND="|| ( - =virtual/jdk-1.8.0* - =dev-java/oracle-jre-bin-1.8.0* + virtual/jdk:1.8 + dev-java/oracle-jre-bin:1.8 )" -DEPEND="" |