commit: c60981a4b9ee082ce4217c04013b22031238d1ec Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Jan 9 22:56:18 2016 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Jan 9 22:57:14 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c60981a4
profiles: Mask Java 8 virtuals on pre-armv6 to fix tree breakage profiles/arch/arm/armv6j/package.mask | 5 +++++ profiles/arch/arm/armv7a/package.mask | 5 +++++ profiles/arch/arm/package.mask | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/profiles/arch/arm/armv6j/package.mask b/profiles/arch/arm/armv6j/package.mask index fba35e2..1302a92 100644 --- a/profiles/arch/arm/armv6j/package.mask +++ b/profiles/arch/arm/armv6j/package.mask @@ -3,6 +3,11 @@ # $Id$ # James Le Cuirot <ch...@gentoo.org> (09 Jan 2016) +# Unmask against the wider arm mask. +-virtual/jdk:1.8 +-virtual/jre:1.8 + +# James Le Cuirot <ch...@gentoo.org> (09 Jan 2016) # This is built for armv6 so unmask against the wider arm mask. -dev-java/oracle-jdk-bin -dev-java/oracle-jre-bin diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask index 56e8360..1502768 100644 --- a/profiles/arch/arm/armv7a/package.mask +++ b/profiles/arch/arm/armv7a/package.mask @@ -3,6 +3,11 @@ # $Id$ # James Le Cuirot <ch...@gentoo.org> (09 Jan 2016) +# Unmask against the wider arm mask. +-virtual/jdk:1.8 +-virtual/jre:1.8 + +# James Le Cuirot <ch...@gentoo.org> (09 Jan 2016) # This is built for armv6 so unmask against the wider arm mask. -dev-java/oracle-jdk-bin -dev-java/oracle-jre-bin diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask index ff6f860..c017824 100644 --- a/profiles/arch/arm/package.mask +++ b/profiles/arch/arm/package.mask @@ -3,6 +3,12 @@ # $Id$ # James Le Cuirot <ch...@gentoo.org> (09 Jan 2016) +# There are no providers for Java 8 on pre-armv6. icedtea 3 may work +# but we don't have it in the tree yet. +virtual/jdk:1.8 +virtual/jre:1.8 + +# James Le Cuirot <ch...@gentoo.org> (09 Jan 2016) # This is built for armv6 and will not work on earlier generations. dev-java/oracle-jdk-bin dev-java/oracle-jre-bin
