summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2016-01-09 22:56:18 +0000
committerJames Le Cuirot <chewi@gentoo.org>2016-01-09 22:57:14 +0000
commitc60981a4b9ee082ce4217c04013b22031238d1ec (patch)
treef05122f8052d88346d5a98c679e0913d34b1d63e /profiles
parentapp-emulation/vmware-workstation: Remove old (diff)
downloadgentoo-c60981a4b9ee082ce4217c04013b22031238d1ec.tar.gz
gentoo-c60981a4b9ee082ce4217c04013b22031238d1ec.tar.bz2
gentoo-c60981a4b9ee082ce4217c04013b22031238d1ec.zip
profiles: Mask Java 8 virtuals on pre-armv6 to fix tree breakage
Diffstat (limited to 'profiles')
-rw-r--r--profiles/arch/arm/armv6j/package.mask5
-rw-r--r--profiles/arch/arm/armv7a/package.mask5
-rw-r--r--profiles/arch/arm/package.mask6
3 files changed, 16 insertions, 0 deletions
diff --git a/profiles/arch/arm/armv6j/package.mask b/profiles/arch/arm/armv6j/package.mask
index fba35e2f0be7..1302a9201232 100644
--- a/profiles/arch/arm/armv6j/package.mask
+++ b/profiles/arch/arm/armv6j/package.mask
@@ -3,6 +3,11 @@
# $Id$
# James Le Cuirot <chewi@gentoo.org> (09 Jan 2016)
+# Unmask against the wider arm mask.
+-virtual/jdk:1.8
+-virtual/jre:1.8
+
+# James Le Cuirot <chewi@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 56e83609e5dd..15027689b1c8 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -3,6 +3,11 @@
# $Id$
# James Le Cuirot <chewi@gentoo.org> (09 Jan 2016)
+# Unmask against the wider arm mask.
+-virtual/jdk:1.8
+-virtual/jre:1.8
+
+# James Le Cuirot <chewi@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 ff6f86039d03..c0178249e536 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -3,6 +3,12 @@
# $Id$
# James Le Cuirot <chewi@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 <chewi@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