forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
2 changed files
with
18 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| )" |
11 changes: 4 additions & 7 deletions
11
virtual/jre/jre-1.8.0.ebuild → virtual/jre/jre-1.8.0-r1.ebuild
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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="" |