summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2015-05-24 12:48:51 +0000
committerJames Le Cuirot <chewi@gentoo.org>2015-05-24 12:48:51 +0000
commit258907441a9f5fc99d37440f968373b5558179fe (patch)
treed526f4e5b91a790d559c693904e62788965352e8 /profiles/arch
parentVersion bump (diff)
downloadgentoo-2-258907441a9f5fc99d37440f968373b5558179fe.tar.gz
gentoo-2-258907441a9f5fc99d37440f968373b5558179fe.tar.bz2
gentoo-2-258907441a9f5fc99d37440f968373b5558179fe.zip
Mask icedtea-bin in non-armv7a profiles instead of relying on
pkg_pretend.
Diffstat (limited to 'profiles/arch')
-rw-r--r--profiles/arch/arm/ChangeLog6
-rw-r--r--profiles/arch/arm/armv7a/package.mask7
-rw-r--r--profiles/arch/arm/package.mask5
3 files changed, 16 insertions, 2 deletions
diff --git a/profiles/arch/arm/ChangeLog b/profiles/arch/arm/ChangeLog
index a546432886db..1a5747c45696 100644
--- a/profiles/arch/arm/ChangeLog
+++ b/profiles/arch/arm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo/ARM profile directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.359 2015/05/24 04:32:05 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.360 2015/05/24 12:48:51 chewi Exp $
+
+ 24 May 2015; James Le Cuirot <chewi@gentoo.org> +armv7a/package.mask,
+ package.mask:
+ Mask icedtea-bin in non-armv7a profiles instead of relying on pkg_pretend.
24 May 2015; Matt Turner <mattst88@gentoo.org> package.use.mask:
Drop dead r600-llvm-compiler USE flag from package.use.mask.
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
new file mode 100644
index 000000000000..28e860a0d12e
--- /dev/null
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/armv7a/package.mask,v 1.1 2015/05/24 12:48:51 chewi Exp $
+
+# James Le Cuirot <chewi@gentoo.org> (24 May 2015)
+# This is built for armv7a so unmask against the wider arm mask.
+-dev-java/icedtea-bin
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 2ffd3d3bdb4a..6d3574047978 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -1,7 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.mask,v 1.37 2015/02/02 20:19:51 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.mask,v 1.38 2015/05/24 12:48:51 chewi Exp $
+# James Le Cuirot <chewi@gentoo.org> (24 May 2015)
+# This is built for armv7a so mask here and unmask in that profile.
+dev-java/icedtea-bin
# Zac Medico <zmedico@gentoo.org> (09 Aug 2011)
# Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and