summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2017-12-01 00:17:24 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2017-12-01 00:17:54 +0100
commite32996811a8ef16d1ba8275930ed4f9e1248c9b8 (patch)
tree742dc5d3166465af9d1c79c11b3ebdb09fea5a67 /profiles
parentpackage.mask: mask several packages that need <gcc-6 in 17.0 profiles (diff)
downloadgentoo-e32996811a8ef16d1ba8275930ed4f9e1248c9b8.tar.gz
gentoo-e32996811a8ef16d1ba8275930ed4f9e1248c9b8.tar.bz2
gentoo-e32996811a8ef16d1ba8275930ed4f9e1248c9b8.zip
package.mask: Move the >=icu-59 mask from base to 13.0, remove the unmask from 17.0
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/package.mask7
-rw-r--r--profiles/releases/13.0/package.mask7
-rw-r--r--profiles/releases/17.0/package.mask8
3 files changed, 7 insertions, 15 deletions
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 07fc9a5e631d..320a6bbb1a0c 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,9 +1,2 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (27 May 2017)
-# This release and later require C++11 or C++14
-# So we mask it here, and unmask in 17.0 release profiles
->=dev-libs/icu-59
->=dev-libs/icu-layoutex-59
->=net-libs/nodejs-9.0.0
diff --git a/profiles/releases/13.0/package.mask b/profiles/releases/13.0/package.mask
index 5b64a27123b6..1efe36dd167e 100644
--- a/profiles/releases/13.0/package.mask
+++ b/profiles/releases/13.0/package.mask
@@ -1,2 +1,9 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (27 May 2017)
+# This release and later require C++11 or C++14
+# So we mask it here, and unmask in 17.0 release profiles
+>=dev-libs/icu-59
+>=dev-libs/icu-layoutex-59
+>=net-libs/nodejs-9.0.0
diff --git a/profiles/releases/17.0/package.mask b/profiles/releases/17.0/package.mask
index 16c53fd62019..d7a0f42bfec1 100644
--- a/profiles/releases/17.0/package.mask
+++ b/profiles/releases/17.0/package.mask
@@ -9,14 +9,6 @@
# packages is neither recommended nor supported in any way.
<sys-devel/gcc-6
-# Andreas K. Huettel <dilfridge@gentoo.org> (27 May 2017)
-# We can unmask ICU 59 and later now we for sure have a recent GCC
-# Note: "and later" is safe here since the profiles/package.mask
-# still overrides.
-->=dev-libs/icu-59
-->=dev-libs/icu-layoutex-59
-->=net-libs/nodejs-9.0.0
-
# Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017)
# The following packages require GCC 5 or earlier and are therefore
# masked in the 17.0 profiles.